Merge branch 'feature-zyw' into 'dev'

Feature zyw

See merge request !23

src/component/picNav/picNav.js

@@ -41,12 +41,21 @@ Component({
 			// 获取当前帐号信息
 			const accountInfo = utils.getAccountInfo()
       const userInfo = wx.getStorageSync('_baseUserInfo')
-      if (userInfo){
           if(accountInfo.miniProgram.appId == appid){
-            if (!memberActivateStatus){
-              wxService.openCard()
+            if (userInfo){
+              if (!memberActivateStatus){
+                wxService.openCard()
+              }else{
+                wxService.router(`${path}`)
+              }
             }else{
-              wxService.router(`${path}`)
+              if (path == '/pages/deliveryService/deliveryService') {
+                wxService.router(`${path}`)
+                return
+              }
+              this.setData({
+                isAuthorization: true
+              })
             }
           } else {
             // 	跳转其他小程序
@@ -65,12 +74,6 @@ Component({
             })
           
         }
-        // 是当前小程序 直接跳转
-      }else{
-        this.setData({
-          isAuthorization: true
-        })
-      }
     }
   }
 })