Merge branch 'dev' into feature-zyw

src/component/authorization-modal/authorization-modal.js

@@ -42,7 +42,7 @@ Component({
       if (res.detail.userInfo) {
         console.log('点击了同意')
         this.setUserInfo()
-        let token = buyer-token;
+        // let token = buyer-token;
         utils.getUserInfoByBtn(userInfo).then(({ token = '', data = {} }) => {
           wx.setStorageSync('_accreditUserInfo', userInfo)
           wx.hideNavigationBarLoading()

src/pages/integralWater/integralWater.js

@@ -9,41 +9,56 @@ wxService.page({
    * 页面的初始数据
    */
   data: {
-    integralNum: 1246
-  },
-  // 点击跳转至会员规则页
-  handleGoMemberRulesRules() {
-    wxService.router(`/pages/memberRules/memberRules`)
-  },
-   // 去积分商城
-  handleGoIntegralMall() {
-    wxService.router(`/pages/IntegralMall/IntegralMall`)
-  },
-  // 消费详情
-  handleGoDetail() {
-    wxService.router(`/pages/consumptionDetails/consumptionDetails`)
+    integralNum: 1246,
+    pageNo: 1,
+    pageSize: 30
   },
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function (options) {
-
-  },
-
+  onLoad() {},
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
   onReady: function () {
 
   },
-
   /**
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-
+    // 积分流水
+    this.getIntegralList()
   },
 
+  getIntegralList() {
+    // wx.showLoading({
+    //   title: '加载中'
+    // })
+
+    const params = {
+      pageNo: this.data.pageNo,
+      pageSize: this.data.pageSize
+    }
+    wxService.post(`/member/memberPointLog/findPage?pageNo=${this.data.pageNo}&pageSize=${this.data.pageSize}`, params).then(res=> {
+      // const {code,data} = res.data
+      // if(code == 200){
+        //  wx.hideLoading()
+      // }
+    })
+  },
+  // 点击跳转至会员规则页
+  handleGoMemberRulesRules() {
+    wxService.router(`/pages/memberRules/memberRules`)
+  },
+    // 去积分商城
+  handleGoIntegralMall() {
+    wxService.router(`/pages/IntegralMall/IntegralMall`)
+  },
+  // 消费详情
+  handleGoDetail() {
+    wxService.router(`/pages/consumptionDetails/consumptionDetails`)
+  },
   /**
    * 生命周期函数--监听页面隐藏
    */

src/utils/Http.js

@@ -84,7 +84,7 @@ class Http {
       url,
       method: 'GET',
       header: {
-        token: this.getToken()
+        'buyer-token': this.getToken()
       },
       data: parmas
     })
@@ -95,7 +95,7 @@ class Http {
       url,
       method: 'POST',
       header: {
-        token: wx.getStorageSync('token')
+        'buyer-token': wx.getStorageSync('token')
       },
       data: parmas,
       channel: channel

src/utils/wxService.js

@@ -155,7 +155,8 @@ class WXService extends Http {
         let newBaseUserInfo = { ...baseUserInfo, ...res.data.data }
         this.baseUserInfo = newBaseUserInfo
         wx.setStorageSync('_baseUserInfo', newBaseUserInfo)
-        wx.setStorageSync('buyer-token', res.data.data.token)
+        // wx.setStorageSync('buyer-token', res.data.data.token)
+        wx.setStorageSync('token', res.data.data.token)
         this.startReport()
         return Promise.resolve({ state: 1, info: res.data.data })
       } else {
@@ -290,7 +291,7 @@ class WXService extends Http {
       app.globalData.baseUserInfo = baseUserInfo
     }
     if (!app.globalData.userNo) {
-      const token = wx.getStorageSync('buyer-token')
+      const token = wx.getStorageSync('token')
       app.globalData.userNo = token.split('###')[0]
     }
   }