header_tunnel-token

src/utils/Http.js

@@ -79,29 +79,63 @@ class Http {
       .catch(this.fail)
   }
 
+  // header: {
+  //   'tunnel-token' : 'aa8a1bfb7f6c5031d172d94b6574293ef954a6f2d4e16657da008e0cc15588feD'
+  // },
+
   get (url, parmas) {
-    return this.request({
-      url,
-      method: 'GET',
-      header: {
-        'buyer-token': this.getToken(),
-        'TENTACLE_CONTENT': this.getTentacle()
-      },
-      data: parmas
-    })
+    let baseUserInfo = wx.getStorageSync('_baseUserInfo')
+    console.log('baseUserInfo', baseUserInfo ? 'buyer-token' : 'tunnel-token')
+    if(baseUserInfo){
+      return this.request({
+        url,
+        method: 'GET',
+        header: {
+          'buyer-token': this.getToken(),
+          'TENTACLE_CONTENT': this.getTentacle()
+        },
+        data: parmas
+      })
+    } else {
+      return this.request({
+        url,
+        method: 'GET',
+        header: {
+          'tunnel-token': this.getToken(),
+          'TENTACLE_CONTENT': this.getTentacle()
+        },
+        data: parmas
+      })
+    }
+    
   }
 
   post (url, parmas, channel) {
-    return this.request({
-      url,
-      method: 'POST',
-      header: {
-        'buyer-token': this.getToken(),
-        'TENTACLE_CONTENT': this.getTentacle()
-      },
-      data: parmas,
-      channel: channel
-    })
+    let baseUserInfo = wx.getStorageSync('_baseUserInfo')
+
+    if(baseUserInfo){
+      return this.request({
+        url,
+        method: 'POST',
+        header: {
+          'buyer-token': this.getToken(),
+          'TENTACLE_CONTENT': this.getTentacle()
+        },
+        data: parmas,
+        channel: channel
+      })
+    } else {
+      return this.request({
+        url,
+        method: 'POST',
+        header: {
+          'tunnel-token': this.getToken(),
+          'TENTACLE_CONTENT': this.getTentacle()
+        },
+        data: parmas,
+        channel: channel
+      })
+    }
   }
 
   checkStatus (resp) {

src/utils/util.js

@@ -308,8 +308,9 @@ function _getUserInfo(ev) {
     setUserInfo()   // 判断有无开卡
   }).catch(err => {
     if (err) {
+      console.log('err', err)
       wx.showToast({
-        title: `会员系统异常请稍后重试!`,
+        title: `您已拒绝授权!`,
         icon: 'none'
       })
     }