Merge branch 'skk/feat/welfare-mall' into jeffrey/feat/coupon-center

# Conflicts:
#	pages/welfareMall/personal/personal.js

pages/welfareMall/personal/personal.js

@@ -18,26 +18,7 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: async function (options) {
-    let  userMobile = await activity.getMobileCache();
-    console.log(userMobile)
-    if (userMobile.length !== 0) {
-      this.setData({
-        isLogin: true,
-        mobileTop: userMobile,
-      })
-    }
-    // this.setData({
-    //   isLogin: getMobileCache() != '',
-    //   mobileTop: getMobileCache(),
-    // })
-
-    if(this.data.isLogin){
-      let nums = await this.getCountNum();
-      this.setData({
-        countNum: nums,
-      })
-    }
+  onLoad: function (options) {
 
   },
 
@@ -195,10 +176,26 @@ Page({
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function () {
-    this.setData({
-      grayTheme: app.globalData.grayTheme
-    })
+  onShow: async function () {
+      this.setData({
+          grayTheme: app.globalData.grayTheme
+      })
+    let  userMobile = await activity.getMobileCache();
+    console.log(userMobile)
+    if (userMobile.length !== 0) {
+      this.setData({
+        isLogin: true,
+        mobileTop: userMobile,
+      })
+    }
+
+    if(this.data.isLogin){
+      let nums = await this.getCountNum();
+      this.setData({
+        countNum: nums,
+      })
+    }
+
   },
 
   /**

pages/welfareMall/personal/personal.wxml

@@ -54,9 +54,11 @@
       <view class="coupon-bag content-style flex-row">
         <view class="grant flex-row">
           <button class="wx-isLogin" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumberCoupon"></button>
-          <view class="content-img-text flex-row" catchtap="toCoupon">
-            <image class="content-img" src="/images/welfareMall/coupon-bag.png" />
-            <view class="content-text">我的券包</view>
+          <view class="grant flex-row" catchtap="toHistorical">
+            <view class="content-img-text flex-row" catchtap="toCoupon">
+              <image class="content-img" src="/images/welfareMall/coupon-bag.png" />
+              <view class="content-text">我的券包</view>
+            </view>
           </view>
           <image class="content-jump" src="/images/welfareMall/jump.png" />
         </view>