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 | 32 ++++++++++++++++++--------------
1 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 667f00d..5422913 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -122,26 +122,30 @@
}
},
onLoad() {
+ this.getCategoryList();
+ this.getPopBannerInfo();
+ },
+ onShow() {
if(!this.hasLogin){
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
+ setTimeout(function(){
+
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ },1000);
+ return;
}
var user= uni.getStorageSync('userInfo');
if(!user.invitation_code)
{
- uni.reLaunch({
- //url:"/pages/login/setInviteCode"
- url:"/pages/login/wxlogin"
- })
+ setTimeout(function(){
+
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ },1000);
+ return;
}
- else
- {
- this.getCategoryList();
- this.getPopBannerInfo();
- }
- },
- onShow() {
if(this.categoryList){
this.getCategoryList();
}
--
Gitblit v1.9.3