From f6a5aae77ecbb705919b8226fbf48dfd1d6fc1a4 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 10:21:45 +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.wxml |  4 +-
 pages/siyutong/index.js                  | 51 +++++++++++++++++-------
 pages/siyutong/index.wxml                | 42 +++++++------------
 3 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/pages/siyutong/activityDetail/index.wxml b/pages/siyutong/activityDetail/index.wxml
index c3304be..bdd29a7 100644
--- a/pages/siyutong/activityDetail/index.wxml
+++ b/pages/siyutong/activityDetail/index.wxml
@@ -6,7 +6,7 @@
       <view class="text-center pt10 pb10 font-42 color-333">活动内容</view>
       <view class="inner20 pt15 font-28 color-666 line-height-16">{{info.remark}}</view>
     </view>
-    <view class="mt30 inner30 bg-fff box-shadow-000-10-10 ulib-r20">
+    <!-- <view class="mt30 inner30 bg-fff box-shadow-000-10-10 ulib-r20">
       <view class="relative pr150" bindtap="pushLink" data-url="{{info.ranking.url}}">
         <view class="text-nowrap font-32 color-666">{{info.ranking.title}}</view>
         <view class="absolute right-0 box-middle">
@@ -14,7 +14,7 @@
           <i class="iconfont icon-gengduo text-middle font-32 color-999"></i>
         </view>
       </view>
-    </view>
+    </view> -->
     <view class="mt30 box-shadow-000-10-10 ulib-r20">
       <view class="ulib-rt20 pt40 pb40 bg-fffaf3 text-center color-333 fn-flex">
         <block wx:for='{{info.menus}}' wx:key='index'>
diff --git a/pages/siyutong/index.js b/pages/siyutong/index.js
index 32470b3..6b74797 100644
--- a/pages/siyutong/index.js
+++ b/pages/siyutong/index.js
@@ -17,6 +17,11 @@ Page({
     },
     swiperCurrent: 0,
     list: [],
+    pageNo: 1,
+    noData: false,
+    end: false,
+    load: true,
+    loading: false,
   },
 
   //生命周期函数--监听页面加载
@@ -49,13 +54,29 @@ Page({
 
   //活动列表
   getAppSytactivityList(){
+    this.setData({
+      load: false,
+      loading: true,
+    })
     let params = {};
-    params['page'] = 1;
-    params['size'] = 100;
+    params['page'] = this.data.pageNo;
+    params['size'] = 10;
     _.apiQuery.getAppSytactivityList(params).then(res => {
       this.setData({
-        list: this.getIconByGroup(res.data.list),
+        pageNo: this.data.pageNo + 1,
+        list: this.data.list.concat(res.data.list),
+        load: true,
+        loading: false,
       })
+      if (res.data.total == 0) {
+        this.setData({
+          noData: true
+        })
+      } else if (this.data.list.length>10&&this.data.list.length == res.data.total) {
+        this.setData({
+          end: true
+        })
+      }
       wx.stopPullDownRefresh()
     });
   },
@@ -88,23 +109,23 @@ Page({
   },
 
   //页面相关事件处理函数--监听用户下拉动作
-  onPullDownRefresh: function () {
+  onPullDownRefresh(){
     this.setData({
-      swiperOptions: {
-        indicatorDots: false,
-        vertical: false,
-        autoplay: false,
-        interval: 4000,
-        duration: 1000,
-        items: 1,
-        circular: false,
-        current: 0
-      },
-      swiperCurrent: 0,
       list: [],
+      pageNo: 1,
+      noData: false,
+      end: false,
+      load: true,
+      loading: false,
     })
     this.getAppSytactivityTabs()
     this.getAppSytactivityList()
   },
 
+  //页面上拉触底事件的处理函数
+  onReachBottom(){
+    if (this.data.noData || this.data.end||!this.data.load) return;
+    this.getAppSytactivityList()
+  },
+
 })
\ No newline at end of file
diff --git a/pages/siyutong/index.wxml b/pages/siyutong/index.wxml
index 41338f2..5b6f547 100644
--- a/pages/siyutong/index.wxml
+++ b/pages/siyutong/index.wxml
@@ -2,43 +2,29 @@
   <view class="relative" style="height:630rpx;"></view>
   <view class="pl30 pr30 pb30">
     <view class="syt-panel box-shadow-000-10-10 ulib-r20">
-      <view class="ulib-rt10 pt40 pb40 bg-fffaf3 text-center fn-flex color-333">
+      <!-- <view class="ulib-rt10 pt40 pb40 bg-fffaf3 text-center fn-flex color-333">
         <block wx:for='{{menus}}' wx:key='index'>
           <view class="fn-flex-item">
             <view class="font-40 text-bold color-fe4109">{{item.value}}</view>
             <view class="font-28">{{item.title}}</view>
           </view>
         </block>
-      </view>
-      <view class="inner30 bg-fff ulib-rb10">
+      </view> -->
+
+      <view class="inner30 bg-fff ulib-r10" style="min-height:700rpx">
         <view class="mt10 text-center"><image style="width:300rpx;height:40rpx;" lazy-load="{{true}}" mode="aspectFill" src="{{imgUrl}}siyutong/ac-tt-1.png?v=220207"></image></view>
-        <view>
-          <swiper style="height:370rpx;" indicator-dots="{{swiperOptions.indicatorDots}}"
-            autoplay="{{swiperOptions.autoplay}}" current="{{swiperOptions.current}}"
-            interval="{{swiperOptions.interval}}" duration="{{swiperOptions.duration}}"
-            display-multiple-items="{{swiperOptions.items}}" circular="{{swiperOptions.circular}}"
-            bindchange="swiperChange">
-            <block wx:for="{{list}}" wx:key="index">
-              <swiper-item>
-                <block wx:for="{{item}}" wx:for-item="it" wx:key="index">
-                  <view class="mt20 inner30 relative bg-f0f4ff pr150 ulib-r10 {{it.color!='#ff842d'?'opacity-50':''}}" bindtap="pushLink" data-url="/pages/siyutong/activityDetail/index?id={{it.id}}">
-                    <view class="text-nowrap font-32 color-333">{{it.title}}</view>
-                    <view class="absolute right-0 box-middle mr20">
-                      <text class="inline-block pl10 pr10 text-middle font-20 color-fff ulib-r750" style="background-color:{{it.color}};" >{{it.type_name}}</text>
-                      <i class="iconfont icon-gengduo text-middle font-32 color-666"></i>
-                    </view>
-                  </view>
-                </block>
-              </swiper-item>
-            </block>
-          </swiper>
-          <view class="dots mt20" wx:if="{{list.length>1}}">
-            <block wx:for="{{list}}" wx:key="unique">
-              <view class="dot{{index == swiperCurrent ? ' active' : ''}}"></view>
-            </block>
+        <block wx:for="{{list}}" wx:key="index">
+          <view class="mt20 inner30 relative bg-f0f4ff pr150 ulib-r10 {{item.color!='#ff842d'?'opacity-50':''}}" bindtap="pushLink" data-url="/pages/siyutong/activityDetail/index?id={{item.id}}">
+            <view class="text-nowrap font-32 color-333">{{item.title}}</view>
+            <view class="absolute right-0 box-middle mr20">
+              <text class="inline-block pl10 pr10 text-middle font-20 color-fff ulib-r750" style="background-color:{{item.color}};" >{{item.type_name}}</text>
+              <i class="iconfont icon-gengduo text-middle font-32 color-666"></i>
+            </view>
           </view>
-        </view>
+        </block>
+        <lcb-listmore isLoading='{{loading}}' isEnd='{{end}}' isNoData='{{noData}}'></lcb-listmore>
       </view>
+
     </view>
   </view>
 </view>
\ No newline at end of file