diff --git a/App.vue b/App.vue
index 3143ca6..28a7a6d 100644
--- a/App.vue
+++ b/App.vue
@@ -170,7 +170,7 @@
 	@import "uview-ui/index.scss";
 	@import "./common/css/iconfont.css";
 	// 自定义tabar样式修改
-	/deep/.u-tabbar__content__item__text{
+	::v-deep.u-tabbar__content__item__text{
 		font-size: 20rpx !important;
 		bottom: 10rpx !important;
 	}
diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index a34a139..7b57acb 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -21,13 +21,12 @@ const install = (Vue, vm) => {
 	// }); 
 	Vue.prototype.$u.http.setConfig({
 			baseUrl: 'https://yxd.ccttiot.com/prod-api',
-			// baseUrl: 'http://192.168.0.100:8081',
+			// baseUrl: 'http://192.168.1.3:8081',
 			loadingText: '努力加载中~',
 			loadingTime: 800,
 			// 设置自定义头部content-type
 			header: {
 				'content-type': 'application/json;charset=UTF-8',
-				
 			},
 			// ......
 		});
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 17810ee..195ab34 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -84,11 +84,11 @@
 	}
 </script>
 <style lang="scss" scoped>
-	/deep/.u-tabbar__content__item__button {
+	::v-deep.u-tabbar__content__item__button {
 		top: 20rpx !important;
 	}
 
-	/deep/.u-tabbar {
+	::v-deep.u-tabbar {
 		.u-tabbar__content__item:nth-child(2) {
 			.u-tabbar__content__item__button {
 				width: 32rpx !important;
diff --git a/page_user/dingshi.vue b/page_user/dingshi.vue
index 88ee223..098fc3f 100644
--- a/page_user/dingshi.vue
+++ b/page_user/dingshi.vue
@@ -78,7 +78,7 @@
 			<view class="name">
 				<text>工作时长：</text>
 				<view class="">
-					<input type="number" v-model="miao"/>
+					<input type="number" v-model="miao" @input="handleMiaoInput" @blur="handleMiaoBlur"/>
 					秒
 				</view>
 			</view>
@@ -165,7 +165,9 @@
 				// 添加默认时间设置
 				defaultTime:'',
 				defaultTimeLength: '',
-				jgtian: ''
+				jgtian: '',
+				shebid:'',
+				zaixianobj:{}
 			}
 		},
 		// 分享到好友（会话）
@@ -184,41 +186,83 @@
 			}
 		},
 		onLoad(option) {
-			xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
-			xBlufi.notifySendCustomData({
-				customData: "11get"
-			})
-			if (option.list.length > 0) { //判断有无数据 有数据直接拿 无数据则发送命令获取数据
-				this.pre = option.pre
-				if (option.pre == 'WATER') {
-					this.list = JSON.parse(option.list)
-					for (let key in this.list) {
-						if (this.list.hasOwnProperty(key)) {
-							// 获取当前数组  
-							let arr = this.list[key];
-							// 只转换开关状态（values[3]）为布尔值
-							arr[3] = arr[3] === 1;
-						}
-					}
-					console.log(this.list,'listlistlist')
-				} else {
-					this.csbobj = JSON.parse(option.list)
-					console.log(this.csbobj,'chobjchobj');
-					this.shi = this.csbobj.hour
-					this.fen = this.csbobj.minute
-					this.miao = this.csbobj.second
-					this.tian = this.csbobj.day
-				}
-			} else {
+			this.pre = option.pre
+			if(option.shebid){
+				this.shebid = option.shebid
+				this.getxq()
+			}else{
+				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
 				xBlufi.notifySendCustomData({
 					customData: "11get"
 				})
+				if (option.list.length > 0) { //判断有无数据 有数据直接拿 无数据则发送命令获取数据
+					if (option.pre == 'WATER') {
+						this.list = JSON.parse(option.list)
+						for (let key in this.list) {
+							if (this.list.hasOwnProperty(key)) {
+								// 获取当前数组  
+								let arr = this.list[key];
+								// 只转换开关状态（values[3]）为布尔值
+								arr[3] = arr[3] === 1;
+							}
+						}
+						console.log(this.list,'listlistlist')
+					} else {
+						this.csbobj = JSON.parse(option.list)
+						console.log(this.csbobj,'chobjchobj');
+						this.shi = this.csbobj.hour
+						this.fen = this.csbobj.minute
+						this.miao = this.csbobj.second
+						this.tian = this.csbobj.day
+					}
+				} else {
+					xBlufi.notifySendCustomData({
+						customData: "11get"
+					})
+				}
 			}
 		},
 		onShow() {
 
 		},
 		methods: {
+			// 请求浇花器数据
+			getxq(){
+				this.$u.get(`/app/getDeviceInfo/${this.shebid}`).then(res => {
+					if (res.code == 200) {
+						if(this.pre != 'WATER'){
+							this.shi = res.data.gatewayReturnParams.h.value
+							this.fen = res.data.gatewayReturnParams.m.value < 10 ? '0' + res.data.gatewayReturnParams.m.value : res.data.gatewayReturnParams.m.value
+							this.miao = res.data.gatewayReturnParams.t.value
+							this.tian = res.data.gatewayReturnParams.d.value
+						} else {
+							// 单阀 WATER，从后台字段 h1/m1/s1/o1...(以及可选 d1..d6) 组装展示结构
+							const params = res.data.gatewayReturnParams
+							const mapped = this.buildListFromBackend(params)
+							// u-switch 需要布尔值，已在构建阶段转换
+							this.list = mapped
+						}
+					}
+				})
+			},
+			// 后台 -> 定时列表结构（与蓝牙解析一致）
+			buildListFromBackend(params){
+				const result = {}
+				for(let i = 1; i <= 6; i++){
+					const h = Number(params?.[`h${i}`]?.value)
+					const m = Number(params?.[`m${i}`]?.value)
+					const s = Number(params?.[`s${i}`]?.value)
+					const o = Number(params?.[`o${i}`]?.value)
+					const d = Number(params?.[`d${i}`]?.value)
+					const hour = isNaN(h) ? 0 : h
+					const minute = isNaN(m) ? 0 : m
+					const second = isNaN(s) ? 0 : s
+					const onoff = !isNaN(o) && o === 1
+					const interval = isNaN(d) || d <= 0 ? 1 : d
+					result[`p_set${i}`] = [hour, minute, second, onoff, interval]
+				}
+				return result
+			},
 			// 选择启动时间
 			confirmtime(e){
 				console.log(e);
@@ -285,39 +329,66 @@
 				})
 				try {
 					this.showLoading()
-					// this.kgflag = true
-					this.btnitem(key, index, values)
-					this.btnqx()
+					// 保持 UI 不变，等待请求成功后再更新
 					this.deviceindex = index
-					this.devicehour = values[0] || 0 // 添加默认值
+					this.devicehour = values[0] || 0
 					this.deviceminute = values[1] || 0
 					this.devicemiao = values[2] || 0
-					
-					if (this.list.hasOwnProperty(key)) {
-						const array = this.list[key]
-						const lastIndex = array.length - 1
-						const lastElement = array[lastIndex]
-						array[lastIndex] = !lastElement
-						this.deviceflag = lastElement ? 0 : 1
-					}
-					let flag = values[3] == 0 ? 1 : 0
-					let cucun = '11p_set' + (Number(this.deviceindex) + 1)+ ':' + this.devicehour + ',' + this.deviceminute + ',' + this.devicemiao + ',' + flag + ',' + this.jgtian + ';'
-					this.lastOperation = () => {
+					const prevSwitch = !!values[3]
+					const nextSwitch = !prevSwitch
+					const intervalDays = parseInt(this.jgtian) || 1
+					const flag = nextSwitch ? 1 : 0
+					const cucun = '11p_set' + (Number(this.deviceindex) + 1)+ ':' + this.devicehour + ',' + this.deviceminute + ',' + this.devicemiao + ',' + flag + ',' + intervalDays + ';'
+					if(this.shebid == ''){
+						this.lastOperation = () => {
+							xBlufi.notifySendCustomData({
+								customData: cucun
+							})
+						}
+						this.lastOperation()
+						await this.delay(1000)
 						xBlufi.notifySendCustomData({
-							customData: cucun
+							customData: "11get"
 						})
+						// BLE 下不立即改 UI，等待设备返回数据刷新
+						setTimeout(() => {
+							uni.hideLoading()
+							this.hideLoading()
+						}, 1000)
+					}else{
+						let parameters = {
+							date:cucun
+						}
+						let data = {
+							deviceId:this.shebid,
+							instructionKey:'date',
+							parameters:parameters
+						}
+					    this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+					    	if (res.code == 200) {
+					    		// 网关成功：仅本地更新开关状态
+					    		const keyName = `p_set${Number(this.deviceindex) + 1}`
+					    		if (this.list[keyName]) {
+					    			this.$set(this.list[keyName], 3, nextSwitch)
+					    		}
+					    		uni.showToast({
+					    			title: '设置成功',
+					    			icon: 'success',
+					    			duration:2000
+					    		})
+					    		// 不再请求新数据
+					    	}else{
+					    		// 失败则保持原状态
+					    		values[3] = prevSwitch
+					    		uni.showToast({
+					    			title: res.msg,
+					    			icon: 'none',
+					    			duration:2000
+					    		})
+					    	}
+					    })
 					}
-					this.lastOperation()
-					await this.delay(1000)
-					xBlufi.notifySendCustomData({
-						customData: "11get"
-					})
 					
-					setTimeout(() => {
-						// this.kgflag = false
-						uni.hideLoading()
-						this.hideLoading()
-					}, 1000)
 				} catch (error) {
 					console.error('btnchange error:', error)
 					this.retryOperation()
@@ -388,21 +459,56 @@
 					const intervalDays = parseInt(this.jgtian) || 0;
 					
 					let cucun = '11p_set' + this.deviceindex + ':' + this.devicehour + ',' + this.deviceminute + ',' + this.devicemiao + ',' + 1 + ',' + intervalDays + ';'
-					this.lastOperation = () => {
+					if(this.shebid == ''){
+						this.lastOperation = () => {
+							xBlufi.notifySendCustomData({
+								customData: cucun
+							})
+						}
+						this.lastOperation()
+						
+						await this.delay(1000)
 						xBlufi.notifySendCustomData({
-							customData: cucun
+							customData: "11get"
+						})
+						// BLE 下设置后计时刷新由设备推送完成
+						this.hideLoading()
+					}else{
+						let parameters = {
+							date:cucun
+						}
+						let data = {
+							deviceId:this.shebid,
+							instructionKey:'date',
+							parameters:parameters
+						}
+						this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+							if (res.code == 200) {
+								uni.showToast({
+									title: '设置成功',
+									icon: 'success',
+									duration:2000
+								})
+								// 网关成功：本地立即更新列表，避免再次请求
+								const key = `p_set${this.deviceindex}`
+								if (!this.list[key]) {
+									this.$set(this.list, key, [0,0,0,false,1])
+								}
+								// 更新为本次设置的值（使用 $set 保证响应式）
+								this.$set(this.list[key], 0, Number(this.devicehour) || 0)
+								this.$set(this.list[key], 1, Number(this.deviceminute) || 0)
+								this.$set(this.list[key], 2, Number(this.devicemiao) || 0)
+								this.$set(this.list[key], 3, true)
+								this.$set(this.list[key], 4, Number(intervalDays) || 1)
+							}else{
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration:2000
+								})
+							}
 						})
 					}
-					this.lastOperation()
-					
-					await this.delay(1000)
-					xBlufi.notifySendCustomData({
-						customData: "11get"
-					});
-					
-					// setTimeout(() => {
-						this.hideLoading()
-					// }, 2000)
 				} catch (error) {
 					console.error('btnqd error:', error)
 					this.retryOperation()
@@ -427,6 +533,16 @@
 						return
 					}
 					
+					// 限制工作时长不能超过9999秒
+					if(this.miao > 9999){
+						uni.showToast({
+							title: '工作时长最大值为9999秒',
+							icon: 'none',
+							duration:2000
+						})
+						this.miao = 9999
+					}
+					
 					this.showLoading();
 					this.timeflag = false;
 					if(this.tian > 99){
@@ -438,27 +554,48 @@
 					}
 					let tian = this.tian > 99 ? 99 : this.tian
 					let cucun = '11pset' + ',' + this.shi + ',' + this.fen + ',' + this.miao + ',' + tian + '@'
-					this.lastOperation = () => {
+					if(this.shebid == ''){
+						this.lastOperation = () => {
+							xBlufi.notifySendCustomData({
+								customData: cucun
+							})
+						};
+						this.lastOperation()
+						await this.delay(1000)
 						xBlufi.notifySendCustomData({
-							customData: cucun
+							customData: "11get"
+						})
+						uni.showToast({
+							title: '保存成功',
+							icon: 'success',
+							duration: 2000
 						})
-					};
-					this.lastOperation()
-					
-					await this.delay(1000)
-					xBlufi.notifySendCustomData({
-						customData: "11get"
-					})
-					
-					uni.showToast({
-						title: '保存成功',
-						icon: 'success',
-						duration: 2000
-					})
-					
-					// setTimeout(() => {
 						this.hideLoading()
-					// }, 2000)
+					}else{
+						let parameters = {
+							date:cucun
+						}
+						let data = {
+							deviceId:this.shebid,
+							instructionKey:'date',
+							parameters:parameters
+						}
+						this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+							if (res.code == 200) {
+								uni.showToast({
+									title: '保存成功',
+									icon: 'success',
+									duration:2000
+								})
+							}else{
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration:2000
+								})
+							}
+						})
+					}
 				} catch (error) {
 					console.error('btnbc error:', error)
 					this.retryOperation()
@@ -493,11 +630,9 @@
 						try {
 							console.log("收到设备发来的自定义数据结果：", options.data);
 							const inputString = options.data.slice(0, -1) + ";";
-							
 							if (this.pre == 'WATER') {
 								const pairs = inputString.split(';');
 								const pSetObjects = {};
-								
 								pairs.forEach(pair => {
 									if (!pair) return;
 									const [key, value] = pair.split(':');
@@ -548,6 +683,43 @@
 						break
 				}
 			},
+			// 处理工作时长输入
+			handleMiaoInput(e) {
+				// 在uni-app中，直接使用e.detail.value获取输入值
+				let value = e.detail.value || e.target.value || '';
+				console.log('输入值:', value); // 调试用
+				
+				// 转换为数字
+				let numValue = parseInt(value) || 0;
+				console.log('转换后数值:', numValue); // 调试用
+				
+				// 限制最大值为9999
+				if (numValue > 9999) {
+					numValue = 9999;
+					uni.showToast({
+						title: '工作时长最大值为9999秒',
+						icon: 'none',
+						duration: 2000
+					});
+				}
+				
+				// 更新数据
+				this.miao = numValue;
+				console.log('最终miao值:', this.miao); // 调试用
+			},
+			
+			// 处理工作时长失去焦点时的验证
+			handleMiaoBlur(e) {
+				// 再次验证并限制
+				if (this.miao > 9999) {
+					this.miao = 9999;
+					uni.showToast({
+						title: '工作时长最大值为9999秒',
+						icon: 'none',
+						duration: 2000
+					});
+				}
+			},
 			// 改变天数
 			changeDays(change) {
 				let newValue = (parseInt(this.jgtian) || 1) + change;
@@ -559,11 +731,11 @@
 </script>
 
 <style lang="less">
-	/deep/ .u-title {
+	::v-deep .u-title {
 		margin-bottom: 22rpx;
 	}
 
-	/deep/ .uicon-nav-back {
+	::v-deep .uicon-nav-back {
 		margin-bottom: 22rpx;
 	}
 	.baocun{
diff --git a/page_user/jiaoshui.vue b/page_user/jiaoshui.vue
index 514a81c..29810ed 100644
--- a/page_user/jiaoshui.vue
+++ b/page_user/jiaoshui.vue
@@ -75,10 +75,10 @@
 </script>
 
 <style lang="less">
-	/deep/ .u-title{
+	::v-deep .u-title{
 		margin-bottom: 22rpx;
 	}
-	/deep/ .uicon-nav-back{
+	::v-deep .uicon-nav-back{
 		margin-bottom: 22rpx;
 	}
 	.list{
diff --git a/page_user/kefu.vue b/page_user/kefu.vue
index 4cb2fe3..bbf12d2 100644
--- a/page_user/kefu.vue
+++ b/page_user/kefu.vue
@@ -154,10 +154,10 @@
 </script>
 
 <style lang="less">
-	/deep/ .u-title{
+	::v-deep .u-title{
 		margin-bottom: 22rpx;
 	}
-	/deep/ .uicon-nav-back{
+	::v-deep .uicon-nav-back{
 		margin-bottom: 22rpx;
 	}
 	.kfimg{
diff --git a/page_user/kefuxq.vue b/page_user/kefuxq.vue
index 28a99da..33abb29 100644
--- a/page_user/kefuxq.vue
+++ b/page_user/kefuxq.vue
@@ -53,10 +53,10 @@
 </script>
 
 <style lang="less">
-	/deep/ .u-title{
+	::v-deep .u-title{
 		margin-bottom: 22rpx;
 	}
-	/deep/ .uicon-nav-back{
+	::v-deep .uicon-nav-back{
 		margin-bottom: 22rpx;
 	}
 	page{
diff --git a/page_user/lanya.vue b/page_user/lanya.vue
index 66d823b..69517a0 100644
--- a/page_user/lanya.vue
+++ b/page_user/lanya.vue
@@ -1,6 +1,7 @@
 <template>
 	<view>
-		<u-navbar :is-back="true" title='添加设备' title-color="#000" :border-bottom="false" :background="bgc" id="navbar">
+		<u-navbar :is-back="true" title=' ' title-color="#000" :border-bottom="false" :background="bgc"
+			id="navbar">
 		</u-navbar>
 		<view class="page">
 			<!-- 有搜索到设备 -->
@@ -13,7 +14,7 @@
 					如未找到想添加的设备，点击重新搜索
 				</view>
 				<view class="list">
-					<view class="list_item" v-for="(item,index) in jiaohuaqi" :key="index" :class="{ show: item.show }">
+					<view class="list_item" v-for="(item,index) in sortedJiaohuaqi" :key="index" :class="{ show: item.show }">
 						<image :src="item.modelPicture" mode=""></image>
 						<view class="cen">
 							<view class="name" style="color: #ccc;" v-if="item.userId && item.userId != userid">
@@ -104,6 +105,15 @@
 				processingQueue: false, // 是否正在处理队列
 			}
 		},
+		computed: {
+			sortedJiaohuaqi() {
+				return this.jiaohuaqi.slice().sort((a, b) => {
+					if (a.ssid === undefined) return 1;
+					if (b.ssid === undefined) return -1;
+					return Math.abs(a.ssid) - Math.abs(b.ssid);
+				});
+			}
+		},
 		// 分享到好友（会话）
 		onShareAppMessage: function() {
 			return {
@@ -380,17 +390,17 @@
 </script>
 
 <style lang="less">
-/deep/ .u-input__input{
+::v-deep .u-input__input{
 	border: 1px solid #ccc;
 	border-radius: 10rpx;
 	padding-left: 10rpx;
 	box-sizing: border-box;
 }
-	/deep/ .u-title {
+	::v-deep .u-title {
 		margin-bottom: 22rpx;
 	}
 
-	/deep/ .uicon-nav-back {
+	::v-deep .uicon-nav-back {
 		margin-bottom: 22rpx;
 	}
 
diff --git a/page_user/photo.vue b/page_user/photo.vue
index d35b24c..bafd314 100644
--- a/page_user/photo.vue
+++ b/page_user/photo.vue
@@ -216,11 +216,11 @@
 </script>
 
 <style lang="scss">
-	/deep/ .u-title {
+	::v-deep .u-title {
 		margin-bottom: 22rpx;
 	}
 
-	/deep/ .uicon-nav-back {
+	::v-deep .uicon-nav-back {
 		margin-bottom: 22rpx;
 	}
 
diff --git a/page_user/photolist.vue b/page_user/photolist.vue
index aef7cbf..483a40b 100644
--- a/page_user/photolist.vue
+++ b/page_user/photolist.vue
@@ -76,10 +76,10 @@
 </script>
 
 <style lang="less">
-	/deep/ .u-title{
+	::v-deep .u-title{
 		margin-bottom: 22rpx;
 	}
-	/deep/ .uicon-nav-back{
+	::v-deep .uicon-nav-back{
 		margin-bottom: 22rpx;
 	}
 	page{
diff --git a/page_user/photoxq.vue b/page_user/photoxq.vue
index d777d74..40fa5db 100644
--- a/page_user/photoxq.vue
+++ b/page_user/photoxq.vue
@@ -138,10 +138,10 @@
 </script>
 
 <style lang="scss">
-	/deep/ .u-title{
+	::v-deep .u-title{
 		margin-bottom: 22rpx;
 	}
-	/deep/ .uicon-nav-back{
+	::v-deep .uicon-nav-back{
 		margin-bottom: 22rpx;
 	}
 	.about{
diff --git a/page_user/upload.vue b/page_user/upload.vue
index fabcbeb..d269e15 100644
--- a/page_user/upload.vue
+++ b/page_user/upload.vue
@@ -134,11 +134,15 @@
 			}
 		},
 		onLoad(option) {
+			console.log(option,'0000');
 			xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+			xBlufi.notifySendCustomData({
+				customData: "11get"
+			})
 			this.deviceid = option.deviceid
 			this.imgpic = option.img
 			if(option.xctime != '--'){
-				this.xinpin = option.xipin
+				// this.xinpin = option.xipin
 				if(option.xctime != '--' && option.ver){
 					this.ver = 'V' + option.ver.slice(3)
 					this.xctime = option.xctime
@@ -156,9 +160,11 @@
 		},
 		onUnload() {
 			this.ver = ''
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent)
 		},
 		onHide() {
 			this.ver = ''
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent)
 		},
 		methods: {
 			btnxip(){
@@ -178,6 +184,9 @@
 				xBlufi.notifySendCustomData({
 					customData: '11sleep' + this.xinpin + '@'
 				})
+				xBlufi.notifySendCustomData({
+					customData: '11get'
+				})
 			},
 			// 解绑设备按钮
 			btnjiebang() {
@@ -223,6 +232,8 @@
 					}
 				})
 			},
+			
+			
 			// 点击显示修改名称弹框
 			btnxianshi() {
 				this.nameflag = true
@@ -343,7 +354,7 @@
 						break
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
 					    // console.log("选择固件升级收信息：", options.data, options.data.length);
-					    if (typeof options.data === 'string') {
+						console.log(options,'020202020202');
 					        if (options.data.indexOf("prom:") !== -1) {
 					            console.log('固件升级中')
 					            var indexOld = options.data.substring(options.data.indexOf('prom:'))
@@ -386,10 +397,38 @@
 										})
 									},1000)
 					            }
-					        }
-					    } else {
-					        console.error("options.data 不是字符串:", options.data);
-					    }
+					        }else{
+								console.log('jiexijiexi',options);
+								const inputString = options.data.slice(0, -1) + ";"
+								const hasAtSymbol = inputString.includes(',');
+								let processedString = inputString;
+								let currentDay = 0;
+								const pairs = processedString.split(';').filter(Boolean);
+								const showObject = {};
+								const pSetObjects = {};
+								// 初始化所有p_set为默认值
+								for (let i = 1; i <= 6; i++) {
+								    pSetObjects[`p_set${i}`] = [0, 0, 0, 0, 0];
+								}
+								// 解析字符串
+								pairs.forEach(pair => {
+								    const [key, value] = pair.split(':');
+								    // 处理可能带有前缀的show键，如 "ver270@show"
+								    const cleanKey = key.includes('@') ? key.split('@')[1] : key;
+								    if (cleanKey == 'show') {
+								        showObject.showArray = value.split(',').map(Number);
+								    } else if (key.startsWith('p_set')) {
+								        const values = value.split(',').map(Number);
+								        // 确保数组长度为5
+								        while (values.length < 5) {
+								            values.push(0);
+								        }
+								        pSetObjects[key] = values;
+								    }
+								})
+								console.log(showObject,'showObjectshowObject');
+								this.xinpin = showObject.showArray[showObject.showArray.length - 2]
+							}
 					    break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
 						if (!options.result) {
@@ -465,11 +504,11 @@
 		}
 	}
 
-	/deep/ .u-title {
+	::v-deep .u-title {
 		margin-bottom: 22rpx;
 	}
 
-	/deep/ .uicon-nav-back {
+	::v-deep .uicon-nav-back {
 		margin-bottom: 22rpx;
 	}
 
diff --git a/page_user/yinsixq.vue b/page_user/yinsixq.vue
index 9c0816a..edfcb0b 100644
--- a/page_user/yinsixq.vue
+++ b/page_user/yinsixq.vue
@@ -53,10 +53,10 @@
 </script>
  
 <style lang="less">
-	/deep/ .u-title{
+	::v-deep .u-title{
 		margin-bottom: 22rpx;
 	}
-	/deep/ .uicon-nav-back{
+	::v-deep .uicon-nav-back{
 		margin-bottom: 22rpx;
 	}
 	page{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d7e0b87..3832c99 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -25,9 +25,10 @@
 						{{user.deviceName == undefined ? '--' : user.deviceName}}
 						<image style="width: 32rpx;height: 26rpx;margin-left: 14rpx;" v-if="!xuanzeflag" src="https://api.ccttiot.com/smartmeter/img/static/uwHOBxvbJjkhx1uDiQHI" mode=""></image>
 						<image style="width: 32rpx;height: 26rpx;margin-left: 14rpx;" v-else class="rotated-image" src="https://api.ccttiot.com/smartmeter/img/static/uwHOBxvbJjkhx1uDiQHI" mode=""></image>
-					</view> <text style="background-color: red;box-shadow: 0rpx 0rpx 10rpx 0rpx red, 0rpx 0rpx 30rpx 0rpx red" v-if="vardataflag == 1 || vardataflag == 2"></text> <text v-else></text> 
-					<view class="lj" @click="btnlj" v-if="vardataflag == 1">
-						点击连接
+					</view>
+					 <!-- <text style="background-color: red;box-shadow: 0rpx 0rpx 10rpx 0rpx red, 0rpx 0rpx 30rpx 0rpx red" v-if="vardataflag == 1 || vardataflag == 2"></text> <text v-else></text> -->
+					<view style="margin-left: 10rpx;" @click="btnlj" v-if="vardataflag == 1">
+						<image style="width: 158rpx;height: 40rpx;vertical-align: sub;" src="https://api.ccttiot.com/smartmeter/img/static/uIkBDnclZIqgUbWom2Aw" mode=""></image>
 					</view>
 					<view class="lj" @click="btnlj" v-if="vardataflag == 2">
 						连接中
@@ -40,6 +41,9 @@
 					<image @click="btnsz" src="https://api.ccttiot.com/smartmeter/img/static/uvCJ8ro0MpfGZd53vypJ" mode=""></image>
 				</view>
 			</view>
+			<view v-if=" ver != '' && ver.slice(3) != version" @click="btnsz" class="" style="width: 100%;height: 76rpx;margin-top: 20rpx;">
+				<image style="width: 100%;height: 76rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uFqC94yHg1YXw1GoqTsL" mode=""></image>
+			</view>
 			<!-- 设备信息 -->
 			<view class="devicebox"> 
 				<view class="devicetop">
@@ -50,8 +54,19 @@
 								<view class="">MAC：{{user.mac == undefined ? '--' : user.mac}}</view>
 						</view>
 					</view>
-					<view style="color: red;font-size: 26rpx;display: flex;align-items: center;" v-if=" ver != '' && ver.slice(3) != version" @click="btnsz">
+					<!-- <view style="color: red;font-size: 26rpx;display: flex;align-items: center;" v-if=" ver != '' && ver.slice(3) != version" @click="btnsz">
 						<text style="display: inline-block;width: 10rpx;height: 10rpx;border-radius: 50%;background-color: red;margin-right: 10rpx;"></text>可更新
+					</view> -->
+					<view class="" style="font-weight: 400;font-size: 26rpx;margin-left: 20rpx;display: flex;align-items: center;">
+						<image style="width: 44rpx;height: 44rpx;" src="https://api.ccttiot.com/smartmeter/img/static/u4yJdBWPMHqgqYjZkQKM" mode=""></image>
+						<view class="">
+							<view class="" style="font-size: 28rpx;color: #999999;">
+								剩余电量
+							</view>
+							<view class="" style="font-size: 24rpx;color: #48893B;">
+								{{sydl}}%
+							</view>
+						</view>
 					</view>
 				</view>
 				<view class="deviceweek" v-if="pre == 'WATER'" @click="btntime">
@@ -308,27 +323,36 @@
 							<image style="width:32rpx;height:32rpx;margin-right: 8rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uhyYG0TLfWi9XUhTQz7D" mode=""></image>
 							启动时间
 						</view>
-						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;">
+						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;" v-if="vardataflag == 3">
 							{{csbobj.hour == undefined ? '--' : csbobj.hour + ':'}}{{csbobj.minute == undefined ? '' : csbobj.minute}}
 						</view>
+						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;" v-else>
+							{{zaixianobj.h.value == undefined ? '-' : zaixianobj.h.value + ':'}}{{zaixianobj.m.value == undefined ? '-' : zaixianobj.m.value < 10 ? '0' + zaixianobj.m.value : zaixianobj.m.value}}
+						</view>
 					</view>
 					<view class="" style="font-size: 24rpx;color: #50565A;margin-top: 10rpx;text-align: center;">
 						<view class="" style="display: flex;align-items: center;">
 							<image style="width:32rpx;height:32rpx;margin-right: 8rpx;font-size: 36rpx;font-weight: 600;" src="https://api.ccttiot.com/smartmeter/img/static/uuQaK98cmdQQnPWus27Z" mode=""></image>
 							工作时长
 						</view>
-						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;">
+						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;" v-if="vardataflag == 3">
 							{{csbobj.second == undefined ? '--' : csbobj.second + '秒'}}
 						</view>
+						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;" v-else>
+							{{zaixianobj.t.value == undefined ? '--' : zaixianobj.t.value + '秒'}}
+						</view>
 					</view>
 					<view class="" style="font-size: 24rpx;color: #50565A;margin-top: 10rpx;text-align: center;">
 						<view class="" style="display: flex;align-items: center;">
 							<image style="width:32rpx;height:32rpx;margin-right: 8rpx;font-size: 36rpx;font-weight: 600;" src="https://api.ccttiot.com/smartmeter/img/static/uM6Yz4xVqFwzW6xlTRph" mode=""></image>
 							间隔天数
 						</view>
-						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;">
+						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;" v-if="vardataflag == 3">
 							{{csbobj.day == undefined ? '--' : csbobj.day + '天'}}
 						</view>
+						<view class="" style="margin-top:10rpx;font-size: 36rpx;font-weight: 600;" v-else>
+							{{zaixianobj.d.value == undefined ? '--' : zaixianobj.d.value + '天'}}
+						</view>
 					</view>
 				</view>
 			</view>
@@ -503,14 +527,14 @@
 					minute: true,
 					second: false
 				},
-				minute: '--',
-				second: '--',
+				minute: '00',
+				second: '10',
 				hasShownVersionAlert: false,
 				devicesList: [],
 				deviceId: '',
 				name: '',
 				mac: '',
-				jstime: '',
+				jstime: '10',
 				ver_data: {},
 				vardataflag:1,
 				showobj: {},
@@ -538,13 +562,19 @@
 				disconnectTimer: null,
 				devicetime:'',
 				imgpic:'',
-				xinp:'',
+				xinp:'30',
 				version:'',
-				
+				jiance:false,
+				shibainum:0,
 				searchStartTime: 0,      // 记录开始搜索的时间戳
-				    searchTimeout: 10000,    // 10秒超时（单位：毫秒）
-				    searchTimer: null,       // 搜索定时器
-				    isSearching: false       // 是否正在搜索中
+				searchTimeout: 10000,    // 10秒超时（单位：毫秒）
+				searchTimer: null,       // 搜索定时器
+				isSearching: false,      // 是否正在搜索中
+				dataTimeoutTimer: null   ,// 5秒数据看门狗定时器
+				dianya:0,
+				sydl:'--',
+				zaixianobj:{},
+				modelId:''
 			}
 		},
 		// 分享到好友（会话）
@@ -563,36 +593,18 @@
 				path: '/pages/index/index'
 			}
 		},
-		onLoad() {
-			 wx.openBluetoothAdapter({
-			     success: function (res) {
-			       console.log('蓝牙适配器初始化成功'); 
-			     },
-			   fail: function (err) {
-			      console.error('蓝牙适配器初始化失败，可能是因为没有权限', err);
-			    uni.showToast({
-			       	title: '蓝牙适配器初始化失败，可能是因为没有权限',
-			       	icon: 'none',
-			       	duration:2000
-			    })
-			   }
-			 }) 	
-			 this.vardataflag = 1
-			 xBlufi.initXBlufi(1)
-			 let that = this
-			 xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent)
-			 xBlufi.notifyStartDiscoverBle({
-			 	'isStart': true
-			 })
-			 // setTimeout(()=>{
-				//  that.btnlj()
-			 // },1500)
+		onLoad() {	
+			xBlufi.initXBlufi(1)
+			// xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+			xBlufi.notifyStartDiscoverBle({
+				'isStart': true
+			})
 		},
 		onShow() {
+			xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
 			// 请求个人信息
 			this.getinfo() 
 			this.getshuju() // 页面加载时启动定时器
-			xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
 		},
 		mounted() {
 		   
@@ -601,30 +613,81 @@
 		    // 页面隐藏时清除定时器
 		   this.clearTimer()
 		   this.clearDisconnectTimer()
+		   this.clearDataTimeoutTimer()
 		},
 		onUnload() {
 		    // 页面卸载时清除定时器
 		   this.clearTimer()
 		   this.clearDisconnectTimer()
+		   this.clearDataTimeoutTimer()
 		},
 		methods: {
+			// 请求浇花器数据
+			getsj(){
+				this.$u.get(`/app/getDeviceInfo/${this.shebid}`).then(res => {
+					if (res.code == 200) {
+						this.zaixianobj = res.data.gatewayReturnParams
+						this.modelId = res.data.modelId
+						console.log(this.vardataflag,this.zaixianobj);
+						if(res.data.gatewayReturnParams.yudi.value){
+							 this.yschecked = res.data.gatewayReturnParams.yudi.value == 0 ? true : false
+						}
+						if(res.data.gatewayReturnParams.lock.value){
+							 this.etchecked = res.data.gatewayReturnParams.lock.value == 0 ? true : false
+						}
+						// 非蓝牙模式时，用后台数据组装渲染结构
+						if(this.pre === 'WATER' && this.vardataflag != 3){
+							this.ver_data = this.buildVerDataFromBackend(this.zaixianobj)
+						}
+					}
+				})
+			},
 			// 点击保存设置
 			btnbc(){
 				this.handleUserAction()
 				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
+					let parameters = {
+						time:this.xinp
+					}
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'sleep',
+						parameters:parameters
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: '保存成功',
+								icon: 'success',
+								duration:2000
+							})
+						}else{
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
 					})
 				}else{
-					uni.showToast({
-						title: '保存成功',
-						icon: 'success',
-						duration:2000
-					})
-					xBlufi.notifySendCustomData({
-						customData: '11sleep' + this.xinp
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=sleep`).then(res =>{
+						if(res.code == 200){
+							uni.showToast({
+								title: '保存成功',
+								icon: 'success',
+								duration:2000
+							})
+							xBlufi.notifySendCustomData({
+								customData: '11' + this.format(res.data, {time: this.xinp })
+							})
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
 					})
 				}
 			},
@@ -700,12 +763,19 @@
 							this.devicelist = res.data
 							this.imgpic = res.data[0].modelPicture
 							this.mac = res.data[0].mac
+							setTimeout(()=>{
+								if(this.vardataflag == 1){
+									this.btnlj()
+								}
+							},1000)
 							this.pre = res.data[0].pre
 							this.deviceId = res.data[0].mac.match(/.{2}/g).reverse().join(':')
 							this.user = res.data[0]
-							this.shebid = res.data[0].deviceId
+							this.shebid = res.data[0].deviceId			
 							this.getbanbens()
-							let that = this
+							setTimeout(()=>{
+								this.getsj()
+							},1000)
 						}else{
 							this.bjflag = true
 						}
@@ -714,42 +784,25 @@
 			},
 			// 点击连接蓝牙函数
 			btnlj() {
-				console.log("进入111蓝牙连接")
-				if (this.vardataflag != 3) {
+				if(this.jiance == true){
+					xBlufi.initXBlufi(1)
+					xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+					xBlufi.notifyStartDiscoverBle({
+						'isStart': true
+					})
 					this.vardataflag = 2
-					let that = this
-					if (that.deviceId != '') {
-						let systemInfo = uni.getSystemInfoSync()
-						if (systemInfo.platform == 'android') {
-							console.log("进入这里是Android")
-							xBlufi.notifyStartDiscoverBle({
-								'isStart': false 
-							})
-							console.log("进入蓝牙连接", that.deviceId)
-							console.log("进入that.name", that.name)
-							xBlufi.notifyConnectBle({
-								isStart: true,
-								deviceId: that.deviceId,
-								name: that.name
-							})
-						} else if (systemInfo.platform == 'ios') {
-							console.log("进入这里是IOS")
-							that.findDevice()
-						}
-					}
-					setTimeout(()=>{
-						if(this.vardataflag != 3){
-							this.vardataflag = 1
-						}
-					},15000)
-				} 
+					this.findDevice()
+				}else{
+					xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+					this.vardataflag = 2
+					this.findDevice()
+				}
 			},
 			// ios递归函数匹配
 			findDevice() {
 			    // 使用 find 方法查找匹配的设备
 			    const matchedDevice = this.devicesarr.find(device => {
 			        console.log(device.name, this.mac, '111') 
-			        console.log("IOSMAC", device)
 			        return device.name.slice(-12) == this.mac.slice(-12)
 			    })
 			    if (matchedDevice) {
@@ -769,404 +822,45 @@
 			        console.log("未找到匹配的设备，继续查找...")
 			        setTimeout(this.findDevice.bind(this), 1000) // 使用 bind 保持 this 上下文
 			    }
-			},
-			
-			// 雨水感应开启
-			btnyushui() {
-				this.handleUserAction()
-				this.one = false
-				this.ones = true
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
+				let that = this
+				const findDevices = () => {
+					that.ver_dataflag = 2
+					const matchedDevice = that.devicesarr.find(device => {
+						if (device.name) {
+							return device.localName.slice(-12) == that.mac.slice(-12)
+						}
 					})
-				}else{
-					uni.showLoading({
-						title: '开启中...'
-					})
-					this.yschecked = false
-					xBlufi.notifySendCustomData({
-						customData: '11yudi'
-					})
-					uni.hideLoading()
-				}
-			},
-			// 点击同步时间
-			btntb(){
-				this.handleUserAction()
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
-					})
-				}else{
-					this.devicetime = this.getCurrentTime();
-					console.log(this.devicetime);
-					// if(this.pre == 'WATER'){ //单阀
-						uni.showLoading({
-							title: '设置中...'
-						})
-						xBlufi.notifySendCustomData({
-							customData: '11date' + this.devicetime + ';' 
-						}) 
-						uni.hideLoading() 
-						uni.showToast({
-							title: '同步成功',
-							icon: 'success',
-							duration:2000
-						})
-					// }else{ //抽水泵
-					// 	uni.showLoading({ 
-					// 		title: '设置中...'
-					// 	})
-					// 	xBlufi.notifySendCustomData({
-					// 		customData: '11hour' + this.devicetime + '@',
-					// 	})
-					// 	uni.hideLoading()
-					// }
-				} 
-			},
-			// 点击显示设置时间
-			btnsztime(){
-				this.handleUserAction()
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
-					})
-				}else{
-					this.timeflag = true
-				}
-			},
-			getCurrentTime() {
-			  const now = new Date();
-			  const padZero = num => num.toString().padStart(2, '0');
-			  const hours = padZero(now.getHours());   // 时 (00-23)
-			  const minutes = padZero(now.getMinutes()); // 分 (00-59)
-			  const seconds = padZero(now.getSeconds()); // 秒 (00-59)
-			  return `${hours}:${minutes}:${seconds}`;
-			},
-			// 点击设置当前时间
-			confirmtime(e){
-				// if(this.pre == 'WATER'){ //单阀
-					uni.showLoading({
-						title: '设置中...'
-					})
-					console.log(e.hour,e.minute);
-					this.devicetime = e.hour + ':' + e.minute
-					xBlufi.notifySendCustomData({
-						customData: '11date' + e.hour + ':' + e.minute + ':' + '00' + ';'
-					})
-					uni.hideLoading()
-				// }else{ //抽水泵
-				// 	uni.showLoading({
-				// 		title: '设置中...'
-				// 	})
-				// 	console.log(e.hour,e.minute);
-				// 	xBlufi.notifySendCustomData({
-				// 		customData: '11hour' + e.hour + '@' + e.minute + '@',
-				// 	})
-				// 	uni.hideLoading()
-				// }
-			},
-			// 雨水感应关闭
-			btnyushuis() {
-				this.handleUserAction()
-				this.one = false
-				this.ones = true
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
-					})
-				}else{
-					uni.showLoading({
-						title: '关闭中...'
-					})
-					this.yschecked = true
-					xBlufi.notifySendCustomData({
-						customData: '11unyudi'
-					})
-					uni.hideLoading()
-				}
-			},
-			// 点击儿童锁开启
-			btnertong() {
-				this.handleUserAction()
-				this.two = false
-				this.twos = true
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
-					})
-				}else{
-					uni.showLoading({
-						title: '开启中...'
-					})
-					this.etchecked = false
-					xBlufi.notifySendCustomData({
-						customData: '11lock'
-					})
-					uni.hideLoading()
-				}
-			},
-			// 点击儿童锁关闭
-			btnertongs() {
-				this.handleUserAction()
-				this.two = false
-				this.twos = true
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
-					})
-			    }else{
-					uni.showLoading({
-						title: '关闭中...'
-					})
-					this.etchecked = true
-					xBlufi.notifySendCustomData({
-						customData: '11unlock'
-					})
-					uni.hideLoading()
-				}
-			},
-
-			// 点击添加设备 
-			btnaddsb() {
-				this.$u.get(`/appVerify/profile`).then((res) => {
-					if (res.code == 200) {
-						this.vardataflag = 1
-						this.ver_data = {}
-						this.datalist = ''
-						uni.navigateTo({
-							url: '/page_user/lanya'
-						})
-					}else if(res.code == 401){
-						this.jmlogin()
-					}
-				})
-			},
-
-			// 点击选择浇水时间
-			confirm(e) {
-				this.handleUserAction()
-				this.minute = e.minute
-				this.second = e.second
-				this.jstime = Number(e.second) + Number(e.minute * 60)
-			},
-
-			// 点击跳转到定时页面
-			btntime() {
-				this.handleUserAction()
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '蓝牙未连接',
-						icon: 'none',
-						duration: 2000
-					})
-				}else{
-					uni.navigateTo({
-						url: '/page_user/dingshi?list=' + JSON.stringify(this.ver_data) + '&pre=' + this.pre
-					})
-				}
-			},
-			
-			// 点击取消手动浇水
-			btnqx() {
-				this.handleUserAction()
-				this.sdjsflag = false
-				this.sdminutes = ''
-				this.sdseconds = ''
-				this.kgflag = true
-				this.jsked = true
-				this.jskeds = false
-			},
-			// 确定选择时间
-			btnqd() {
-				this.handleUserAction()
-				if (this.minute == '--' || this.second == '--') {
-					uni.showToast({
-						title: '请选择浇水时长',
-						icon: 'none',
-						duration: 3000
-					})
-				} else {
-					uni.showLoading({
-						title: '开启中...'
-					})
-					xBlufi.notifySendCustomData({
-						customData: "11time@" + this.jstime + '@'
-					})
-					uni.hideLoading()
-					this.startTimer(this.jstime)
-					this.sdjsflag = false
-				}
-			},
-
-			// 手动浇水定时器
-			startTimer(totalSeconds) {  
-			    let remainingSeconds = totalSeconds
-			    const sdminutes = ''
-			    const sdseconds = ''
-			    this.timer = setInterval(() => {  
-			        // 计算分钟和秒  
-			        const minutes = Math.floor(remainingSeconds / 60).toString()
-			        const secs = (remainingSeconds % 60).toString()
-			        // 格式化秒和分钟，确保是两位数  
-			        this.sdseconds = secs.padStart(2, '0')
-			        this.sdminutes = (minutes > 0 ? minutes : '').padStart(2, '0') // 如果分钟为0，则不显示分钟  
-			        // 更新剩余秒数  
-			        remainingSeconds--
-			        // 如果剩余秒数为0，则停止定时器  
-			        if (remainingSeconds <= 0) {  
-			            clearInterval(this.timer)
-			            this.btnkq()
-			            this.sdminutes = '' 
-			            this.sdseconds = '' 
-			        }  
-			    }, 1000)
-			},
-			
-			// 关闭手动浇水
-			btnkq() {
-				this.handleUserAction()
-				console.log('关闭')
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
-					})
-				}else{
-					uni.showLoading({
-						title: '关闭中...'
-					})
-					xBlufi.notifySendCustomData({
-						customData: "11close"
-					})
-					clearInterval(this.timer)
-					this.sdminutes = ''
-					this.sdseconds = ''
-					this.kgflag = true
-					this.jsked = true
-					this.jskeds = false
-					uni.hideLoading()
-				}
-			},
-			// 开启手动浇水
-			btngb() {
-				this.handleUserAction()
-				console.log('开启')
-				if(this.vardataflag != 3){
-					uni.showToast({
-						title: '设备未连接',
-						icon: 'none',
-						duration:2000
-					})
-					this.jsked = true
-					this.jskeds = false
-				}else{
-					this.sdjsflag = true
-					this.kgflag = false
-				}
-			},
-
-			// 跳转到设置
-			btnsz() {
-				xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent)
-				if(this.csbobj.day){
-					this.xctime = '111'
-				}
-				uni.navigateTo({
-					url: '/page_user/upload?deviceid=' + this.shebid + '&ver=' + this.ver + '&xctime=' + this.xctime + '&xipin=' + this.xinp + '&img=' + this.imgpic
-				})
-			},
-			// 选择设备
-			btnactive(deviceId,index) {
-				this.shebid = deviceId
-                this.btnxuanze()
-			},
-			// 选择确定设备  shebid
-			btnxuanze() {
-				this.$u.put(`/app/toggleDevice?userId=${this.userobj.userId}&deviceId=${this.shebid}`).then(res => {
-					if(res.code == 200){
-						wx.closeBLEConnection({
-							deviceId:  this.mac,
+					if (matchedDevice) {
+						xBlufi.notifyStartDiscoverBle({
+							'isStart': false
 						})
 						xBlufi.notifyConnectBle({
-						    isStart: false,
-						    deviceId: this.deviceId,
-						    name: this.name
-						})
-						uni.showToast({
-							title: res.msg,
-							icon: 'success',
-							duration: 2000
-						})
-						this.datalist = ''
-						this.mac = ''
-						this.ver_data = {}
-						this.name = ''
-						this.deviceId = ''
-						this.xuanzeflag = false
-						this.vardataflag = 1
-						this.sdseconds = ''
-						this.sdminutes = ''
-						this.kgflag = true
-						this.jsked = true
-						this.jskeds = false
-						this.getshebxq()
-					}else{
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
+							isStart: true,
+							deviceId: matchedDevice.deviceId,
+							name: matchedDevice.name
 						})
+						that.deviceid = matchedDevice.deviceId
+						that.devicename = matchedDevice.name
+						setTimeout(() => {
+							console.log(this.ver_dataflag, '连接状态2');
+							if (that.ver_dataflag == 3) {
+
+							} else {
+								that.ver_dataflag = 1
+								that.shibainum = 0
+							}
+						}, 4000)
+					} else {
+						if (that.shibainum < 3) {
+							that.shibainum++
+							that.findDeviceTimer = setTimeout(findDevices.bind(that), 1000) // 使用 bind 保持 this 上下文
+						} else {
+							that.ver_dataflag = 1
+							that.shibainum = 0
+						}
 					}
-				})
-			},
-			// 获取设备信息
-			getshebxq(){
-				this.$u.get(`/app/getDeviceInfo/${this.shebid}`).then(res => {
-					if(res.code == 200){
-						this.mac = res.data.mac
-						this.pre = res.data.pre
-						this.imgpic = res.data.modelPicture
-						this.deviceId = res.data.mac.match(/.{2}/g).reverse().join(':')
-						this.user = res.data
-						this.getbanbens()
-						// this.btnlj()
-					}
-				})
-			},
-			
-			// 点击切换设备
-			btnksxz() {
-				if (this.xuanzeflag == true) {
-					this.xuanzeflag = false
-				} else {
-					this.xuanzeflag = true
 				}
-			},
-			//跳转到浇水日志页
-			btnjs() {
-				uni.showToast({
-					title: '此功能暂未开通',
-					icon: 'none',
-					duration:2000
-				})
-				// uni.navigateTo({
-				// 	url: '/page_user/jiaoshui'
-				// })
+				findDevices()
 			},
 			// 获取附近蓝牙设备列表
 			funListenDeviceMsgEvent: function(options) {
@@ -1175,6 +869,7 @@
 						if (!options.result) {
 							this.vardataflag = 1
 							this.clearDisconnectTimer()
+							console.log('111111111','断断断');
 						}
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
@@ -1189,14 +884,14 @@
 						})
 						if (options.result == true){
 							console.log('服务发现成功:', options);
-							this.datalist = '1'
-							setTimeout(()=>{
-								this.vardataflag = 3
-								this.initDisconnectTimer()
-								xBlufi.notifySendCustomData({
-									customData: "11get"
-								})
-							},3000)
+							// 一连上立刻请求数据推送
+							this.vardataflag = 3
+							this.initDisconnectTimer()
+							this.datalist = ''
+							this.startDataTimeoutTimer()
+							xBlufi.notifySendCustomData({
+								customData: "11get"
+							})
 						}else{
 							console.log('服务发现失败:', options.data);
 							this.vardataflag = 1
@@ -1204,21 +899,7 @@
 						}
 						break
 					case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
-						// if (options.result == true){
-						// 	console.log('服务发现成功:', options);
-						// 	this.datalist = '1'
-						// 	this.vardataflag = 3
-						// 	this.initDisconnectTimer()
-						// 	// 连接成功后立即发送一次获取数据命令
-						// 	console.log("连接成功后发送获取数据命令")
-						// 	xBlufi.notifySendCustomData({
-						// 		customData: "11get"
-						// 	})
-						// }else{
-						// 	console.log('服务发现失败:', options.data);
-						// 	this.vardataflag = 1
-						// 	this.clearDisconnectTimer() 
-						// }
+			
 						break
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
 						console.log("收到设备数据：", options.data)
@@ -1265,6 +946,7 @@
 							}
 						} else {
 							this.datalist = options.data.slice(0, -1) + ";"
+							this.clearDataTimeoutTimer()
 							this.vardataflag = 3
 							if(this.pre == 'WATER'){
 								this.getchuli()
@@ -1276,18 +958,681 @@
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
 						if (!options.result) {
 							this.vardataflag = 1
+							this.jiance = true
 							console.log('蓝牙初始化失败')
 							return
 						}
 						break
 				}
 			},
+			
+			
+			// 雨水感应开启
+			btnyushui() {
+				this.handleUserAction()
+				this.one = false
+				this.ones = true
+				if(this.vardataflag != 3){
+					uni.showLoading({
+						title: '开启中...'
+					})
+					let parameters = {
+						command:'yudi'
+					}
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'yudi',
+						// parameters:parameters
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.hideLoading()
+							this.yschecked = false
+							uni.showToast({
+								title: '开启成功',
+								icon: 'success',
+								duration:2000
+							})
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}else{
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=yudi`).then(res =>{
+						if(res.code == 200){
+							uni.showLoading({
+								title: '开启中...'
+							})
+							this.yschecked = false
+							xBlufi.notifySendCustomData({
+								customData: '11' + res.data
+							})
+							uni.hideLoading()
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}
+			},
+			// 点击同步时间
+			btntb(){
+				this.handleUserAction()
+				if(this.vardataflag != 3){
+					uni.showLoading({
+						title: '设置中...'
+					})
+					this.devicetime = this.getCurrentTime();
+					let parameters = {
+						date:this.devicetime + ';' 
+					}
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'date',
+						parameters:parameters
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.hideLoading()
+							uni.showToast({
+								title: '同步成功',
+								icon: 'success',
+								duration:2000
+							})
+						}else{
+							uni.hideLoading()
+							this.devicetime = '--'
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}else{
+					this.devicetime = this.getCurrentTime();
+					console.log(this.devicetime);
+					// if(this.pre == 'WATER'){ //单阀
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=date`).then(res =>{
+						if(res.code == 200){
+							uni.showLoading({
+								title: '设置中...'
+							})
+							xBlufi.notifySendCustomData({
+								customData: '11' + this.format(res.data, {date: this.devicetime + ':' + '00' + ';'})
+							})
+							uni.hideLoading()
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				} 
+			},
+			// 点击显示设置时间
+			btnsztime(){
+				this.handleUserAction()
+				this.timeflag = true
+				// if(this.vardataflag != 3){
+				// 	uni.showToast({
+				// 		title: '设备未连接',
+				// 		icon: 'none',
+				// 		duration:2000
+				// 	})
+				// }else{
+					
+				// }
+			},
+			getCurrentTime() {
+			  const now = new Date();
+			  const padZero = num => num.toString().padStart(2, '0');
+			  const hours = padZero(now.getHours());   // 时 (00-23)
+			  const minutes = padZero(now.getMinutes()); // 分 (00-59)
+			  const seconds = padZero(now.getSeconds()); // 秒 (00-59)
+			  return `${hours}:${minutes}:${seconds}`;
+			},
+			// 点击设置当前时间
+			confirmtime(e){
+				this.devicetime = e.hour + ':' + e.minute
+				if(this.vardataflag == 3){
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=date`).then(res =>{
+						if(res.code == 200){
+							uni.showLoading({
+								title: '设置中...'
+							})
+							xBlufi.notifySendCustomData({
+								customData: '11' + this.format(res.data, {date: this.devicetime + ':' + '00' + ';'})
+							})
+							uni.hideLoading()
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}else{
+					uni.showLoading({
+						title: '设置中...'
+					})
+					this.devicetime = e.hour + ':' + e.minute
+					let parameters = {
+						date:this.devicetime + ';' 
+					}
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'date',
+						parameters:parameters
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.hideLoading()
+							uni.showToast({
+								title: '设置成功',
+								icon: 'success',
+								duration:2000
+							})
+						}else{
+							this.devicetime = '--'
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}
+			},
+			// 雨水感应关闭
+			btnyushuis() {
+				this.handleUserAction()
+				this.one = false
+				this.ones = true
+				if(this.vardataflag != 3){
+					uni.showLoading({
+						title: '关闭中...'
+					})
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'unyudi',
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.hideLoading()
+							this.yschecked = true
+							uni.showToast({
+								title: '关闭成功',
+								icon: 'success',
+								duration:2000
+							})
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}else{
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=unyudi`).then(res =>{
+						if(res.code == 200){
+							uni.showLoading({
+								title: '关闭中...'
+							})
+							this.yschecked = true
+							xBlufi.notifySendCustomData({
+								customData: '11' + res.data
+							})
+							uni.hideLoading()
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}
+			},
+			// 点击儿童锁开启
+			btnertong() {
+				this.handleUserAction()
+				this.two = false
+				this.twos = true
+				if(this.vardataflag != 3){
+					uni.showLoading({
+						title: '开启中...'
+					})
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'lock',
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.hideLoading()
+							this.etchecked = false
+							uni.showToast({
+								title: '开启成功',
+								icon: 'success',
+								duration:2000
+							})
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}else{
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=lock`).then(res =>{
+						if(res.code == 200){
+							uni.showLoading({
+								title: '开启中...'
+							})
+							this.etchecked = false
+							xBlufi.notifySendCustomData({
+								customData: '11' + res.data
+							})
+							uni.hideLoading()
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}
+			},
+			// 点击儿童锁关闭
+			btnertongs() {
+				this.handleUserAction()
+				this.two = false
+				this.twos = true
+				if(this.vardataflag != 3){
+					uni.showLoading({
+						title: '关闭中...'
+					})
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'unlock',
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.hideLoading()
+							this.etchecked = true
+							uni.showToast({
+								title: '关闭成功',
+								icon: 'success',
+								duration:2000
+							})
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+			    }else{
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=unlock`).then(res =>{
+						if(res.code == 200){
+							uni.showLoading({
+								title: '关闭中...'
+							})
+							this.etchecked = true
+							xBlufi.notifySendCustomData({
+								customData: '11' + res.data
+							})
+							uni.hideLoading()
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}
+			},
+
+			// 点击添加设备 
+			btnaddsb() {
+				this.$u.get(`/appVerify/profile`).then((res) => {
+					if (res.code == 200) {
+						this.vardataflag = 1
+						this.ver_data = {}
+						this.datalist = ''
+						uni.navigateTo({
+							url: '/page_user/lanya'
+						})
+					}else if(res.code == 401){
+						this.jmlogin()
+					}
+				})
+			},
+
+			// 点击选择浇水时间
+			confirm(e) {
+				this.handleUserAction()
+				this.minute = e.minute
+				this.second = e.second
+				this.jstime = Number(e.second) + Number(e.minute * 60)
+			},
+
+			// 点击跳转到定时页面
+			btntime() {
+				this.handleUserAction()
+				if(this.vardataflag != 3){
+					uni.navigateTo({
+						url: '/page_user/dingshi?pre=' + this.pre + '&shebid=' + this.shebid
+					})
+				}else{
+					uni.navigateTo({
+						url: '/page_user/dingshi?list=' + JSON.stringify(this.ver_data) + '&pre=' + this.pre
+					})
+				}
+			},
+			
+			// 点击取消手动浇水
+			btnqx() {
+				this.handleUserAction()
+				this.sdjsflag = false
+				this.sdminutes = ''
+				this.sdseconds = ''
+				this.kgflag = true
+				this.jsked = true
+				this.jskeds = false
+			},
+			// 替换
+			format(template, params) {
+			  return template.replace(/\{(\w+)\}/g, (_, k) => params[k] ?? '');
+			},
+			// 确定选择时间
+			btnqd() {
+				this.handleUserAction()
+				if (this.minute == '--' || this.second == '--') {
+					uni.showToast({
+						title: '请选择浇水时长',
+						icon: 'none',
+						duration: 3000
+					})
+				} else if(this.vardataflag == 3){
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=time`).then(res =>{
+						if(res.code == 200){
+							uni.showLoading({
+								title: '开启中...'
+							})
+							xBlufi.notifySendCustomData({
+								customData: '11' + this.format(res.data, {time: this.jstime})
+							})
+							uni.hideLoading()
+							this.startTimer(this.jstime)
+							this.sdjsflag = false
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}else{
+					let parameters = {
+						time: '@' + this.jstime + '@'
+					}
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'time',
+						parameters:parameters
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: '开启成功',
+								icon: 'success',
+								duration:2000
+							})
+							uni.hideLoading()
+							this.startTimer(this.jstime)
+							this.sdjsflag = false
+						}else{
+							this.kgflag = true
+							this.jsked = false
+							this.jskeds = false
+							uni.hideLoading()
+							this.sdjsflag = false
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}
+			},
+
+			// 手动浇水定时器
+			startTimer(totalSeconds) {  
+			    let remainingSeconds = totalSeconds
+			    const sdminutes = ''
+			    const sdseconds = ''
+			    this.timer = setInterval(() => {  
+			        // 计算分钟和秒  
+			        const minutes = Math.floor(remainingSeconds / 60).toString()
+			        const secs = (remainingSeconds % 60).toString()
+			        // 格式化秒和分钟，确保是两位数  
+			        this.sdseconds = secs.padStart(2, '0')
+			        this.sdminutes = (minutes > 0 ? minutes : '').padStart(2, '0') // 如果分钟为0，则不显示分钟  
+			        // 更新剩余秒数  
+			        remainingSeconds--
+			        // 如果剩余秒数为0，则停止定时器  
+			        if (remainingSeconds <= 0) {  
+			            clearInterval(this.timer)
+			            this.btnkq()
+			            this.sdminutes = '' 
+			            this.sdseconds = '' 
+			        }  
+			    }, 1000)
+			},
+			
+			// 关闭手动浇水
+			btnkq() {
+				this.handleUserAction()
+				console.log('关闭')
+				if(this.vardataflag != 3){
+					uni.showLoading({
+						title: '关闭中...'
+					})
+					let data = {
+						deviceId:this.shebid,
+						instructionKey:'close',
+					}
+					this.$u.post(`/app/sendCommandByGateway`,data).then(res => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: '关闭成功',
+								icon: 'success',
+								duration:2000
+							})
+							uni.hideLoading()
+							this.sdminutes = ''
+							this.sdseconds = ''
+							this.kgflag = true
+							this.jsked = true
+							this.jskeds = false
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}else{
+					this.$u.get(`/app/getModelCommand/${this.modelId}?instructionKey=close`).then(res =>{
+						if(res.code == 200){
+							uni.showLoading({
+								title: '关闭中...'
+							})
+							xBlufi.notifySendCustomData({
+								customData: "11" + res.data
+							})
+							clearInterval(this.timer)
+							this.sdminutes = ''
+							this.sdseconds = ''
+							this.kgflag = true
+							this.jsked = true
+							this.jskeds = false
+							uni.hideLoading()
+						}else{
+							uni.hideLoading()
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration:2000
+							})
+						}
+					})
+				}
+			},
+			// 开启手动浇水
+			btngb() {
+				this.handleUserAction()
+				console.log('开启')
+				this.sdjsflag = true
+				this.kgflag = false
+			},
+
+			// 跳转到设置
+			btnsz() {
+				xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent)
+				if(this.csbobj.day){
+					this.xctime = '111'
+				}
+				uni.navigateTo({
+					url: '/page_user/upload?deviceid=' + this.shebid + '&ver=' + this.ver + '&xctime=' + this.xctime + '&xipin=' + this.xinp + '&img=' + this.imgpic
+				})
+			},
+			// 选择设备
+			btnactive(deviceId,index) {
+				this.shebid = deviceId
+				this.zaixianobj = {}
+                this.btnxuanze()
+			},
+			// 选择确定设备  shebid
+			btnxuanze() {
+				this.$u.put(`/app/toggleDevice?userId=${this.userobj.userId}&deviceId=${this.shebid}`).then(res => {
+					if(res.code == 200){
+						wx.closeBLEConnection({
+							deviceId:  this.mac,
+						})
+						xBlufi.notifyConnectBle({
+						    isStart: false,
+						    deviceId: this.deviceId,
+						    name: this.name
+						})
+						uni.showToast({
+							title: res.msg,
+							icon: 'success',
+							duration: 2000
+						})
+						this.datalist = ''
+						this.mac = ''
+						this.ver_data = {}
+						this.name = ''
+						this.deviceId = ''
+						this.xuanzeflag = false
+						this.vardataflag = 1
+						this.sdseconds = ''
+						this.sdminutes = ''
+						this.kgflag = true
+						this.jsked = true
+						this.jskeds = false
+						this.getshebxq()
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+			// 获取设备信息
+			getshebxq(){
+				this.$u.get(`/app/getDeviceInfo/${this.shebid}`).then(res => {
+					if(res.code == 200){
+						this.mac = res.data.mac
+						this.modelId = res.data.modelId
+						console.log(this.modelId,'00000');
+						if(this.vardataflag == 1){
+							setTimeout(()=>{
+								this.btnlj()
+							},1000)
+						}
+						this.pre = res.data.pre
+						this.imgpic = res.data.modelPicture
+						this.deviceId = res.data.mac.match(/.{2}/g).reverse().join(':')
+						this.user = res.data
+						this.getbanbens()
+						// this.btnlj()
+					}
+				})
+			},
+			
+			// 点击切换设备
+			btnksxz() {
+				if (this.xuanzeflag == true) {
+					this.xuanzeflag = false
+				} else {
+					this.xuanzeflag = true
+				}
+			},
+			//跳转到浇水日志页
+			btnjs() {
+				uni.showToast({
+					title: '此功能暂未开通',
+					icon: 'none',
+					duration:2000
+				})
+				// uni.navigateTo({
+				// 	url: '/page_user/jiaoshui'
+				// })
+			},
 			// 每隔一时间发送一次获取数据
 			getshuju() {
 				const that = this
 				that.intervalId = setInterval(() => {
 					if (that.vardataflag == 3) {
-						// console.log("发送获取数据命令")
+						// 发送前清空数据并开启5秒看门狗
+						that.datalist = ''
+						that.startDataTimeoutTimer()
 						xBlufi.notifySendCustomData({
 							customData: "11get"
 						})
@@ -1323,7 +1668,10 @@
 			    // 5. 重新组合为期望的格式
 			    const result = [parts[0], dataPart];
 			    console.log('最终结果:', result); // ["ver3@p_set0", "11,5,603,99,19,9,0"]
-			    
+				const versionNumber = result[0].match(/ver(\d+)/)?.[1];
+				const ver = versionNumber ? parseInt(versionNumber) : 0;
+				this.ver = 'ver' + ver
+				console.log(this.ver,'ververver');
 			    // 6. 继续您原来的处理逻辑
 			    const timeParts = dataPart.split(',');
 			    
@@ -1341,6 +1689,14 @@
 			    this.ver_data = {...this.csbobj};
 			    console.log('设备时间:', this.devicetime);
 			},
+			// 获取电量
+			getdianliang(){
+				this.$u.get(`/app/device/remainingPower/${this.shebid}?voltage=${this.dianya / 1000}`).then(res => {
+					if (res.code == 200) {
+						this.sydl = res.data
+					}
+				})
+			},
 			// 处理从设备接收数据
 			getchuli() {
 			    const inputString = this.datalist;
@@ -1357,39 +1713,16 @@
 			        const showMatch = processedString.match(/show:([^;]+)/);
 			        if (showMatch) {
 			            const showValues = showMatch[1].split(',');
-			            currentDay = parseInt(showValues[showValues.length - 1]) || 0;
+			            currentDay = parseInt(showValues[showValues.length - 2]) || 0;
 			        }
 			    } else {
 			        processedString = inputString;
 			        this.ver = '';
 			    }
-			    // console.log('处理后的字符串:', processedString);
-				// console.log(this.ver,'this.verthis.verthis.ver');
+				console.log(this.ver,'ververver');
 			    const version = this.ver;
 			    // 使用正则表达式提取数字部分
 			    const versionNumber = version.match(/\d+/); // 匹配连续的数字
-			    // if (versionNumber) {
-			    //     const num = parseInt(versionNumber[0], 10); // 转换为整数
-			    //     if (num < 9 && !this.hasShownVersionAlert) {
-			    //         this.hasShownVersionAlert = true; // 设置标记为已显示
-			    //         uni.showModal({
-			    //             title: "提示",
-			    //             content: `您当前设备版本过低，可能无法正常使用，请点击右上角设置前去升级`,
-			    //             showCancel: false, // 不显示取消按钮
-			    //             confirmText: "确定", // 按钮文字
-			    //             success: (res) => {
-			    //                 if (res.confirm) {
-			    //                     console.log("用户点击了确定");
-			    //                     this.hasShownVersionAlert = false; // 重置标记，允许下次判断
-			    //                 }
-			    //             }
-			    //         })
-			    //     } else {
-			    //         console.log(`版本号 ${num} 不小于 9`);
-			    //     }
-			    // } else {
-			    //     console.log("没有找到版本号数字");
-			    // }
 			    const pairs = processedString.split(';').filter(Boolean);
 			    // console.log('分割后的数据对:', pairs);
 			    const showObject = {};
@@ -1418,6 +1751,9 @@
 			    // 设置开关状态
 			    this.yschecked = this.showobj.showArray[1] !== 1;
 			    this.etchecked = this.showobj.showArray[0] !== 1;
+				this.dianya = this.showobj.showArray[this.showobj.showArray.length - 1]
+				console.log('电压',this.dianya);
+				this.getdianliang()
 			    // 计算浇水时间
 			    const calculateTimeDifference = (date1, date2) => {
 			        const diffMs = Math.abs(date1 - date2);
@@ -1474,7 +1810,10 @@
 			        nextTimeDiff: this.xctime,
 			        prevTime: this.sctimejs
 			    });
-				this.xinp = this.showobj.showArray[this.showobj.showArray.length - 1]
+				this.xinp = this.showobj.showArray[this.showobj.showArray.length - 2]
+				this.dianya = this.showobj.showArray[this.showobj.showArray.length - 1]
+				console.log('息屏',this.xinp,'电压',this.dianya);
+				this.getdianliang()
 				// if(this.showobj.showArray[6] != '' && this.showobj.showArray[7] != ''){
 					// console.log('111111111111111111111111111111111111111111111111111111111111111');
 				  // 显式转为字符串
@@ -1518,6 +1857,7 @@
 							console.log('蓝牙连接已断开')
 							this.vardataflag = 1
 							this.datalist = ''
+							this.clearDataTimeoutTimer()
 							uni.showToast({
 								title: '蓝牙已断开连接',
 								icon: 'none',
@@ -1532,9 +1872,32 @@
 					})
 				}
 			},
+			// 启动5秒数据看门狗
+			startDataTimeoutTimer() {
+				if (this.dataTimeoutTimer) {
+					clearTimeout(this.dataTimeoutTimer)
+					this.dataTimeoutTimer = null
+				}
+				this.dataTimeoutTimer = setTimeout(() => {
+					if (this.vardataflag == 3 && !this.datalist) {
+						console.log('5秒未收到数据，重连蓝牙')
+						this.disconnectBluetooth()
+						setTimeout(() => {
+							this.btnlj()
+						}, 1000)
+					}
+				}, 5000)
+			},
+			// 清理5秒数据看门狗
+			clearDataTimeoutTimer() {
+				if (this.dataTimeoutTimer) {
+					clearTimeout(this.dataTimeoutTimer)
+					this.dataTimeoutTimer = null
+				}
+			},
 			// 监听用户操作的方法
 			handleUserAction() {
-				if(this.vardataflag === 3) {
+				if(this.vardataflag == 3) {
 					this.resetDisconnectTimer()
 				}
 			},
@@ -1588,6 +1951,25 @@
 				}
 				return true;
 			},
+			// 将后台返回的 h1/m1/o1/s1... 整合为 ver_data 结构
+			buildVerDataFromBackend(params){
+				const result = {}
+				for(let i = 1; i <= 6; i++){
+					const h = Number(params?.[`h${i}`]?.value)
+					const m = Number(params?.[`m${i}`]?.value)
+					const s = Number(params?.[`s${i}`]?.value)
+					const o = Number(params?.[`o${i}`]?.value)
+					// 按天间隔（若后台没有提供分组的 d1..d6，则默认 1 天）
+					const d = Number(params?.[`d${i}`]?.value)
+					const hour = isNaN(h) ? 0 : h
+					const minute = isNaN(m) ? 0 : m
+					const second = isNaN(s) ? 0 : s
+					const onoff = isNaN(o) ? 0 : o
+					const interval = isNaN(d) || d <= 0 ? 1 : d
+					result[`p_set${i}`] = [hour, minute, second, onoff, interval]
+				}
+				return result
+			},
 		}
 	}
 </script>
@@ -1759,7 +2141,7 @@
 		box-sizing: border-box;
 		.tabsb {
 			width: 750rpx;
-			max-height: 90vh;
+			max-height: 95vh;
 			background: #FFFFFF;
 			position: fixed;
 			top: 0;
diff --git a/pages/login/denglu.vue b/pages/login/denglu.vue
index c4d09bd..87b9b3f 100644
--- a/pages/login/denglu.vue
+++ b/pages/login/denglu.vue
@@ -6,7 +6,7 @@
 			<text></text>
 		</view>
 		
-		<view class="telsele">
+		<!-- <view class="telsele">
 			<view class="tel">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/ucosihVOuRDfyaNn5VzX" mode=""></image> 手机号
 			</view>
@@ -14,9 +14,9 @@
 				<input type="text" v-model="tel" placeholder="请输入您的手机号"/>
 				<image v-if="tel" @click="btnqk" style="width: 32rpx;height: 32rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uE9WtCydr2ISGWek6EkS" mode=""></image>
 			</view>
-		</view>
+		</view> -->
 		
-		<view class="telsele" style="margin-top: 36rpx;margin-bottom: 26rpx;">
+		<!-- <view class="telsele" style="margin-top: 36rpx;margin-bottom: 26rpx;">
 			<view class="tel">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uFiLt1SC4cHdZrIDRxeO" mode=""></image> 密码	
 			</view>
@@ -35,9 +35,9 @@
 		</view>
 		<view class="you">
 			没有账户？ <text @click="btnljdl">立即注册</text>
-		</view>
+		</view> -->
 		<view class="wxlogo">
-			——————  其他登录方式  ——————
+			——————  登录方式  ——————
 		</view>
 		
 		<button style="color: #ccc;margin-top: 30rpx;" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
@@ -186,7 +186,7 @@
 </script>
 
 <style lang="less">
-	/deep/ .u-checkbox__icon-wrap{
+	::v-deep .u-checkbox__icon-wrap{
 		border: 1px solid #666666;
 	}
 	page{
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 80f79c1..635c462 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,12 +2,16 @@
 	<view>
 	  <image src="https://api.ccttiot.com/smartmeter/img/static/uZUV03nVfyr3MvcLKUfs" class="bj" mode=""></image>
 	   <view class="anniu">
-	   	<view class="zhuce" @click="btnzc">
+	   <!-- 	<view class="zhuce" @click="btnzc">
 	   		注册
-	   	</view>
-		<view class="denglu" @click="denglu">
+	   	</view> -->
+		<!-- <view class="denglu" @click="denglu">
 			登录
-		</view>
+		</view> -->
+		<button class="denglu" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">
+			<!-- <image src="https://api.ccttiot.com/smartmeter/img/static/uxWMldLMb888YHm0qOgN" mode=""></image> -->
+			快捷登录
+		</button>
 		<view class="zhuce" style="margin-top: 30rpx;" @click="denglus">
 			暂不登录
 		</view>
@@ -56,6 +60,44 @@
 				xBlufi.initXBlufi(1)
 			},
 			methods:{
+				// 点击微信一键登录
+				getPhoneNumber(e) {
+					this.jsCode = e.detail.code
+					let that = this;
+					const wxLoginAsync = () => {
+						return new Promise((resolve, reject) => {
+							wx.login({
+								success(res) {
+									if (res.code) {
+										that.mobileCode = res.code
+										let data = {
+											jsCode:  e.detail.code,
+											mobileCode: res.code,
+										}
+										resolve(data);
+									} else {
+										reject(res.errMsg)
+									}
+								},
+								fail(err) {
+									reject(err)
+								}
+							})
+						})
+					}
+					wxLoginAsync().then(async (data) => {
+						this.$u.post(`/wxlogin?mobileCode=${this.jsCode}&jsCode=${this.mobileCode}`, data).then((res) => {
+							if (res.code == 200) {
+								wx.setStorageSync('token', res.token)
+								uni.switchTab({
+									url:'/pages/index/index'
+								})
+							}
+						})
+					}).catch((err) => {
+						console.error(err)
+					})
+				},
 				// 跳转到注册页
 				btnzc(){
 					uni.navigateTo({
diff --git a/pages/login/wjpassword.vue b/pages/login/wjpassword.vue
index babe0be..fbf2189 100644
--- a/pages/login/wjpassword.vue
+++ b/pages/login/wjpassword.vue
@@ -226,10 +226,10 @@
 </script>
 
 <style lang="less">
-	/deep/ .u-title{
+	::v-deep .u-title{
 		margin-bottom: 22rpx;
 	}
-	/deep/ .uicon-nav-back{
+	::v-deep .uicon-nav-back{
 		margin-bottom: 22rpx;
 	}
 	page{
diff --git a/pages/login/zhuce.vue b/pages/login/zhuce.vue
index 798b4e0..379096f 100644
--- a/pages/login/zhuce.vue
+++ b/pages/login/zhuce.vue
@@ -132,13 +132,28 @@
 							duration: 2000
 						})
 					}else{
+						let that = this
+						wx.login({
+							success(res) {
+								if (res.code) {
+									that.mobileCode = res.code
+									resolve(data);
+								} else {
+									reject(res.errMsg)
+								}
+							},
+							fail(err) {
+								reject(err)
+							}
+						})
 						let data = {
-							phone:this.tel,
-							phoneCode:this.yzm,
-							uuid:this.uuid,
-							password:this.password
+							phone:that.tel,
+							phoneCode:that.yzm,
+							uuid:that.uuid,
+							password:that.password,
+							jsCode:that.mobileCode
 						}
-						this.$u.post(`/appCodeLogin`,data).then((res) => {
+						that.$u.post(`/appCodeLogin`,data).then((res) => {
 							if (res.code == 200) {
 								wx.setStorageSync('token', res.token)
 								uni.switchTab({
@@ -269,7 +284,7 @@
 </script>
 
 <style lang="less">
-	/deep/ .u-checkbox__icon-wrap{
+	::v-deep .u-checkbox__icon-wrap{
 		border: 1px solid #666666;
 	}
 	page{
diff --git a/pages/nearbystores/index.vue b/pages/nearbystores/index.vue
index a83ab62..8a18ddf 100644
--- a/pages/nearbystores/index.vue
+++ b/pages/nearbystores/index.vue
@@ -89,7 +89,7 @@
 </script>
 
 <style lang="scss">
-	/deep/ .map{
+	::v-deep .map{
 		width: 100%;
 		height: 100%;
 	}