From 55803b1a7b478aade9b6e59ca6675777375e2a92 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期五, 07 七月 2023 15:48:24 +0800
Subject: [PATCH] no message
---
uniapp/pages/index/index.vue | 100 ++++++++++++++++++++++++++++++++------------------
1 files changed, 64 insertions(+), 36 deletions(-)
diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 2d77b3a..41c8d5a 100644
--- a/uniapp/pages/index/index.vue
+++ b/uniapp/pages/index/index.vue
@@ -1,6 +1,6 @@
<template>
- <view v-if="!isshowtype">
- <indexnewPage></indexnewPage>
+ <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) +';')">
@@ -128,47 +128,19 @@
nowcurrentid:'',
recomendType:1,
isshowtype:false,
+ hasshow:false,
}
},
onLoad() {
this.getCategoryList();
this.getPopBannerInfo();
+ this.updateCid();
},
onShow() {
- if(!this.hasLogin){
- setTimeout(function(){
-
- uni.reLaunch({
- url:"/pages/login/wxlogin"
- })
- },1000);
- return;
- }
- // #ifdef APP-PLUS
-
- var showtar = getApp().globalData.ifwt == 1 ? false : true;
- var platform = plus.os.name;
- console.log(showtar);
- console.log(platform);
- if(showtar&&platform=='iOS')
- {//璺宠浆new
- this.isshowtype=true;
-
- return;
- }
- // #endif
- 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();
}
@@ -178,10 +150,66 @@
this.recomendType = open_like_recommend == "" ? 1 : open_like_recommend;
},
onReady() {
+ console.log("鑾峰彇楂樹綆")
this.getTopheight()
},
watch: {},
methods: {
+ updateCid()
+ {
+ //浠庣紦瀛樿幏鍙朿id
+ let clientInfo = uni.getStorageSync('clientInfo');
+ console.log(clientInfo);
+ if(clientInfo&&clientInfo.clientid)
+ {
+ this.$u.api.updateCid({
+ pushcid:clientInfo.clientid
+ }).then(e => {
+ console.log(e);
+ }).catch(function (err) {
+ })
+ }
+ },
+ 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;
+ }
+ }
+ 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);
+ })
+ },
goToShowBulletFrame(info){
this.showBulletFrame = false
utils.goUrl(info, this)
@@ -275,7 +303,6 @@
stopswiper(){
this.canrefush = true
},
-
// 璺敱璺宠浆
goPath(url) {
if (url == 'search') {
@@ -329,6 +356,7 @@
getTopheight() {
// 鑾峰彇椤堕儴楂樺害
uni.createSelectorQuery().in(this).select('.fixed-container').boundingClientRect(data => {
+ console.log(data.height+":----------------");
this.Topheight = data.height
}).exec();
},
--
Gitblit v1.9.3