合并代码

pages/index/index.vue

@@ -10,7 +10,7 @@
 			</view> -->
 		</view>
 
-		<template v-if="$common.isIosExamine">
+		<template v-if="datas.setindexdata">
 			<view class="gongao">
 				<view class="gongaoicon">
 					公告
@@ -42,7 +42,7 @@
 		</view>
 	</view>
 	<contentlist :list='datas.list'></contentlist>
-	<image v-if="$common.isIosExamine" @click="goMsg()" src="@/static/index/red-pack-new.gif"
+	<image v-if="datas.setindexdata" @click="goMsg()" src="@/static/index/red-pack-new.gif"
 		style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>
 	<up-modal :show="datas.version.show" :confirm-text="datas.version.confirmText"
 		:showCancelButton="datas.version.cancelText!=''" @confirm='confirmUpdateVersion' :title="datas.version.title"
@@ -93,8 +93,8 @@
 		useCommonStore
 	} from '@/store/common.js'
 	const $common = useCommonStore()
-	onShow(()=>{
+	onShow(() => {
-		console.log('cash:'+uni.getStorageSync('userInfo').userId + "" + new Date().getTime(),'debug')
+		console.log('cash:' + uni.getStorageSync('userInfo').userId + "" + new Date().getTime(), 'debug')
 		// 判断ios是否审核
 		$common.init()
 	})
@@ -111,14 +111,15 @@
 		rule_content: '', // 首页弹窗内容
 		ruleIndex: 0,
 		ruleList: [],
-		
+
 		version: {
 			show: false,
 			title: "",
 			content: "",
 			confirmText: "",
 			cancelText: "",
-		}
+		},
+		setindexdata :"false"
 	})
 	onLoad(() => {
 		versionUpdate()
@@ -127,7 +128,7 @@
 		datas.isExamine = $common.isIosExamine || 0
 	})
 	onReady(() => {
-		if(!uni.getStorageSync('ruleShow')){
+		if (!uni.getStorageSync('ruleShow')) {
 			announcement({
 				type: 0
 			}).then(res => {
@@ -138,7 +139,7 @@
 				}
 			})
 		}
-		
+
 	})
 	onReachBottom(() => {
 		++datas.page
@@ -159,7 +160,7 @@
 				}
 				if (uni.getSystemInfoSync().platform == 'ios') {
 					version = res.iosVersion
-					$common.setversion(widgetInfo.version,version)
+					$common.setversion(widgetInfo.version, version)
 				}
 				version = res.version
 				// && uni.getSystemInfoSync().platform == 'android'