优化

pages/main.vue

@@ -360,9 +360,18 @@
 										}
 										if(routerLogin){
                                             uni.setStorageSync('routerLogin', false)
-											uni.redirectTo({
-												url:routerLogin
-											})
+                                            let routerLoginPageType = uni.getStorageSync('routerLoginPageType')
+                                            if(routerLoginPageType == 'switchTab') { 
+                                                uni.navigateTo({
+                                                	url: routerLogin
+                                                })
+                                            } else {
+                                                uni.redirectTo({
+                                                	url:routerLogin
+                                                })
+                                            }
+                                            uni.removeStorageSync('routerLoginPageType')
+											
 										}
 										// 判断是否有京东跳转
 										let jdNavToObj = uni.getStorageSync('jdNavToObj')

pagesA/pages/mrAct/index.vue

@@ -330,6 +330,7 @@ export default {
             let token = uni.getStorageSync('userToken')
             if(!token) { 
                 uni.setStorageSync('routerLogin', '/pagesA/pages/mrAct/index')
+                uni.setStorageSync('routerLoginPageType', 'switchTab')
                 //跳转到登录页
                 let returnPage = '/pages/main';
                 let pageType = "reLaunch"

uni_modules/address-picker/components/address-picker/address-picker.vue

@@ -68,7 +68,9 @@
 			}
 		},
 		mounted(){
-			this.formatData()
+            setTimeout(() => {
+                this.formatData()
+            }, 1000)
 		},
 		methods: {
 			changeHandler(e) {