From 33c6d3490a3216775e8e869ede1a32c710b5b2c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= <yerz@shengshi.com.cn>
Date: Thu, 10 Feb 2022 17:08:31 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E5=9F=9F=E9=80=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/siyutong/activityDetail/index.js   | 2 +-
 pages/siyutong/activityDetail/index.wxml | 2 +-
 pages/siyutong/index.js                  | 2 +-
 pages/siyutong/index.wxml                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/siyutong/activityDetail/index.js b/pages/siyutong/activityDetail/index.js
index 78ca59e..366edf5 100644
--- a/pages/siyutong/activityDetail/index.js
+++ b/pages/siyutong/activityDetail/index.js
@@ -60,7 +60,7 @@ Page({
         this.setData({
           noData: true
         })
-      } else if (this.data.list.length>9&&this.data.list.length == res.data.total) {
+      } else if (this.data.list.length == res.data.total) {
         this.setData({
           end: true
         })
diff --git a/pages/siyutong/activityDetail/index.wxml b/pages/siyutong/activityDetail/index.wxml
index 129c2e8..4c1a190 100644
--- a/pages/siyutong/activityDetail/index.wxml
+++ b/pages/siyutong/activityDetail/index.wxml
@@ -33,7 +33,7 @@
               <view class="absolute right-0 box-middle mr30 font-28 color-999">{{item.c_time}}</view>
             </view>
           </block>
-          <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
+          <lcb-listmore isLoading='{{loading}}' isEnd='{{list.length>9&&end}}' isNoData='{{noData}}'></lcb-listmore>
         </view>
       </view>
     </view>
diff --git a/pages/siyutong/index.js b/pages/siyutong/index.js
index aaa320c..a86b5e5 100644
--- a/pages/siyutong/index.js
+++ b/pages/siyutong/index.js
@@ -72,7 +72,7 @@ Page({
         this.setData({
           noData: true
         })
-      } else if (this.data.list.length>9&&this.data.list.length == res.data.total) {
+      } else if (this.data.list.length == res.data.total) {
         this.setData({
           end: true
         })
diff --git a/pages/siyutong/index.wxml b/pages/siyutong/index.wxml
index 5b6f547..6b661cd 100644
--- a/pages/siyutong/index.wxml
+++ b/pages/siyutong/index.wxml
@@ -22,7 +22,7 @@
             </view>
           </view>
         </block>
-        <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
+        <lcb-listmore isLoading='{{loading}}' isEnd='{{list.length>9&&end}}' isNoData='{{noData}}'></lcb-listmore>
       </view>
 
     </view>