From ab9bc98c6f9ab820f7f4f343b524f7b8310ef272 Mon Sep 17 00:00:00 2001
From: LAPTOP-RI7D261L\Mr Ke <545800322@qq.com>
Date: Mon, 17 Feb 2020 10:30:42 +0800
Subject: [PATCH] 南沙小程序修改

---
 SunshineLnsMinApp/pages/activityList/activityList.js |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/SunshineLnsMinApp/pages/activityList/activityList.js b/SunshineLnsMinApp/pages/activityList/activityList.js
index 01cd572..cb4525c 100644
--- a/SunshineLnsMinApp/pages/activityList/activityList.js
+++ b/SunshineLnsMinApp/pages/activityList/activityList.js
@@ -3,27 +3,33 @@
   data: {
     // navbar: ['全部', '未进行', '进行中', '已结束'],
     currentTab: 0,
-    src: app.globalData.imgUrl +'/image/bg.jpg',
-    itemIcon: app.globalData.imgUrl +'/image/ceshi.jpg',
-    icon: app.globalData.imgUrl +'/image/fzl.svg',
-    user: app.globalData.imgUrl +'/image/user.svg',
+    src: app.globalData.imgUrl + '/image/bg.jpg',
+    itemIcon: app.globalData.imgUrl + '/image/ceshi.jpg',
+    icon: app.globalData.imgUrl + '/image/fzl.svg',
+    user: app.globalData.imgUrl + '/image/user.svg',
     dataSet: [],
     content: '------加载中------',
     size: 10,
     hasMoreData: true,
   },
 
-  onLoad:function() {
+  onLoad: function() {
     this.showList()
   },
 
-  showList: function () {
+  showList: function() {
     var userinfo = wx.getStorageSync("user");
     var that = this;
     var id = userinfo.id;
     wx.request({
-      url: app.globalData.url + '/api/activityInfo/preview?page=1&size=' + that.data.size + '&userId=' + id,
-      success: function (res) {
+      url: app.globalData.url + '/api/activity/preview',
+      data: {
+        page: 1,
+        size: that.data.size,
+        userId: id,
+        type: 'act_1'
+      },
+      success: function(res) {
         console.log(res)
         if (res.data.code == 0) {
           (res.data.data.content).forEach(e => {
@@ -44,7 +50,7 @@
               size: that.data.size + 10
             })
           }
-        } else{
+        } else {
           wx.showModal({
             title: '提示',
             content: "请求失败!"
@@ -55,7 +61,7 @@
     })
   },
 
-  link:function(event) {
+  link: function(event) {
     var id = event.currentTarget.dataset['id'];
     var flag = event.currentTarget.dataset['flag'];
     console.log(flag)
@@ -64,7 +70,7 @@
     })
   },
 
-  onReachBottom: function () {
+  onReachBottom: function() {
     if (this.data.hasMoreData) {
       this.showList()
       this.setData({
@@ -76,4 +82,4 @@
       })
     }
   },
-})
+})
\ No newline at end of file

--
Gitblit v1.8.0