From 18421bc31b96072803263c3a684f31d989783378 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Fri, 24 May 2024 18:02:56 +0800
Subject: [PATCH] aa

---
 page_components/fuwu/index.vue        | 94 +++++++++++++++++----------
 page_fenbao/statulist/fault/index.vue |  3 +
 2 files changed, 61 insertions(+), 36 deletions(-)

diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 37220ab..602ec58 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar title="充值" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
-			height='58'></u-navbar>
+		<u-navbar title="充值" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
+			title-size='36' height='58'></u-navbar>
 		<view class="title">
 			设备名称：{{deviceobj.deviceName}}
 		</view>
@@ -52,8 +52,8 @@
 					立即支付
 				</view>
 			</view>
-			
-			
+
+
 		</view>
 	</view>
 </template>
@@ -65,29 +65,44 @@
 				indexactive: 0,
 				checked: false,
 				deviceobj: {},
-				deviceid: 'DS-000002',
+				deviceid: '',
 				timer: null,
 				expireTimeStr: '',
 				zfobj: {},
 				orderno: '',
-				id:'',
-				czflag:false,
-				sytime:0,
-				datetime:0
+				id: '',
+				czflag: false,
+				sytime: 0,
+				datetime: 0
 			}
 		},
 		onLoad(option) {
-			this.id = option.id
-			this.startTimer()
-			this.gettaoc()
+			if (option.q) {
+				function getQueryParam(url, paramName) {
+					let regex = new RegExp(`[?&]${paramName}=([^&]*)`);
+					let results = regex.exec(url);
+					return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null;
+				}
+				let sceneValue = option.q
+				let decodedValue = decodeURIComponent(sceneValue);
+				this.id = getQueryParam(decodedValue, 'deviceNo')
+				console.log(this.id)
+				this.startTimer()
+				this.gettaoc()
+			} else {
+				this.id = option.id
+				this.startTimer()
+				this.gettaoc()
+			}
+
 		},
 		computed: {
 
 		},
 		onShow() {
-           if(this.orderno){
-			   this.gethuidaio()
-		   }
+			if (this.orderno) {
+				this.gethuidaio()
+			}
 		},
 		methods: {
 			startTimer() {
@@ -138,16 +153,16 @@
 										package: res.data.packageVal,
 										signType: res.data.signType,
 										paySign: res.data.paySign,
-										 success: (res) => {
-											console.log(res,'支付成功');
+										success: (res) => {
+											console.log(res, '支付成功');
 											if (this.timer) {
 												clearInterval(this.timer);
 												this.timer = null;
 											}
 											// 支付成功逻辑
-				                            uni.reLaunch({
-				                            	url:'/pages/shouye/index'
-				                            })
+											uni.reLaunch({
+												url: '/pages/shouye/index'
+											})
 											uni.setStorageSync('time', this.expireTimeStr)
 										},
 										fail(err) {
@@ -161,16 +176,16 @@
 									});
 								}
 							})
-						}else if(res.code == 401){
+						} else if (res.code == 401) {
 							uni.reLaunch({
-								url:'/pages/login/login'
+								url: '/pages/login/login'
 							})
 						}
 					})
 				}
 			},
-			
-			
+
+
 
 			btnactive(item) {
 				this.sytime = item.value
@@ -192,9 +207,10 @@
 </script>
 
 <style lang="scss">
-	/deep/ .u-title{
+	/deep/ .u-title {
 		padding-bottom: 41rpx;
 	}
+
 	// /deep/ .u-icon__icon{
 	// 	padding-bottom: 41rpx;
 	// }
@@ -212,7 +228,8 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-		.tip_box{
+
+		.tip_box {
 			position: fixed;
 			left: 72rpx;
 			top: 700rpx;
@@ -221,9 +238,11 @@
 			background: #F7FAFE;
 			border-radius: 30rpx 30rpx 30rpx 30rpx;
 			z-index: 10000000;
-			.top{
+
+			.top {
 				padding: 52rpx 38rpx 42rpx 36rpx;
-				.txt{
+
+				.txt {
 					width: 100%;
 					text-align: center;
 					font-weight: 500;
@@ -231,12 +250,14 @@
 					color: #3D3D3D;
 				}
 			}
-			.bot{
-				border-top: 2rpx solid #D8D8D8 ;
+
+			.bot {
+				border-top: 2rpx solid #D8D8D8;
 				display: flex;
 				flex-wrap: nowrap;
 				height: 100%;
-				.bot_left{
+
+				.bot_left {
 					width: 50%;
 					height: 98rpx;
 					display: flex;
@@ -246,20 +267,21 @@
 					font-size: 36rpx;
 					color: #3D3D3D;
 				}
-				.bot_right{
+
+				.bot_right {
 					width: 50%;
 					height: 98rpx;
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					
-					border-left: 2rpx solid #D8D8D8 ;
+
+					border-left: 2rpx solid #D8D8D8;
 					font-weight: 500;
 					font-size: 36rpx;
 					color: #8883F0;
-					
+
 				}
-				
+
 			}
 		}
 
diff --git a/page_fenbao/statulist/fault/index.vue b/page_fenbao/statulist/fault/index.vue
index 8b7df44..3b5db07 100644
--- a/page_fenbao/statulist/fault/index.vue
+++ b/page_fenbao/statulist/fault/index.vue
@@ -41,6 +41,9 @@
 				total: 0,
 				keyword:''
 			}
+		},
+		onLoad() {
+
 		},
 		onShow() {
 			this.wateringList = []