From 89b2b6cb360a71ddeb8ae593fdee62757ab1dd97 Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Mon, 13 Jan 2025 15:52:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/me/index.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pages/me/index.vue b/pages/me/index.vue
index bcd64c1..08b5153 100644
--- a/pages/me/index.vue
+++ b/pages/me/index.vue
@@ -162,12 +162,11 @@ function toTask() {
 	});
 }
 
-onLoad(() => {
+onLoad(() => {});
+onShow(() => {
 	selectByUserIdAjax();
 	collectVideoSummaryAjax();
 	selectUserMoneyAjax();
-});
-onShow(() => {
 	userInfo.value = uni.getStorageSync('userInfo');
 });
 </script>

From 421592420c585bd0c38f2e609d5f0892d0be4edc Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Mon, 13 Jan 2025 17:58:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5/=E6=8F=90=E7=8E=B0?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=BC=B9=E7=AA=97=E4=BC=98=E5=8C=96=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue       | 61 +++++++++++++++++++-----------
 pages/me/withdraw/index.vue | 75 +++++++++++++++++++++++++------------
 2 files changed, 92 insertions(+), 44 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6754292..cedfe9e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -45,15 +45,6 @@
 	<image v-if="datas.isExamine == 0" @click="goMsg('/me/VjgyqAzklr/VjgyqAzklr')" src="@/static/index/red-pack-new.gif"
 		style="width: 200rpx;height: 200rpx;position: fixed;right: 10rpx;bottom: 180rpx;" mode=""></image>
 
-	<u-modal :show="datas.ruleShow" v-if="datas.isExamine == 0" confirm-text="知道了" @confirm='datas.ruleShow = false'
-		:title="datas.rule_title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)">
-		<view class="" style="padding-top: 30rpx;text-align: left;">
-			<scroll-view scroll-y="true" style="max-height: 50vh;">
-				<rich-text style="color:#666" :nodes="datas.rule_content"></rich-text>
-			</scroll-view>
-		</view>
-	</u-modal>
-	 
 	<u-modal :show="datas.version.show"  :confirm-text="datas.version.confirmText" :showCancelButton="datas.version.cancelText" @confirm='confirmUpdateVersion'
 		:title="datas.version.title" :title-style="{ fontWeight: '700' }" confirm-color="rgb(255, 117, 129)" @cancel="datas.version.show = false">
 		<view class="" style="padding-top: 30rpx;text-align: left;">
@@ -62,6 +53,13 @@
 			</scroll-view>
 		</view>
 	</u-modal>
+	<up-modal :show="datas.ruleShow" v-if="datas.isExamine == 0" confirm-text="知道了" title="规则说明" :title="datas.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm" confirm-color="rgb(255, 117, 129)">
+		<view class="u-p-30 u-text-left">
+			<scroll-view scroll-y="true" style="max-height: 50vh;" >
+				<rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="datas.rule_content"></rich-text>
+			</scroll-view>
+		</view>
+	</up-modal>
 </template>
 
 <script setup>
@@ -71,6 +69,7 @@ import {
 import { announcement, messageselectMessage, courseselectCourse } from '@/api/index/index.js'
 import {
 	onLoad,
+	onReady,
 	onReachBottom
 } from '@dcloudio/uni-app'
 import contentlist from './components/contentlist.vue'
@@ -88,7 +87,9 @@ let datas = reactive({
 	ruleShow: false,
 	rule_title: '', // 首页弹窗标题
 	rule_content: '', // 首页弹窗内容
-
+	ruleIndex: 0,
+	ruleList: [],
+	
 	//ios是否在审核 1是审核
 	isExamine: uni.getStorageSync('isExamine'),
 	
@@ -104,9 +105,14 @@ onLoad(() => {
 	versionUpdate()
 	getMsg()
 	getrecomVideo()
-	getPop()
 })
-
+onReady(() => {
+	announcement({type: 0}).then(res=>{
+		datas.ruleList = res
+		ruleInit()
+		datas.ruleShow = true
+	})
+})
 onReachBottom(() => {
 	++datas.page
 	getrecomVideo()
@@ -184,6 +190,27 @@ function confirmUpdateVersion(){
 		plus.runtime.openURL(iosLink, function(res) {});
 	}
 }
+function ruleInit(){
+	datas.rule_title = datas.ruleList[datas.ruleIndex].title
+	datas.rule_content = datas.ruleList[datas.ruleIndex].content
+}
+/**
+ * 规则确认
+ */
+function ruleConfirm() {
+	datas.ruleShow = false
+	datas.ruleIndex++
+	console.log(datas.ruleIndex >= datas.ruleList.length)
+	if( datas.ruleIndex >= datas.ruleList.length) {
+		datas.ruleIndex = 0
+		return
+	}
+	setTimeout(res=>{
+		ruleInit()
+		datas.ruleShow = true
+	},300)
+}
+	
 // 跳转公告链接
 function goMsg(url) {
 	// if (url.indexOf('/pages/') !== -1 || url.indexOf('/me/') !== -1) {
@@ -201,15 +228,7 @@ function goMsg(url) {
 	//#endif	
 	// }
 }
-// 获取弹窗信息
-async function getPop() {
-	let res = await announcement()
-	if (res.state == 1) {
-		datas.ruleShow = true
-		datas.rule_title = res.title
-		datas.rule_content = res.content
-	}
-}
+
 // 搜索跳转
 function moreVideo() {
 	uni.navigateTo({
diff --git a/pages/me/withdraw/index.vue b/pages/me/withdraw/index.vue
index ac1af3d..918a012 100644
--- a/pages/me/withdraw/index.vue
+++ b/pages/me/withdraw/index.vue
@@ -1,13 +1,12 @@
 <template>
 	<view class="container">
 		 <up-navbar title="申请提现"
-		            @rightClick="data.ruleShow = true"
 					bgColor="rgb(255, 117, 129)"
 					leftIconColor="#FFF"
 					:titleStyle ="{color:'#FFF'}" >
 				<template #right>
 				     <view class="u-p-r-30 u-flex u-col-center" style="color: #fff;">
-				     	<text class="rule-btn" @click="data.ruleShow = true">规则</text>
+				     	<text class="rule-btn" @click="showRule">规则</text>
 				     </view>
 				</template>
 		</up-navbar>
@@ -72,13 +71,13 @@
 
 		</view>
 
-		<up-modal :show="data.ruleShow" confirm-text="知道了" title="规则说明" :title-style="{fontWeight:'700'}" @confirm="data.ruleShow=false" confirm-color="rgb(255, 117, 129)">
+		
+		<up-modal :show="data.ruleShow" confirm-text="知道了" title="规则说明" :title="data.rule_title" :title-style="{fontWeight:'700'}" @confirm="ruleConfirm" confirm-color="rgb(255, 117, 129)">
 			<view class="u-p-30 u-text-left">
 				<scroll-view scroll-y="true" style="max-height: 50vh;" >
-					<rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="data.ruleInfo"></rich-text>
+					<rich-text style="text-align: justify;font-size: 18px;color: #666;" :nodes="data.rule_content"></rich-text>
 				</scroll-view>
 			</view>
-			
 		</up-modal>
 		
 		<view style="width: 0;height: 0;overflow: hidden;">
@@ -96,27 +95,14 @@
 	import { onReady,onLoad,onShow,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';
 	import { commonType } from '@/api/init.js';
 	import { linkTo } from '@/utils/app.js';
 	
 	let data = reactive({
 		ruleShow: true,
-		ruleInfo: `
-		用户在平台中对奖励提现的，适用以下规则：
-		<br/>
-		<br/>
-		1，用户的收益达到最低提现金额要求后，可以申请提现，每日只可以提现一笔。
-		<br/>
-		2，用户需要通过支付宝提现，需按照要求绑定支付宝账号并填写提现金额或其他提现所需信息，请确保提供的信息准确无误，以免提现失败。
-		<br/>
-		3，如果用户发现显示「提现失败」，需确认当前填写或绑定的支付宝账号或银行卡账号是否正确，以及支付宝账号是否可用。如果用户发现显示「提现成功」但没到账
-		<br/>
-		(1)如果用户有多个支付宝账号，请检查用户是否提现到了其他支付宝账号。
-		<br/>
-		(2)高峰期提现人数多会导致网络拥堵，显示提现成功之后72小时内属于正常现象，请耐心等候。
-		<br/>
-		4，每日08:00至次日18:00为提现时间，活动的对应奖励可能延迟到账。提现通常会在72小时内到账，如遇双休日、节假日，提现到账时间可能会延长。活动高峰期间，由于网络拥堵，用户可能存在短时间内无法提现的情况。平台将尽最大努力及时恢复提现功能，但无需因此承担任何责任。
-		<br/>`,
+		rule_title: "",
+		rule_content: "",
 		money: '',
 		mayMoney: '0',
 		list: [],
@@ -129,16 +115,24 @@
 		adRewardedVideoloadNum: 0,
 		isWithdraw: false,
 		userInfo: null,
+		ruleIndex: 0,
+		ruleList: []
 	})
 	
 	const adRewarded = ref(null);
 	onLoad(() => {
 		getExtractFei();
 		getMoneyDetail();
+		
 	})
 	onShow(() => {
 		getcashMoney()
 		getUserInfo();
+		announcement({type: 1}).then(res=>{
+			data.ruleList = res
+			ruleInit()
+			data.ruleShow = true
+		})
 	})
 	onReady(() => {
 		nextTick(()=>{
@@ -150,14 +144,49 @@
 	onReachBottom(() => {
 		if (data.page * data.limit < data.totalCount) {
 			data.page = data.page + 1;
-			data.getMoneyDetail();
+			getMoneyDetail();
 		}
 	})
 	onPullDownRefresh(() => {
 		data.page = 1;
 		data.list = []
-		data.getMoneyDetail();
+		getMoneyDetail();
 	})
+	function ruleInit(){
+		data.rule_title = data.ruleList[data.ruleIndex].title
+		data.rule_content = data.ruleList[data.ruleIndex].content
+	}
+	/**
+	 * 规则弹窗打开
+	 */
+	function showRule() {
+		if( data.ruleList.length <= 0) {
+			uni.showToast({
+				title: "暂未配置规则",
+				icon: 'none'
+			})
+			return
+		}
+		ruleInit()
+		data.ruleShow = true
+	}
+	/**
+	 * 规则确认
+	 */
+	function ruleConfirm() {
+		data.ruleShow = false
+		data.ruleIndex++
+		console.log(data.ruleIndex >= data.ruleList.length)
+		if( data.ruleIndex >= data.ruleList.length) {
+			data.ruleIndex = 0
+			return
+		}
+		setTimeout(res=>{
+			ruleInit()
+			data.ruleShow = true
+		},300)
+	}
+	
 	function getUserInfo() {
 		selectUserById().then(res=>{
 			data.userInfo = res;