Merge branch 'test' of https://e.coding.net/g-cphe0354/duanju/new_app into test

pages/me/withdraw/index.vue

@@ -94,40 +94,15 @@
 </template>
 
 <script setup>
-	import {
-		reactive,
-		nextTick,
-		ref
-	} from 'vue';
-	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';
-	import {
-		commonType
-	} from '@/api/init.js';
-	import {
-		linkTo
-	} from '@/utils/app.js';
-
-	let data = reactive({
+	import { reactive, nextTick, ref } from 'vue';
+	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';
+	import { commonType } from '@/api/init.js';
+	import { linkTo } from '@/utils/app.js';
+	
+	const data = reactive({
 		ruleShow: false,
 		rule_title: "",
 		rule_content: "",
@@ -164,6 +139,7 @@
 			type: 1
 		}).then(res => {
 			data.ruleList = res
+			
 			ruleInit()
 
 		})
@@ -191,8 +167,8 @@
 		data.list = []
 		getMoneyDetail();
 	})
-
-	function ruleInit() {
+	function ruleInit(){
+		data.rule_content = ""
 		data.rule_title = data.ruleList[data.ruleIndex].title
 		data.rule_content = data.ruleList[data.ruleIndex].content
 	}
@@ -205,7 +181,7 @@
 				title: "暂未配置规则",
 				icon: 'none'
 			})
-			return
+			return false;
 		}
 		ruleInit()
 		data.ruleShow = true
@@ -214,6 +190,7 @@
 	 * 规则确认
 	 */
 	function ruleConfirm() {
+		console.log(1)
 		data.ruleShow = false
 		data.ruleIndex++
 		if (data.ruleIndex >= data.ruleList.length) {