From ba3d748f9eb65a66fca9bd74fc7796b90a0a70ae Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 30 六月 2023 09:06:15 +0800
Subject: [PATCH] Merge branch 'release/v1.1.3发布'
---
uniapp/pages/index/index.vue | 59 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 50e40da..8b90c02 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -1,8 +1,7 @@
<template>
<view v-if="isshowtype">
- <indexnewPage></indexnewPage>
-
- </view>
+ <indexnewPage :Topheight="Topheight" :recomendType="recomendType" :canrefush='canrefush' :fixedClass='fixedClass'></indexnewPage>
+ </view>
<view v-else class="index-wrapper wrapperLayer borderBox">
<view class="fixed-container colCen borderBox" :style="'background:'+ (categoryCurrent>0?'#EE1B14':(scrollTop>30?'#EE1B14;':bannerColor) +';')">
<view class="topbarbox"></view>
@@ -129,35 +128,19 @@
nowcurrentid:'',
recomendType:1,
isshowtype:false,
+ hasshow:false,
}
},
onLoad() {
- this.shShow();
+
this.getCategoryList();
this.getPopBannerInfo();
},
onShow() {
- if(!this.hasLogin){
- setTimeout(function(){
-
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
- },1000);
- return;
- }
- var user= uni.getStorageSync('userInfo');
- console.log(user);
- if(!user.invitation_code)
+ if(!this.hasshow)
{
- setTimeout(function(){
-
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
- },1000);
- return;
- }
+ this.shShow();
+ }
if(this.categoryList){
this.getCategoryList();
}
@@ -167,6 +150,7 @@
this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
},
onReady() {
+ console.log("鑾峰彇楂樹綆")
this.getTopheight()
},
watch: {},
@@ -174,17 +158,38 @@
shShow()
{
var that=this;
- console.log('寮�濮嬭姹偮仿仿仿仿仿�');
+ 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(that.isshowtype);
}
+ 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"
+ })
+ },1000);
+ return;
+ } */
+ }
+
// #endif
}).catch(function(err) {
console.log(err);
@@ -283,7 +288,6 @@
stopswiper(){
this.canrefush = true
},
-
// 璺敱璺宠浆
goPath(url) {
if (url == 'search') {
@@ -337,6 +341,7 @@
getTopheight() {
// 鑾峰彇椤堕儴楂樺害
uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
+ console.log(data.height+":----------------");
this.Topheight = data.height
}).exec();
},
--
Gitblit v1.9.3