From a1797c09e5bb8ea52bd8887458a7b993a125a8af 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 16:59:18 +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.json | 2 +-
 pages/siyutong/activityDetail/index.wxml | 3 ++-
 pages/siyutong/activityDetail/index.wxss | 2 +-
 pages/siyutong/index.js                  | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pages/siyutong/activityDetail/index.js b/pages/siyutong/activityDetail/index.js
index 366edf5..78ca59e 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 == res.data.total) {
+      } else if (this.data.list.length>9&&this.data.list.length == res.data.total) {
         this.setData({
           end: true
         })
diff --git a/pages/siyutong/activityDetail/index.json b/pages/siyutong/activityDetail/index.json
index d18b2ed..5c7441e 100644
--- a/pages/siyutong/activityDetail/index.json
+++ b/pages/siyutong/activityDetail/index.json
@@ -3,7 +3,7 @@
   "navigationStyle": "custom",
   "navigationBarTextStyle": "white",
   "navigationBarBackgroundColor": "#333",
-  "backgroundColor": "#ffffff",
+  "backgroundColor": "#333",
   "backgroundColorTop": "#333",
   "usingComponents": {
     "activityPoster": "/components/activityPoster/index"
diff --git a/pages/siyutong/activityDetail/index.wxml b/pages/siyutong/activityDetail/index.wxml
index bdd29a7..129c2e8 100644
--- a/pages/siyutong/activityDetail/index.wxml
+++ b/pages/siyutong/activityDetail/index.wxml
@@ -25,7 +25,7 @@
         </block>
       </view>
       <view class="inner30 bg-fff ulib-rb20">
-        <view class="text-center pb10 font-42 color-333">实时战报</view>
+        <view class="text-center pb10 font-42 color-333">实时数据</view>
         <view>
           <block wx:for='{{list}}' wx:key='index'>
             <view class="mt20 inner30 relative bg-f0f4ff pr150 ulib-r10">
@@ -33,6 +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>
         </view>
       </view>
     </view>
diff --git a/pages/siyutong/activityDetail/index.wxss b/pages/siyutong/activityDetail/index.wxss
index a39dbae..fe654c4 100644
--- a/pages/siyutong/activityDetail/index.wxss
+++ b/pages/siyutong/activityDetail/index.wxss
@@ -1,5 +1,5 @@
 page{
-  background-color:#fff;
+  background-color:#333;
 }
 .tt-ac{
   background-color:#76a1e5;
diff --git a/pages/siyutong/index.js b/pages/siyutong/index.js
index 6b74797..aaa320c 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>10&&this.data.list.length == res.data.total) {
+      } else if (this.data.list.length>9&&this.data.list.length == res.data.total) {
         this.setData({
           end: true
         })