Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-shikongwang

pages/center/index.vue

@@ -100,7 +100,8 @@
 					id: '',
 					tel: '',
 					tags: []
-				}
+				},
+				showLogin: true
 			}
 		},
 		computed: {
@@ -122,10 +123,11 @@
 			}
 		},
 		onLoad() {
-			this.getData();
+			
 		},
-		onShow(){
+		onShow(e){
 			this.verifyUserInfo();
+			this.getData();
 		},
 		methods: {
 			verifyUserInfo(){
@@ -135,7 +137,13 @@
 				// }
 				let userInfo = uni.getStorageSync('userinfo') || {};
 				if(!userInfo.id || !userInfo.nickname || !userInfo.avatar){
-					this.$url('/pages/login/index?type=userinfo');
+					if(this.showLogin){
+						this.showLogin = false;
+						this.$url('/pages/login/index?type=userinfo');
+					}else{
+						this.showLogin = true;
+						this.$url('/pages/index/index', {type: 'switch'});
+					}
 				}
 			},
 			getData(){

pages/order/index.vue

@@ -104,7 +104,8 @@
 				current: 0, // tab下表
 				pageSize: 10,
 				assetsType: '', //账户类型
-				orderType: []
+				orderType: [],
+				showLogin: true
 			}
 		},
 		onLoad(e) {
@@ -124,7 +125,13 @@
 			verifyUserInfo(){
 				let userInfo = uni.getStorageSync('userinfo') || {};
 				if(!userInfo.id || !userInfo.nickname || !userInfo.avatar){
-					this.$url('/pages/login/index?type=userinfo');
+					if(this.showLogin){
+						this.showLogin = false;
+						this.$url('/pages/login/index?type=userinfo');
+					}else{
+						this.showLogin = true;
+						this.$url('/pages/index/index', {type: 'switch'});
+					}
 				}
 			},
 			// 切换tab