Merge branch 'feature-zyw' into 'dev_7.0.1'

Feature zyw

See merge request !37

src/app.js

@@ -108,8 +108,8 @@ App({
     imageUrl: envInfo.imgCtx, //图片地址
     isFullSucreen: false, // 当前设备是否为 FullSucreen
     commonFunc: commonFunc,
-    // brandId: 2711,
-    brandId: 2005,
+    brandId: 2711,
+    // brandId: 2005,
     // brandId: 1001,
     // brandId: 1002,
   }

src/component/personCenter/personCenter.js

@@ -66,7 +66,7 @@ Component({
     const { cardMember } = this.data
     if(cardMember){
       this.setData({
-        currentMobile: cardMember.mobile
+        currentMobile: cardMember.mobile || ''
       })
     }
 

src/pages/integralWater/integralWater.wxml

@@ -19,7 +19,7 @@
       <view class="detail-integral" wx:for="{{integralList}}" wx:for-item="item" data-memberId = "{{item.memberId}}" data-expandInfo= "{{item.expandInfo}}" wx:for-index="k" wx:key="{{k}}" bindtap="handleGoDetail">
         <view class="detail-left">
           <view class="detail-title">{{item.changeTypeDesc}}</view>
-          <view class="detail-time">{{item.createTime}}</view>
+          <view class="detail-time">{{item.changeTime}}</view>
         </view>
         <view class="detail-num {{item.operation==true ? 'add' : 'less'}}">{{item.operation == 1? '+':''}}{{item.operation*item.changeValue}}</view>
       </view>

src/project.config.json

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