解决冲突

pages/index/index.vue

@@ -10,7 +10,7 @@
 			</view>
 		</view>
 
-		<template v-if="datas.noticeList.length > 0">
+		<template v-if="datas.isExamine == 0">
 			<view class="gongao">
 				<view class="gongaoicon">
 					公告
@@ -41,8 +41,8 @@
 			飙升
 		</view>
 	</view>
-	<contentlist :list='datas.list'></contentlist> 
-	<image v-if="datas.isExamine == 0" @click="goMsg('/me/VjgyqAzklr/VjgyqAzklr')" src="@/static/index/red-pack-new.gif"
+	<contentlist :list='datas.list'></contentlist>
+	<image v-if="datas.isExamine == 0" @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'
@@ -76,6 +76,10 @@ import contentlist from './components/contentlist.vue'
 import { selectNewApp } from '@/api/user/user.js';
 import config from '@/commons/config.js';
 import { linkTo } from '@/utils/app.js';
+import {
+		useCommonStore
+	} from '@/store/common.js'
+	const $common = useCommonStore()
 let datas = reactive({
 	noticeList: [], //公告列表
 
@@ -91,7 +95,7 @@ let datas = reactive({
 	ruleList: [],
 	
 	//ios是否在审核 1是审核
-	isExamine: uni.getStorageSync('isExamine'),
+	isExamine: $common.isExamine,
 	
 	version: {
 		show: false,
@@ -213,20 +217,9 @@ function ruleConfirm() {
 	
 // 跳转公告链接
 function goMsg(url) {
-	// if (url.indexOf('/pages/') !== -1 || url.indexOf('/me/') !== -1) {
 	uni.navigateTo({
 		url: '/pages/me/prizeDraw'
 	});
-	// } else {
-	//#ifndef H5
-	// uni.navigateTo({
-	// 	url: '/pages/index/webView?url=' + url
-	// });
-	//#endif
-	//#ifdef H5
-	// window.location.href = url;
-	//#endif	
-	// }
 }
 
 // 搜索跳转

pages/me/index.vue

@@ -31,7 +31,7 @@
 						<view class="title">我的追剧</view>
 						<view class="num">{{ likeData.collectCount }}</view>
 					</navigator>
-					<view class="item" @click="linkTo('/pages/me/withdraw/index')">
+					<view class="item" v-if="$common.isExamine==0" @click="linkTo('/pages/me/withdraw/index')">
 						<view class="title">我的红包</view>
 						<view class="num">{{ amount || 0 }}</view>
 					</view>
@@ -114,7 +114,10 @@ import { ref, reactive } from 'vue';
 import { onLoad, onPullDownRefresh } from '@dcloudio/uni-app';
 import { selectByUserId, collectVideoSummary, selectUserMoney } from '@/api/me/me.js';
 import { linkTo } from '@/utils/app.js';
-
+import {
+		useCommonStore
+	} from '@/store/common.js'
+	const $common = useCommonStore()
 const userInfo = ref({});
 
 // 获取最近的三条观看历史

pages/me/prizeDraw.vue

@@ -243,6 +243,7 @@ export default {
 		// 大哥，这里只是模拟，别告诉我你不会对接自己的接口
 		async requestApiGetPrizeList() {
 			const res = await selectDiscSpinning({ source: this.source });
+			console.log(res,'debug')
 			return {
 				ok: true,
 				data: res.records.map((v) => {

pages/task/index.vue

@@ -69,6 +69,10 @@
 </template>
 
 <script setup>
+import {
+		useCommonStore
+	} from '@/store/common.js'
+	const $common = useCommonStore()
 	import {
 		reactive,
 		getCurrentInstance,
@@ -89,7 +93,7 @@
 		signInList: [],
 		list: [],
 		// ios审核
-		isExamine: uni.getStorageSync('isExamine'),
+		isExamine: $common.isExamine,
 		urlCallback: {},
 		adRewardedVideo: true,