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

pages/index/index.vue

@@ -67,7 +67,8 @@
 
 <script setup>
 	import {
-		reactive
+		reactive,
+		nextTick
 	} from 'vue';
 	import {
 		announcement,
@@ -117,16 +118,19 @@
 		versionUpdate()
 		getMsg()
 		getrecomVideo()
-		 
+		datas.isExamine = $common.isExamine || 0
 	})
 	onReady(() => {
-		announcement({
-			type: 0
-		}).then(res => {
-			datas.ruleList = res
-			ruleInit()
+		if(!uni.getStorageSync('ruleShow')){
 			datas.ruleShow = true
-		})
+			announcement({
+				type: 0
+			}).then(res => {
+				datas.ruleList = res
+				ruleInit()
+			})
+		}
+		
 	})
 	onReachBottom(() => {
 		++datas.page
@@ -220,6 +224,7 @@
 		datas.ruleIndex++
 		if (datas.ruleIndex >= datas.ruleList.length) {
 			datas.ruleIndex = 0
+			uni.setStorageSync('ruleShow', true)
 			return
 		}
 		setTimeout(res => {

pages/pays/pays.vue

@@ -31,6 +31,7 @@
 		getOrderInfo({
 			orderId: state.orderId
 		}).then(res => {
+			console.log(res);
 			if (res == 1) {
 				uni.hideLoading()
 				const sysInfo = uni.getSystemInfoSync();