From 90ef820cdc18a108b67aef0c7d6c3fa1e8ecb3f7 Mon Sep 17 00:00:00 2001
From: heyuntao <heyuntao@LAPTOP-MP4HD5NS>
Date: 星期四, 01 六月 2023 11:24:38 +0800
Subject: [PATCH] Merge branch 'master' of http://60.204.153.149:8081/r/dfgApp

---
 uniapp/pages/index/index.vue |   15 ++++++---------
 1 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 8bebf3c..5422913 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -122,13 +122,17 @@
 			}
 		},
 		onLoad() {
+			this.getCategoryList();
+			this.getPopBannerInfo();
+		},
+		onShow() {
 			if(!this.hasLogin){
 				setTimeout(function(){
 					
 					uni.reLaunch({
 						url:"/pages/login/wxlogin"
 					})
-				},3000);
+				},1000);
 				return;
 			}
 			var user= uni.getStorageSync('userInfo');
@@ -139,16 +143,9 @@
 					uni.reLaunch({
 						url:"/pages/login/wxlogin"
 					})
-				},3000);
+				},1000);
 				return;
 			}
-			else
-			{
-				this.getCategoryList();
-				this.getPopBannerInfo();
-			}
-		},
-		onShow() {
 			if(this.categoryList){
 				this.getCategoryList();
 			}

--
Gitblit v1.9.3