From c288988edff277f0f65553b4c22900241f67995f Mon Sep 17 00:00:00 2001
From: taiyuan <yvan.ni@yolipai.com>
Date: Wed, 15 Jul 2020 17:11:56 +0800
Subject: [PATCH] 修改 上拉加载更多

---
 packageA/pages/liveStream/liveStream.js | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------
 1 file changed, 75 insertions(+), 36 deletions(-)

diff --git a/packageA/pages/liveStream/liveStream.js b/packageA/pages/liveStream/liveStream.js
index ae9bee8..4b167e1 100644
--- a/packageA/pages/liveStream/liveStream.js
+++ b/packageA/pages/liveStream/liveStream.js
@@ -17,7 +17,7 @@ Page({
    */
   data: {
     curPage: 1,
-    pageNum: 0,
+    pageNum: 1,
     liveing: [],
     livetoBegin: [],
     liveOver: []
@@ -67,7 +67,7 @@ Page({
     });
   },
 
-  loadLiveList: function (curPage) {    
+  loadLiveList: function (curPage) {
     // console.log('---->curPage', curPage);
     // var live = {};
     // live.toBegin = []; // 即将开始
@@ -79,61 +79,76 @@ Page({
     // 请求数据
     getApp().request.promiseGet("/api/weshop/wx/livelist/page", {
       data: {
-        storedId: storeId,
+        storedId: o.stoid,
         page: curPage,
         live_status: 103
       }
     }).then(res => {
       if (res.data.code == 0) {
+        console.log('res------------>', res);
         // 计算总页数
-        var total = res.data.data.total;
-        var pageSize = res.data.data.pageSize;
-        var pageNum = total % pageSize;
-
-        that.setData({
-          pageNum: pageNum
-        });
+        // var total = res.data.data.total;
+        // console.log("total", total);
+        // var pageSize = res.data.data.pageSize;
+        // console.log("pageSize", pageSize);
+        // var pageNum = that.pageTotal(total, pageSize);
+        // that.setData({
+        //   pageNum: that.pageTotal(total, pageSize)
+        // });
 
         // 如果当前请求的是第一页数据，则执行赋值，否则执行合并再赋值
-        if(curPage == 1) {
+        if (curPage == 1) {
           that.setData({
-            liveOver: res.data.data.pageData
-            // 测试
-            // liveOver: that.data.liveOver.concat(res.data.data.pageData)
-          });
+            liveOver: that.data.liveOver.concat(res.data.data.pageData)
+          })
         } else {
           that.setData({
             liveOver: that.data.liveOver.concat(res.data.data.pageData)
-          });
+          })
         };
-    
+
         // var list = that.data.list;
         // for(var i in list) {
-          // var liveStatus = list[i].live_status;
-          // if (liveStatus == '101') {
-          //   live.ing.push(list[i]);
-          // } else if (liveStatus == '102') {
-          //   live.toBegin.push(list[i]);
-          // } else if (liveStatus == '103') {
-          //   live.over.push(list[i]);
-          // }
+        // var liveStatus = list[i].live_status;
+        // if (liveStatus == '101') {
+        //   live.ing.push(list[i]);
+        // } else if (liveStatus == '102') {
+        //   live.toBegin.push(list[i]);
+        // } else if (liveStatus == '103') {
+        //   live.over.push(list[i]);
+        // }
         // }
 
         // that.setData({
         //   liveOver: list
         // });
 
-        curPage ++;
+        curPage++;
         that.setData({
           curPage
         });
 
+        console.log('上拉已经触发，当前page------------------------->',that.data.curPage);
+
       } else {
         console.error('请求失败！！！！！');
       }
     })
   },
 
+  pageTotal: function (rowCount, pageSize) {
+    if (rowCount == null || rowCount == "") {
+      return 0;
+    } else {
+      if (pageSize != 0 && rowCount % pageSize == 0) {
+        return parseInt(rowCount / pageSize)
+      };
+      if (pageSize != 0 && rowCount % pageSize != 0) {
+        return parseInt(rowCount / pageSize) + 1;
+      };
+    }
+  },
+
   getData: function (liveStatus) {
     var that = this;
     var curPage = this.data.curPage
@@ -145,21 +160,37 @@ Page({
       }
     }).then(res => {
       if (res.data.code == 0) {
-        if(liveStatus == 101) {
+        if (liveStatus == 101) {
           that.setData({
             liveing: res.data.data.pageData
           });
-        } else if(liveStatus == 102) {
+        } else if (liveStatus == 102) {
           that.setData({
             livetoBegin: res.data.data.pageData
           });
-        } else if(liveStatus == 103) {
+        } else if (liveStatus == 103) {
           that.setData({
             liveOver: res.data.data.pageData
           });
+
+          var total = res.data.data.total;
+          console.log("total", total);
+          var pageSize = res.data.data.pageSize;
+          console.log("pageSize", pageSize);
+          var pageNum = that.pageTotal(total, pageSize);
+          console.log("pageNum", pageNum);
+          that.setData({
+            pageNum
+          });
+
         }
-        
       }
+
+      curPage++;
+      that.setData({
+        curPage
+      });
+
     });
   },
 
@@ -167,7 +198,13 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log('ppppp',this.pageTotal(4, 10));
+    // var self = this;
+    // this.updateLiveList().then(() => {
+    //   self.getData(101);
+    //   self.getData(102);
+    //   self.getData(103);
+    // });
   },
 
   /**
@@ -178,6 +215,7 @@ Page({
     // this.updateLiveList().then(() => {
     //   self.loadLiveList(1);
     // });
+
     var self = this;
     this.updateLiveList().then(() => {
       self.getData(101);
@@ -219,30 +257,31 @@ Page({
     //   wx.stopPullDownRefresh(); //停止下拉刷新 
     // }, 500);  
   },
+
   /**
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
     var self = this;
     var curPage = this.data.curPage;
+    console.log('now curPage',curPage);
     var pageNum = this.data.pageNum;
+    console.log('now pageNum',pageNum);
 
-    if(curPage <= pageNum) {
+    if (curPage <= pageNum) {
       wx.showLoading({
         title: '加载中...',
       })
-      setTimeout(function() {
-        self.loadLiveList(1);
+      setTimeout(function () {
+        self.loadLiveList(curPage);
         wx.hideLoading();
       }, 500);
-      
     } else {
       wx.showToast({
         title: '已经到底啦~',
         duration: 1000
       })
     }
-    console.log('当前curpage',curPage, pageNum);
   },
 
   /**
--
libgit2 0.21.4