From 73d4022530530be074c48a978ff6d489134bc8e4 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Fri, 02 Apr 2021 11:00:01 +0800
Subject: [PATCH] 完善筛选组件与无限滚动组件

---
 plugins/infiniteScroll/CInfiniteScroll.vue |   17 +++++++++++++----
 1 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/plugins/infiniteScroll/CInfiniteScroll.vue b/plugins/infiniteScroll/CInfiniteScroll.vue
index 19504bd..9792580 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"
@@ -73,7 +77,7 @@
         // 发起加载页面数据回调
         //   参数 {
         //     current: 当前页页码,
-        //     next: 需要到达的页面页码,
+        //     next: 需要加载的页面页码,
         //     success: 当加载成功后页面调用, 回传参数 { pageTotal: 当前翻页总页数 }
         //     fail: 加载失败后页面调用
         //   }
@@ -288,6 +292,11 @@
                 }
             }
         },
+        refresh() {
+            this.ending = false;
+            this.current = 0;
+            this.hanldeLoadMore();
+        },
     },
     mounted() {
         // 开启自动初始化

--
Gitblit v1.9.1