From 84920ada00d69565bef33e7e31bc32b426ec5dc3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 19 十二月 2020 16:19:28 +0800
Subject: [PATCH] '接口完善'

---
 pages/scan-record/scan-record.js |  102 ++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/pages/scan-record/scan-record.js b/pages/scan-record/scan-record.js
index d4fc187..a97235e 100644
--- a/pages/scan-record/scan-record.js
+++ b/pages/scan-record/scan-record.js
@@ -1,25 +1,97 @@
 var help = require('../../util/help.js');
+var api = require('../../util/api.js');
+var $this;
 Page({
   data: {
-    list: [{ id: 13213 }, 2, 3, 4, 5, 6, 7, 8, 10],
+    /* 鍒楄〃鏁版嵁寮�濮� */
+    list: [],
     showLoading: false,
     page: 1,
-    total: 15
+    total: 0,
+    showEmptyDefault: false,
+    isRequesting: false,//鏄惁姝ｅ湪璇锋眰涓�
+    showFooter: false,
+    /* 鍒楄〃鏁版嵁缁撴潫 */
   },
   onLoad() {
     help.setPageNavBar("娴忚瓒宠抗");
+    $this = this;
+    $this.requestActivity(1, true);
   },
   onPullDownRefresh() {
     console.log('onPullDownRefresh', new Date());
     my.showToast({
       content: "涓嬫媺鍒锋柊瑙﹀彂"
     });
+    this.requestActivity(1);
+  },
+  //璇锋眰娲诲姩
+  requestActivity(page, first) {
+    $this.setData({
+      page: page,
+      isRequesting: true,
+      showEmptyDefault:false
+    });
+    api.getScanActivityRecord({
+      page: page,
+      showLoading: first,
+      success: function (res) {
+        console.log(res)
+        if (res.code == 0) {
+          var list =res.data.data;
+          //璁剧疆鍒楄〃鏁版嵁
+          if (list != null && list.length > 0) {
+            var totalList = $this.data.list.concat(list);
+            if (page == 1) {
+              totalList = list;
+            }
+            $this.setData({
+              total: res.data.count,
+              list: totalList,
+              showFooter: totalList.length >= res.data.count
+            })
+          }
+          //璁剧疆绌哄垪琛ㄩ粯璁ゆ樉绀�
+          if (page == 1 && (list == null || list.length == 0)) {
+            $this.setData({
+              showEmptyDefault: true
+            })
+          }
+        } else {
+          my.showToast({
+            content: res.msg
+          });
+        }
+      },
+      fail: function () {
+        //璇锋眰澶辫触闇�瑕佸皢椤电爜鍑�1
+        if ($this.data.page > 1) {
+          $this.setData({
+            page: $this.data.page - 1
+          });
+        }
+      },
+      complete: function () {
+        my.stopPullDownRefresh();
+        setTimeout(() => {
+          $this.setData({
+            isRequesting: false,
+            showLoading: false
+          });
+        }, 1000);
 
-    this.getActivityList(1);
-
+      }
+    });
 
   },
+  //涓嬫媺鍒锋柊
+  onPullDownRefresh() {
+    this.requestActivity(1, false);
+  },
+  //鍒拌揪搴曢儴
   async scrollMytrip() {
+    if (this.data.isRequesting)
+      return;
     try {
       console.log('scrollMytrip:');
       const { page, list, } = this.data;
@@ -28,32 +100,18 @@
         //寮�鍚姞杞�
         this.setData({ showLoading: true });
         const newPage = page + 1;
-        this.getActivityList(newPage);
+        $this.requestActivity(newPage);
       }
     } catch (e) {
-      this.setData({ show: false });
+      this.setData({ showLoading: false });
       console.log('scrollMytrip鎵ц寮傚父:', e);
     }
   },
-  //鑾峰彇鍒楄〃
-  getActivityList(page = 1) {
-    setTimeout(function () {
-      my.stopPullDownRefresh({
-        complete(res) {
-          console.log(res, new Date())
-        }
-      });
-      my.showToast({
-        content: "璇锋眰鏁版嵁:" + page
-      });
-
-    }, 5000);
-  },
   clickItem(event) {
     var item = help.getEventParam(event, 'item');
-    console.log(item.id);
+    console.log(item.activity.id);
     my.navigateTo({
-      url: '/pages/activity-detail/activity-detail?id=' + item.id
+      url: '/pages/activity-detail/activity-detail?id=' + item.activity.id
     });
   }
 

--
Gitblit v1.8.0