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 | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 9ba098e..a0b0e24 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -1,8 +1,8 @@
<template>
- <!-- <view v-if="isshowtype">
- <indexnewPage></indexnewPage>
- </view> -->
- <view class="index-wrapper wrapperLayer borderBox">
+ <view v-if="isshowtype">
+ <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>
<view class="headerSearch-container rowCenBet borderBox">
@@ -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();
}
@@ -172,6 +172,7 @@
this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
},
onReady() {
+ console.log("鑾峰彇楂樹綆")
this.getTopheight()
},
watch: {},
@@ -187,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);
}
@@ -288,7 +306,6 @@
stopswiper(){
this.canrefush = true
},
-
// 璺敱璺宠浆
goPath(url) {
if (url == 'search') {
@@ -342,6 +359,7 @@
getTopheight() {
// 鑾峰彇椤堕儴楂樺害
uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
+ console.log(data.height+":----------------");
this.Topheight = data.height
}).exec();
},
--
Gitblit v1.9.3