提交代码

src/project.config.json

@@ -501,7 +501,7 @@
 					"scene": null
 				},
 				{
-					"id": -1,
+					"id": 69,
 					"name": "开卡页",
 					"pathName": "shoppingGuid/page/pages/openCard/openCard",
 					"query": "",

src/shoppingGuid/page/pages/openCard/openCard.js

@@ -11,27 +11,40 @@ wxService.page({
    */
   data: {
     showOpenCardModal : false,
-    imageUrl: 'https://img3.bigaka.com/test/1001/201912/20191202/1001854598a6-67dd-4b3e-9a02-934c1b28a295.jpg'
+    imageUrl: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/7_3_0/icon_u_open_card_small.png'
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
     //判断用户是不是已经登录了
     let userInfo = wx.getStorageSync('_baseUserInfo');
-    if(userInfo){
-      wx.reLaunch({
-        url: '/pages/userCenter/userCenter',
-      });
-      return;
-    }
+    // if (userInfo) {
+    //   wx.reLaunch({
+    //     url: '/pages/userCenter/userCenter',
+    //   });
+    //   return;
+    // }
 
     //未登录 需要授权登录 弹出设置的开卡图片
     this.setData({
-      showOpenCardModal : true,
+      showOpenCardModal: true,
     });
+  },
 
+  //进入首页
+  onTapToMall(){
+    wx.reLaunch({
+      url: '/pages/userCenter/userCenter',
+    });
   },
 
   //授权回调
@@ -82,10 +95,4 @@ wxService.page({
     });
   },
 
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
 });
\ No newline at end of file

src/shoppingGuid/page/pages/openCard/openCard.wxml

@@ -20,5 +20,8 @@
     <button bindgetuserinfo="userAuthBtnCallBack" open-type='getUserInfo'>
         <image src='{{imageUrl}}' mode='widthFix'></image>
     </button>
+    <view class='enter-mall'>
+      <view class='enter' bindtap='onTapToMall'>进入商城</view>
+    </view>
   </view>
 </view>

src/shoppingGuid/page/pages/openCard/openCard.wxss

@@ -54,6 +54,29 @@ view{
   border: none;
 }
 
+.enter-mall{
+  width: 100%;
+  height: auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.enter-mall .enter{
+  width: 220rpx;
+  height: 70rpx;
+  border: solid 1px #ffffff;
+  color: #ffffff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 35rpx;
+}
+
+.enter-mall .enter:active{
+  opacity: 0.7;
+}
+
 /* 加载 */
 /*动画一：单个渐变  */
 .circle-line{

src/shoppingGuid/page/pages/qrcode/qrcode.js

@@ -9,12 +9,12 @@ wxService.page({
   // https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/demo_qrcode.png
   // https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/biaka_default_u_logo.png
   data: {
-    codeImg: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/demo_qrcode.png',
-    avator: 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/biaka_default_u_logo.png',
-    name :'谢中龙',
+    codeImg: '',
+    avator: '',
+    name :'',
     template : {},
     cardImg : '',
-    companyName: '上海舞象',
+    companyName: '',
     bottomTypeArr : [
       { 
         name: "关注公众号", 

src/utils/wxService.js

@@ -142,7 +142,8 @@ class WXService extends Http {
             let dataResp = response.data.data
             wx.setStorageSync('token', dataResp.token)
             wx.setStorageSync('_baseUserInfo', dataResp)
-
+            _this.currentPage.onLoad && _this.currentPage.onLoad(_this.currentPage.options);
+            _this.currentPage.onShow && _this.currentPage.onShow();
             return Promise.resolve({
               response
             })