From d27fe3ba7dea348a05085ebfb276a3526ef24c80 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Thu, 24 Jun 2021 10:40:48 +0800
Subject: [PATCH] 调整请求名称
---
plugins/infiniteScroll/CInfiniteScroll.vue | 108 +++++++++++++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 45 deletions(-)
diff --git a/plugins/infiniteScroll/CInfiniteScroll.vue b/plugins/infiniteScroll/CInfiniteScroll.vue
index b28aa65..b1ca855 100644
--- a/plugins/infiniteScroll/CInfiniteScroll.vue
+++ b/plugins/infiniteScroll/CInfiniteScroll.vue
@@ -35,12 +35,16 @@
</view>
</view>
</view>
- <slot />
+ <view class="c-infinite-content">
+ <slot />
+ </view>
<view class="c-infinite-bottom">
<view
class="c-infinite-loading"
- v-if="loading"
- >加载中，请稍后...</view>
+ v-if="!ending"
+ >
+ <text v-show="loading">加载中，请稍后...</text>
+ </view>
<view v-if="ending">
<text
class="c-infinite-ended"
@@ -70,7 +74,13 @@
type: Boolean,
default: false,
},
- // 加载页面回调
+ // 发起加载页面数据回调
+ // 参数 {
+ // current: 当前页页码,
+ // next: 需要加载的页面页码,
+ // success: 当加载成功后页面调用, 回传参数 { pageTotal: 当前翻页总页数 }
+ // fail: 加载失败后页面调用
+ // }
onLoadMore: Function,
},
data() {
@@ -116,47 +126,49 @@
// 开始加载
this.inital = true;
this.loading = true;
- this.onLoadMore({
- current: this.current,
- next: this.current + 1,
- // 加载成功
- success: options => {
- setTimeout(() => {
- this.loading = false;
- // 没有数据
- if (!options.pageTotal || options.pageTotal <= 0) {
- this.ending = true;
- }
- // 有数据
- else {
- this.pageTotal = options.pageTotal;
- this.current = this.current + 1;
- // 已到最后一页
- if (this.current >= this.pageTotal) {
+ setTimeout(() => {
+ this.onLoadMore({
+ current: this.current,
+ next: this.current + 1,
+ // 加载成功
+ success: options => {
+ this.$nextTick(() => {
+ this.loading = false;
+ // 没有数据
+ if (!options.pageTotal || options.pageTotal <= 0) {
this.ending = true;
}
- }
- // 还原下拉
+ // 有数据
+ else {
+ this.pageTotal = options.pageTotal;
+ this.current = this.current + 1;
+ // 已到最后一页
+ if (this.current >= this.pageTotal) {
+ this.ending = true;
+ }
+ }
+ // 如果下拉刷新，还原下拉
+ if (this.touch.dargState === 2) {
+ this.touch.driftTop = 0;
+ setTimeout(() => {
+ this.touch.dargState = 0;
+ }, 300);
+ }
+ });
+ },
+ // 加载失败
+ fail: () => {
+ this.loading = false;
+ // 如果下拉刷新，还原下拉
if (this.touch.dargState === 2) {
this.touch.driftTop = 0;
setTimeout(() => {
this.touch.dargState = 0;
}, 300);
}
- }, 100);
- },
- // 加载失败
- fail: () => {
- this.loading = false;
- // 还原下拉
- if (this.touch.dargState === 2) {
- this.touch.driftTop = 0;
- setTimeout(() => {
- this.touch.dargState = 0;
- }, 300);
- }
- },
- });
+ },
+ });
+ }, 100);
},
onScroll(evt) {
// 已经滚动（滚动后禁止下拉刷新）
@@ -185,14 +197,6 @@
// 小程序中滚动到底部
onScrollToLower() {
if (process.env.TARO_ENV !== 'weapp') {
- return;
- }
- this.hanldeLoadMore();
- },
- // 初始加载
- initScroll() {
- // 已初始化，跳过
- if (this.inital) {
return;
}
this.hanldeLoadMore();
@@ -282,6 +286,20 @@
}
}
},
+ // 初始加载
+ $initScroll() {
+ // 已初始化，跳过
+ if (this.inital) {
+ return;
+ }
+ this.hanldeLoadMore();
+ },
+ // 刷新加载
+ $refresh() {
+ this.ending = false;
+ this.current = 0;
+ this.hanldeLoadMore();
+ },
},
mounted() {
// 开启自动初始化
--
Gitblit v1.9.1