From 4ac3c2382e0733685f7612f8e9ca4e85d15c1411 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期日, 25 六月 2023 08:55:00 +0800
Subject: [PATCH] Merge branch 'hotfix/苹果审核修改'
---
uniapp/pages/index/index.vue | 84 +++++++++++++++++++++++++++++++++---------
1 files changed, 66 insertions(+), 18 deletions(-)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index b5cf339..a0b0e24 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -1,5 +1,8 @@
<template>
- <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">
@@ -97,10 +100,12 @@
import utils from '@/utils/utils.js'
import indexPage from '../../components/indexPage.vue';
import categoryPage from '../../components/categoryPage.vue';
+ import indexnewPage from '../../components/sh_page/indexNewPage.vue';
export default {
components: {
indexPage,
- categoryPage
+ categoryPage,
+ indexnewPage
},
data() {
return {
@@ -121,15 +126,18 @@
scrollleftnum:0,
rowLeft:0,
nowcurrentid:'',
- recomendType:1
+ recomendType:1,
+ isshowtype:false,
+ hasshow:false,
}
},
onLoad() {
+
this.getCategoryList();
this.getPopBannerInfo();
},
onShow() {
- if(!this.hasLogin){
+ /* if(!this.hasLogin){
setTimeout(function(){
uni.reLaunch({
@@ -137,19 +145,24 @@
})
},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();
}
+
+ /* 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();
}
@@ -159,10 +172,47 @@
this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
},
onReady() {
+ console.log("鑾峰彇楂樹綆")
this.getTopheight()
},
watch: {},
methods: {
+ shShow()
+ {
+ var that=this;
+ 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;
+ } 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);
+ }
+ // #endif
+ }).catch(function(err) {
+ console.log(err);
+ })
+ },
goToShowBulletFrame(info){
this.showBulletFrame = false
utils.goUrl(info, this)
@@ -175,7 +225,6 @@
}).then(e => {
if (e.code == 1) return that.$alert(e.msg);
var res = e.data.info;
- console.log(res)
if(res.length > 0){
this.showBulletFrame = true;
this.BulletFrameData = res[0]
@@ -257,7 +306,6 @@
stopswiper(){
this.canrefush = true
},
-
// 璺敱璺宠浆
goPath(url) {
if (url == 'search') {
@@ -311,7 +359,7 @@
getTopheight() {
// 鑾峰彇椤堕儴楂樺害
uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
- console.log("寰楀埌甯冨眬浣嶇疆淇℃伅" + JSON.stringify(data));
+ console.log(data.height+":----------------");
this.Topheight = data.height
}).exec();
},
--
Gitblit v1.9.3