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 |  115 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 89 insertions(+), 26 deletions(-)

diff --git a/uniapp/pages/index/index.vue b/uniapp/pages/index/index.vue
index 5422913..41c8d5a 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">
@@ -10,6 +13,9 @@
 					<view class="hotSearchbox rowCenCen">
 						<view>杈撳叆鍟嗗搧鍚嶆垨绮樿创瀹濊礉鏍囬鎼滅储</view>
 					</view>
+				</view>
+				<view class="rightgoMsg rowCenCen iconfont searchImg" @click="goPath('turnChain')">
+					<image src="https://yanfeiobpub.obs.cn-east-3.myhuaweicloud.com/dfg/zhuanlian.png"></image>
 				</view>
 				<view class="rightgoMsg rowCenCen iconfont" @click="goPath('officialNotice')">
 					<view>&#xe6e9;</view>
@@ -94,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 {
@@ -118,34 +126,21 @@
 				scrollleftnum:0,
 				rowLeft:0,
 				nowcurrentid:'',
-				recomendType:1
+				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;
-			}
-			var user= uni.getStorageSync('userInfo');
-			if(!user.invitation_code)
+			if(!this.hasshow)
 			{
-				setTimeout(function(){
-					
-					uni.reLaunch({
-						url:"/pages/login/wxlogin"
-					})
-				},1000);
-				return;
-			}
+				this.shShow();
+			} 
 			if(this.categoryList){
 				this.getCategoryList();
 			}
@@ -155,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)
@@ -171,7 +222,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]
@@ -253,7 +303,6 @@
 			stopswiper(){
 				this.canrefush = true
 			},
-
 			// 璺敱璺宠浆
 			goPath(url) {
 				if (url == 'search') {
@@ -263,6 +312,12 @@
 				} else if (url == 'officialNotice') {
 					uni.navigateTo({
 						url: './officialNotice'
+					})
+				}
+				else if(url=='turnChain')
+				{
+					uni.navigateTo({
+						url: '../mine/tools/turnChain'
 					})
 				}
 			},
@@ -301,7 +356,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();
 			},
@@ -363,7 +418,7 @@
 				z-index: 100;
 
 				.leftgoSearchbox {
-					width: 615rpx;
+					width: 575rpx;
 					height: 70rpx;
 					background-color: #FFFFFF;
 					border: 1rpx solid #EDEDED;
@@ -393,6 +448,14 @@
 					color: #FFFFFF;
 				}
 			}
+			.searchImg{
+				image{
+					width: 40rpx;
+					height: 40rpx;
+					font-size: 50rpx;
+					color: #FFFFFF;
+				}
+			}
 
 			.categoryNavbar-container {
 				width: 100%;

--
Gitblit v1.9.3