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' })
+                uni.reLaunch({ url: `/pages/AppMine/userInfo?isFromTabbar=1&path='/pages/AppHome/AppHome'` })
               } else if (res.cancel) {
                 // 停留
               }

src/project/fengdu/AppMine/userInfo.vue

@@ -75,7 +75,9 @@ export default {
   computed: {
     ...mapState(['user', 'token']),
   },
-  onLoad() {
+  onLoad(o) {
+    this.isFromTabbar = o.isFromTabbar
+    this.path = o.path
     this.getUserInfo('qujing') 
     uni.setNavigationBarTitle({
       title: '个人中心'
@@ -97,6 +99,8 @@ export default {
       userAreaId: '',
       userAreaName: '',
       btnText: false,
+      isFromTabbar: '',
+      path: '',
     }
   },
   methods: {
@@ -155,7 +159,11 @@ export default {
           this.autoLogin({ loginWay:'qujing'})
           uni.$emit('auth')
           setTimeout(() => {
-            uni.navigateBack()
+            if(this.isFromTabbar==1) {
+              uni.switchTab({ url: this.path})
+            } else {
+              uni.navigateBack()
+            }
           }, 600);
         }
       }).catch(err=> {