From 1f2f5a0ed17bbe3445104a1c707981eefed06fad Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Mon, 22 Feb 2021 10:56:43 +0800
Subject: [PATCH] APP通讯初始化,第一步

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

diff --git a/plugins/infiniteScroll/CInfiniteScroll.vue b/plugins/infiniteScroll/CInfiniteScroll.vue
index b66a703..f54c096 100644
--- a/plugins/infiniteScroll/CInfiniteScroll.vue
+++ b/plugins/infiniteScroll/CInfiniteScroll.vue
@@ -10,12 +10,18 @@
         @scroll="evt=>onScroll(evt)"
     >
         <slot />
-        <view class="bottom">
-            <view v-if="loading">加载中,请稍后...</view>
+        <view class="c-infinite-bottom">
+            <view
+                class="c-infinite-loading"
+                v-if="loading"
+            >加载中,请稍后...</view>
             <view v-if="ending">
-                <text v-if="pageTatal > 0">-- 没有更多了 --</text>
                 <text
-                    class="empty"
+                    class="c-infinite-ended"
+                    v-if="pageTotal > 0"
+                >-- 没有更多了 --</text>
+                <text
+                    class="c-infinite-empty"
                     v-else
                 >暂无数据...</text>
             </view>
@@ -68,21 +74,21 @@
                 next: this.current + 1,
                 // 加载成功
                 success: (options) => {
-                    // 没有数据
-                    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;
-                        }
-                    }
                     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) {
+                                this.ending = true;
+                            }
+                        }
                     }, 100);
                 },
                 // 加载失败

--
Gitblit v1.9.1