From 9ea0383c303620cd019d0776ecbb47f52bcef805 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 28 六月 2023 14:17:25 +0800
Subject: [PATCH] Merge branch 'feature/1.1.3版本开发' into develop
---
uniapp/pages/index/index.vue | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 1fa19b6..a0b0e24 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -137,7 +137,7 @@
this.getPopBannerInfo();
},
onShow() {
- if(!this.hasLogin){
+ /* if(!this.hasLogin){
setTimeout(function(){
uni.reLaunch({
@@ -145,24 +145,24 @@
})
},1000);
return;
- }
+ } */
if(!this.hasshow)
{
this.shShow();
}
- var user= uni.getStorageSync('userInfo');
- console.log(user);
- if(!user.invitation_code)
- {
- setTimeout(function(){
+ /* var user= uni.getStorageSync('userInfo');
+ console.log(user); */
+ // if(!user.invitation_code)
+ // {
+ // setTimeout(function(){
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
- },1000);
- return;
- }
+ // uni.reLaunch({
+ // url:"/pages/login/wxlogin"
+ // })
+ // },1000);
+ // return;
+ // }
if(this.categoryList){
this.getCategoryList();
}
@@ -188,6 +188,23 @@
that.isshowtype=true;
} else {
that.isshowtype=false;
+ console.log("璺宠浆");
+ if(!that.hasLogin){
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ }
+ var user= uni.getStorageSync('userInfo');
+ if(!user.invitation_code)
+ {
+ setTimeout(function(){
+
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ },1000);
+ return;
+ }
}
console.log(that.isshowtype);
}
@@ -289,7 +306,6 @@
stopswiper(){
this.canrefush = true
},
-
// 璺敱璺宠浆
goPath(url) {
if (url == 'search') {
--
Gitblit v1.9.3