Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !25

src/pages/userCenter/userCenter.js

@@ -23,7 +23,8 @@ wxService.page({
     couponNum: 0,
     // isAllScreen: fullSucreen.isAllScreen
     isAllScreen: config.isAllScreen,
-    token:''
+    token:'',
+    isAuthorization: false
   },
 
   /**
@@ -112,23 +113,29 @@ wxService.page({
 			// 获取当前帐号信息
 			const accountInfo = utils.getAccountInfo()
 			// 是当前小程序 直接跳转
-			if(accountInfo.miniProgram.appId == appid){
-				wxService.router(`${path}`)
-			} else {
-				// 	跳转其他小程序
-				wx.navigateToMiniProgram({
-					appId: appid,
-					path: `${path}`,
-					success: e => {
-						console.log(e)
-					},
-					fail: e => {
-						console.log(e)
-					},
-					complete: e => {
-						console.log(e)
-					},
-				})
+      if (wx.getStorageSync('_baseUserInfo')){
+        if(accountInfo.miniProgram.appId == appid){
+          wxService.router(`${path}`)
+        } else {
+          // 	跳转其他小程序
+          wx.navigateToMiniProgram({
+            appId: appid,
+            path: `${path}`,
+            success: e => {
+              console.log(e)
+            },
+            fail: e => {
+              console.log(e)
+            },
+            complete: e => {
+              console.log(e)
+            },
+          })
+        }
+      }else{
+        this.setData({
+          isAuthorization: true
+        })
       }
     }
   },

src/pages/userCenter/userCenter.wxml

@@ -27,3 +27,5 @@
   </view>
   </block>
 </view>
+<authorization-modal isAuthorization='{{isAuthorization}}'/>
+