update

src/app.js

@@ -113,7 +113,7 @@ App({
     loginFirst: false,
     imageUrl:"", //图片地址
     isFullSucreen: false, // 当前设备是否为 FullSucreen
-    // brandId: 2005,
-    brandId: 1001,
+    brandId: 2005,
+    // brandId: 1001,
   }
 })

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

@@ -43,13 +43,6 @@ Component({
     //立即兑换
     query() {},
     _getUserInfo(res = {}) {
-      if(!this.data.checkAll) {
-        wx.showToast({
-          title: '请同意会员规则',
-          icon: 'none'
-        })  
-        return false
-      }
       this.setData({
         isAuthorization: false
       })

src/component/authorization-modal/authorization-modal.wxml

@@ -7,7 +7,7 @@
       <view class='auth-shop'>
         广东7-Eleven申请获取授权，用于会员服务
       </view>
-      <button type='primary'  bindgetuserinfo="_getUserInfo" open-type='getUserInfo' class='agree' >同意</button>
+      <button type='primary'  bindgetuserinfo="_getUserInfo" open-type='getUserInfo' class='agree' disabled='{{!checkAll}}'>同意</button>
       <view class='rule-wrap'>
         <view class='agree-rule'>
           <view class="agree-icon"><icon size="18" type="{{checkAll ? 'success' : 'circle'}}" bindtap="checkAll"></icon></view>

src/component/personCenter/personCenter.wxml

@@ -3,8 +3,8 @@
     <button type="primary" plain='false' bindtap="handleTtoActiveMemebr">激活立享会员特权</button>
 </view>-->
 
-<view wx:if='{{!memberActivateStatus}}' class="member-unActive">
-  <text class="un-active-btn" bindtap="handleTtoActiveMemebr">激活立享会员特权</text>
+<view wx:if='{{!memberActivateStatus}}' class="member-unActive" bindtap="handleTtoActiveMemebr">
+  <text class="un-active-btn" >激活立享会员特权</text>
 </view>
 
 <view wx:if='{{memberActivateStatus}}' class="activation-content activation-bg {{true ? 'user-content' : ''}}" style="{{personData.backgroundImageUrl ? 'background-image: url('+ personData.backgroundImageUrl +');' : 'background-image: url(' + baseUrl + ');'}}">

src/config/index.js

-const PROJECT_ENV = 'dev' // 生产 prod, 测试 dev, 预生产 pre
+const PROJECT_ENV = 'pre' // 生产 prod, 测试 dev, 预生产 pre
 const needMock = '' //
 
 // appid_dev_wx   wxc3b64b09b1d3dfc2

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.6.6",
-	"appid": "wxc3b64b09b1d3dfc2",
+	"appid": "wx358b56af62edbde1",
 	"projectname": "7-Eleven",
 	"debugOptions": {
 		"hidedInDevtools": []

src/utils/Http.js

@@ -148,7 +148,7 @@ class Http {
         content: '请求数据超时'
       })
     }
-    if (error.msg && error.msg !='用户未登录'){
+    if (error.msg && error.msg !='该用户尚未登录'){
       wx.showToast({
         title: `${error.msg}`,
         icon: 'none'

src/utils/wxService.js

@@ -48,7 +48,8 @@ class WXService extends Http {
       wx.hideLoading()
     }).catch(res => {
       console.log(res)
-      if (res.msg === '用户未登录') {
+      if (res.msg === '该用户尚未登录') {
+        wx.setStorageSync('token', '')
         var _this = this
         let userInfo = wx.getStorageSync('_baseUserInfo')
         _this.login().then(result=>{