From 93300872e24fb4078bce34dc67d8ef8043a395a1 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Thu, 16 Jan 2025 18:03:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=85=B3=20=E8=93=9D=E7=89=99?=
 =?UTF-8?q?=E5=85=A8=E9=9D=A2=E4=BC=98=E5=8C=96=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js                    |    4 +-
 page_components/blufi/xBlufi-wx-impl.js       |    2 +-
 page_components/eletj.vue                     |  361 +--
 page_components/fuwu/index.vue                |  230 +-
 .../statulist/myshop/shopdetail/index.vue     |    7 +-
 page_user/sbdetail.vue                        |  271 +--
 pages.json                                    |    9 +
 pages/login/login.vue                         |    4 +-
 pages/shebeione.vue                           | 1987 +++++++++++++++++
 pages/shouye/index.vue                        |  114 +-
 pages/shuaxin.vue                             |    4 +-
 pages/sjshiming.vue                           |    4 +-
 pages/tj.vue                                  |   16 +-
 13 files changed, 2468 insertions(+), 545 deletions(-)
 create mode 100644 pages/shebeione.vue

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 02416cc..ad96f00 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -19,8 +19,8 @@ const install = (Vue, vm) => {
 	// 	},
 	// }); 
 	Vue.prototype.$u.http.setConfig({ 
-			// baseUrl: 'http://192.168.1.4:10002', 
-			baseUrl: 'https://kg.chuangtewl.com/prod-api',
+			baseUrl: 'http://192.168.1.4:10002', 
+			// baseUrl: 'https://kg.chuangtewl.com/prod-api',
 			// loadingText: '加载中...',
 			// loadingTime: 1000,
 			// 设置自定义头部content-type
diff --git a/page_components/blufi/xBlufi-wx-impl.js b/page_components/blufi/xBlufi-wx-impl.js
index 34b49b3..e7cbc0d 100644
--- a/page_components/blufi/xBlufi-wx-impl.js
+++ b/page_components/blufi/xBlufi-wx-impl.js
@@ -1145,7 +1145,7 @@ function init() {
 												// 	&& devices.devices[0].name != 'SMART_R2XS'
 												// 	&& devices.devices[0].name != 'SMART_R2XS'
 												// ) 
-												if (devices.devices[0].name.indexOf("CTKG") != -1 || devices.devices[0].name.indexOf("CTPO") != -1 || devices.devices[0].name.indexOf("gjkg") != -1){
+												if (devices.devices[0].name.indexOf("CTKG") != -1 || devices.devices[0].name.indexOf("CTPO") != -1 || devices.devices[0].name.indexOf("gjkg") != -1 || devices.devices[0].name.indexOf("CCYK") != -1){
 													// console.log("跳过",devices.devices[0].name)
 													// isnotexist = false;
 													isnotexist = true;
diff --git a/page_components/eletj.vue b/page_components/eletj.vue
index 5d42279..c237bc8 100644
--- a/page_components/eletj.vue
+++ b/page_components/eletj.vue
@@ -34,6 +34,20 @@
 			</view>
 			</view>
 		</view>
+		<view class="wz" v-if="onlineStatus == 0">
+			<view v-if="ver_dataflag == 1" style="color: #8883F0;">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/u6akzRBuxxP94XlUcMtV" mode=""></image>
+				未连接
+			</view>
+			<view v-if="ver_dataflag == 2" style="color: #8883F0;">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/u6akzRBuxxP94XlUcMtV" mode=""></image>
+				连接中
+			</view>
+			<view v-if="ver_dataflag == 3" style="color: #8883F0;">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/usSHAkmok1YIdjsgRECI" mode=""></image>
+				已连接
+			</view>
+		</view>
 		<!-- 操作 -->
 		<view class="card2" style="padding-bottom: 30rpx;box-sizing: border-box;margin-top: 0;" v-if="detaobj.suitFeeType == 1 || detaobj.suitFeeType == 4">
 		    <view class="" style="display: flex;box-sizing: border-box;width: 100%;
@@ -56,15 +70,7 @@
 
 		<view class="time_list">
 			<view class="time_top">
-				<!--      <view class="" v-if="detaobj.suitEndTime && detaobj.suitFeeType == 1">
-		        	{{formattedTime}}
-		        </view> -->
-			<!-- 	<view class="" v-if="detaobj.suitEndTime && detaobj.suitFeeType != 1">
-					已结束
-				</view> -->
 				<view class="">
-					<!-- <text
-						v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">{{timeDifferenceString == '' ? '1分' : timeDifferenceString}}</text> -->
 					<text v-if="detaobj.suitFeeType == 2 || detaobj.suitFeeType == 3">{{du}}度</text>
 					<text v-if="detaobj.suitFeeType == 1 || detaobj.suitFeeType == 4">{{formattedTime == '1秒' ? '0' : formattedTime}}</text>
 				</view>
@@ -78,7 +84,6 @@
 			</view>
 			<view class="time_bot" v-if="!detaobj.suitEndTime || detaobj.suitFeeType == 1">
 				<view class="">
-					<!-- <text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">已使用时长</text> -->
 					<text >订单剩余</text>
 				</view>
 				<view class="">
@@ -143,14 +148,6 @@
 					{{detaobj.suitStartTime == null ? '--' : detaobj.suitStartTime}}
 				</view>
 			</view>
-			<!-- <view class="emilist">
-				<view class="">
-					结束时间
-				</view>
-				<view class="">
-					{{detaobj.suitEndTime == null ? '--' : detaobj.suitEndTime}}
-				</view>
-			</view> -->
 			<view class="emilist">
 				<view class="">
 					店铺名称
@@ -322,21 +319,23 @@
 				timerone:null,
 				hasCalledGetczly:false,
 				timerIds: null ,
-				formattedTime:''
+				formattedTime:'',
+				ver_data:null,
+				ver_dataflag:1
 			}
 		},
 		onLoad(option) {
-			let id = option.id
-			this.id = id
+			this.id = option.id
 			this.$u.put(`/app/bill/${this.id}/refreshPayResult`).then(res => {
 				this.getDevice()
 			})
+			if(this.ver_data == null){
+				this.getlanya()
+			}
 			if (option.flag) {
 				this.opflag = option.flag
 			}
 			setTimeout(()=>{
-				// this.shuaxin()
-				// this.gethuidaio()
 				this.startTimerone()
 			},1500)
 			
@@ -408,9 +407,21 @@
 		methods: {
 			// 点击续单 跳转到重新下单
 			btnxudan(){
-              uni.navigateTo({
-              	url:'/page_components/fuwu/index?id=' + this.sbobj.deviceNo
-              })
+				let that = this
+				uni.showModal({
+					title: '温馨提示',
+					content: '您是否需要前去续单？',
+					showCancel: true,
+					success: function(res) {
+						if (res.confirm) {
+							uni.navigateTo({
+								url:'/page_components/fuwu/index?id=' + that.sbobj.deviceNo
+							})
+						} else if (res.cancel) {
+						    console.log('取消'); // 用户点击取消
+						}
+					}
+				})
 			},
 			start() {  
 			    this.timerIds = setInterval(() => {  
@@ -512,6 +523,7 @@
 				})
 			},
 			
+			
 			// 开启和关闭
 			btnkq() {
 				if (this.onlineStatus == 1) {
@@ -570,39 +582,15 @@
 					   })
 					} else {
 					   if (this.ver_data == null) {
-					   		this.jieshufalg = true
-					   		uni.showLoading({
-					   			title: '切换中'
-					   		})
-					   		xBlufi.initXBlufi(1)
-					   		xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
-					   		xBlufi.notifyStartDiscoverBle({
-					   			'isStart': true
-					   		})
-					   		// 停止蓝牙搜索  
-					   		setTimeout(() => {
-					   			xBlufi.notifyStartDiscoverBle({
-					   				'isStart': false
-					   			})
-					   			xBlufi.notifyConnectBle({
-					   				isStart: true,
-					   				deviceId: this.deviceId,
-					   				name: this.name
-					   			})
-					   			xBlufi.notifyInitBleEsp32({
-					   				deviceId: this.deviceId
-					   			})
-					   			let name = ''
-					   			let index = this.name.indexOf('-')
-					   			if (index !== -1) {
-					   				name = this.name.slice(index + 1)
-					   			}
-					   			if (this.sbobj.powerStatus == 0) {
-					   				this.imgflag = false
-					   			} else {
-					   				this.imgflag = true
-					   			}
-					   		}, 1000)
+						   let that = this
+						    uni.showModal({
+						    	title: '温馨提示',
+						    	content: '正在连接蓝牙，请尽量靠近设备',
+						    	showCancel: false,
+						    	success: function(res) {
+						    		
+						    	}
+						    })
 					   	} else {
 					   		// console.log(this.tdtxt,'020202');
 					   		if (this.tdtxt == '开启') {
@@ -616,6 +604,9 @@
 					   									// console.log('close关闭');
 					   									that.tdtxt = '关闭'
 					   									that.imgflag = false
+														xBlufi.notifySendCustomData({
+															customData: 'close'
+														})
 					   									xBlufi.notifySendCustomData({
 					   										customData: '11close'
 					   									})
@@ -647,6 +638,9 @@
 					   									// console.log('open开启');
 					   									that.tdtxt = '开启'
 					   									that.imgflag = true
+														xBlufi.notifySendCustomData({
+															customData: 'open'
+														})
 					   									xBlufi.notifySendCustomData({
 					   										customData: '11open'
 					   									})
@@ -670,7 +664,43 @@
 					   		}
 					   	}
 					}
+				}
+			},
+			
+			getlanya(){
+				this.ver_dataflag = 2
+				xBlufi.initXBlufi(1)
+				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+				xBlufi.notifyStartDiscoverBle({
+					'isStart': true
+				})
+				// 停止蓝牙搜索  
+				setTimeout(() => {
+					xBlufi.notifyStartDiscoverBle({
+						'isStart': false
+					})
+					xBlufi.notifyConnectBle({
+						isStart: true,
+						deviceId: this.deviceId,
+						name: this.name
+					})
+					xBlufi.notifyInitBleEsp32({
+						deviceId: this.deviceId
+					})
+					if (this.sbobj.powerStatus == 0) {
+						this.imgflag = false
+					} else {
+						this.imgflag = true
 					}
+				}, 2000)
+				setTimeout(()=>{
+					if(this.ver_data == null){
+						this.ver_dataflag = 1
+						setTimeout(()=>{
+							this.getlanya()
+						},3000)
+					}
+				},15000)
 			},
 			
 			
@@ -699,15 +729,6 @@
 					}
 				})
 			},
-			
-			// 获取channelId
-			getzfqd(){
-				// this.$u.get(`/app/channel/recharge/enabledList`).then(res =>{
-				// 	if(res.code == 200){
-				// 		this.channelId = res.data[0].channelId
-				// 	}
-				// })
-			},
 			// 点击默认返回首页
 			btns() {
 				uni.reLaunch({
@@ -752,29 +773,16 @@
 							}
 						})
 					} else {
-						if (this.temperature == null) {
-							this.jieshufalg = true
+						if (this.ver_data == null) {
 							let that = this
-							xBlufi.initXBlufi(1);
-							xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
-							xBlufi.notifyStartDiscoverBle({
-								'isStart': true
-							})
-							setTimeout(() => {
-								xBlufi.notifyStartDiscoverBle({
-									'isStart': false
-								})
-								if (that.devicesList.length > 0) {
-									xBlufi.notifyConnectBle({
-										isStart: true,
-										deviceId: that.deviceId,
-										name: that.name
-									})
-								}
-							}, 2000)
-							uni.showLoading({
-								title: '正在连接蓝牙'
-							})
+							 uni.showModal({
+							 	title: '温馨提示',
+							 	content: '正在连接蓝牙，请尽量靠近设备',
+							 	showCancel: false,
+							 	success: function(res) {
+							 		
+							 	}
+							 })
 						} else {
 							this.jieshufalg = true
 							let data = {
@@ -820,124 +828,6 @@
 						}
 					}
 			},
-			// 分时段支付订单
-			// btnbox() {
-			// 	this.trueboxfalg = false
-			// 	this.jieshuflag = true
-			// 	if (this.onlineStatus == 1) {
-			// 		let data = {
-			// 			billId: this.billId
-			// 		}
-			// 		this.$u.put(`/app/bill/endUse`, data).then(res => {
-			// 			if (res.code == 200) {
-			// 				uni.showToast({
-			// 					title: res.msg,
-			// 					icon: 'success',
-			// 					duration: 1000
-			// 				})
-			// 				setTimeout(() => {
-			// 					this.jieshuflag = false
-			// 					uni.reLaunch({
-			// 						url: '/pages/shouye/index'
-			// 					})
-			// 				}, 1500)
-			// 			} else {
-			// 				this.getDevice()
-			// 				this.jieshuflag = false
-			// 				uni.showToast({
-			// 					title: res.msg,
-			// 					icon: 'none',
-			// 					duration: 2000
-			// 				})
-			// 			}
-			// 		})
-			// 	} else {
-			// 		// console.log(this.temperature,'this.temperature');
-			// 		if (this.temperature == null) {
-			// 			uni.showLoading({
-			// 				title: '切换中'
-			// 			})
-			// 			let that = this
-			// 			xBlufi.initXBlufi(1)
-			// 			xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
-			// 			xBlufi.notifyStartDiscoverBle({
-			// 				'isStart': true
-			// 			})
-			// 			setTimeout(() => {
-			// 				xBlufi.notifyStartDiscoverBle({
-			// 					'isStart': false
-			// 				})
-			// 				if (that.devicesList.length > 0) {
-			// 					xBlufi.notifyConnectBle({
-			// 						isStart: true,
-			// 						deviceId: that.deviceId,
-			// 						name: that.name
-			// 					})
-			// 				}
-			// 			}, 2000)
-			// 			uni.showModal({
-			// 				title: '温馨提示',
-			// 				content: `检测到该设备未联网,为您切换为蓝牙模式,支付的时候靠近该设备,并打开蓝牙`,
-			// 				showCancel: false,
-			// 				success: function(res) {
-			
-			// 				}
-			// 			})
-			// 		} else {
-			// 			let data = {
-			// 				billId: this.billId,
-			// 				totalEle: this.temperature
-			// 			}
-			// 			let that = this
-			// 			this.$u.put(`/app/bill/endUse`, data).then(res => {
-			// 				if (res.code == 200) {
-			// 					uni.getNetworkType({
-			// 						success(res) {
-			// 							if (res.networkType !== 'none') {
-			// 								uni.getConnectedBluetoothDevices({
-			// 									success(res) {
-			// 										setTimeout(() => {
-			// 											xBlufi.notifySendCustomData({
-			// 												customData:  "time@" + 0
-			// 											})
-			// 											let datas = {
-			// 												mac:that.qrResult,
-			// 												reason:'用户结束订单操作',
-			// 												command:'11close',
-			// 												result:'成功'
-			// 											}
-			// 											console.log(datas,'111');
-			// 											that.$u.post(`/app/commandLog/bluetooth`,datas).then(res => {})
-			// 											setTimeout(() => {
-			// 												that.jieshuflag = false
-			// 												uni.reLaunch({
-			// 													url: '/pages/shouye/index'
-			// 												})
-			// 											}, 1000)
-			// 										}, 1500)
-			// 									},
-			// 									fail(err) {
-			// 										console.error('获取已连接蓝牙设备信息失败：', err)
-			// 									}
-			// 								})
-			// 							} else {
-			// 								console.log('手机未连接网络')
-			// 							}
-			// 						}
-			// 					})
-			// 				} else {
-			// 					this.jieshuflag = false
-			// 					uni.showToast({
-			// 						title: res.msg,
-			// 						icon: 'none',
-			// 						duration: 2000
-			// 					})
-			// 				}
-			// 			})
-			// 		}
-			// 	}
-			// },
-
 			// 每一分钟请求更新一次
 			startTimers() {
 				// 确保没有重复的定时器  
@@ -1031,7 +921,6 @@
 						}
 						this.onlineStatus = res.data.onlineStatus
 						this.qrResult = res.data.mac
-						// getApp().set_ble_mac(this.qrResult)
 						this.totalElectriQuantity = res.data.totalElectriQuantity
 					}
 				})
@@ -1087,41 +976,6 @@
 					seconds: seconds
 				}
 			},
-			opendevice() {
-				let stause = 0
-				if (this.deviceInfo.powerStatus == 1) {
-					stause = 0
-				} else {
-					stause = 1
-				}
-				this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
-					if (res.code == 200) {
-						setTimeout(() => {
-							this.getDevice()
-						}, 2000)
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-				})
-			},
-			opendevices() {
-
-			},
-			swiperchange(e) {
-				this.curtitidx = e.detail.current
-				// console.log(e, 'aaaa');
-			},
-			changeidx(index) {
-				this.curtitidx = index
-			},
-			toydfx() {
-				uni.navigateTo({
-					url: "/page_components/eletj?id=" + this.id
-				})
-			},
 			
 			funListenDeviceMsgEvent: function(options) {
 				switch (options.type) {
@@ -1166,6 +1020,7 @@
 						this.temperature = this.ver_data.temperature / 1000
 						setTimeout(() => {
 							// this.czflag = false
+							this.ver_dataflag = 3
 							this.jieshuflag = false
 							this.jieshufalg = false
 							uni.hideLoading()
@@ -1182,11 +1037,7 @@
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
 						if (!options.result) {
 							this.lanyaflag = true
-							uni.showToast({
-								title: '蓝牙未开启',
-								icon: 'none',
-								duration: 3000
-							})
+							this.ver_dataflag = 1
 							return
 						} else {
 							this.lanyaflag = false
@@ -1258,6 +1109,20 @@
 		padding-bottom: 300rpx;
 		overflow: scroll;
 	}
+	.wz {
+		font-weight: 400;
+		font-size: 32rpx;
+		margin-top: 30rpx;
+		view{
+			display: flex;
+			align-items: center;
+			image{
+				width: 80rpx;
+				height: 80rpx;
+				margin-right: 10rpx;
+			}
+		}
+	}
 	
 	.card2 {
 		padding-top: 40rpx;
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index 74b9ec4..6e08351 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -5,14 +5,23 @@
 		    <text style="width: 80%;text-align: center;display: inline-block;">{{deviceobj.deviceName == undefined ? '--' : deviceobj.deviceName}}</text>
 			<view class="" style="display: flex;justify-content: space-between;">
 				<view class="wz" v-if="onlineStatus == 0">
-					<text v-if="ver_dataflag == 1" style="color: red;padding: 6rpx;border: 1px solid red;box-sizing: border-box;border-radius: 10rpx;">蓝牙未连接</text>
-					<text v-if="ver_dataflag == 2" style="color: aquamarine;padding: 6rpx;border: 1px solid aquamarine;box-sizing: border-box;border-radius: 10rpx;">蓝牙连接中</text>
-					<text v-if="ver_dataflag == 3" style="color: aquamarine;padding: 6rpx;border: 1px solid aquamarine;box-sizing: border-box;border-radius: 10rpx;">蓝牙已连接</text>
+					<view v-if="ver_dataflag == 1" style="color: #fff;">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u6akzRBuxxP94XlUcMtV" mode=""></image>
+						未连接
+					</view>
+					<view v-if="ver_dataflag == 2" style="color: #fff;">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/u6akzRBuxxP94XlUcMtV" mode=""></image>
+						连接中
+					</view>
+					<view v-if="ver_dataflag == 3" style="color: #fff;">
+						<image src="https://api.ccttiot.com/smartmeter/img/static/usSHAkmok1YIdjsgRECI" mode=""></image>
+						已连接
+					</view>
 				</view>
-				<view class="wz" @click="call" style="text-align: right;padding-right: 20rpx;" v-if="deviceobj.storeContactMobile == null">
+				<view class="wz" @click="call" style="text-align: right;padding-right: 20rpx;margin-top: 50rpx;" v-if="deviceobj.storeContactMobile == null">
 					联系客服
 				</view>
-				<view class="wz" @click="call" style="text-align: right;padding-right: 20rpx;" v-else>
+				<view class="wz" @click="call" style="text-align: right;padding-right: 20rpx;margin-top: 50rpx;" v-else>
 					联系客服
 				</view>
 			</view>
@@ -298,7 +307,7 @@
 			xBlufi.notifyStartDiscoverBle({
 				'isStart': false
 			})
-		},
+		}, 
 		methods: {
 			//选择套餐
 			btnactive(item) {
@@ -340,13 +349,15 @@
 			// 点击我已知晓隐藏防骗提示
 			btnswindleflag(){
 				this.swindleflag = false
-				if(this.ver_data == ''){
-					uni.showLoading({
-						title: '蓝牙连接中'
-					})
-				}else{
-					this.ver_dataflag = 3
-					uni.hideLoading()
+				if(this.onlineStatus == 0){
+					if(this.ver_data == ''){
+						// uni.showLoading({
+						// 	title: '蓝牙连接中'
+						// })
+					}else{
+						this.ver_dataflag = 3
+						uni.hideLoading()
+					}
 				}
 			},
 			getzfqd(){
@@ -380,44 +391,7 @@
 										that.onlineStatus = res.data.onlineStatus
 										that.mac = 'CTKG-' + res.data.mac
 										if(that.onlineStatus == 0){
-											if (this.ver_data == '') {
-												this.czflag = true	
-												this.ver_dataflag = 2
-												let that = this
-												xBlufi.initXBlufi(1)
-												xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent)
-												xBlufi.notifyStartDiscoverBle({
-													'isStart': true
-												})
-												setTimeout(() => {
-													xBlufi.notifyStartDiscoverBle({
-														'isStart': false
-													})
-													if (that.devicesList.length > 0) {
-														xBlufi.notifyConnectBle({
-															isStart: true,
-															deviceId: that.deviceId,
-															name: that.name
-														})
-													}
-												}, 2000)
-												setTimeout(()=>{
-													if(this.ver_data == ''){
-														// uni.showToast({
-														// 	title: '未连接成功，如多次失败请点击右上角联系客服咨询',
-														// 	icon: 'none',
-														// 	duration: 5000
-														// })
-														this.ver_dataflag = 1
-														this.czflag = false
-														this.zhifuflag = false
-														setTimeout(()=>{
-															uni.hideLoading()
-														},5000)
-													}
-												},13000)
-												
-											}
+											that.getlanya()
 										}
 									}
 								})
@@ -436,7 +410,40 @@
 				this.gettaoc()
 			},
 			
-			
+			getlanya(){
+				if (this.ver_data == '') {
+					this.czflag = true	
+					this.ver_dataflag = 2
+					let that = this
+					xBlufi.initXBlufi(1)
+					xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent)
+					xBlufi.notifyStartDiscoverBle({
+						'isStart': true
+					})
+					setTimeout(() => {
+						xBlufi.notifyStartDiscoverBle({
+							'isStart': false
+						})
+						if (that.devicesList.length > 0) {
+							xBlufi.notifyConnectBle({
+								isStart: true,
+								deviceId: that.deviceId,
+								name: that.name
+							})
+						}
+					}, 2000)
+					setTimeout(()=>{
+						if(this.ver_data == ''){
+							this.ver_dataflag = 1
+							this.czflag = false
+							this.zhifuflag = false
+							setTimeout(()=>{
+								this.getlanya()
+							},3000)
+						}
+					},15000)
+				}
+			},
 			
 			btnshouye(){
 				uni.reLaunch({
@@ -445,23 +452,7 @@
 			},
 			btnjxcz() {
 				this.czflag = false
-				xBlufi.initXBlufi(1)
-				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
-				xBlufi.notifyStartDiscoverBle({
-					'isStart': true
-				})
-				setTimeout(() => {
-					xBlufi.notifyStartDiscoverBle({
-						'isStart': false
-					})
-					if (this.devicesList.length > 0) {
-						xBlufi.notifyConnectBle({
-							isStart: true,
-							deviceId: this.deviceId,
-							name: this.name
-						})
-					}
-				}, 2000)
+				this.getlanya()
 			},
 
 			call() {
@@ -606,27 +597,27 @@
 						icon: 'none',
 						duration: 1000
 					})
-				}else if(this.ver_data == ''){
+				}else if(this.ver_data == '' && this.onlineStatus == 0){
 					let that = this
 					uni.showModal({
 						title: '温馨提示',
-						content: '您是否要重新连接蓝牙？',
-						showCancel: true,
+						content: '蓝牙连接中，请尽量靠近设备！',
+						showCancel: false,
 						success: function(res) {
-							if (res.confirm) {
-								that.ver_data = ''
-								that.ver_dataflag = 2
-								that.getzhifu()
-							} else if (res.cancel) {
-							    console.log('取消')
-							}
+							// if (res.confirm) {
+							// 	that.ver_data = ''
+							// 	that.ver_dataflag = 2
+							// 	that.getzhifu()
+							// } else if (res.cancel) {
+							//     console.log('取消')
+							// }
 						}
 					})
 				}else if(this.checked == false) {
 					let that = this
 					uni.showModal({
 						title: '温馨提示',
-						content: '是否确定勾选用户服务协议？',
+						content: '是否同意《用户服务协议》及《隐私政策》？',
 						showCancel: true,
 						success: function(res) {
 							if (res.confirm) {
@@ -706,7 +697,7 @@
 												that.$u.put(`/app/bill/${that.payNo}/refreshPayResult`).then(res => {})
 												// 支付成功逻辑
 												uni.reLaunch({
-													url:'/page_components/eletj?id=' + that.orderno
+													url:'/page_components/eletj?id=' + that.orderno + '&ver_data=' + this.ver_data
 												})
 												uni.setStorageSync('time', that.expireTimeStr)
 											},
@@ -753,7 +744,7 @@
 													that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(res => {})
 													// 支付成功逻辑
 													uni.reLaunch({
-														url:'/page_components/eletj?id=' + that.orderno
+														url:'/page_components/eletj?id=' + that.orderno  + '&ver_data=' + this.ver_data
 													})
 													uni.setStorageSync('time', that.expireTimeStr)
 												},
@@ -792,52 +783,7 @@
 					})
 				} else {
 					if (this.ver_data == '') {
-						this.ver_dataflag = 2
-						this.czflag = true	
-						let that = this
-						xBlufi.initXBlufi(1)
-						xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent)
-						xBlufi.notifyStartDiscoverBle({
-							'isStart': true
-						})
-						setTimeout(() => {
-							xBlufi.notifyStartDiscoverBle({
-								'isStart': false
-							})
-							if (that.devicesList.length > 0) {
-								xBlufi.notifyConnectBle({
-									isStart: true,
-									deviceId: that.deviceId,
-									name: that.name
-								})
-							}
-						}, 2000)
-						uni.showModal({
-							title: '温馨提示',
-							content: '检测到该设备未联网,为您切换为蓝牙模式,支付的时候靠近该设备,并打开蓝牙',
-							showCancel: false,
-							//是否显示取消按钮
-							success: function(res) {
-								uni.showLoading({
-									title: '蓝牙连接中'
-								})
-							}
-						})
-						setTimeout(()=>{
-							if(this.ver_data == ''){
-								// uni.showToast({
-								// 	title: '未连接成功，如多次失败请点击右上角联系客服咨询',
-								// 	icon: 'none',
-								// 	duration: 5000
-								// })
-								this.czflag = false
-								this.zhifuflag = false
-								this.ver_dataflag = 1
-								setTimeout(()=>{
-									uni.hideLoading()
-								},5000)
-							}
-						},10000)
+						
 					} else {
 						uni.showLoading({
 							title: '准备支付中...'
@@ -917,7 +863,7 @@
 																							setTimeout(() => {
 																								that.zhifuflag = false
 																								uni.reLaunch({
-																									url:'/page_components/eletj?id=' + that.orderno
+																									url:'/page_components/eletj?id=' + that.orderno  + '&ver_data=' + this.ver_data
 																								})
 																							},1000)
 																						},1500)
@@ -1078,7 +1024,7 @@
 																							}else{
 																								that.zhifuflag = false
 																								uni.reLaunch({
-																									url:'/page_components/eletj?id=' + that.orderno
+																									url:'/page_components/eletj?id=' + that.orderno  + '&ver_data=' + this.ver_data
 																								})
 																							}
 																						},1000)
@@ -1246,11 +1192,11 @@
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
 						if (!options.result) {
 							this.lanyaflag = true
-							uni.showToast({
-								title: '蓝牙未开启',
-								icon: 'none',
-								duration: 3000
-							});
+							// uni.showToast({
+							// 	title: '蓝牙未开启',
+							// 	icon: 'none',
+							// 	duration: 3000
+							// });
 							return
 						} else {
 							this.lanyaflag = false
@@ -1459,7 +1405,8 @@
 	// 	padding-bottom: 41rpx;
 	// }
 	page {
-		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
+		background: linear-gradient(180deg,rgb(136, 131,240) 30%, rgba(255, 255, 255, 0) 100%);
+		// background-color: rgb(136, 131,240);
 	}
 
 	.active {
@@ -1539,7 +1486,7 @@
 			font-weight: 600;
 			font-size: 40rpx;
 			color: #fff;
-			margin-bottom: 30rpx;
+			margin-bottom: 45rpx;
 			margin-top: 110rpx;
 			height: 126rpx;
 
@@ -1547,6 +1494,15 @@
 				font-weight: 400;
 				font-size: 32rpx;
 				margin-top: 30rpx;
+				view{
+					display: flex;
+					align-items: center;
+					image{
+						width: 80rpx;
+						height: 80rpx;
+						margin-right: 10rpx;
+					}
+				}
 			}
 		}
 
diff --git a/page_fenbao/statulist/myshop/shopdetail/index.vue b/page_fenbao/statulist/myshop/shopdetail/index.vue
index f09ae38..19381ca 100644
--- a/page_fenbao/statulist/myshop/shopdetail/index.vue
+++ b/page_fenbao/statulist/myshop/shopdetail/index.vue
@@ -51,7 +51,7 @@
 				</view>
 				<view class="swiper" :current='curtitidx' @change="swiperchange" @scrolltolower="onReachBottom">
 						<view class="swiper-item ">
-							<view class="card_box" v-for="(item,index) in wateringList" :key="index">
+							<view class="card_box" v-for="(item,index) in wateringList" :key="index" @click="btnitem(item.deviceId)">
 								<view class="card">
 									<view class="card_left">
 										<view class="card_left_tit">
@@ -158,6 +158,11 @@
 		    }  
 		  },
 		methods: {	
+			btnitem(id){
+				uni.navigateTo({
+					url:'/pages/shebeione?id=' + id
+				})
+			},
 			getlist() {
 				this.$u.get(`/app/device/list?storeId=${this.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`)
 					.then((res) => {
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index ce96f49..3f10c5f 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -10,8 +10,9 @@
 						<view class="mid_top">
 							{{ deviceInfo.deviceName == null ? '' : deviceInfo.deviceName }} 
 							<view class="" v-if="deviceInfo.onlineStatus==0">
-								<text style="color: #00BA88;border: 1px solid #00BA88;border-radius: 10rpx;" v-if="setMode != null">蓝牙已连接</text>
-								<text style="color: red;border: 1px solid red;border-radius: 10rpx;" v-else>蓝牙未连接</text>
+								<text style="color: #00BA88;border: 1px solid #00BA88;border-radius: 10rpx;" v-if="ver_dataflag == 3">蓝牙已连接</text>
+								<text style="color: red;border: 1px solid red;border-radius: 10rpx;" v-if="ver_dataflag == 2">蓝牙连接中</text>
+								<text style="color: red;border: 1px solid red;border-radius: 10rpx;" v-if="ver_dataflag == 1">蓝牙未连接</text>
 							</view>
 						</view>
 						<view class="mid_bot">
@@ -55,13 +56,13 @@
 			<view class="card2">
 				<view class="" style="display: flex;justify-content: space-between;padding-right: 24rpx;box-sizing: border-box;">
 					<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">实时参数</view>
-					<view @click="shuaxin" style="display: flex;color: #8883F0;justify-content: center;align-items: center;box-sizing: border-box;" v-if="deviceInfo.onlineStatus==1">
+					<view @click="shuaxin" style="display: flex;color: #8883F0;justify-content: center;align-items: center;box-sizing: border-box;">
 						点击刷新
 						<image style="width: 30rpx;height: 30rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uiVZaazpgTY3gE7aYtGb" mode="aspectFit"></image>
 					</view>
-					<view v-if="deviceInfo.onlineStatus==0" @click="lianjie" style="display: flex;color: #8883F0;justify-content: center;align-items: center;box-sizing: border-box;">
+					<!-- <view v-if="deviceInfo.onlineStatus==0" @click="lianjie" style="display: flex;color: #8883F0;justify-content: center;align-items: center;box-sizing: border-box;"v-if="deviceInfo.onlineStatus==1">
 						点击连接
-					</view>
+					</view> -->
 				</view>
 				<view class="bot_right">
 					<view class="cont" style="text-align: center;">
@@ -298,16 +299,12 @@
 		<view v-if="btnmsk"
 			style="width: 100%;height: 100vh;position: fixed;top: 0;left: 0;background-color: #000;opacity: .1;z-index: 999;">
 		</view>
-		<view class="maskss" v-if="ljljflag"></view>
 	</view>
 </template>
 
 <script>
 	var xBlufi = require("@/page_components/blufi/xBlufi.js")
 	export default {
-		components: {
-			// uniEcCanvas
-		},
 		data() { 
 			return {
 				suitSurplus:'',
@@ -371,19 +368,21 @@
 				sklist:{},
 				sklistflag:false,
 				ljtype:'2',
-				ljljflag:false,
-				userTpye_userid:''
+				userTpye_userid:'',
+				ver_dataflag:2
 			}
 		},
 		onLoad(option) {
 			let id = option.id
 			this.id = id
+			if(this.setMode == null){
+				this.Binddevice()
+			}
 			if (option.flag) {
 				this.opflag = false
 			} else {
 				this.opflag = true
 			}
-
 		},
 		// 分享到好友（会话）
 		onShareAppMessage: function() {
@@ -458,7 +457,6 @@
 			this.shibaiflag = false
 			this.getshuax()
 			this.getQiniuToken()
-		    
 		},
 		mounted() {
 			this.drawCanvas()
@@ -469,28 +467,38 @@
 					url:'/pages/index/index'
 				})
 			},
-			// 点击连接
-			lianjie(){
-				this.ljljflag = true
-				this.Binddevice()
-				this.getljlj()
-				// 停止蓝牙搜索  
-				setTimeout(() => {
-					xBlufi.notifyStartDiscoverBle({
-						'isStart': false
-					})
-					if (this.deviceInfo.powerStatus == 0) {
-						this.imgflag = false
-					} else {
-						this.imgflag = true
-					}
-				}, 2000)
-			},
 			// 拿到mac调用查询附近设备进行匹配
+			// Binddevice(){
+			// 	this.ver_dataflag = 2
+			// 	xBlufi.initXBlufi(1)
+			// 	xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+			// 	xBlufi.notifyStartDiscoverBle({
+			// 		'isStart': true
+			// 	})
+			// 	// 停止蓝牙搜索  
+			// 	setTimeout(() => {
+			// 		xBlufi.notifyStartDiscoverBle({
+			// 			'isStart': false
+			// 		})
+			// 		xBlufi.notifyConnectBle({
+			// 			isStart: true,
+			// 			deviceId: this.deviceId,
+			// 			name: this.name
+			// 		})
+			// 		xBlufi.notifyInitBleEsp32({
+			// 			deviceId: this.deviceId
+			// 		})
+			// 	}, 2000)
+			// 	setTimeout(()=>{
+			// 		if(this.setMode == null){
+			// 			this.ver_dataflag = 1
+			// 			setTimeout(()=>{
+			// 				this.Binddevice()
+			// 			},3000)
+			// 		}
+			// 	},15000)
+			// },
 			Binddevice() {
-				uni.showLoading({
-					title: '蓝牙连接中..'
-				})
 				xBlufi.initXBlufi(1);
 				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
 				xBlufi.notifyStartDiscoverBle({
@@ -503,21 +511,14 @@
 					});
 					setTimeout(() => {
 						if (this.devicesList.length == 0) {
-							uni.showToast({
-								title: '暂无发现对应设备,请重试',
-								icon: 'none'
-							})
-							this.ljljflag = false
+							
 						} else {
 							let uniqueDevicesList = Array.from(new Set(this.devicesList));
 							this.devicesList = uniqueDevicesList;
-							// console.log(this.devicesList,'this.devicesListthis.devicesList');
 							this.devicesList.forEach(device => {
 								let macFromName = device.name.substring(device.name.length - 12);
 								console.log(macFromName, 'macFromNamemacFromName');
-								// 与 this.mac 进行比较
-								if (macFromName ==  this.qrResult) {
-									// 如果相同，则将 this.ishave 设置为 true
+								if (macFromName == this.qrResult) {
 									console.log(device);
 									this.deviceInfoss = device
 									this.createBLEConnection(device)
@@ -530,15 +531,22 @@
 						}
 					}, 200)
 				}, 2000)
+				setTimeout(() =>{
+					if(this.setMode == null){
+						setTimeout(() =>{
+							this.Binddevice()
+						},3000)
+					}else{
+						console.log('已连接11111');
+					}
+				},15000)
 			},
 			// 匹配到了之后进行连接
 			createBLEConnection(e) {
-				console.log('调用了');
 				xBlufi.notifyStartDiscoverBle({
 					'isStart': false
 				});
 				console.log(e, '蓝牙信息')
-				const deviceId = e.deviceId
 				this.deviceId = e.deviceId
 				this.Bluetoothmac = e.localName.substring(5) //从第七位开始截取 只取后面的mac号
 				console.log(this.Bluetoothmac, '11111');
@@ -548,28 +556,8 @@
 					isStart: true,
 					deviceId: e.deviceId,
 					name
-				});
+				})
 			},
-			// 匹配的同时定义一个匹配失败处理
-			getljlj(){
-				let that = this
-				setTimeout(() =>{
-					if(this.setMode == null){
-						uni.showModal({
-							title: '温馨提示',
-							content: '蓝牙连接失败，请重新连接', 
-							showCancel: false,
-							success: function(res) {
-								that.ljljflag = false
-								uni.hideLoading()
-							}
-						})
-					}else{
-						console.log('32751212');
-					}
-				},15000)
-			},
-			
 			
 			
 			 groupChange(n) {
@@ -645,6 +633,7 @@
 
 			// 选择时长单位
 			btnconfirm(e) {
+				console.log(e);
 				this.danwei = e[0].label
 				this.damweiid = e[0].value
 			},
@@ -741,20 +730,14 @@
 						}
 					} else {
 						if (this.setMode == null) {
-							this.ljljflag = true
-							this.Binddevice()
-							this.getljlj()
-							// 停止蓝牙搜索  
-							setTimeout(() => {
-								xBlufi.notifyStartDiscoverBle({
-									'isStart': false
-								})
-								if (this.deviceInfo.powerStatus == 0) {
-									this.imgflag = false
-								} else {
-									this.imgflag = true
+							uni.showModal({
+								title: '温馨提示',
+								content: '蓝牙连接中，请尽量靠近设备！',
+								showCancel: false,
+								success: function(res) {
+									
 								}
-							}, 2000)
+							})
 						} else {
 							this.shibaiflag = false
 							if (this.tdtxt == '开启') {
@@ -840,7 +823,6 @@
 						let str = JSON.parse(res.data)
 						_this.userImgs = 'https://api.ccttiot.com/' + str.key
 						_this.imglist = _this.userImgs
-						// console.log(_this.imglist,'_this.imglist_this.imglist')
 						let data = {
 							deviceId: _this.id,
 							customPicture: _this.imglist
@@ -876,10 +858,10 @@
 				this.$u.get("/app/device/" + id).then((res) => {
 					if (res.code == 200) {
 						this.deviceInfo = res.data
+						this.qrResult = res.data.mac
 						this.modelId = res.data.modelTags
 						this.storeId = res.data.storeId
 						this.deviceNo = res.data.deviceNo
-						this.qrResult = res.data.mac
 						this.getshoukuan()
 						if (res.data.customPicture != null) {
 							this.imglist = res.data.customPicture
@@ -959,47 +941,6 @@
 					seconds: seconds
 				}
 			},
-			opendevice() {
-				let stause = 0
-				if (this.deviceInfo.powerStatus == 1) {
-					stause = 0
-				} else {
-					stause = 1
-				}
-				// console.log(stause, 'stausestause');
-				this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
-					if (res.code == 200) {
-						// this.groupList=res.rows
-						setTimeout(() => {
-							this.getDevice(this.id)
-						}, 2000)
-
-						// this.loadings=true
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-				})
-			},
-			opendevices() {
-
-			},
-			swiperchange(e) {
-				this.curtitidx = e.detail.current
-				// console.log(e, 'aaaa');
-			},
-			changeidx(index) {
-				this.curtitidx = index
-			},
-
-			toydfx() {
-				uni.navigateTo({
-					url: "/page_components/eletj?id=" + this.id
-				})
-			},
-
 
 			// 其他部分 点击进行跳转
 			topage(num) {
@@ -1050,9 +991,14 @@
 					}else{
 						this.btnmsk = false
 						if (this.setMode == null) {
-							this.ljljflag = true
-							this.Binddevice()
-							this.getljlj()
+							uni.showModal({
+								title: '温馨提示',
+								content: '蓝牙连接中，请尽量靠近设备！',
+								showCancel: false,
+								success: function(res) {
+									
+								}
+							})
 						} else {
 							let that = this
 							uni.showModal({
@@ -1231,9 +1177,14 @@
 						})
 				} else {
 					if (this.setMode == null) {
-						this.ljljflag = true
-						this.Binddevice()
-						this.getljlj()
+						uni.showModal({
+							title: '温馨提示',
+							content: '蓝牙连接中，请尽量靠近设备！',
+							showCancel: false,
+							success: function(res) {
+								
+							}
+						})
 					} else {
 						let that = this
 						uni.getNetworkType({
@@ -1303,6 +1254,63 @@
 				this.cztime = ''
 			},
 			// 蓝牙回调
+			// funListenDeviceMsgEvent: function(options) {
+			// 	switch (options.type) {
+			// 		case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+			// 			if (options.result) {
+			// 				let devicesarr = options.data
+			// 				devicesarr.forEach(device => {
+			// 					const mac = device.name.substring(4)
+			// 					if (device.name.slice(5, 17) == this.qrResult) {
+			// 						this.deviceId = device.deviceId
+			// 						this.name = device.name
+			// 						this.devicesList.push(device)
+			// 						let uniqueDevicesList = Array.from(new Set(this.devicesList))
+			// 						this.devicesList = uniqueDevicesList
+			// 					} 
+			// 				})
+			// 			}
+			// 			break;
+			// 		case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
+			// 			console.log("连接回调：" + JSON.stringify(options))
+			// 			if (options.result) {
+			// 				{
+			// 					xBlufi.notifyInitBleEsp32({
+			// 						deviceId: this.deviceId
+			// 					})
+			// 					xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents)
+			// 					this.deviceIds = options.data.deviceId
+			// 					this.name = this.name
+			// 				}
+			// 			} else {
+			
+			// 			}
+			// 			break;
+			// 		case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+			// 			this.setMode = this.parseCustomData(options.data)
+			// 			console.log("1收到设备发来的自定义数据结果：", this.setMode)
+			// 			setTimeout(() => {
+			// 				this.ver_dataflag = 3
+			// 			}, 1000)
+			// 			break
+			// 		case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
+			// 			if (options.result) {
+			// 				let uniqueDevicesList = Array.from(new Set(this.devicesList));
+			// 				let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) === "CTKG");
+			// 				// 将过滤后的数组重新赋值给 this.devicesList
+			// 				this.devicesList = filteredDevices
+			// 			}
+			// 			break
+			// 		case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
+			// 			if (!options.result) {
+			// 				this.ver_dataflag = 1
+			// 				return
+			// 			} else {
+
+			// 			}
+			// 			break
+			// 	}
+			// },
 			funListenDeviceMsgEvent: function(options) {
 				let that = this;
 				switch (options.type) {
@@ -1321,13 +1329,6 @@
 						console.log("连接回调：" + JSON.stringify(options));
 						if (options.result) {
 							setTimeout(()=>{
-								uni.showToast({
-									title: '连接成功',
-									icon: 'success',
-									duration:2000
-								})
-								this.ljljflag = false
-								uni.hideLoading();
 							},2000)
 							{
 								xBlufi.notifyInitBleEsp32({
@@ -1341,6 +1342,7 @@
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
 						this.setMode = this.parseCustomData(options.data)
+						this.ver_dataflag = 3
 						console.log("1收到设备发来的自定义数据结果：", this.setMode);
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
@@ -1348,6 +1350,7 @@
 							console.log('初始化成功');
 						} else {
 							console.log('初始化失败');
+							this.ver_dataflag = 1
 							break;
 						}
 						break;
diff --git a/pages.json b/pages.json
index 8cceb16..60d3985 100644
--- a/pages.json
+++ b/pages.json
@@ -24,6 +24,15 @@
 				"navigationBarTextStyle": "#FFFFFF",
 				"navigationStyle": "custom" 
 			}
+		},{
+			"path": "pages/shebeione",
+			"style": {
+				"navigationBarTitleText": "",
+				// "enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#8883F0",
+				"navigationBarTextStyle": "#FFFFFF",
+				"navigationStyle": "custom" 
+			}
 		},{
 			"path": "pages/shopewm",
 			"style": {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1d514fb..8e163d4 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -8,12 +8,12 @@
 			<image src="https://api.ccttiot.com/smartmeter/img/static/uCqHftk2W2zEPX03DLcb" mode="aspectFit"></image>
 		</view>
 		<view class="tip">
-			欢迎来到共享开关
+			欢迎来到创想开关
 		</view>
 		<view class="inputbox">
 			<view class="box1" v-if="syflag">
 				<view class="input_txt" style="width: 536rpx;font-size: 24rpx;line-height: 32rpx;">
-					您暂未授权共享开关小程序获取你的信息，将无法正常使用小程序的功能。如需要正常使用请点击“授权”按钮，打开头像，昵称等信息的授权。
+					您暂未授权创想开关小程序获取你的信息，将无法正常使用小程序的功能。如需要正常使用请点击“授权”按钮，打开头像，昵称等信息的授权。
 				</view>
 				<!-- <button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
 					style="margin-left: -10rpx;">
diff --git a/pages/shebeione.vue b/pages/shebeione.vue
new file mode 100644
index 0000000..800d942
--- /dev/null
+++ b/pages/shebeione.vue
@@ -0,0 +1,1987 @@
+<template>
+	<view class="page">
+		<u-navbar  :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#000" title-color='#000'
+			title-size='36' height='50' id="navbar">
+		</u-navbar>
+		<view class="zhuhu">
+			<view class="card1">
+				<view class="mid">
+					<view class="mid_right">
+						<view class="mid_top">
+							{{ deviceInfo.deviceName == null ? '' : deviceInfo.deviceName }} 
+							<view class="" v-if="deviceInfo.onlineStatus==0">
+								<text style="color: #00BA88;border: 1px solid #00BA88;border-radius: 10rpx;" v-if="setMode != null">蓝牙已连接</text>
+								<text style="color: red;border: 1px solid red;border-radius: 10rpx;" v-else>蓝牙未连接</text>
+							</view>
+						</view>
+						<view class="mid_bot">
+							<div class="tip" v-if="deviceInfo.onlineStatus==1">
+								<text>网络：</text> <text style="color: #00BA88;">在线</text>
+							</div>
+							<div class="tip" v-if="deviceInfo.onlineStatus==0">
+								<text>网络：</text> <text style="color: red;">离线</text>
+							</div>
+							<div class="tip" v-if="deviceInfo.status==1">
+								<text>状态：</text> <text style="color: #00BA88;">空闲</text>
+							</div>
+							<div class="tip" v-if="deviceInfo.status==2">
+								<text>状态：</text> <text style="color: red;">使用中</text>
+							</div>
+						</view>
+						<view class="txt" v-if="deviceInfo" style="width: 100%;">
+							SN：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}</view>
+						<view class="" style="font-size: 24rpx;color: #95989D;">
+							更新时间：{{deviceInfo.lastPullTime == null ? '--' : deviceInfo.lastPullTime}}</view>
+					</view>
+					<view class="mid_left" style="position: relative;">
+						<view v-if="opflag"
+							style="border: 0;outline: none;width: 196rpx;padding-left: 0rpx;height: 196rpx;border-radius: 16rpx;"
+							@click="btnpic">
+							<image :src="imglist" mode="aspectFit"
+								style="width: 196rpx;height: 196rpx;border-radius: 0rpx;"></image>
+						</view>
+						<image v-else :src="imglist" mode="aspectFit"
+							style="width: 196rpx;height: 196rpx;border-radius: 0rpx;"></image>
+						<text class="lanyalx">{{deviceInfo.model == undefined ? '' : deviceInfo.model}}</text>
+
+						<ksp-cropper mode="free" :width="142" :height="142" :maxWidth="1024" :maxHeight="1024"
+							:url="url" @cancel="oncancel" @ok="onok"></ksp-cropper>
+					</view>
+				</view>
+				<view class="bot">
+					
+				</view>
+			</view>
+			<view class="card2">
+				<view class="" style="display: flex;justify-content: space-between;padding-right: 24rpx;box-sizing: border-box;">
+					<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">实时参数</view>
+					<view @click="shuaxin" style="display: flex;color: #8883F0;justify-content: center;align-items: center;box-sizing: border-box;" v-if="deviceInfo.onlineStatus==1">
+						点击刷新
+						<image style="width: 30rpx;height: 30rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uiVZaazpgTY3gE7aYtGb" mode="aspectFit"></image>
+					</view>
+					<view v-if="deviceInfo.onlineStatus==0" @click="lianjie" style="display: flex;color: #8883F0;justify-content: center;align-items: center;box-sizing: border-box;">
+						点击连接
+					</view>
+				</view>
+				<view class="bot_right">
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.voltage == null ? 0 : deviceInfo.voltage}}
+						</view>
+						<view class="txt">
+							电压（V）
+						</view>
+					</view>
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.electricity == null ? 0 : deviceInfo.electricity}}
+						</view>
+						<view class="txt">
+							电流（A）
+						</view>
+					</view>
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.realTimePower == null ? 0 : deviceInfo.realTimePower}}
+						</view>
+						<view class="txt">
+							功率（W）
+						</view>
+					</view>
+				</view>
+               <view class="" style="display: flex;margin-top: 20rpx;padding: 50rpx;box-sizing: border-box;width: 100%;
+               height: 80rpx;align-items: center;justify-content: space-between;background-color: #fff;border-radius: 20rpx;font-size: 32rpx;color: #3D3D3D;">
+               	<view class="bot">开关状态：{{tdtxt}}</view>
+               	<view class="cont" @click="btnkq">
+               		<view class="top" style="padding-top: 10rpx;">
+               			<view class="rt">
+               				<image v-if="imgflag" style="width: 160rpx;height: 80rpx;"
+               					src="https://api.ccttiot.com/smartmeter/img/static/uccaWar4FDp37op7haWM " mode="aspectFit">
+               				</image>
+               				<image style="width: 160rpx;height: 80rpx;" v-else
+               					src="https://api.ccttiot.com/smartmeter/img/static/ur9HRtZKY7YcxGewJARz" mode="aspectFit">
+               				</image>
+               			</view>
+               		</view>
+               	</view>
+               </view>
+			</view>
+			<view class="card2" style="padding-bottom: 40rpx;">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">设备剩余</view>
+				<view class="bot_right">
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.surplusEle == null || Number(deviceInfo.surplusEle) < 0 ? '--' : deviceInfo.surplusEle}}
+						</view>
+						<view class="txt">
+							剩余度数
+						</view>
+					</view>
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{formattedTime}}
+						</view>
+						<view class="txt">
+							剩余时长
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 当前订单 -->
+			<view v-if="sklistflag" @click="btnshdd" class="card2" style="padding-bottom: 30rpx;box-sizing: border-box;margin-top: 20rpx;">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;display: flex;justify-content: space-between;padding-right: 40rpx;margin-bottom: 20rpx;">当前订单 <text style="color: #8883F0;font-size: 32rpx;font-weight: 400;">查看</text> </view>
+                 <view class="aa">
+                 	<text>用户</text> <text>{{sklist.userName}}</text>
+                 </view>
+				 <view class="aa">
+				 	<text>计价方式</text> <text v-if="sklist.suitFeeType == 1">计时收费</text>
+				<text v-if="sklist.suitFeeType == 2">按量收费</text>
+				<text v-if="sklist.suitFeeType == 3">分时段按量收费</text>
+				<text v-if="sklist.suitFeeType == 4">分时段按时收费</text>
+				 </view>
+				 <view class="aa">
+				 	<text>下单时间</text> <text>{{sklist.suitStartTime}}</text>
+				 </view>
+			</view>
+			<view class="card3" v-if="opflag">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">其他功能</view>
+				<view class="cont_box" style="display: block;">
+					<view class="">
+						<view class="cont" @click="topage(0)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u2ALEsvAJrHnW7nhrTVD" mode="aspectFit"
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">充值记录</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view>
+						<view class="cont" @click="topage(3)" v-if="userTpye_userid == deviceInfo.userId">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uJmpaxyrv34a1EW5lWQv" mode="aspectFit"
+									style="width: 44rpx;height: 44rpx;"></image>
+									<view class="bot">收费方式</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view>
+						<view class="cont" @click="topage(1)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uhsqQVT62DOTdW8qW7ez" mode="aspectFit"
+									style="width: 44rpx;height: 44rpx;"></image>
+									<view class="bot">归零</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view>
+						<view class="cont" @click="topage(6)" v-if="deviceInfo.allowSwitch == true">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/u9vzIeLLorfYuoZnxBDZ" mode="aspectFit">
+								</image>
+								<view class="bot">充值</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view>
+					</view>
+					<view class="">
+						<view class="cont" @click="topage(5)" v-if="modelId.some(tag => tag == 2)">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/ule3wEEDaXzfXCUCM1Ks" mode="aspectFit">
+								</image>
+								<view class="bot">配网</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view>
+						<view class="cont" @click="qrFun">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uGjm0qpPFeDJZ2hUFexi" mode="aspectFit">
+								</image>
+								<view class="bot">设备二维码</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view>
+						<view class="cont" @click="topage(2)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/ueQ5V8QAidDZGt0FpqXb" mode="aspectFit"
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">上报异常</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view>
+						<view class="cont" @click="topage(4)">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uOUM2aclDz2ZnRxOll9g" mode="aspectFit">
+								</image>
+								<view class="bot">设置</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view>
+						<!-- <view class="cont" @click="btnfirmware">
+							<view class="top" style="border: 0;">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uOUM2aclDz2ZnRxOll9g" mode="aspectFit">
+								</image>
+								<view class="bot">固件更新</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode="aspectFit"></image>
+						</view> -->
+					</view>
+				</view>
+				<view class="cont_box" style="padding-left: 30rpx;"></view>
+			</view>
+		</view>
+
+		<view class="tanc" v-if="vipflag">
+			<view class="tit">请输入您需要充值的时长或度数</view>
+			<input type="number" :focus="focus" v-model="cztime" placeholder="请输入时长或度数" />
+			<view class="inpss"  @click="btnxzdw">{{danwei}}</view>
+			<!-- #ifdef MP-WEIXIN -->
+			<u-icon name="arrow-down" style="position: fixed;top: 234rpx;right: 60rpx;" color="#999" size="28"></u-icon>
+			<!-- #endif -->
+			<view class="xian"></view>
+			<view class="anniu">
+				<text @click="btnqx">取消</text> <text style="border-left: 1px solid #eee;color: #8883F0;"
+					@click="trueje">确定</text>
+			</view>
+		</view>
+		<view class="maskss" v-if="vipflag"></view>
+		<!-- 蓝牙连接 -->
+		<view class="bluetoothbox" v-if="bluetoothflag">
+			<view class="stop">
+				正在连接该设备蓝牙
+			</view>
+			<view class="xtop">
+				请将手机与设备尽量靠近
+			</view>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/ucDphMKsozqwwllJTAKL" mode="aspectFit"></image>
+		</view>
+
+		<!-- 蓝牙连接失败 -->
+		<view class="bluetoothbox" v-if="shibaiflag">
+			<image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uTb3vSlbcHdPMFQMBjyL" mode="aspectFit"></image>
+			<view class="one">
+				蓝牙连接失败
+			</view>
+			<view class="two">
+				请确保手机足够靠近设备
+			</view>
+			<view class="thr">
+				并且设备处于上电状态
+			</view>
+			<view class="anfour">
+				<view class="qx" @click="btnlyqx">
+					取消
+				</view>
+				<view class="cx" @click="btnkq">
+					重新连接
+				</view>
+			</view>
+		</view>
+		<!-- 选择单位 -->
+		<u-select v-model="showflag" :list="listdanwei" title='选择单位' @confirm="btnconfirm"></u-select>
+
+		<!-- 展示二维码 -->
+		<view class="imgewm" v-if="wemflag" @longpress="saveCanvas">
+			<canvas canvas-id="qrcode" style="height: 100%;margin: 0 auto;" />
+			<view class="" style="width: 100%;text-align: center;margin-top: 20rpx;">
+				SN:{{deviceNo}}
+			</view>
+			<view class=""
+				style="border: 1px solid; padding: 20rpx;box-sizing: border-box;width: 100%;text-align: center;margin-top: 40rpx;"
+				@click="wemflag = false">
+				关闭二维码
+			</view>
+		</view>
+		<view class="imgewmflag" v-if="wemflag" @click.stop="ewmyc"></view>
+
+		<view v-if="btnmsk"
+			style="width: 100%;height: 100vh;position: fixed;top: 0;left: 0;background-color: #000;opacity: .1;z-index: 999;">
+		</view>
+		<view class="maskss" v-if="ljljflag"></view>
+	</view>
+</template>
+
+<script>
+	var xBlufi = require("@/page_components/blufi/xBlufi.js")
+	export default {
+		components: {
+			// uniEcCanvas
+		},
+		data() { 
+			return {
+				suitSurplus:'',
+				showflag: false,
+				imgflag: false,
+				wemflag: false,
+				btnmsk: false,
+				bluetoothflag: false,
+				shibaiflag: false,
+				danwei: '请选择时长单位',
+				listdanwei: [{
+					value: 2,
+					label: '小时'
+				}, {
+					value: 3,
+					label: '分钟'
+				}, {
+					value: 4,
+					label: '秒钟'
+				}, {
+					value: 0,
+					label: '度'
+				}],
+				bgc: {
+					backgroundColor: "#F9F8FF",
+				},
+				ec: {
+					lazyLoad: true
+				},
+				deviceInfo: {},
+				loadings: false,
+				info: '',
+				checked: false,
+				tittxt: "设备详情",
+				titlist: [],
+				tdtxt: '开启',
+				curtitidx: 0,
+				id: '',
+				focus: false,
+				timeday: '',
+				imglist: '',
+				token: '',
+				userImgs: '',
+				imgflag: true,
+				mac: "",
+				name: '',
+				deviceId: '',
+				storeId: '',
+				qrResult: '',
+				devicesList: [],
+				setMode: null,
+				vipflag: false,
+				cztime: '',
+				opflag: true,
+				timer: null,
+				url: "",
+				deviceNo: '',
+				modelId: [],
+				damweiid: '',
+				intervalId: null,
+				sklist:{},
+				sklistflag:false,
+				ljtype:'2',
+				ljljflag:false,
+				userTpye_userid:''
+			}
+		},
+		onLoad(option) {
+			let id = option.id
+			this.id = id
+			if (option.flag) {
+				this.opflag = false
+			} else {
+				this.opflag = true
+			}
+
+		},
+		// 分享到好友（会话）
+		onShareAppMessage: function() {
+			return {
+				title: '创想物联',
+				path: '/pages/shouye/index'
+			}
+		},
+
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '创想物联',
+				query: '',
+				path: '/pages/shouye/index'
+			}
+		},
+		computed: {
+			formattedTime() {
+				if (this.timeday.days > 0) {
+					// 只展示天和小时  
+					return `${this.timeday.days}天${this.timeday.hours}小时`
+				} else if (this.timeday.hours > 0) {
+					// 展示小时和分钟  
+					return `${this.timeday.hours}小时${this.timeday.minutes}分钟`
+				} else if (this.timeday.minutes > 0) {
+					// 展示分钟和秒  
+					return `${this.timeday.minutes}分钟${this.timeday.seconds}秒`
+				} else if (this.timeday.seconds == 0) {
+					this.deviceInfo.status = 1
+					this.imgflag = false
+					this.tdtxt = '关闭'
+					return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0'
+				} else {
+					// 展示秒或0（如果秒也为0）  
+					return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0'
+				}
+			}
+		},
+		beforeDestroy() {
+			// 组件销毁前清除定时器，防止内存泄漏  
+			if (this.timer) {
+				clearInterval(this.timer)
+				this.timer = null
+				console.log('已销毁')
+			}
+		},
+		onHide() {
+			if (this.timer || this.intervalId) {
+				clearInterval(this.intervalId)
+				clearInterval(this.timer)
+				this.timer = null
+				this.intervalId = null
+				console.log('已销毁')
+			}
+		},
+		onUnload: function() {
+			if (this.timer || this.intervalId) {
+				clearInterval(this.intervalId)
+				clearInterval(this.timer)
+				this.timer = null
+				this.intervalId = null
+				console.log('已销毁')
+			}
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
+			wx.closeBLEConnection({
+				deviceId: this.deviceId,
+			})
+		},
+		onShow() {
+			this.userTpye_userid = uni.getStorageSync('userType').userId
+			this.shibaiflag = false
+			this.getshuax()
+			this.getQiniuToken()
+		    
+		},
+		mounted() {
+			this.drawCanvas()
+		},
+		methods: {
+			btns(){
+				uni.reLaunch({
+					url:'/pages/index/index'
+				})
+			},
+			// 点击连接
+			lianjie(){
+				this.ljljflag = true
+				this.Binddevice()
+				this.getljlj()
+				// 停止蓝牙搜索  
+				setTimeout(() => {
+					xBlufi.notifyStartDiscoverBle({
+						'isStart': false
+					})
+					if (this.deviceInfo.powerStatus == 0) {
+						this.imgflag = false
+					} else {
+						this.imgflag = true
+					}
+				}, 2000)
+			},
+			// 拿到mac调用查询附近设备进行匹配
+			Binddevice() {
+				uni.showLoading({
+					title: '蓝牙连接中..'
+				})
+				xBlufi.initXBlufi(1);
+				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
+				xBlufi.notifyStartDiscoverBle({
+					'isStart': true
+				})
+				// 两秒后停止蓝牙搜索
+				setTimeout(() => {
+					xBlufi.notifyStartDiscoverBle({
+						'isStart': false
+					});
+					setTimeout(() => {
+						if (this.devicesList.length == 0) {
+							uni.showToast({
+								title: '暂无发现对应设备,请重试',
+								icon: 'none'
+							})
+							this.ljljflag = false
+						} else {
+							let uniqueDevicesList = Array.from(new Set(this.devicesList));
+							this.devicesList = uniqueDevicesList;
+							// console.log(this.devicesList,'this.devicesListthis.devicesList');
+							this.devicesList.forEach(device => {
+								let macFromName = device.name.substring(device.name.length - 12);
+								console.log(macFromName, 'macFromNamemacFromName');
+								// 与 this.mac 进行比较
+								if (macFromName ==  this.qrResult) {
+									// 如果相同，则将 this.ishave 设置为 true
+									console.log(device);
+									this.deviceInfoss = device
+									this.createBLEConnection(device)
+									console.log('对比正确1111111111');
+								} else {
+									console.log('对比错误');
+			
+								}
+							});
+						}
+					}, 200)
+				}, 2000)
+			},
+			// 匹配到了之后进行连接
+			createBLEConnection(e) {
+				console.log('调用了');
+				xBlufi.notifyStartDiscoverBle({
+					'isStart': false
+				});
+				console.log(e, '蓝牙信息')
+				const deviceId = e.deviceId
+				this.deviceId = e.deviceId
+				this.Bluetoothmac = e.localName.substring(5) //从第七位开始截取 只取后面的mac号
+				console.log(this.Bluetoothmac, '11111');
+				let name = e.name;
+				console.log('点击了，蓝牙准备连接的deviceId:' + e.deviceId);
+				xBlufi.notifyConnectBle({
+					isStart: true,
+					deviceId: e.deviceId,
+					name
+				});
+			},
+			// 匹配的同时定义一个匹配失败处理
+			getljlj(){
+				let that = this
+				setTimeout(() =>{
+					if(this.setMode == null){
+						uni.showModal({
+							title: '温馨提示',
+							content: '蓝牙连接失败，请重新连接', 
+							showCancel: false,
+							success: function(res) {
+								that.ljljflag = false
+								uni.hideLoading()
+							}
+						})
+					}else{
+						console.log('32751212');
+					}
+				},15000)
+			},
+			
+			
+			
+			 groupChange(n) {
+			   console.log('groupChange', n);
+			 },
+			 radioChange(n) {
+			   console.log('radioChange', n);
+			 },
+			// 商户跳转进行中订单
+			btnshdd(){
+				uni.navigateTo({
+					url:'/pages/shanghudd?id=' + this.sklist.billNo
+				})
+			},
+			// 刷新
+			getshuax() {
+				this.$u.get(`/app/device/${this.id}/refreshIot`).then((res) => {
+					this.getDevice(this.id)
+				})
+			},
+			getshoukuan(){
+				this.$u.get(`/app/bill/incomeList?isUsing=true&deviceId=${this.deviceInfo.deviceId}`).then((res) => {
+					if(res.code == 200){
+						if(res.rows == null || res.rows.length == 0){
+							this.sklistflag = false
+						}else{
+							this.sklistflag = true
+							this.sklist = res.rows[0]
+							this.suitSurplus = res.rows[0].surplusEle
+						}
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1500
+						})
+					}
+				})
+			},
+			// 点击刷新
+			shuaxin(){
+				this.$u.get(`/app/device/${this.id}/refreshIot`).then((res) => {
+					if(res.code == 200){
+						this.getDevice(this.id)
+						uni.showToast({
+							title: res.msg,
+							icon: 'success',
+							duration: 1500
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1500
+						})
+					}
+				})
+			},
+			
+			// 点击跳转固件更新页面
+			btnfirmware(){
+				uni.navigateTo({
+					url:'/pages/daili/gujian'
+				})
+			},
+
+			// 点击显示选择单位
+			btnxzdw(){
+				this.showflag = true
+				console.log(1);
+			},
+
+
+			// 选择时长单位
+			btnconfirm(e) {
+				this.danwei = e[0].label
+				this.damweiid = e[0].value
+			},
+
+
+			drawCanvas() {
+				const ctx = uni.createCanvasContext('qrcode', this)
+				ctx.setFillStyle('#fff')
+				ctx.fillRect(10, 10, 250, 250)
+				ctx.draw();
+			},
+			// 长按保存二维码
+			saveCanvas() {
+				uni.canvasToTempFilePath({
+					canvasId: 'qrcode',
+					success: (res) => {
+						console.log(res.tempFilePath)// 打印图片路径  
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function() {
+								uni.showToast({
+									title: '保存成功',
+									icon: 'success'
+								})
+							}
+						})
+					},
+					fail: (err) => {
+						console.error(err)
+					}
+				});
+			},
+			//**生成二维码**//
+			qrFun: function() {
+				uni.navigateTo({
+					url:'/page_fenbao/fenxiang?id=' + this.deviceNo
+				})
+			},
+			ewmyc() {
+				this.wemflag = false
+			},
+            // 点击连接取消
+			btnlyqx() {
+				this.shibaiflag = false
+				this.bluetoothflag = false
+			},
+
+			// 开启和关闭
+			btnkq() {
+				if(this.deviceInfo.allowSwitch == true){
+					if (this.deviceInfo.onlineStatus == 1) {
+						if (this.tdtxt == '开启') {
+							this.$u.put(`/app/device/${this.id}/changePower?status=0`).then((res) => {
+								if (res.code == 200) {
+									this.tdtxt = '关闭'
+									this.imgflag = false
+									this.deviceInfo.status = 1
+									uni.showToast({
+										title: res.msg,
+										icon: 'success',
+										duration: 2000
+									})
+								} else {
+									this.imgflag = true
+									this.tdtxt = '开启'
+									uni.showToast({
+										title: res.msg,
+										icon: 'none', 
+										duration: 2000
+									})
+								}
+							})
+						} else {
+							this.$u.put(`/app/device/${this.id}/changePower?status=1`).then((res) => {
+								if (res.code == 200) {
+									this.imgflag = true
+									this.tdtxt = '开启'
+									this.deviceInfo.status = 2
+									uni.showToast({
+										title: res.msg,
+										icon: 'success',
+										duration: 2000
+									})
+								} else {
+									this.imgflag = false
+									this.tdtxt = '关闭'
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							})
+						}
+					} else {
+						if (this.setMode == null) {
+							this.ljljflag = true
+							this.Binddevice()
+							this.getljlj()
+							// 停止蓝牙搜索  
+							setTimeout(() => {
+								xBlufi.notifyStartDiscoverBle({
+									'isStart': false
+								})
+								if (this.deviceInfo.powerStatus == 0) {
+									this.imgflag = false
+								} else {
+									this.imgflag = true
+								}
+							}, 2000)
+						} else {
+							this.shibaiflag = false
+							if (this.tdtxt == '开启') {
+								let that = this
+								that.tdtxt = '关闭'
+								that.imgflag = false
+								that.deviceInfo.status = 1
+								xBlufi.notifySendCustomData({
+									customData: 'close'
+								})
+								xBlufi.notifySendCustomData({
+									customData: '11close'
+								})
+								let data = {
+									mac:that.qrResult,
+									reason:'商户操作临时开关关闭',
+									command:'11close',
+									result:'成功'
+								}
+								that.$u.post(`/app/commandLog/bluetooth`,data).then(res => {})
+							} else {
+								let that = this
+								that.tdtxt = '开启'
+								that.imgflag = true
+								that.deviceInfo.status = 2
+								xBlufi.notifySendCustomData({
+									customData: 'open'
+								})
+								xBlufi.notifySendCustomData({
+									customData: '11open'
+								})
+                                let data = {
+                                	mac:that.qrResult,
+                                	reason:'商户操作临时开关开启',
+                                	command:'11open',
+                                	result:'成功'
+                                }
+                                that.$u.post(`/app/commandLog/bluetooth`,data).then(res => {})
+							}
+						}
+					}
+				}else{
+					uni.showToast({
+						title: '您没有权限操作',
+						icon: 'none',
+						duration: 2000
+					})
+				}
+			},
+			// 获取七牛云token
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				});
+			},
+
+            // 选择图像
+			btnpic() {
+				uni.chooseImage({
+					count: 1,
+					success: (rst) => {
+						this.url = rst.tempFilePaths[0]
+					}
+				})
+			},
+			onok(ev) {
+				this.url = ""
+				this.path = ev.path
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				wx.uploadFile({
+					url: 'https://up-z2.qiniup.com',
+					name: 'file',
+					filePath: _this.path,
+					formData: {
+						token: _this.token,
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						// console.log(res);
+						let str = JSON.parse(res.data)
+						_this.userImgs = 'https://api.ccttiot.com/' + str.key
+						_this.imglist = _this.userImgs
+						// console.log(_this.imglist,'_this.imglist_this.imglist')
+						let data = {
+							deviceId: _this.id,
+							customPicture: _this.imglist
+						}
+						_this.putdevice(data)
+					}
+				})
+			},
+			oncancel() {
+				// url设置为空，隐藏控件
+				this.url = ""
+			},
+			putdevice(data) {
+				this.$u.put('/app/device', data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+
+			// 获取设备详情
+			getDevice(id) {
+				this.$u.get("/app/device/" + id).then((res) => {
+					if (res.code == 200) {
+						this.deviceInfo = res.data
+						this.modelId = res.data.modelTags
+						this.storeId = res.data.storeId
+						this.deviceNo = res.data.deviceNo
+						this.qrResult = res.data.mac
+						this.getshoukuan()
+						if (res.data.customPicture != null) {
+							this.imglist = res.data.customPicture
+						} else {
+							this.imglist = res.data.picture
+						}
+						if (this.deviceInfo.expireTime == null) {
+							this.timeday = 0
+						} else {
+							let expireTimeStr = this.deviceInfo.expireTime
+							let expireTimeParts = expireTimeStr.split(" ");
+							let expireDateParts = expireTimeParts[0].split("-");
+							let expireTimePartsTime = expireTimeParts[1].split(":");
+							let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[
+								2], expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
+							let now = new Date()
+							let differenceInMs = expireDate - now
+							if (differenceInMs <= 0) {
+								this.timeday = 0
+							} else {
+								clearInterval(this.timer)
+								this.timer = null
+								this.timeday = this.formatMilliseconds(differenceInMs)
+								this.startTimer()
+							}
+						}
+						if (res.data.powerStatus == 0) {
+							this.imgflag = false
+							this.tdtxt = '关闭'
+						} else {
+							this.imgflag = true
+							this.tdtxt = '开启'
+						}
+						this.loadings = true
+					}
+				})
+			},
+			startTimer() {
+				this.timer = setInterval(() => {
+					if (this.timeday.seconds > 0) {
+						this.timeday.seconds--
+					} else if (this.timeday.minutes > 0) {
+						this.timeday.seconds = 59 // 重置秒数为59  
+						this.timeday.minutes--
+					} else if (this.timeday.hours > 0) {
+						this.timeday.minutes = 59 // 重置分钟数为59  
+						this.timeday.hours--
+						this.timeday.seconds = 0 // 同时重置秒数为0  
+					} else if (this.timeday.days > 0) {
+						this.timeday.hours = 23 // 重置小时数为23  
+						this.timeday.minutes = 59 // 重置分钟数为59  
+						this.timeday.seconds = 0 // 重置秒数为0  
+						this.timeday.days--
+					} else {
+						// 所有时间单位都已减为0，停止定时器  
+						clearInterval(this.timer)
+						this.timer = null;
+						// console.log('时间已到期') 
+					}
+				}, 1000); // 每秒执行一次  
+			},
+			// 计算天时分秒
+			formatMilliseconds(milliseconds) {
+				// 计算天数  
+				let days = Math.floor(milliseconds / (1000 * 60 * 60 * 24))
+				// 计算剩余的小时数  
+				let hours = Math.floor((milliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+				// 计算剩余的分钟数  
+				let minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60))
+				// 计算剩余的秒数  
+				let seconds = Math.floor((milliseconds % (1000 * 60)) / 1000)
+				// 返回一个对象，包含天、小时、分钟和秒  
+				return {
+					days: days,
+					hours: hours,
+					minutes: minutes,
+					seconds: seconds
+				}
+			},
+			opendevice() {
+				let stause = 0
+				if (this.deviceInfo.powerStatus == 1) {
+					stause = 0
+				} else {
+					stause = 1
+				}
+				// console.log(stause, 'stausestause');
+				this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
+					if (res.code == 200) {
+						// this.groupList=res.rows
+						setTimeout(() => {
+							this.getDevice(this.id)
+						}, 2000)
+
+						// this.loadings=true
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			opendevices() {
+
+			},
+			swiperchange(e) {
+				this.curtitidx = e.detail.current
+				// console.log(e, 'aaaa');
+			},
+			changeidx(index) {
+				this.curtitidx = index
+			},
+
+			toydfx() {
+				uni.navigateTo({
+					url: "/page_components/eletj?id=" + this.id
+				})
+			},
+
+
+			// 其他部分 点击进行跳转
+			topage(num) {
+				this.btnmsk = true
+				if (num == 0) {
+					this.btnmsk = false
+					uni.navigateTo({ //抄表
+						url: '/page_user/cbRecord?id=' + this.id
+					})
+				} else if (num == 1) {
+					if (this.deviceInfo.onlineStatus == 1) {
+						let that = this
+						uni.showModal({
+							title: '提示',
+							content: '您确定要将设备时间归零吗？',
+							success: function(res) {
+								if (res.confirm) {
+									that.btnmsk = false
+									//归零
+									that.$u.put(`/app/device/${that.id}/reset`).then((res) => {
+										if (res.code == 200) {
+											uni.showToast({
+												title: res.msg,
+												icon: 'success',
+												duration: 2000
+											})
+											that.getDevice(that.id)
+											setTimeout(()=>{
+												that.deviceInfo.status = 1
+												that.imgflag = false
+												that.tdtxt = '关闭'
+											},1000)
+											// that.getshuax()
+										} else if (res.code == 500) {
+											uni.showToast({
+												title: res.msg,
+												icon: 'none',
+												duration: 2000
+											})
+										}
+									})
+								} else if (res.cancel) {
+									that.btnmsk = false
+									console.log('用户点击了取消')
+								}
+							}
+						})
+					}else{
+						this.btnmsk = false
+						if (this.setMode == null) {
+							this.ljljflag = true
+							this.Binddevice()
+							this.getljlj()
+						} else {
+							let that = this
+							uni.showModal({
+								title: '提示',
+								content: '您确定要将设备时间归零吗？',
+								success: function(res) {
+									if (res.confirm) {
+										that.btnmsk = false
+										setTimeout(() => {
+													that.deviceInfo.status = 1
+													that.imgflag = false
+													that.tdtxt = '关闭'
+													that.timeday = 0
+													xBlufi.notifySendCustomData({
+															customData: 'time0@'
+														})
+													xBlufi.notifySendCustomData({
+															customData: 'mmney0@'
+														})
+													xBlufi.notifySendCustomData({
+															customData: '11time0@'
+														})
+													xBlufi.notifySendCustomData({
+															customData: '11mmney0@'
+														})
+													let data = {
+														mac:that.qrResult,
+														reason:'归零',
+														command:'@time0@mmney0close',
+														result:'成功'
+													}
+													that.$u.post(`/app/commandLog/bluetooth`,data).then(res => {})
+													uni.showToast({
+														title: '归零成功',
+														icon: 'success',
+														duration: 2000
+													})
+										}, 1000)
+									}
+								}
+							})
+						}
+					}
+				} else if (num == 2) { //异常
+					this.btnmsk = false
+					uni.navigateTo({
+						url: '/page_fenbao/statulist/fault/yichang/index'
+					})
+				} else if (num == 3) {
+					this.btnmsk = false
+					uni.navigateTo({
+						url: "/page_fenbao/statulist/taocanlist/index?id=" + this.id + '&modevalue=' + 1
+					})
+				} else if (num == 4) { //设置
+					this.btnmsk = false
+					uni.navigateTo({
+						url: '/page_user/setting?id=' + this.id
+					})
+				} else if (num == 5) {
+					this.btnmsk = false
+					let that = this
+					uni.openBluetoothAdapter({
+					  success: function (res) {
+						  uni.getLocation({
+						  	type: 'wgs84',
+						  	success: (res) => { 
+						  		if(that.deviceInfo.wifi == null){
+						  			let systemInfo = uni.getSystemInfoSync()
+						  			if (systemInfo.platform == 'android') {
+						  				// 当前设备是 Android  
+						  				uni.navigateTo({
+						  					url: '/page_components/wifilist/index?deviceId=' + that
+						  						.qrResult + '&name=' + that.name + '&wifi=' + '暂无配网' + '&id=' + that.id
+						  				})
+						  			} else if (systemInfo.platform == 'ios') {
+						  				// 当前设备是 iOS  
+						  				uni.navigateTo({
+						  					url: '/page_fenbao/device/wifivideo?deviceId=' + that
+						  						.qrResult + '&name=' + that.name + '&wifi=' + '暂无配网' + '&id=' + that.id
+						  				})
+						  			}else{ 
+						  				uni.showToast({
+						  					title: '目前仅支持安卓和iOS系统',
+						  					icon: 'none',
+						  					duration: 2000
+						  				})
+						  			}
+						  		}else{
+						  			let systemInfo = uni.getSystemInfoSync()
+						  			if (systemInfo.platform == 'android') {
+						  				// 当前设备是 Android  
+						  				uni.navigateTo({
+						  					url: '/page_components/wifilist/index?deviceId=' + that
+						  						.qrResult + '&name=' + that.name + '&wifi=' + that.deviceInfo.wifi  + '&id=' + that.id
+						  				})
+						  			} else if (systemInfo.platform == 'ios') {
+						  				// 当前设备是 iOS  
+						  				uni.navigateTo({
+						  					url: '/page_fenbao/device/wifivideo?deviceId=' + that
+						  						.qrResult + '&name=' + that.name + '&wifi=' + that.deviceInfo.wifi  + '&id=' + that.id
+						  				})
+						  			}else{ 
+						  				uni.showToast({
+						  					title: '目前仅支持安卓和iOS系统',
+						  					icon: 'none',
+						  					duration: 2000
+						  				})
+						  			}
+						  		}
+						  	},
+						  	fail: (err) => {
+						  		console.error('获取位置失败：', err);
+								uni.showToast({
+								  title: '位置信息未打开，无法配网，请授权后重试',
+								  icon: 'none',
+								  duration:2000
+								})
+						  	}
+						  })
+					  },
+					  fail: function (err) {
+					    console.error('蓝牙适配器初始化失败', err);
+					    // 蓝牙未打开或初始化失败
+					    uni.showToast({
+					      title: '手机蓝牙未打开',
+					      icon: 'none'
+					    });
+					  }
+					})
+
+				} else if (num == 6) {
+					uni.pageScrollTo({
+					        scrollTop: 0,//滚动到距离顶部为0
+					        duration: 0//滚动时长
+					    })
+					this.btnmsk = false
+					this.vipflag = true
+					this.focus = true
+				}
+			},
+			getaddtime() {
+				this.$u.put('/app/device/addTime/' + this.id + '?amount=' + this.cztime + '&timeUnit=' + this.damweiid +'&withIot=false').then(res => {})
+			},
+			trueje() {
+				if (this.timer) {
+					clearInterval(this.timer)
+					this.timer = null
+				}
+				let id = this.deviceInfo.deviceId
+				this.vipflag = false
+				if (this.deviceInfo.onlineStatus == 1) {
+					this.$u.put('/app/device/addTime/' + id + '?amount=' + this.cztime + '&timeUnit=' + this.damweiid)
+						.then(res => {
+							if (res.code == 200) {
+								uni.showToast({
+									title: '充值成功',
+									icon: 'success',
+									duration: 2000
+								})
+								// this.getshuax()
+								setTimeout(() => {
+									this.getshuax()
+									this.cztime = ''
+									this.danwei = ''
+									this.deviceInfo.status = 2
+									this.tdtxt = '开启'
+									this.imgflag = true
+								}, 2000)
+							} else if (res.code == 500) {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+				} else {
+					if (this.setMode == null) {
+						this.ljljflag = true
+						this.Binddevice()
+						this.getljlj()
+					} else {
+						let that = this
+						uni.getNetworkType({
+							success(res) {
+								if (res.networkType !== 'none') {
+									uni.getConnectedBluetoothDevices({
+										success(res) {
+											setTimeout(() => {
+												that.deviceInfo.status = 2
+												that.imgflag = true
+												that.tdtxt = '开启'
+												if (that.damweiid == 0) {
+													xBlufi.notifySendCustomData({
+														customData: 'mmney' + that.cztime + '@'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11mmney' + that.cztime + '@'
+													})
+													that.getaddtime()
+												} else if (that.damweiid == 4) {
+													xBlufi.notifySendCustomData({
+														customData: 'time' + that.cztime + '@'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11time' + that.cztime + '@'
+													})
+													that.getaddtime()
+												} else if (that.damweiid == 3) {
+													xBlufi.notifySendCustomData({
+														customData: 'time' + that.cztime * 60 + '@'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11time' + that.cztime * 60 + '@'
+													})
+													that.getaddtime()
+												} else if (that.damweiid == 2) {
+													xBlufi.notifySendCustomData({
+														customData: 'time' + that.cztime * 60 * 60 + '@'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11time' + that.cztime * 60 * 60 + '@'
+													})
+													that.getaddtime()
+												}
+												let data = {
+													mac:that.qrResult,
+													reason:'增加时长',
+													command:'11time@',
+													result:'成功'
+												}
+												console.log(data,'111');
+												that.$u.post(`/app/commandLog/bluetooth`,data).then(res => {})
+											}, 1000)
+										},
+										fail(err) {
+											console.error('获取已连接蓝牙设备信息失败：', err)
+										}
+									})
+								}
+							}
+						})
+					}
+				}
+			},
+			btnqx() {
+				this.vipflag = false
+				this.cztime = ''
+			},
+			// 蓝牙回调
+			funListenDeviceMsgEvent: function(options) {
+				let that = this;
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+						if (options.result) {
+							let devicesarr = options.data
+							devicesarr.forEach(device => {
+								this.devicesList.push(device);
+								let uniqueDevicesList = Array.from(new Set(this.devicesList));
+								// 将去重后的数组重新赋值给 this.devicesList
+								this.devicesList = uniqueDevicesList;
+							})
+						}
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
+						console.log("连接回调：" + JSON.stringify(options));
+						if (options.result) {
+							setTimeout(()=>{
+								uni.showToast({
+									title: '连接成功',
+									icon: 'success',
+									duration:2000
+								})
+								this.ljljflag = false
+								uni.hideLoading();
+							},2000)
+							{
+								xBlufi.notifyInitBleEsp32({
+									deviceId: options.data.deviceId
+								});
+							}
+						}
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
+						console.log("文件读取中", options.data);
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+						this.setMode = this.parseCustomData(options.data)
+						console.log("1收到设备发来的自定义数据结果：", this.setMode);
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
+						if (options.result) {
+							console.log('初始化成功');
+						} else {
+							console.log('初始化失败');
+							break;
+						}
+						break;
+				}
+			},
+			parseCustomData(data) {
+				// 将字符串按照 "@" 分割成数组  
+				const dataArray = data.split('@'); 
+				const parsedData = {};
+				const prefixMap = {
+					'V': 'voltage',
+					'S': 'switchState',
+					'A': 'current',
+					'P': 'power',
+					'M': 'remainingPower',
+					'T': 'setMode',
+					'W': 'temperature'
+				} 
+				for (let i = 0; i < dataArray.length; i++) {
+					const field = dataArray[i];
+					for (const prefix in prefixMap) {
+						if (field.startsWith(prefix)) {
+							const value = field.substring(1);
+							const propertyName = prefixMap[prefix];
+							parsedData[propertyName] = isNaN(parseFloat(value)) ? value : parseFloat(value);
+							break;
+						}
+					}
+				}
+				return parsedData;
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pagesac{
+		top: 0 !important;
+	}
+	/deep/ .panel {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 99 !important;
+		overflow: hidden;
+	}
+
+	.imgewmflag {
+		width: 750rpx;
+		height: 100vh;
+		background: #fff;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		z-index: 1;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+
+	.imgewm {
+		width: 250px;
+		height:250px;
+		position: fixed;
+		top:400rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 2;
+	}
+
+	.lanyalx {
+		display: inline-block;
+		text-align: center;
+		font-size: 26rpx;
+		width: 196rpx;
+		height: 40rpx;
+		line-height: 40rpx;
+		background-color: rgba(198, 209, 248, .6);
+		color: #3D3D3D;
+		position: absolute;
+		bottom: 0;
+	}
+
+	.conts {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 50rpx;
+		align-items: center;
+		width: 100%;
+		height: 100%;
+		padding: 20rpx;
+		border-radius: 30rpx;
+		box-sizing: border-box;
+		background-color: #fff;
+
+		.bot {
+			// width: 100%;
+			// height: 80rpx;
+			// line-height: 80rpx;
+			// text-align: center;
+			// border-radius: 30rpx;
+			// background-color: #fff;
+			// margin-top: 30rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	.picjt {
+		position: fixed;
+		top: 190rpx;
+		right: 60rpx;
+		width: 16rpx;
+		height: 30rpx;
+	}
+
+	.bluetoothbox {
+		width: 100%;
+		height: 100vh;
+		background-color: #f4f1f6;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		text-align: center;
+
+		.img {
+			margin-top: 400rpx;
+			width: 320rpx;
+			height: 320rpx;
+		}
+
+		.one {
+			font-size: 36rpx;
+			color: #000;
+		}
+
+		.two {
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+
+		.thr {
+			margin-top: 30rpx;
+			font-size: 28rpx;
+			color: #ccc;
+		}
+
+		.anfour {
+			display: flex;
+			margin-top: 30rpx;
+			justify-content: space-between;
+			padding: 0 220rpx;
+			box-sizing: border-box;
+
+			.qx {
+				width: 100rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				border: 1px solid #3D3D3D;
+				border-radius: 10rpx;
+			}
+
+			.cx {
+				width: 200rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				background-color: #8883F0;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+		}
+
+		.stop {
+			font-size: 36rpx;
+			color: #000;
+			margin-top: 380rpx;
+		}
+
+		.xtop {
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+
+		.xqx {
+			width: 530rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 20rpx;
+			text-align: center;
+			background-color: #fff;
+			margin: auto;
+			margin-top: 200rpx;
+		}
+
+		image {
+			width: 500rpx;
+			height: 500rpx;
+			margin-top: 100rpx;
+		}
+	}
+
+	/deep/ .u-title {
+		padding-bottom: 22rpx;
+	}
+
+	/deep/ .uicon-nav-back {
+		padding-bottom: 22rpx;
+	}
+
+	page {
+		background-color: #F9F8FF;
+	}
+
+	.maskss {
+		width: 750rpx;
+		height: 100vh;
+		background: #000000;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		opacity: 0.2;
+		z-index: 1;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+
+	.tanc {
+		width: 610rpx;
+		max-height: 430rpx;
+		background: #FFFFFF;
+		border-radius: 30rpx 30rpx 30rpx 30rpx;
+		position: fixed;
+		top: 528rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 2;
+        text-align: center;
+		.tit {
+			width: 100%;
+			text-align: center;
+			margin-top: 28rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #3D3D3D;
+		}
+
+		input {
+			width: 504rpx;
+			height: 90rpx;
+			background: #EEEEEE;
+			border-radius: 6rpx 6rpx 6rpx 6rpx;
+			margin: auto;
+			margin-top: 22rpx;
+			padding-left: 20rpx;
+			text-align: left;
+		}
+        .inpss{
+			width: 510rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			font-size: 32rpx;
+			color: #ccc;
+			background: #EEEEEE;
+			border-radius: 6rpx 6rpx 6rpx 6rpx;
+			margin: auto;
+			margin-top: 22rpx;
+			padding-left: 20rpx;
+			text-align: left;
+		}
+		.xian {
+			width: 610rpx;
+			height: 2rpx;
+			background: #eee;
+			border-radius: 0rpx 0rpx 0rpx 0rpx;
+			margin-top: 26rpx;
+		}
+
+		.anniu {
+			display: flex;
+			justify-content: space-between;
+			height: 98rpx;
+
+			text {
+				padding: 24rpx;
+				text-align: center;
+				box-sizing: border-box;
+				font-weight: 500;
+				font-size: 36rpx;
+				color: #3D3D3D;
+				display: inline-block;
+				width: 100%;
+				height: 100rpx;
+			}
+		}
+	}
+
+	.txt {
+		text-align: left;
+		font-size: 28rpx;
+		color: #808080;
+		font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+		font-weight: 400;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.page {
+		// width: 100%;
+		// height: 100vh;
+		// overflow: scroll;
+  //       padding-bottom: 80rpx;
+		// box-sizing: border-box;
+		.zhuhu {
+			margin-top: 46rpx;
+			padding: 0 40rpx;
+            padding-bottom: 80rpx;
+			.card1 {
+				// padding: 34rpx 0 0 40rpx;
+				width: 670rpx;
+				// height: 320rpx;
+
+				.top {
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-between;
+					align-items: center;
+
+					.left {
+						font-size: 35rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 400;
+						color: #8883F0;
+					}
+
+					.right {
+						margin-right: 56rpx;
+
+						.img1 {
+							width: 76rpx;
+							height: 76rpx;
+						}
+					}
+				}
+
+				.mid {
+					margin-top: 20rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-content: flex-start;
+					justify-content: space-between;
+
+					.mid_left {
+						image {
+							width: 160rpx;
+							height: 160rpx;
+							border-radius: 20rpx;
+						}
+					}
+
+					.mid_right {
+						margin-left: 20rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.mid_top {
+							width: 100%;
+							font-size: 36rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 600;
+							color: #333;
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+							padding-right: 10rpx;
+							box-sizing: border-box;
+							text{
+								margin-left: 20rpx;
+								font-weight: 400;
+								font-size: 24rpx;
+								padding: 6rpx;
+								box-sizing: border-box;
+							}
+						}
+
+						.mid_bot {
+							width: 100%;
+							display: flex;
+							justify-content: space-between;
+							padding-right: 102rpx;
+							box-sizing: border-box;
+							// flex-wrap: nowrap;
+							// align-items: center;
+							margin-top: 6rpx;
+
+
+
+							.tip {
+								// display: flex;
+								// align-items: center;
+								// justify-content: center;
+								// margin-left: 10rpx;
+								// padding: 0 10rpx;
+								box-sizing: border-box;
+								background: rgba(204, 204, 204, 0);
+								opacity: 1;
+								font-size: 28rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #5B5B5B;
+							}
+						}
+					}
+				}
+
+				.bot {
+					margin-top: 20rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+
+					.bot_left {
+						width: 210rpx;
+						height: 180rpx;
+						margin-right: 34rpx;
+
+						.echarts {
+							height: 200rpx;
+
+							.uni-ec-canvas {
+								width: 100%;
+								height: 100rpx !important;
+								display: block;
+							}
+						}
+					}
+
+					.bot_right {
+						display: flex;
+						width: 100%;
+						justify-content: space-between;
+						padding-left: 80rpx;
+						padding-right: 80rpx;
+						box-sizing: border-box;
+
+						.cont {
+							.tit {
+								font-size: 28rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 600;
+								color: #262B37;
+								line-height: 49rpx;
+							}
+
+							.txt {
+								font-size: 26rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #262B37;
+							}
+						}
+					}
+				}
+			}
+
+			.bot_right {
+				display: flex;
+				width: 100%;
+				justify-content: space-between;
+				padding-left: 60rpx;
+				padding-right: 60rpx;
+				box-sizing: border-box;
+				margin-top: 30rpx;
+
+				.cont {
+					.tit {
+						font-size: 32rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 600;
+						color: #262B37;
+						line-height: 49rpx;
+						margin-left: 0;
+					}
+
+					.txt {
+						font-size: 32rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 400;
+						color: #262B37;
+					}
+				}
+			}
+
+			.card2 {
+				padding-top: 40rpx;
+				margin-top: 20rpx;
+				width: 670rpx;
+				max-height: 614rpx;
+				padding-bottom: 30rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
+				border-radius: 28rpx;
+                .aa{
+					padding-left: 40rpx;
+					padding-right: 40rpx;
+					box-sizing: border-box;
+					display: flex;
+					justify-content: space-between;
+					margin-top: 10rpx;
+					font-size: 28rpx;
+					color: #808080;
+				}
+				.tit {
+					margin-left: 40rpx;
+					font-size: 36rpx;
+					color: #3D3D3D;
+					font-weight: 600;
+				}
+
+				.cont_box {
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-around;
+
+
+					.cont {
+						width: 25%;
+						display: flex;
+						flex-wrap: wrap;
+						align-items: center;
+						justify-content: center;
+						text-align: center;
+
+						.top {
+							width: 100%;
+							font-size: 32rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+
+						.bot {
+							margin-top: 20rpx;
+							font-size: 26rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+					}
+				}
+			}
+
+			.card3 {
+				padding-top: 40rpx;
+				margin-top: 24rpx;
+				width: 670rpx;
+				// height: 490rpx;
+				// overflow: scroll;
+				background: #FFFFFF;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
+				border-radius: 28rpx;
+				.tit {
+					margin-left: 40rpx;
+
+					font-size: 35rpx;
+					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+					font-weight: 400;
+					color: #3D3D3D;
+				}
+
+				.cont_box {
+					padding: 0 40rpx;
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-around;
+
+					.cont:last-child {
+						margin-right: 0rpx;
+					}
+
+					.cont {
+						width: 100%;
+                        display: flex;
+						justify-content: space-between;
+						align-items: center;
+						.jt{
+							width: 15rpx;
+							height: 26rpx;
+						}
+						.top {
+							width: 100%;
+							display: flex;
+							align-items: center;
+							border-bottom: 1px solid #D8D8D8;
+							padding-top: 20rpx;
+							padding-bottom: 20rpx;
+							box-sizing: border-box;
+							image {
+								width: 44rpx;
+								height: 44rpx;
+								margin-right: 26rpx;
+							}
+							.bot {
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								font-size: 32rpx;
+								color: #3D3D3D;
+							}
+						}
+					}
+				}
+			}
+
+			.button {
+				margin-left: 76rpx;
+				margin-top: 178rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 520rpx;
+				height: 104rpx;
+				background: #8883F0;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+				border-radius: 52rpx 52rpx 52rpx 52rpx;
+				font-size: 32rpx;
+				font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index 33033d8..de23fa5 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -4,6 +4,17 @@
 		<view class="useryonghu">
 			<u-navbar :is-back="false" title="创想物联" :border-bottom="false" :background="bgc" title-color='#fff'
 				title-size='44' height='50'></u-navbar>
+			<view class="gonggao">
+				<u-icon name="volume-fill" color="#fff" style="position: absolute;left: 20rpx;" size="32"></u-icon>
+				<view class="container">
+				    <view class="scroll-text">
+				      <view class="scroll-item">
+				        {{announcements.noticeTitle == null ? '暂无最新公告！！！' : announcements.noticeTitle}}
+				      </view>
+				    </view>
+				</view>
+				<u-icon name="arrow-right" color="#fff" style="position: absolute;right: 10rpx;" size="32"></u-icon>
+			</view>
 			<view class="ditu">
 				<view class="dtxs">
 					<map class='map' id="map" :latitude="latitude" :longitude="longitude" @markertap="handleMarkerClick"
@@ -60,8 +71,11 @@
 					</view>
 				</view>
 				<view class="guangg" @click="btnad">
-					<image :src="imgad" mode="aspectFit"></image>
+					<image :src="imgad" mode="aspectFill"></image>
 				</view>
+				<!-- <view class="guangg">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/u0htqJ2dRrag4RrrZmJM" mode="aspectFill"></image>
+				</view> -->
 				<view class="saoma" @click="scanQRCode">
 					<view>
 						<image src="https://api.ccttiot.com/smartmeter/img/static/uBh15vzRx6gV0wRQj7gi" mode="aspectFit"></image>
@@ -123,6 +137,19 @@
 		</view>
 		<view class="shenfentcflag" @click="btnyc" v-if="xuanzeflag"></view>
 		
+		<!-- 公告弹窗 -->
+		<view class="noticetc">
+			<view class="name">
+				创想物联公告
+			</view>
+			<view class="biaoti">
+				公告标题
+			</view>
+			<view class="" v-html="">
+				
+			</view>
+		</view>
+		
 	</view>
 </template>
 
@@ -169,11 +196,12 @@
 				iconflag: false,
 				xuanzeflag:false,
 				isStaff:null,
-				dlflag:false
-			};
+				dlflag:false,
+				announcements: {},
+				gonggaoxq:{}
+			}
 		},
 		onLoad(option) {
-			console.log(option,'000');
 			if (option.id) {
 				let id = option.id
 				let that = this
@@ -251,6 +279,7 @@
 			    console.error('蓝牙适配器初始化失败，可能是因为没有权限', err);
 			  }
 			})
+			this.getgonggao()
 			this.getad()
 			this.getzf()
 			this.gethuidaio()
@@ -277,6 +306,19 @@
 		},
 
 		methods: {
+			// 获取最新公告
+			getgonggao(){
+				this.$u.get("/app/notice/new").then(res =>{
+					if(res.code == 200){
+						this.announcements = res.data
+						this.$u.get(`/app/notice/${res.data.noticeId}`).then(resp =>{
+							if(resp.code == 200){
+								this.gonggaoxq = res.data
+							}
+						})
+					}
+				})
+			},
 			btnyc(){
 				this.xuanzeflag = false
 			},
@@ -880,6 +922,51 @@
 </script>
 
 <style lang="scss">
+	.gonggao{
+		width: 680rpx;
+		height: 60rpx;
+		position: relative;
+		display: flex;
+		align-items: center;
+		margin-bottom: 10rpx;
+		background-color: rgba(255, 255, 255, .1);
+	}
+	.container {
+	  width: 560rpx;
+	  height: 60rpx; /* 根据需要调整高度 */
+	  display: flex;
+	  align-items: center;
+	  margin: auto;
+	  overflow: hidden;
+	  position: relative;
+	  color: #fff;
+	  box-sizing: border-box;
+	}
+	 
+	.scroll-text {
+	  width: 100%;
+	  overflow: hidden;
+	  box-sizing: border-box;
+	  display: inline-block;
+	  white-space: nowrap;
+	  animation: scroll 8s linear infinite;
+	}
+	 
+	.scroll-item {
+	  display: inline-block;
+	  padding: 0 10px;
+	  font-size: 16px;
+	}
+	 
+	@keyframes scroll {
+	  0% {
+	    transform: translateX(100%);
+	  }
+	  100% {
+	    transform: translateX(-100%);
+	  }
+	}
+	
 	.shenfentc{
 		width: 632rpx;
 		height: 498rpx;
@@ -998,9 +1085,7 @@
 	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
-	/deep/ .u-icon__icon {
-		padding-bottom: 22rpx;
-	}
+	
 	/deep/ .map {
 		width: 100%;
 		height: 100%;
@@ -1026,8 +1111,10 @@
 		width: 750rpx;
 		padding-left: 34rpx;
 		padding-right: 34rpx;
+		padding-bottom: 430rpx;
 		box-sizing: border-box;
-		height: 100%;
+		overflow: scroll; 
+		height: 100vh;
 		.tip_box {
 			position: fixed;
 			left: 72rpx;
@@ -1236,8 +1323,9 @@
 			width: 750rpx;
 			height: 166rpx;
 			background: #FFFFFF;
-			position: relative;
-			left: -34rpx;
+			position: fixed;
+			left: 0;
+			bottom: 0;
 			padding-top: 22rpx;
 			border-radius: 54rpx 54rpx 0 0;
 			margin-top: 20rpx;
@@ -1263,7 +1351,7 @@
 		}
 		.ditu {
 			width: 100%;
-			height: 980rpx;
+			height: 900rpx;
 			background: #FFFFFF;
 			border-radius: 38rpx 38rpx 38rpx 38rpx;
 			padding-top: 16rpx;
@@ -1328,7 +1416,7 @@
 			}
 			.fujin {
 				position: absolute;
-				top: 730rpx;
+				top: 660rpx;
 				padding-left: 30rpx;
 				width: 100%;
 				image {
@@ -1338,7 +1426,7 @@
 			}
 			.dtxs {
 				width: 642rpx;
-				height: 812rpx;
+				height: 750rpx;
 				margin: auto;
 				border-radius: 30rpx;
 				overflow: hidden;
diff --git a/pages/shuaxin.vue b/pages/shuaxin.vue
index 24cbb5b..4ddb066 100644
--- a/pages/shuaxin.vue
+++ b/pages/shuaxin.vue
@@ -18,7 +18,7 @@
 		},
 		onShareAppMessage: function() {
 			return {
-				title: '创享物联', 
+				title: '创想物联', 
 				path: '/pages/index/index'
 			}
 		},
@@ -26,7 +26,7 @@
 		// 分享到朋友圈  
 		onShareTimeline: function() { 
 			return {
-				title: '创享物联',
+				title: '创想物联',
 				query: '',
 				path: '/pages/index/index'
 			}
diff --git a/pages/sjshiming.vue b/pages/sjshiming.vue
index 77ab8c6..810b62d 100644
--- a/pages/sjshiming.vue
+++ b/pages/sjshiming.vue
@@ -18,7 +18,7 @@
 		},
 		onShareAppMessage: function() {
 			return {
-				title: '创享物联', 
+				title: '创想物联', 
 				path: '/pages/index/index'
 			}
 		},
@@ -26,7 +26,7 @@
 		// 分享到朋友圈  
 		onShareTimeline: function() {
 			return {
-				title: '创享物联',
+				title: '创想物联',
 				query: '',
 				path: '/pages/index/index'
 			}
diff --git a/pages/tj.vue b/pages/tj.vue
index 62c9a13..8e168f9 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -33,7 +33,7 @@
 				<view class="tongji">
 					<view class="one">
 						<view class="top">
-							{{tjobj.withDrawlAmount == null ? '0.00' : tjobj.withDrawlAmount}}
+							{{userobj.withDrawlAmount == null ? '0.00' : userobj.withDrawlAmount}}
 						</view>
 						<view class="bot" style="font-size: 24rpx;">
 							总收入/元
@@ -49,7 +49,7 @@
 					</view>
 					<view class="one">
 						<view class="top">
-							{{tjobj.balance == null ? '0.00' : tjobj.balance}}
+							{{userobj.balance == null ? '0.00' : userobj.balance}}
 						</view>
 						<view class="bot" style="font-size: 24rpx;">
 							账户余额
@@ -204,7 +204,8 @@
 				formattedCurrentDate:'',
 				formattedThirtyDaysAgo:'',
 				zongprice:'',
-				zongnum:''
+				zongnum:'',
+				userobj:{}
 			}
 		},
 		// 分享到好友（会话）
@@ -238,10 +239,19 @@
 			this.formattedCurrentDate = this.formatDate(currentDate)
 			this.formattedThirtyDaysAgo = this.formatDate(thirtyDaysAgo)
 			console.log(this.formattedCurrentDate,this.formattedThirtyDaysAgo)
+			this.getinfo()
 			this.gettimes()
 			this.gettj()
 		},
 		methods: {
+			getinfo(){
+				this.$u.get("/app/user/userInfo").then((res) => {
+					if (res.code == 200) {
+						this.userobj = res.data
+					}
+				})
+			},
+			
 			// 点击导航栏回到首页
 			btnshouye() {
 				uni.reLaunch({