Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wechat_app into dev

src/components/utils/modules.js

@@ -106,7 +106,7 @@ export const user = {
             confirmText: '去认证',
             success: (res)=> {
               if (res.confirm) {
-                uni.reLaunch({ url: `/pages/AppMine/userInfo?isFromTabbar=1&path='/pages/AppHome/AppHome'` })
+                uni.reLaunch({ url: `/pages/AppMine/userInfo?isFromTabbar=1&path=/pages/AppHome/AppHome` })
               } else if (res.cancel) {
                 // 停留
               }

src/project/fengdu/AppMine/userInfo.vue

@@ -158,20 +158,13 @@ export default {
           this.$u.toast('提交成功')
           this.autoLogin({ loginWay:'qujing'})
           uni.$emit('auth')
-          if (this.isFromTabbar == 1) {
-            console.log('111')
-            setTimeout(() => {
-              console.log('222')
-              uni.switchTab({
-                url: this.path
-              })
-            }, 600);
-          } else {
-            setTimeout(() => {
+          setTimeout(() => {
+            if (this.isFromTabbar == 1) {
+              uni.switchTab({ url: this.path })
+            } else {
               uni.navigateBack()
-            }, 600);
-          }
-          
+            }
+          }, 600);
         }
       }).catch(err=> {
         this.$u.toast(err.msg)