modify: 2019.6.5

src/app.js

@@ -57,6 +57,12 @@ App({
       });
       // encodeURIComponent
       // decodeURIComponent
+
+      // 激活成功 变更 _baseUserInfo
+      baseUserInfo.wechatCardId = card_id
+      baseUserInfo.wechatCode = code
+      wx.setStorageSync('_baseUserInfo',baseUserInfo)
+
     }
 
   },

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

@@ -66,7 +66,7 @@ Component({
           }
           wx.setStorageSync('_baseUserInfo', data)
           // 存储用户开卡状态
-          wx.setStorageSync('memberActivateStatus', data.memberActivateStatus)
+          // wx.setStorageSync('memberActivateStatus', data.memberActivateStatus)
           this.setUserInfo()
         }).catch(err=> {
           if (err) {
@@ -85,7 +85,8 @@ Component({
     },
     setUserInfo () {
       // 判断有无开卡
-      const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
+      // const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
+      const {memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
       // 没有开卡并且需要开卡
       if(!memberActivateStatus) {
         wxService.openCard()

src/component/personCenter/personCenter.js

@@ -34,8 +34,8 @@ Component({
       personCenter: this.data.personData
     })
     // 取会员卡号
-    const {memberCardNo} = wx.getStorageSync('_baseUserInfo')
-    const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
+    const {memberCardNo,memberActivateStatus} = wx.getStorageSync('_baseUserInfo')
+    // const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
     this.setData({
       memberCardNo,
       memberActivateStatus
@@ -64,6 +64,7 @@ Component({
       console.log('kabao')
       // wechatCardId wechatCode
       const {wechatCardId,wechatCode} = wx.getStorageSync('_baseUserInfo')
+
       wx.openCard({
         cardList: [{
           cardId: wechatCardId,

src/component/picNav/picNav.wxss

 /* component/picNav/picNav.wxss */
 .pic-nav {
   display: flex;
+  height:172.5rpx;
 }
 .pic-item {
   flex: 1;

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/pages/activateCard/activateCardCallback.js

@@ -49,7 +49,13 @@ wxService.page({
       const {result,data} = res.data
       if(result == 0){
         // 变更 激活状态
-        wx.setStorageSync('memberActivateStatus',true)
+        //wx.setStorageSync('memberActivateStatus',true)
+
+        // 激活成功 变更 _激活状态
+        const baseUserInfo = wx.getStorageSync('_baseUserInfo')
+        baseUserInfo.memberActivateStatus = true
+        wx.setStorageSync('_baseUserInfo',baseUserInfo)
+
         wx.hideLoading()
         wxService.router(`/pages/userCenter/userCenter`)
       } else {

src/pages/coupons/coupons.wxml

@@ -17,9 +17,10 @@
 							wx:key="{{k}}"
 							>
 								<view data-title="{{item.title}}" data-cardNo="{{item.cardNo}}" bindtap="handelPresentCouponCode">
-									<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
+									<image class='coupon-bg' src='/assets/imgs/coupon-bg.png'/>
 									<view class='coupon-img'>
-										<image src='/assets/imgs/qr-code.png' />
+										<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
+										<image wx:else src='/assets/imgs/qr-code.png' />
 									</view>
 									<view class='coupon-info'>
 										<view class='coupon-name fs-28'>{{item.title}}</view>
@@ -54,7 +55,8 @@
 											<image src='/assets/imgs/invalid.png' class='invalid-img' />
 											<image class='coupon-bg' src='/assets/imgs/coupon-bg.png' />
 											<view class='coupon-img'>
-												<image src='/assets/imgs/qr-code.png' />
+												<image wx:if="{{item.takeCouponBgimg}}" class='coupon-bg' src='{{item.takeCouponBgimg}}' />
+												<image wx:else src='/assets/imgs/qr-code.png' />
 											</view>
 											<view class='coupon-info'>
 												<view class='coupon-name fs-28'>{{item.title}}</view>

src/pages/memberRules/memberRules.wxml

 <!--pages/memberRules.wxml-->
 <view class="memberRules">
-  <image class='rule-img' src='{{ruleImg}}'></image>
+  <image class='rule-img' src='{{ruleImg}}' mode="widthFix"></image>
 </view>

src/project.config.json

@@ -13,7 +13,7 @@
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.6.6",
-	"appid": "wxc3b64b09b1d3dfc2",
+	"appid": "wx358b56af62edbde1",
 	"tempappid_wx": "wxc3b64b09b1d3dfc2",
 	"tempappid_711": "wx358b56af62edbde1",
 	"projectname": "7-Eleven",
@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 13,
+			"current": 4,
 			"list": [
 				{
 					"id": -1,
@@ -66,10 +66,10 @@
 					"query": "cardno=24390355190533807720&title=新券"
 				},
 				{
-					"id": 7,
+					"id": 4,
 					"name": "会员规则",
 					"pathName": "pages/memberRules/memberRules",
-					"query": ""
+					"query": "type=1"
 				},
 				{
 					"id": 8,
@@ -81,7 +81,7 @@
 					"id": 6,
 					"name": "积分兑换详情页",
 					"pathName": "pages/integralMallDetail/integralMallDetail",
-					"query": "id=585585301259423744"
+					"query": "id=585873719780577280"
 				},
 				{
 					"id": 7,

src/utils/wxService.js

@@ -472,7 +472,8 @@ class WXService extends Http {
     return new Promise((resolve, reject) => {
       // const app = this.getApp()
 
-      const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
+      const {memberActivateStatus} = baseUserInfo
+      // const memberActivateStatus = wx.getStorageSync('memberActivateStatus')
       if(memberActivateStatus) {
         resolve(baseUserInfo)
       } else {