解決衝突

api/me/withdraw.js

@@ -58,6 +58,7 @@ export const realNameAuth = (data) => {
 export const canCash = (data) => {
 	return http.request({
 		url: '/cash/canCash',
+		showLoading: false,
 	})
 }
 

api/task/index.js

@@ -4,7 +4,8 @@ import http from '@/http/http.js'
 export const selectTaskCenter = (data) => {
     return http.request({
         url: '/taskCenter/selectTaskCenter',
-        data
+        data,
+		showLoading:false
     })
 } 
 // 兑换列表
@@ -19,7 +20,8 @@ export const selectTaskCenterUserReward = (data) => {
 export const getUserSignData = (data) => {
     return http.request({
         url: 'userSignRecord/getUserSignData',
-        data
+        data,
+		showLoading:false
     })
 } 
 export const receiveGoods = (data) => {

pages/me/index.vue

@@ -9,14 +9,12 @@
 						<image class="img" src="/static/logo.png" mode="widthFix"></image>
 					</view>
 					<view class="quick-menu">
-						<image class="icon" src="/static/me/logo_btn1.png" mode="aspectFit" @click="linkTo('/pages/share/index')"></image>
+						<image class="icon" src="/static/me/logo_btn1.png" mode="aspectFit" @click="linkTo('/pages/share/index', true)"></image>
 						<image class="icon" src="/static/me/logo_btn2.png" mode="aspectFit" @click="linkTo('/pages/me/message', true)"></image>
-						<navigator hover-class="none" url="/pages/me/contact">
+						<image class="icon" src="/static/me/logo_btn3.png" mode="aspectFit" @click="linkTo('/pages/me/contact', true)"></image>
-							<image class="icon" src="/static/me/logo_btn3.png" mode="aspectFit"></image>
-						</navigator>
 					</view>
 				</view>
-				<view class="top" @click="linkTo('/pages/me/userInfo')">
+				<view class="top" @click="linkTo(userInfo.phone?'/pages/me/userInfo':'/pages/login/login')">
 					<image class="avatar" :src="userInfo.avatar || '/static/default_avatar.png'" mode="aspectFill"></image>
 					<view class="info-wrap">
 						<view class="name">{{ userInfo.phone || '请登录' }}</view>
@@ -31,7 +29,7 @@
 						<view class="title">我的追剧</view>
 						<view class="num">{{ likeData.collectCount }}</view>
 					</navigator>
-					<view class="item" v-if="$common.isIosExamine" @click="linkTo('/pages/me/withdraw/index')">
+					<view class="item" v-if="$common.isIosExamine" @click="linkTo('/pages/me/withdraw/index',true)">
 						<view class="title">我的红包</view>
 						<view class="num">{{ amount || 0 }}</view>
 					</view>
@@ -43,16 +41,18 @@
 						<image class="icon" src="/static/me/gold_icon.png" mode="aspectFit"></image>
 						<view class="num">{{ gold }}</view>
 					</view>
-					<navigator hover-class="none" url="/pages/me/gold_record">
+					<div @click="linkTo('/pages/me/gold_record', true)">
 						<view class="btn">金币明细</view>
-					</navigator>
+					</div>
+				
 				</view>
-				<navigator class="title-wrap" hover-class="none" url="/pages/watching_history/watching_history?type=3">
+				<div class="title-wrap" @click="linkTo('/pages/watching_history/watching_history?type=3', true)">
 					<view class="a">
 						<view class="t">观看历史</view>
 						<up-icon name="arrow-right"></up-icon>
 					</view>
-				</navigator>
+				</div>
+			
 				<view class="history-list">
 					<view
 						class="item"
@@ -111,19 +111,21 @@
 
 <script setup>
 import { ref, reactive } from 'vue';
-import { onLoad, onShow, onPullDownRefresh } from '@dcloudio/uni-app';
+import { onLoad,onShow, 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';
+import {
-const $common = useCommonStore();
+		useCommonStore
+	} from '@/store/common.js'
+	const $common = useCommonStore()
 const userInfo = ref({});
 
 // 获取最近的三条观看历史
 const recordThree = ref([]);
-onShow(() => {
+onShow(()=>{
 	// 判断ios是否审核
-	$common.init();
+	$common.init()
-});
+})
 async function selectByUserIdAjax() {
 	try {
 		const res = await selectByUserId({ page: 1, limit: 3, classify: 3 });
@@ -177,11 +179,14 @@ onPullDownRefresh(async () => {
 	}, 500);
 });
 
-onShow(() => {
+onLoad(() => {
-	selectByUserIdAjax();
+	if(uni.getStorageSync('token')){
-	collectVideoSummaryAjax();
+		selectByUserIdAjax();
-	selectUserMoneyAjax();
+		collectVideoSummaryAjax();
-	userInfo.value = uni.getStorageSync('userInfo');
+		selectUserMoneyAjax();
+		userInfo.value = uni.getStorageSync('userInfo');
+	}
+	
 });
 </script>
 

pages/me/setting.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<view class="list">
-			<view class="item" @click="linkTo('/pages/login/bind')">
+			<view class="item" @click="linkTo('/pages/login/bind',true)">
 				<view class="title">修改手机号</view>
 				<up-icon name="arrow-right" />
 			</view>
@@ -9,7 +9,7 @@
 				<view class="title">帮助中心</view>
 				<up-icon name="arrow-right" />
 			</view>
-			<view class="item" @click="linkTo('/pages/me/feedback')">
+			<view class="item" @click="linkTo('/pages/me/feedback',true)">
 				<view class="title">意见反馈</view>
 				<up-icon name="arrow-right" />
 			</view>
@@ -21,7 +21,7 @@
 				<view class="title">隐私协议</view>
 				<up-icon name="arrow-right" />
 			</view>
-			<view class="item" @click="logout">
+			<view class="item" @click="logout" v-if="token">
 				<view class="title">退出登录</view>
 				<up-icon name="arrow-right" />
 			</view>
@@ -36,6 +36,7 @@ import { linkTo } from '@/utils/app.js';
 import { onLoad } from '@dcloudio/uni-app';
 
 const version = ref('');
+const token = ref('');
 
 // 退出登录
 function logout() {
@@ -54,6 +55,7 @@ function logout() {
 }
 
 onLoad(() => {
+	token.value = uni.getStorageSync('token');
 	const systemInfo = uni.getSystemInfoSync();
 	//#ifdef APP-PLUS
 	version.value = systemInfo.appWgtVersion;

pages/me/withdraw/index.vue

@@ -93,7 +93,7 @@
 
 <script setup>
 	import { reactive, nextTick, ref } from 'vue';
-	import { onReady,onLoad,onShow,onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+	import { onReady,onLoad,onShow,onLaunch,onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
 	import { selectUserMoney, selectPayDetails, canCash, state, withdraw } from '@/api/me/withdraw.js';
 	import { selectUserById } from '@/api/user/user.js';
 	import { announcement } from '@/api/index/index.js';
@@ -133,23 +133,24 @@
 		getExtractFei();
 		getMoneyDetail();
 		getCanCash()
-		
+		announcement({type: 1}).then(res=>{
+			data.ruleList = res
+			ruleInit()
+			
+		})
 	})
 	onShow(() => {
 		getcashMoney()
 		getUserInfo();
-		announcement({type: 1}).then(res=>{
-			data.ruleList = res
-			ruleInit()
-			data.ruleShow = true
-		})
 	})
 	onReady(() => {
 		nextTick(()=>{
 			data.adRewardedVideoloadNum = 0
 			adRewardedw.value.load();
+			data.ruleShow = true
 		})
 	})
+	
 	onReachBottom(() => {
 		if (data.page * data.limit < data.totalCount) {
 			data.page = data.page + 1;

pages/share/index.vue

@@ -98,7 +98,6 @@
 	import config from '@/commons/config.js';
 	let data = reactive({
 		loading:false,
-		qrcode: false,
 		earning: {
 			inviteMoney: 0,
 			inviteGoldMoney: 0,
@@ -122,8 +121,6 @@
 		bgImg: '',
 		tuiguang: '',
 		invitationCode: uni.getStorageSync('userInfo').invitationCode,
-		h5SaveImg: '',
-		haibaoImgH5: '',
 		inviteSignCount:0,
 		canvasW: 350,
 		canvasH: 667,

pages/task/index.vue

@@ -108,7 +108,7 @@
 	})
 	const adRewarded = ref(null);
 	onShow(() => {
-		$common.init()
+		// $common.init()
 		// if ( uni.getSystemInfoSync().platform == 'android' ) {
 		// datas.adpid = 1531580352
 		// }
@@ -274,6 +274,10 @@
 			let res = await state({
 				extraKey: datas.urlCallback.extra
 			})
+			uni.showToast({
+				title: '获得' + $common.freeDuration + '分钟免费时长',
+				icon: 'none'
+			})
 		} else {
 			// 播放中途退出
 		}

store/common.js

@@ -38,6 +38,7 @@ const $map = {
 	922: 'withdrawNum',
 	500: 'payTips',
 	914: 'goldBili', // 金币比例
+	921: 'freeDuration' //看广告免费分钟时长
 }
 
 export const useCommonStore = defineStore("common", {