money&time

app.js

@@ -5,6 +5,7 @@ App({
   data:{
   },
   globalData: {
+    common: {},
     userInfo: null,
     HOST: 'https://chaoshi.henhaojie.com',
     platform: 0,
@@ -62,6 +63,7 @@ App({
                   if (resLogin.data.errno == 0) {
                     user = resLogin.data.rst;
                     wx.setStorageSync("user", user)
+                    app.globalData.common['token'] = user.token
                     if (func) {
                       func();
                     }
@@ -90,8 +92,8 @@ App({
                                     success: function (resLogin) {
                                       if (resLogin.data.errno == 0) {
                                         user = resLogin.data.rst;
-                                        // user_id = resLogin.data.rst.user_id;
                                         wx.setStorageSync("user", user)
+                                        app.globalData.common['token'] = user.token
                                         if (func) {
                                           func();
                                         }
@@ -119,6 +121,7 @@ App({
     wx.request({
       url: app.globalData.HOST + '/user/wx/share',
       method: 'POST',
+      data: app.globalData.common,
       success: function (res) {
         if (res.data.errno == '0'){
           title = res.data.rst.title;

pages/application/application.js

@@ -31,7 +31,7 @@ Page({
       wx.request({
         url: app.globalData.HOST + '/user/wx/myapply',
         method: "POST",
-        data: {token: token, pageId: ++that.data.page},
+        data: Object.assign({}, app.globalData.common, {pageId: ++that.data.page}),
         success: function (res) {
           var data = res.data;
             // console.log(data);
@@ -69,7 +69,7 @@ Page({
     wx.request({
       url: app.globalData.HOST + '/user/wx/xykMyapply',
       method: "POST",
-      data: {token: token, pageId: ++that.data.page},
+      data: Object.assign({}, app.globalData.common, {pageId: ++that.data.page}),
       success: function (res) {
         var data = res.data;
           // console.log(data);
@@ -108,11 +108,13 @@ Page({
   onPullDownRefresh: function () {
     //下拉
     this.data.page = 0;
-    if (this.data.activeIndex == 0) {
-      this.initApplication();
-    }else{
-      this.initCardList();
-    }
+    setTimeout(() => {
+        if (this.data.activeIndex == 0) {
+          this.initApplication();
+        }else{
+          this.initCardList();
+        }
+    }, 600)
   },
   onReachBottom: function () {
     //上拉

pages/card/card.js

@@ -51,7 +51,7 @@ Page({
     wx.request({
       url: app.globalData.HOST + '/user/CreditCard/list',
       method: "POST",
-      data: {pageId: ++this.data.page},
+      data: Object.assign({}, app.globalData.common, {pageId: ++this.data.page}),
       success: function (res) {
         if (res.data.errno == '0') {
           // data = res.data.rst.list;
@@ -71,6 +71,7 @@ Page({
     wx.request({
       url: app.globalData.HOST + '/user/CreditCard/bannerlist',
       method: "POST",
+      data: app.globalData.common,
       success: function (res) {
         if (res.data.errno == '0') {
           data = res.data.rst.data;

pages/details/details.js

@@ -40,7 +40,7 @@ Page({
       wx.request({
         url: app.globalData.HOST + '/user/product/detail',
         method: "POST",
-        data: {id: that.data.id},
+        data: Object.assign({}, app.globalData.common, {id: that.data.id}),
         success: function (res) {
           if (res.data.errno == '0') {
             data = res.data.rst;
@@ -59,7 +59,7 @@ Page({
       wx.request({
         url: app.globalData.HOST + '/user/product/getSameAmountByProductId',
         method: "POST",
-        data: {id: that.data.id, platform: app.globalData.platform},
+        data: Object.assign({}, app.globalData.common, {id: that.data.id, platform: app.globalData.platform}),
         success: function (res) {
           if (res.data.errno == '0') {
             list = res.data.rst.data;
@@ -115,7 +115,7 @@ Page({
       wx.request({
         url: app.globalData.HOST + '/user/wx/known',
         method: "POST",
-        data: {id: id, },
+        data: Object.assign({}, app.globalData.common, {id: id}),
         success: function (res) {
         },
         complete: function () {

pages/feedback/feedback.js

@@ -23,10 +23,10 @@ Page({
         wx.request({
           url: app.globalData.HOST + '/user/wx/addMessage',
           method: 'POST',
-          data: {
+          data: Object.assign({}, app.globalData.common, {
             token: token,
             content: value
-          },
+          }),
           success: function (res) {
             if (res.data.errno == 0) {
                 app.noticeModal('我们会及时处理，感谢您的反馈～', that.goMine)

pages/find/find.js

@@ -37,6 +37,7 @@ Page({
     wx.request({
       url: app.globalData.HOST + '/user/wx/filter',
       method: "POST",
+      data: app.globalData.common,
       success: function (res) {
         var data = res.data.rst;
         if (res.data.errno == '0') {
@@ -103,14 +104,15 @@ Page({
     //下拉
     var that = this;
     that.data.page = 1;
-    utils.initList(that, that.data.obj, 'top', that.data.page);
-    // utils.initList(that, that.data.obj, that.data.page);
+    setTimeout(() => {
+        utils.initList(that, that.data.obj, that.data.page);
+    }, 500)
   },
   onReachBottom: function () {
     //上拉
     var that = this;
     if (that.data.hasNext) {
-      utils.initList(that, that.data.obj, 'bottom', ++that.data.page);
+      utils.initList(that, that.data.obj, ++that.data.page);
     }
   },
   onReady: function () {

pages/getIt/getIt.js

@@ -22,7 +22,7 @@ Page({
       wx.request({
         url: app.globalData.HOST + '/user/wx/known',
         method: "POST",
-        data: {id: id, },
+        data: Object.assign({}, app.globalData.common, {id: id}),
         success: function (res) {
         },
         complete: function () {

pages/index/index.js

@@ -21,10 +21,11 @@ Page({
       that.setData({source: options.source})
     }
     app.login(that);
+    const dataParam =  Object.assign({}, app.globalData.common, {version: 2, platform: app.globalData.platform});
     wx.request({
       url: app.globalData.HOST + '/user/product/homeact',
       method: 'POST',
-      data: {version: 2, platform: app.globalData.platform},
+      data: dataParam,
       success: function (res) {
         if (res.data.errno == '0'){
           that.setData({ imgUrls: res.data.rst.homeact});
@@ -44,12 +45,17 @@ Page({
   onPullDownRefresh: function () {
     //下拉
       var that = this, obj = { amount: 0, is_hot: 1, is_new: 0, search: 0, term: 0, user_title: "不限" };
-      utils.initList(that, obj, 'top', ++that.data.page);
+      that.data.page = 1;
+      setTimeout(()=>{
+        utils.initList(that, obj, that.data.page);
+      }, 800)
   },
   onReachBottom: function () {
     //上拉
     var that = this, obj = { amount: 0, is_hot: 1, is_new: 0, search: 0, term: 0, user_title: "不限" };
-    utils.initList(that, obj, 'bottom', ++that.data.page);
+    if (that.data.hasNext) {
+      utils.initList(that, obj, ++that.data.page);
+    }
   },
   onShareAppMessage: function () {
     return {

pages/signup/signup.js

@@ -96,13 +96,13 @@ Page({
       } else {
           if (codeNotice == '获取验证码') {
             that.countDown(60);
+            const dataParam = Object.assign({}, app.globalData.common, {
+                phone: phone
+              })
             wx.request({
               url: app.globalData.HOST + '/user/wx/sendCode',
               method: 'POST',
-              data: {
-                token: token,
-                phone: phone
-              },
+              data: dataParam,
               success: function (errno) {
                 if (errno.data.errno == '0') {
                 }
@@ -135,14 +135,14 @@ Page({
               errorMsg: '手机号格式不正确'
             })
         }else{
+            const dataParam = Object.assign({}, app.globalData.common, {
+                phone: phone,
+                code: code
+              })
             wx.request({
               url: app.globalData.HOST + '/user/wx/bindMobile',
               method: 'POST',
-              data: {
-                token: token,
-                phone: phone,
-                code: code
-              },
+              data: dataParam,
               success: function (res) {
                 if (res.data.errno == '0') {
                   wx.setStorage({key:"tel", data: phone})

utils/util.js

@@ -1,8 +1,7 @@
 // 请求列表数据
 var app = getApp();
-var initList = function (that, obj, orient, page) {
+var initList = function (that, obj, page) {
   that.setData({hidden: false});
-  orient = orient || '';
   var obj = obj || { amount: 0, is_hot: 1, is_new: 0, search: 0, term: 0, user_title: "不限" };
   obj['page'] = page || 1;
   obj['platform'] = app.globalData.platform
@@ -12,10 +11,11 @@ var initList = function (that, obj, orient, page) {
   }else{
     list = that.data.dataList
   }
+  const dataParam = Object.assign({}, obj, app.globalData.common)
   wx.request({
     url: app.globalData.HOST + '/user/product/searchSecond',
     method: "POST",
-    data: obj,
+    data: dataParam,
     success: function (res) {
       var data = res.data.rst.data;
       if (res.data.errno == '0') {