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

src/project/fengdu/AppMine/userInfo.vue

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