From fc9bd6378d3bfbde6d5c71535757a3d44de8d8ff Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期四, 20 七月 2023 15:18:06 +0800
Subject: [PATCH] Merge branch 'feature/1.1.4开发' into develop
---
uniapp/pages/index/index.vue | 68 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 1fa19b6..5104307 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -128,41 +128,19 @@
nowcurrentid:'',
recomendType:1,
isshowtype:false,
- hasshow:false,
+ hasshow:false
}
},
onLoad() {
-
this.getCategoryList();
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();
}
@@ -172,25 +150,49 @@
this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
},
onReady() {
- console.log("鑾峰彇楂樹綆")
- this.getTopheight()
+ this.getTopheight();
},
watch: {},
methods: {
+
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(that.isshowtype);
}
+ if(istoLogin)
+ {
+ if(!that.hasLogin){
+ setTimeout(() => {
+ uni.reLaunch({
+ url:"/pages/login/wxlogin"
+ })
+ }, 1000)
+
+ }
+ /* 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);
@@ -289,7 +291,6 @@
stopswiper(){
this.canrefush = true
},
-
// 璺敱璺宠浆
goPath(url) {
if (url == 'search') {
@@ -343,7 +344,6 @@
getTopheight() {
// 鑾峰彇椤堕儴楂樺害
uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
- console.log(data.height+":----------------");
this.Topheight = data.height
}).exec();
},
@@ -369,6 +369,11 @@
</script>
<style lang="scss">
+ uni-image
+ {
+ width:30rem;
+ height:25rem
+ }
.index-wrapper {
height: 100vh;
overflow: hidden;
@@ -585,9 +590,10 @@
// height: 100vw;
}
}
+
.clone {
position:absolute;
- bottom: -150rpx;
+ bottom: -30rpx;
transform: translate(calc(50% - 32rpx));
.image {
width: 64rpx;
--
Gitblit v1.9.3