From ea3df4a7c5e60fff7935eed4b07feebde8c4e723 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 30 六月 2023 09:06:27 +0800
Subject: [PATCH] Merge tag 'v1.1.3发布' into develop
---
uniapp/pages/index/index.vue | 60 +++++++++++++++++++++---------------------------------------
1 files changed, 21 insertions(+), 39 deletions(-)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index a0b0e24..8b90c02 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -137,32 +137,10 @@
this.getPopBannerInfo();
},
onShow() {
- /* if(!this.hasLogin){
- setTimeout(function(){
-
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
- },1000);
- return;
- } */
if(!this.hasshow)
{
this.shShow();
- }
-
- /* var user= uni.getStorageSync('userInfo');
- console.log(user); */
- // if(!user.invitation_code)
- // {
- // setTimeout(function(){
-
- // uni.reLaunch({
- // url:"/pages/login/wxlogin"
- // })
- // },1000);
- // return;
- // }
+ }
if(this.categoryList){
this.getCategoryList();
}
@@ -180,34 +158,38 @@
shShow()
{
var that=this;
+ var istoLogin=true;
this.$u.api.comminInt({}).then(e => {
that.hasshow=true;
// #ifdef APP-PLUS
if (plus.os.name == 'iOS') {
if (e.data.basic.iosExamine && plus.runtime.version == e.data.basic.IosExamineV) {
that.isshowtype=true;
+ istoLogin=false;
} else {
that.isshowtype=false;
- console.log("璺宠浆");
- if(!that.hasLogin){
+ }
+ }
+ if(istoLogin)
+ {
+ 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"
})
- }
- var user= uni.getStorageSync('userInfo');
- if(!user.invitation_code)
- {
- setTimeout(function(){
-
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
- },1000);
- return;
- }
- }
- console.log(that.isshowtype);
+ },1000);
+ return;
+ } */
}
+
// #endif
}).catch(function(err) {
console.log(err);
--
Gitblit v1.9.3