diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 4f59292..3173f5d 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.2.12:10002',
-			baseUrl: 'https://kg.chuangtewl.com/prod-api',
+			baseUrl: 'http://192.168.2.12:10002',
+			// baseUrl: 'https://kg.chuangtewl.com/prod-api',
 			// loadingText: '加载中...',
 			// loadingTime: 1000,
 			// 设置自定义头部content-type
diff --git a/page_components/shebeixz.vue b/page_components/shebeixz.vue
index a47e613..5885880 100644
--- a/page_components/shebeixz.vue
+++ b/page_components/shebeixz.vue
@@ -66,11 +66,12 @@
 				titflag:'',
 				arrlists:[],
 				deviceList:[],
+				shu:''
 			};
 		},
 		onLoad(option) {
 			uni.removeStorageSync('tcidlist')
-			
+			this.shu = option.shu
 			this.deviceId = option.id
 			if(option.title == '确定'){
 				this.titflag = '确定'
@@ -213,7 +214,8 @@
 			getlist() {
 				let data = {
 					pageNum: 1,
-					pageSize: 99
+					pageSize: 99,
+					modelTag:this.shu
 				}
 				this.$u.get(`/app/device/list`, data).then((res) => {
 					if (res.code == 200) {
diff --git a/page_fenbao/device/joinDevice.vue b/page_fenbao/device/joinDevice.vue
index befe9ed..b4f6d50 100644
--- a/page_fenbao/device/joinDevice.vue
+++ b/page_fenbao/device/joinDevice.vue
@@ -268,7 +268,8 @@
 			// 		delta: 1 // delta值为1时表示返回的页面层数
 			// 	});
 			// },
-			bind() {
+			// 新增and替换设备
+			gettihuan(){
 				let data = {
 					sn: this.storeId,
 					mac: this.mac,
@@ -277,7 +278,7 @@
 				this.$u.post('/app/device', data).then((res) => {
 					if (res.code == 200) {
 						uni.showToast({
-							title: '录入成功',
+							title: res.msg,
 							icon: 'success',
 							duration: 2000
 						})
@@ -297,38 +298,38 @@
 						});
 					}
 				})
-				
-				
-				// this.$u.post(`/appVerify/band?sn=` + this.sn + '&mac=' + this.mac + '&hardwareVersionId=' + this
-				// 	.hardwareVersionId).then((res) => {
-
-				// 	if (res.code == 200) {
-
-				// 		uni.showToast({
-				// 			title: '绑定成功',
-				// 			icon: 'none',
-				// 			duration: 2000
-				// 		});
-				// 		setTimeout(() => {
-				// 			uni.navigateBack({
-				// 				delta: 1 // delta值为1时表示返回的页面层数
-				// 			});
-				// 		}, 2000)
-
-				// 	} else {
-				// 		if (res.msg == '该MAC号已经存在') {
-				// 			this.showbind = true
-				// 		} else {
-				// 			uni.showToast({
-				// 				title: res.msg,
-				// 				icon: 'none',
-				// 				duration: 2000
-				// 			});
-
-				// 		}
-
-				// 	}
-				// })
+			},
+			bind() {
+				this.$u.get(`/app/device/admin/byMac?mac=${this.mac}`).then(res =>{
+					if(res.code == 200){
+						if(res.data == '' || res.data == null){
+                           this.gettihuan()
+						}else{
+							let that = this
+							uni.showModal({
+							    title: '温馨提示',  
+							    content: '该设备已绑定SN，您确定修改该设备的SN吗？',  
+							    success: (resModal) => {  
+							        if (resModal.confirm) { 
+										that.gettihuan()
+							        } else if (resModal.cancel) { // 用户点击了取消按钮  
+							            uni.showToast({  
+							                title: '已取消',  
+							                icon: 'none',  
+							                duration: 1000  
+							            })
+							        }  
+							    }  
+							})
+						}
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'success',
+							duration: 2000
+						})
+					}
+				})
 			},
 			qrcode() {
 				uni.scanCode({
diff --git a/page_fenbao/zhuce.vue b/page_fenbao/zhuce.vue
index ca90406..f50f151 100644
--- a/page_fenbao/zhuce.vue
+++ b/page_fenbao/zhuce.vue
@@ -37,7 +37,7 @@
 			</view>
 		</view>
 
-		<view class="anniu" @click="Search">
+		<view class="anniu" v-if="seachflag" @click="Search">
 			<button>重新扫描</button>
 		</view>
 
@@ -103,7 +103,8 @@
 				snname: '',
 				qrResult:'',
 				name:'',
-				ver_data:null
+				ver_data:null,
+				seachflag:true
 			}
 		},
 		onLoad(option) {
@@ -442,18 +443,18 @@
 				// 	if (res.code == 200) {
 				// this.lurulist = res.data
 				// if(this.lurulist){
-				xBlufi.initXBlufi(1);
-				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
-				xBlufi.notifyStartDiscoverBle({
-					'isStart': true
-				})
-				// 两秒后停止蓝牙搜索  
-				setTimeout(() => {
-					xBlufi.notifyStartDiscoverBle({
-						'isStart': false
-					});
-					this.status = true
-				}, 1000)
+				// xBlufi.initXBlufi(1);
+				// xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
+				// xBlufi.notifyStartDiscoverBle({
+				// 	'isStart': true
+				// })
+				// // 两秒后停止蓝牙搜索  
+				// setTimeout(() => {
+				// 	xBlufi.notifyStartDiscoverBle({
+				// 		'isStart': false
+				// 	});
+				// 	this.status = true
+				// }, 1000)
 				// }
 				// }
 				// })
@@ -485,47 +486,48 @@
 				return parsedData;
 			},
 			//4、建立连接
-			createBLEConnection(e) {
-				// this.deviceId = e.name
-				this.mengcflag = true
-				uni.showLoading({
-					title: '录入中...'
-				})
-				this.mac = e.name.substring(5)
-				// 录入设备
-				let data = {
-					sn: this.storeId,
-					mac: this.mac,
-					modelId: this.valuexh
-				}
-				this.$u.post('/app/device', data).then((res) => {
-					if (res.code == 200) {
-						uni.showToast({
-							title: '设备:' + this.mac + '已录入成功',
-							icon: 'success',
-							duration: 2000
-						})
-						this.mengcflag = false
-						uni.hideLoading()
-						this.Search()
-						// setTimeout(() => {
-						// 	uni.navigateBack()
-						// }, 1000)
-						uni.removeStorageSync('mac')
-					} else {
-						this.mengcflag = false
-						uni.hideLoading()
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						})
-					}
-				})
-			},
+			// createBLEConnection(e) {
+			// 	// this.deviceId = e.name
+			// 	this.mengcflag = true
+			// 	uni.showLoading({
+			// 		title: '录入中...'
+			// 	})
+			// 	this.mac = e.name.substring(5)
+			// 	// 录入设备
+			// 	let data = {
+			// 		sn: this.storeId,
+			// 		mac: this.mac,
+			// 		modelId: this.valuexh
+			// 	}
+			// 	this.$u.post('/app/device', data).then((res) => {
+			// 		if (res.code == 200) {
+			// 			uni.showToast({
+			// 				title: '设备:' + this.mac + '已录入成功',
+			// 				icon: 'success',
+			// 				duration: 2000
+			// 			})
+			// 			this.mengcflag = false
+			// 			uni.hideLoading()
+			// 			this.Search()
+			// 			// setTimeout(() => {
+			// 			// 	uni.navigateBack()
+			// 			// }, 1000)
+			// 			uni.removeStorageSync('mac')
+			// 		} else {
+			// 			this.mengcflag = false
+			// 			uni.hideLoading()
+			// 			uni.showToast({
+			// 				title: res.msg,
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			})
+			// 		}
+			// 	})
+			// },
 			// 点击重新搜索
 			Search() {
 				// if (this.status) {
+					this.seachflag = false
 				this.mengcflag = true
 				uni.showLoading({
 					title: '请稍后...'
@@ -551,13 +553,14 @@
 						xBlufi.notifyStartDiscoverBle({
 							'isStart': false
 						});
+						this.seachflag = true
 						// 判断是否存在设备
-						if (this.devicesList.length == 0) {
-							this.tishiflag = true
-							this.texts = '扫描完毕，暂无发现设备'
-						} else {
-							this.texts = '扫描到以下设备，请点击录入！'
-						}
+						// if (this.devicesList.length == 0) {
+						// 	this.tishiflag = true
+						// 	this.texts = '扫描完毕，暂无发现设备'
+						// } else {
+						// 	this.texts = '扫描到以下设备，请点击录入！'
+						// }
 					// } else {
 					// 	xBlufi.notifyStartDiscoverBle({
 					// 		'isStart': true
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index ba90d79..1f4ff79 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -57,7 +57,13 @@
 				</view>
 			</view>
 			<view class="card2">
-				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">实时参数</view>
+				<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;">
+						点击刷新
+						<image style="width: 30rpx;height: 30rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uiVZaazpgTY3gE7aYtGb" mode=""></image>
+					</view>
+				</view>
 				<view class="bot_right">
 					<view class="cont" style="text-align: center;">
 						<view class="tit">
@@ -92,10 +98,23 @@
 						</view>
 					</view> -->
 				</view>
-                <view @click="shuaxin" style="width: 100%;display: flex;color: #8883F0;justify-content: center;align-items: center;padding-top:40rpx;padding-bottom: 30rpx;box-sizing: border-box;">
-                	点击刷新实时信息 
-					<image style="width: 32rpx;height: 32rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uiVZaazpgTY3gE7aYtGb" mode=""></image>
-                </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;">
+               			<!-- <u-switch v-model="checked" active-color="#8883F0"></u-switch> -->
+               			<view class="rt">
+               				<image v-if="imgflag" style="width: 160rpx;height: 80rpx;"
+               					src="https://api.ccttiot.com/smartmeter/img/static/uccaWar4FDp37op7haWM " mode="">
+               				</image>
+               				<image style="width: 160rpx;height: 80rpx;" v-else
+               					src="https://api.ccttiot.com/smartmeter/img/static/ur9HRtZKY7YcxGewJARz" mode="">
+               				</image>
+               			</view>
+               		</view>
+               	</view>
+               </view>
 			</view>
 			
 			<view class="card2" style="padding-bottom: 40rpx;">
@@ -137,15 +156,15 @@
 				 </view>
 			</view>
 			<!-- 操作 -->
-			<view class="card2" style="padding-bottom: 30rpx;box-sizing: border-box;margin-top: 20rpx;">
+			<!-- <view 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;">设备控制 </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="top" style="padding-top: 10rpx;"> -->
 			    			<!-- <u-switch v-model="checked" active-color="#8883F0"></u-switch> -->
-			    			<view class="rt">
+			    			<!-- <view class="rt">
 			    				<image v-if="imgflag" style="width: 160rpx;height: 80rpx;"
 			    					src="https://api.ccttiot.com/smartmeter/img/static/uccaWar4FDp37op7haWM " mode="">
 			    				</image>
@@ -156,7 +175,7 @@
 			    		</view>
 			    	</view>
 			    </view>
-			</view>
+			</view> -->
 			
 			<view class="card3" v-if="opflag">
 				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">其他功能</view>
@@ -1971,7 +1990,8 @@
 				padding-top: 40rpx;
 				margin-top: 20rpx;
 				width: 670rpx;
-				max-height: 314rpx;
+				max-height: 614rpx;
+				padding-bottom: 30rpx;
 				background: #FFFFFF;
 				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
 				border-radius: 28rpx;
diff --git a/page_user/wifijoint/index.vue b/page_user/wifijoint/index.vue
index 02d9ec3..b54e5f0 100644
--- a/page_user/wifijoint/index.vue
+++ b/page_user/wifijoint/index.vue
@@ -140,6 +140,7 @@
 							icon: 'success',
 							duration: 2000,
 						})
+						uni.hideLoading()
 				 	}else{
 						uni.showToast({
 							title: res.msg,
@@ -157,19 +158,23 @@
 			 
 			 // 开启
 			 btnkq(){
+				 uni.showLoading({
+				 	title: '设备开启中...'
+				 })
 				 this.$u.put(`/app/device/admin/${this.id}/switch?open=true`).then((res) => {
 				 	if (res.code == 200) {
-						setTimeout(()=>{
-							this.btnsx()
-						},1000)
+						// setTimeout(()=>{
+						// 	this.btnsx()
+						// },1000)
 				 		uni.showToast({
-				 			title: res.msg,
+				 			title: '开启成功',
 				 			icon: 'success',
 				 			duration: 2000
 				 		})
+						this.powerStatus = '开启'
 				 	} else {
 				 		uni.showToast({
-				 			title: res.msg,
+				 			title: '开启失败',
 				 			icon: 'none',
 				 			duration: 2000
 				 		})
@@ -178,19 +183,23 @@
 			 },
 			 // 关闭
 			 btngb(){
+				 uni.showLoading({
+				 	title: '设备关闭中...'
+				 })
 				 this.$u.put(`/app/device/admin/${this.id}/switch?open=false`).then((res) => {
 				 	if (res.code == 200) {
-						setTimeout(()=>{
-							this.btnsx()
-						},1000)
+						// setTimeout(()=>{
+						// 	this.btnsx()
+						// },1000)
 				 		uni.showToast({
-				 			title: res.msg,
+				 			title: '关闭成功',
 				 			icon: 'success',
 				 			duration: 2000
 				 		})
+						this.powerStatus = '关闭'
 				 	} else {
 				 		uni.showToast({
-				 			title: res.msg,
+				 			title: '关闭失败',
 				 			icon: 'none',
 				 			duration: 2000
 				 		})
@@ -199,17 +208,18 @@
 			 },
 			 // 刷新
 			 btnsx(){
-				 this.$u.get(`/app/device/${this.id}/refreshIot`).then((res) => {
+				 
+				 this.$u.get(`/app/device/v2/refreshIot?deviceNo=${this.storeId}`).then((res) => {
 					 if(res.code == 200){
 						 this.getsn()
 						 uni.showToast({
-						 	title: res.msg,
+						 	title: '刷新成功',
 						 	icon: 'success',
 						 	duration: 2000
 						 })
 					 }else{
 						 uni.showToast({
-						 	title: res.msg,
+						 	title: '刷新失败',
 						 	icon: 'none',
 						 	duration: 2000
 						 })
diff --git a/page_user/yetx.vue b/page_user/yetx.vue
index 208333c..d150290 100644
--- a/page_user/yetx.vue
+++ b/page_user/yetx.vue
@@ -6,7 +6,7 @@
 			<view class="top_box">
 				<view class="tip">账户余额(元)</view>
 				<view class="txt">
-					￥{{userinfo.balance == undefined ? '' : Number(userinfo.balance) + Number(userinfo.waitBonusAmount)}} <text style="margin-left: 20rpx;">{{'待结算(' + userinfo.waitBonusAmount + ')'}}</text>
+					￥{{userinfo.balance == undefined ? '' : Number(userinfo.balance) + Number(userinfo.waitBonusAmount)}} <text style="margin-left: 20rpx;">{{'待结算(￥' + waitBonusAmount + ')'}}</text>
 				</view>
 				<view class="tip" style="display: flex;justify-content: space-between;">
 					<text>累计提现：￥{{userinfo.withDrawlAmount == undefined ? '' : userinfo.withDrawlAmount}}</text>
@@ -101,7 +101,8 @@
 				sjmeoey: '',
 				txlist: '',
 				channelId: '',
-				listflag: true
+				listflag: true,
+				waitBonusAmount:0
 			}
 		},
 		onShow() {
@@ -229,7 +230,7 @@
 								title: '提现金额不能大于余额',
 								icon: 'none',
 								duration: 2000
-							});
+							})
 						} else if (this.currentindex == -1) {
 							uni.showToast({
 								title: '请选择提现方式',
@@ -293,6 +294,7 @@
 				this.$u.get("/app/user/userInfo").then((res) => {
 					if (res.code == 200) {
 						this.userinfo = res.data
+						this.waitBonusAmount = this.userinfo.waitBonusAmount
 						this.money = ''
 					}
 				})
@@ -496,4 +498,10 @@
 
 		}
 	}
-</style>
\ No newline at end of file
+</style>
+
+
+
+
+
+
diff --git a/pages.json b/pages.json
index abaf3b9..3342f9a 100644
--- a/pages.json
+++ b/pages.json
@@ -22,6 +22,37 @@
 				"navigationBarTextStyle": "#FFFFFF",
 				"navigationStyle": "custom"
 				
+			}
+		},
+		{
+			"path": "pages/daili/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				// "enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#3996FD",
+				"navigationBarTextStyle": "#FFFFFF",
+				"navigationStyle": "custom"
+				
+			}
+		},{
+			"path": "pages/daili/devicexq",
+			"style": {
+				"navigationBarTitleText": "我的",
+				// "enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#3996FD",
+				"navigationBarTextStyle": "#FFFFFF",
+				"navigationStyle": "custom"
+				
+			}
+		},{
+			"path": "pages/daili/dailibing",
+			"style": {
+				"navigationBarTitleText": "我的",
+				// "enablePullDownRefresh": true,
+				"navigationBarBackgroundColor": "#3996FD",
+				"navigationBarTextStyle": "#FFFFFF",
+				"navigationStyle": "custom"
+				
 			}
 		},{
 			"path": "pages/tongji",
diff --git a/pages/daili/dailibing.vue b/pages/daili/dailibing.vue
new file mode 100644
index 0000000..5476c72
--- /dev/null
+++ b/pages/daili/dailibing.vue
@@ -0,0 +1,815 @@
+<template>
+	<view class="page">
+		<u-navbar title="代理设置" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff' title-size='36'
+			height='50'></u-navbar>
+		<view class="card">
+			
+			<view class="icon">
+				<view class="tit">
+					设备主图
+				</view>
+				<view class="imgbox" v-if="userImgs">
+					<view style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;margin: auto;" @click="getImage">
+					     	<image style="border-radius: 10rpx;" :src="userImgs" mode="aspectFit"></image>
+					</view>
+				</view>
+				<view class="imgbox" v-else>
+					<view style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;margin: auto;" @click="getImage">
+			              <image src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode="aspectFit"></image>
+					</view>
+				</view>
+				<!-- 截图 -->
+				<ksp-cropper mode="free" :width="142" :height="142" :maxWidth="1024" :maxHeight="1024" :url="url"
+					@cancel="oncancel" @ok="onok"></ksp-cropper>
+					
+			</view>
+			
+			
+			<view class="li" @click.stop="sremakemc()">
+				<view class="tit">
+					设备名称
+				</view>
+				<view class="info">
+					<view class="txt">
+						{{listobj.deviceName}}
+					</view>
+					<view class="iconfont icon-xiangyou1"></view>
+				</view>
+			</view>
+			<view class="li" @click.stop="sremake()">
+				<view class="tit">
+					备注（代理）
+				</view>
+				<view class="info">
+					<view class="txt">
+						{{remake == null ? '' : remake}}
+					</view>
+					<view class="iconfont icon-xiangyou1"></view>
+				</view>
+			</view>
+			<view class="li" @click.stop="sremakes()">
+				<view class="tit">
+					所属商户
+				</view>
+				<view class="info">
+					<view class="txt">
+						{{listobj.storeName == null ? '' : listobj.storeName}}
+					</view>
+					<!-- <view class="iconfont icon-xiangyou1"></view> -->
+				</view>
+			</view>
+		
+			<view class="li">
+				<view class="tit">
+					S/N
+				</view>
+				<view class="info">
+					<view class="txt">
+						{{listobj.deviceNo == null ? '' : listobj.deviceNo}}
+					</view>
+				</view>
+			</view>
+			<view class="li">
+				<view class="tit">
+					类型
+				</view>
+				<view class="info">
+					<view class="txt">
+						{{listobj.model == null ? '' : listobj.model}}
+					</view>
+				</view>
+			</view>
+			<view class="li" v-if="modelId.some(tag => tag == 2)" style="border-bottom: 0;"> 
+				<view class="tit">
+					WiFi名称
+				</view>
+				<view class="info">
+					<view class="txt">
+						{{listobj.wifi == null || listobj.wifi == '创特物联TP' ? '--' : listobj.wifi}}
+					</view>
+				</view>
+			</view>
+			
+			<view class="lis" @click="deldevice()">
+						解除绑定
+			</view>
+		
+		</view>
+		<u-mask :show="showloading"></u-mask>
+		<u-mask :show="showfz"></u-mask>
+		<view class="fz" v-show="showfz">
+			<view class="fz_top">
+				<view class="iconfont icon-shanchu" @click="showfz=false">
+
+				</view>
+				<view class="tit">
+					设备分组
+				</view>
+				<view class="txt" @click="tosetpage()">
+					管理
+				</view>
+			</view>
+			<view class="card_cont">
+				<view class="cards" v-for="(item,index) in groupList" :key="index" @click="changeGp(item)">
+					<view class="txt">
+						{{item.groupName}}
+					</view>
+					<view class="num">
+						{{item.deviceCount}}
+					</view>
+				</view>
+				<view class="zhanwei" style="width: 100%;height: 100rpx;">
+
+				</view>
+			</view>
+		</view>
+		<view class="dd">
+			<u-select v-model="show" :list="list" title='欠费断电' @confirm="confirm"></u-select>
+		</view>
+		<u-popup v-model="showpopup" mode="center" border-radius='20'>
+			<view class="popcard" v-if="showremake">
+				<view class="tit">
+					修改备注
+				</view>
+				<view class="ipt">
+					<u-input v-model="remake" placeholder=" " border='surround' placeholder-style='font-size: 24rpx;' />
+				</view>
+				<view class="btnbox">
+					<view class="btn2" @click="close()">
+						取消
+					</view>
+					<view class="btn1" @click="sub(1)">
+						确定
+					</view>
+				</view>
+
+			</view>
+			<view class="popcard" v-if="showpeice">
+				<view class="tit">
+					修改备注
+				</view>
+				<view class="ipt">
+					<u-input v-model="price" placeholder=" " border='surround' placeholder-style='font-size: 24rpx;' />
+				</view>
+				<view class="btnbox">
+					<view class="btn2" @click="close()">
+						取消
+					</view>
+					<view class="btn1" @click="sub(2)">
+						确定
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		<u-popup v-model="showmc" mode="center" border-radius='20'>
+			<view class="popcard" v-if="showmc">
+				<view class="tit">
+					修改名称
+				</view>
+				<view class="ipt">
+					<u-input v-model="xgname" placeholder=" " border='surround' placeholder-style='font-size: 24rpx;' />
+				</view>
+				<view class="btnbox">
+					<view class="btn2" @click="close()">
+						取消
+					</view>
+					<view class="btn1" @click="sub(3)">
+						确定
+					</view>
+				</view>
+			</view>
+		 </u-popup>
+
+		<!-- 选择店铺 -->
+		<u-select v-model="showshop" :list="wateringList" @confirm="confirms"></u-select>
+        
+		<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>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				btnmsk:false,
+				bgc: {
+					backgroundColor: "#8883f0",
+				},
+				showloading: false,
+				showfz: false,
+				show: false,
+				showshop: false,
+				list: [{
+						value: '1',
+						label: '欠费立即断电'
+					},
+					{
+						value: '0',
+						label: '欠费不断电'
+					}
+				],
+				id: '',
+				xgname:'',
+				deviceInfo: {},
+				groupList: {},
+				showpopup: false,
+				remake: '',
+				price: '',
+				showpeice: false,
+				showremake: false,
+				listobj: {
+					deviceName:'',
+					storeName:'',
+					deviceNo:'',
+					model:'',
+					wifi:'',
+				},
+                showmc:false,
+				pagenum: 1,
+				wateringList: [],
+				pagesize: 10,
+				isLoading: false, 
+				noMoreData: false,
+				total: 0,
+				
+				userImgs:'',
+				url:'',
+				token:'',
+				modelId:''
+			}
+		},
+		onLoad(option) {
+			let id = option.id
+			this.id = id
+			this.getshua()
+			this.getQiniuToken()
+			this.getDevice(id)
+			this.getlistobj(id)
+			this.gettanc()
+		},
+		// 分享到好友（会话）
+		  onShareAppMessage: function () {  
+		    return {  
+		      title: '创想物联',  
+		      path: '/pages/shouye/index'  
+		    }  
+		  },  
+		  
+		  // 分享到朋友圈  
+		  onShareTimeline: function () {  
+		    return {  
+		      title: '创想物联',  
+		      query: '',  
+		      path: '/pages/shouye/index'  
+		    }  
+		  },
+		onShow() {
+			this.getgroup()
+		},
+		methods: {
+			getshua(){
+				this.$u.get(`/app/device/${this.id}/refreshIot`).then((res) => {})
+			},
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				})
+			},
+			getImage() {
+				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, //后端返回的token
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						let str = JSON.parse(res.data)
+						_this.userImgs = 'https://api.ccttiot.com/' + str.key
+						let data = {
+							deviceId:_this.id,
+							customPicture:_this.userImgs
+						}
+						_this.$u.put('/app/device', data).then((res) => {
+							if (res.code == 200) {
+								// this.getDevice()
+								uni.showToast({
+									title: '操作成功',
+									icon: 'success',
+									duration: 2000
+								})
+							}
+						})
+					}
+				})
+			},
+			oncancel() {
+				// url设置为空，隐藏控件
+				this.url = ""
+			},
+			
+			
+			sremakes() {
+				this.showshop = true
+			},
+			confirms(e){
+				// console.log(e);
+				let data = {
+					deviceId: this.id,
+					storeId:e[0].value
+				}
+				this.putdevice(data)
+				setTimeout(()=>{
+					this.getlistobj(this.id)
+				},1000)
+			},
+			
+			gettanc(){
+				this.$u.get('/app/store/listCount').then((res) => {
+					if (res.code == 200) {
+						this.total = res.total
+						if (res.data.length > 0) {
+							// 有数据，追加到列表  
+							let arr = res.data.map(row => ({
+								value: row.storeId, // 将storeId赋值给value  
+								label: row.name // 将name赋值给label  
+							}));
+							this.wateringList = this.wateringList.concat(arr)
+							this.wateringList = this.wateringList.slice(1)
+							this.pagenum++
+							console.log(this.wateringList);
+						} else {
+							// 没有更多数据  
+							this.noMoreData = true;
+						}
+						this.isLoading = false;
+					}
+				})
+			},
+			
+			onReachBottom() {
+				let sum = this.total / this.pagesize
+				if (this.pagenum - 1 < sum) {
+					this.getlist() // 上拉加载更多  
+				} else {
+					uni.showToast({
+						title: '没有更多订单记录了',
+						icon: 'none',
+						duration: 1000
+					});
+				}
+			},
+
+			changeGp(item) {
+				let data = {
+					deviceId: this.id,
+					groupId: item.groupId
+				}
+				this.putdevice(data)
+				this.showfz = false
+
+				setTimeout(() => {
+					this.getgroup()
+				}, 1000)
+
+			},
+			tosetpage() {
+				this.showfz = false
+				uni.navigateTo({
+					url: '/page_user/fenzu'
+				})
+			},
+			sub(num) {
+				if (num == 1) {
+					console.log(this.remake)
+					let data = {
+						deviceId: this.id,
+						remark: this.remake
+					}
+					this.showpopup = false
+					this.showremake = false
+					this.putdevice(data)
+				} else if (num == 2) {
+					let data = {
+						deviceId: this.id,
+						price: this.price,
+					}
+					this.showpopup = false
+					this.showpeice = false
+					this.showmc = false
+					this.putdevice(data)
+				}else if(num == 3){
+					// console.log(this.xgname);
+					let data = {
+						deviceId: this.id,
+						deviceName: this.xgname,
+					}
+					this.showpopup = false
+					this.showpeice = false
+					this.showmc = false
+					this.putdevice(data)
+					setTimeout(()=>{
+						this.getlistobj(this.id)
+					},1000)
+				}
+			},
+			deldevice() {
+				uni.showModal({  
+				    title: '确认解绑',  
+				    content: '您确定要解绑设备吗？',  
+				    success: (resModal) => {  
+				        if (resModal.confirm) { 
+							this.btnmsk = true
+				            this.$u.delete(`/app/device/mch/unbind/${this.id}`).then((res) => {  
+				                if (res.code == 200) {  
+				                    uni.showToast({  
+				                        title: '解除成功',  
+				                        icon: 'success',  
+				                        duration: 2000  
+				                    })
+									this.btnmsk = false
+				                    uni.navigateBack({  
+				                        delta: 2 // 返回上级页面  
+				                    }) 
+				                } else if(res.code == 500){  
+				                    uni.showToast({  
+				                        title: res.msg,  
+				                        icon: 'none',  
+				                        duration: 2000  
+				                    })
+									this.btnmsk = false
+				                }  
+				            }).catch((error) => {  
+				                // 请求失败的处理逻辑  
+				                uni.showToast({  
+				                    title: '请求失败',  
+				                    icon: 'none',  
+				                    duration: 2000  
+				                })
+								this.btnmsk = false
+				            })
+				        } else if (resModal.cancel) { // 用户点击了取消按钮  
+				            uni.showToast({  
+				                title: '已取消',  
+				                icon: 'none',  
+				                duration: 1000  
+				            })
+				        }  
+				    }  
+				});
+			},
+			confirm(e) {
+				let data = {
+					deviceId: this.id,
+					outageWay: e[0].value
+				}
+				this.putdevice(data)
+			},
+			putdevice(data) {
+				this.$u.put('/app/device', data).then((res) => {
+					if (res.code == 200) {
+						this.getDevice()
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					}
+				})
+			},
+			sremakemc(){
+				// console.log(1);
+				this.showmc = true
+				this.xgname = this.listobj.deviceName
+			},
+			sremake() {
+				this.showpopup = true
+				this.showremake = true
+			},
+			sprice() {
+				this.showpopup = true
+				this.showpeice = true
+			},
+			close() {
+				this.showpeice = false
+				this.showremake = false
+				this.showpopup = false
+                this.showmc = false
+			},
+			getDevice(id) {
+				this.$u.get("/app/device/" + this.id).then((res) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						this.deviceInfo = res.data
+						console.log(this.deviceInfo, 'resres');
+						this.price = this.deviceInfo.price
+						this.remake = this.deviceInfo.remark
+						if(this.deviceInfo.customPicture == null){
+							this.userImgs = this.deviceInfo.picture
+						}else{
+							this.userImgs = this.deviceInfo.customPicture
+						}
+						// this.loadings=true  
+						// this.initChart()
+					}
+				})
+			},
+			getgroup() {
+				this.$u.get("/app/store/listCount").then((res) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						this.groupList = res.data
+						// this.loadings=true
+						// this.initChart()
+					}
+				});
+			},
+
+			getlistobj(id) {
+				this.$u.get("/app/device/" + id).then((res) => {
+					if (res.code == 200) {
+						this.listobj = res.data
+						this.modelId = res.data.modelTags
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .u-flex{
+		padding-top: 20rpx !important;
+		box-sizing: border-box;
+	} 
+	/deep/ .u-title{
+		padding-bottom: 22rpx;
+	}
+	/deep/ .u-icon__icon{
+		padding-bottom: 22rpx;
+	}
+	page {
+		background-color: #F7FAFE;
+	}
+    .lis{
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 230rpx;
+		width: 632rpx;
+		height: 90rpx;
+		background-color: #8883f0;
+		text-align: center;
+		line-height: 90rpx;
+		font-size: 36rpx;
+		color: #fff;
+		border-radius: 50rpx;
+	}
+	.page {
+		width: 750rpx;
+
+		.popcard {
+			display: flex;
+			justify-content: center;
+			flex-wrap: wrap;
+			width: 550rpx;
+			height: 400rpx;
+			border-radius: 20rpx;
+
+			.tit {
+				display: flex;
+				justify-content: center;
+				width: 100%;
+				align-items: center;
+				font-size: 28rpx;
+				font-weight: 700;
+			}
+
+			.ipt {
+				margin-top: 60rpx;
+				width: 80%;
+
+				.u-input::placeholder {
+					font-size: 20px;
+					color: red;
+				}
+			}
+
+			.btnbox {
+				width: 100%;
+				display: flex;
+				flex-wrap: nowrap;
+				border-radius: 0 0 20rpx 20rpx;
+
+				.btn2 {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 50%;
+					font-size: 32rpx;
+					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+					font-weight: 400;
+					color: #000;
+					background-color: #fff;
+				}
+
+				.btn1 {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					width: 50%;
+					font-size: 32rpx;
+					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+					font-weight: 400;
+					color: #fff;
+					background-color: #8883f0;
+					border: 1rpx solid #ccc;
+				}
+			}
+
+		}
+
+		.card {
+			padding: 16rpx 38rpx;
+			margin: 60rpx auto 0;
+			width: 654rpx;
+			background: #FFFFFF;
+			border-radius: 30rpx;
+			box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+			opacity: 1;
+
+			.li {
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: space-between;
+				height: 94rpx;
+				border-bottom: #E5E5E5 solid 2rpx;
+
+				.tit {
+					font-size: 32rpx;
+					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+					font-weight: 400;
+					color: #000000;
+				}
+
+				.info {
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+
+					.txt {
+						font-size: 32rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 400;
+						color: #95989D;
+					}
+
+					.icon-xiangyou1 {
+						margin-left: 6rpx;
+						color: #95989D;
+					}
+				}
+			}
+		}
+
+		.btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin: 52rpx auto 0;
+			width: 654rpx;
+			height: 100rpx;
+			background: #FF4F4F;
+			box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+			opacity: 1;
+			border-radius: 30rpx;
+			font-size: 32rpx;
+			font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+			font-weight: 400;
+			color: #FFFFFF;
+		}
+
+		.fz {
+
+			position: fixed;
+			bottom: 0;
+			width: 750rpx;
+			height: 1152rpx;
+			background: #F7FAFE;
+			border-radius: 30rpx 30rpx 0 0;
+			z-index: 10071;
+
+			.fz_top {
+				margin: 18rpx 0 auto;
+				display: flex;
+				flex-wrap: nowrap;
+				justify-content: space-between;
+
+				.icon-shanchu {
+					margin-left: 40rpx;
+					font-size: 50rpx;
+				}
+
+				.tit {
+					font-size: 36rpx;
+					font-family: Source Han Sans, Source Han Sans;
+					font-weight: 400;
+					color: #000000;
+				}
+
+				.txt {
+					margin-right: 40rpx;
+					font-size: 36rpx;
+					font-family: Source Han Sans, Source Han Sans;
+					font-weight: 400;
+					color: #2A82E4;
+
+				}
+			}
+
+			.card_cont {
+				width: 750rpx;
+				display: flex;
+				flex-wrap: wrap;
+				align-items: baseline;
+				justify-content: center;
+				height: 1030rpx;
+				overflow-y: auto;
+				overflow-x: hidden;
+
+				.cards {
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+					justify-content: space-between;
+					padding: 0 40rpx;
+					width: 682rpx;
+					border-radius: 30rpx;
+					height: 114rpx;
+					background: #FFFFFF;
+					box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+
+					.txt {
+						font-size: 36rpx;
+						font-family: Source Han Sans, Source Han Sans;
+						font-weight: 400;
+						color: #000000;
+					}
+
+					.num {
+						font-size: 36rpx;
+						font-family: Source Han Sans, Source Han Sans;
+						font-weight: 400;
+						color: #000000;
+					}
+				}
+			}
+		}
+	}
+	.icon {
+		.tit{
+			padding-top: 50rpx;
+			box-sizing: border-box;
+			font-size: 32rpx;
+		}
+		margin-top: 40rpx;
+		margin-bottom: 30rpx;
+		display: flex;
+		justify-content: space-between;
+		.imgbox {
+			margin-left: 300rpx;
+			image {
+				width: 142rpx;
+				height: 142rpx;
+			}
+		}
+	}
+	/deep/ .panel{
+		position: fixed;
+		    width: 100%;
+		    height: 100%;
+		    top: 0;
+		    bottom: 0;
+		    left: 0;
+		    z-index: 99 !important;
+		    overflow: hidden;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/daili/devicexq.vue b/pages/daili/devicexq.vue
new file mode 100644
index 0000000..2bcc90b
--- /dev/null
+++ b/pages/daili/devicexq.vue
@@ -0,0 +1,2132 @@
+<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="top">
+					<view class="left">
+						设备
+					</view>
+					<view class="right">
+
+					</view>
+				</view> -->
+				<view class="mid">
+					<view class="mid_right">
+						<view class="mid_top">
+							{{ deviceInfo.deviceName == null ? '' : deviceInfo.deviceName }}
+						</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">
+							SN：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}</view>
+						<view class="" style="font-size: 24rpx;color: #95989D;">
+							更新时间：{{deviceInfo.lastPullTime == null ? '--' : deviceInfo.lastPullTime}}</view>
+						<view class="" style="font-size: 24rpx;color: #95989D;">
+							归属商户：111</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">
+					<!-- 设备租期到期时间: {{deviceInfo.rentTime}} -->
+				</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;">
+					点击刷新
+					<image style="width: 30rpx;height: 30rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uiVZaazpgTY3gE7aYtGb" mode=""></image>
+				</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 class="cont" style="text-align: center;">
+					<view class="tit">
+						{{formattedTime}}
+					</view>
+					<view class="txt">
+						剩余时长
+					</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;">
+		   			<!-- <u-switch v-model="checked" active-color="#8883F0"></u-switch> -->
+		   			<view class="rt">
+		   				<image v-if="imgflag" style="width: 160rpx;height: 80rpx;"
+		   					src="https://api.ccttiot.com/smartmeter/img/static/uccaWar4FDp37op7haWM " mode="">
+		   				</image>
+		   				<image style="width: 160rpx;height: 80rpx;" v-else
+		   					src="https://api.ccttiot.com/smartmeter/img/static/ur9HRtZKY7YcxGewJARz" mode="">
+		   				</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="card2" style="padding-bottom: 30rpx;box-sizing: border-box;margin-top: 20rpx;">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">设备控制 </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="">
+			    				</image>
+			    				<image style="width: 160rpx;height: 80rpx;" v-else
+			    					src="https://api.ccttiot.com/smartmeter/img/static/ur9HRtZKY7YcxGewJARz" mode="">
+			    				</image>
+			    			</view>
+			    		</view>
+			    	</view>
+			    </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=""
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">充值记录</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
+						</view>
+						<!-- <view class="cont" @click="topage(3)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uJmpaxyrv34a1EW5lWQv" mode=""
+									style="width: 44rpx;height: 44rpx;"></image>
+									<view class="bot">收费方式</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
+						</view> -->
+						<view class="cont" @click="topage(1)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uhsqQVT62DOTdW8qW7ez" mode=""
+									style="width: 44rpx;height: 44rpx;"></image>
+									<view class="bot">归零</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
+						</view>
+						<view class="cont" @click="topage(6)">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/u9vzIeLLorfYuoZnxBDZ" mode="">
+								</image>
+								<view class="bot">充值</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></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="">
+								</image>
+								<view class="bot">配网</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
+						</view>
+						<view class="cont" @click="qrFun">
+							<view class="top">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uMdtTPOmGVJqcYIQvnUj" mode="">
+								</image>
+								<view class="bot">分享</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
+						</view>
+						<!-- <view class="cont" @click="topage(2)">
+							<view class="top">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/ueQ5V8QAidDZGt0FpqXb" mode=""
+									style="width: 44rpx;height: 40rpx;"></image>
+									<view class="bot">上报异常</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
+						</view> -->
+						<view class="cont" @click="topage(4)">
+							<view class="top" style="border: 0;">
+								<image style="width: 44rpx;height: 44rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uOUM2aclDz2ZnRxOll9g" mode="">
+								</image>
+								<view class="bot">设置</view>
+							</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" style="margin-top: 20rpx;" mode=""></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="请输入时长或度数" />
+			<input type="text" placeholder="请选择单位时长或度数" v-model="danwei" disabled="false" @click="showflag = true" />
+			<u-icon name="arrow-down" style="position: fixed;top: 234rpx;right: 60rpx;" color="#999" size="28"></u-icon>
+			<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=""></image>
+		</view>
+
+		<!-- 蓝牙连接失败 -->
+		<view class="bluetoothbox" v-if="shibaiflag">
+			<image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uTb3vSlbcHdPMFQMBjyL" mode=""></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="topage(5)">
+					重新连接
+				</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>
+</template>
+
+<script>
+	var xBlufi = require("@/page_components/blufi/xBlufi.js")
+	import uQRCode from '@/common/uqrcode.js'
+	import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas.vue'
+	import * as echarts from '@/components/uni-ec-canvas/echarts'
+	let chart = null
+	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,
+			}
+		},
+		onLoad(option) {
+			let id = option.id
+			this.id = id
+			// this.startIntervals();
+			// this.getDevice(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.getshuax()
+			this.getQiniuToken()
+			// if (!this.intervalId) {
+			// 	this.startIntervals();
+			// }
+		},
+		mounted() {
+			this.drawCanvas()
+		},
+		methods: {
+			// 商户跳转进行中订单
+			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
+						})
+					}
+				})
+			},
+			// 定时每一分钟请求一次
+			// startIntervals() {
+			// 	this.intervalId = setInterval(() => {
+			// 		this.getshuax()
+			// 	}, 60000); // 60000毫秒 = 1分钟  
+			// },
+
+
+			// 选择时长单位
+			btnconfirm(e) {
+				this.danwei = e[0].label
+				this.damweiid = e[0].value
+			},
+
+			capture() {
+				var pages = getCurrentPages(); //获取当前页面信息
+				var page = pages[pages.length - 1];
+				var bitmap = null;
+				var currentWebview = page.$getAppWebview();
+				bitmap = new plus.nativeObj.Bitmap('amway_img');
+				// 将webview内容绘制到Bitmap对象中
+				currentWebview.draw(bitmap, function() {
+					// console.log('截屏绘制图片成功');
+					//这里我将文件名用四位随机数拼接了，不然会出现当前图片替换上一张图片只能保存一张图片的问题
+					let rand = Math.floor(Math.random() * 10000)
+					let saveUrl = '_doc/' + rand + 'a.jpg'
+					bitmap.save(saveUrl, {}, function(i) {
+						// console.log('保存图片成功：' + JSON.stringify(i));
+						uni.saveImageToPhotosAlbum({
+							filePath: i.target,
+							success: function() {
+								// bitmap.clear(); //销毁Bitmap图片
+								uni.showToast({
+									title: '保存图片成功',
+									mask: false,
+									duration: 1500
+								});
+							}
+						});
+					}, function(e) {
+						console.log('保存图片失败：' + JSON.stringify(e));
+					});
+				}, function(e) {
+					console.log('截屏绘制图片失败：' + JSON.stringify(e));
+				});
+				//currentWebview.append(amway_bit);
+			},
+
+
+			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
+				})
+				// this.wemflag = true
+				// uQRCode.make({
+				// 	canvasId: 'qrcode',
+				// 	// componentInstance: this,
+				// 	text: 'https://kg.chuantewulian.cn/w?s=' + this.deviceNo,
+				// 	size: 250,
+				// 	margin: 0,
+				// 	backgroundColor: '#ffffff',
+				// 	foregroundColor: '#000000',
+				// 	fileType: 'jpg',
+				// 	errorCorrectLevel: uQRCode.errorCorrectLevel.H,
+				// })
+			},
+			ewmyc() {
+				this.wemflag = false
+			},
+
+			btnlyqx() {
+				this.shibaiflag = false
+				this.bluetoothflag = false
+			},
+			// 开启和关闭
+			btnkq() {
+				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.btnmsk = false
+						this.shibaiflag = false
+						this.bluetoothflag = true
+						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.deviceInfo.powerStatus == 0) {
+								this.imgflag = false
+							} else {
+								this.imgflag = true
+							}
+						}, 1000)
+					} else {
+						// console.log(this.tdtxt,'020202');
+						if (this.tdtxt == '开启') {
+							let that = this
+							uni.getNetworkType({
+								success(res) {
+									if (res.networkType !== 'none') {
+										uni.getConnectedBluetoothDevices({
+											success(res) {
+												setTimeout(() => {
+													// console.log('close关闭');
+													that.tdtxt = '关闭'
+													that.imgflag = false
+													that.deviceInfo.status = 1
+													xBlufi.notifySendCustomData({
+														customData: 'close'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11close'
+													})
+												}, 1000)
+											},
+											fail(err) {
+												console.error('获取已连接蓝牙设备信息失败：', err)
+											}
+										})
+									}
+								}
+							})
+						} else {
+							let that = this
+							uni.getNetworkType({
+								success(res) {
+									if (res.networkType !== 'none') {
+										uni.getConnectedBluetoothDevices({
+											success(res) {
+												setTimeout(() => {
+													// console.log('open开启');
+													that.tdtxt = '开启'
+													that.imgflag = true
+													that.deviceInfo.status = 2
+													xBlufi.notifySendCustomData({
+														customData: 'open'
+													})
+													xBlufi.notifySendCustomData({
+														customData: '11open'
+													})
+												}, 1000)
+											},
+											fail(err) {
+												console.error('获取已连接蓝牙设备信息失败：', err)
+											}
+										})
+									}
+								}
+							})
+						}
+					}
+				}
+			},
+			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 = 'CTKG-' + res.data.mac
+						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) {
+					// console.log(this.deviceInfo.onlineStatus, 'this.deviceInfo.onlineStatusthis.deviceInfo.onlineStatus');
+					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 {
+						if (this.setMode == null) {
+							this.btnmsk = false
+							this.shibaiflag = false
+							this.bluetoothflag = true
+							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
+								})
+							}, 1000)
+						} else {
+							let that = this
+							uni.showModal({
+								title: '提示',
+								content: '您确定要将设备时间归零吗？',
+								success: function(res) {
+									if (res.confirm) {
+										that.btnmsk = false
+										uni.getNetworkType({
+											success(res) {
+												if (res.networkType !== 'none') {
+													uni.getConnectedBluetoothDevices({
+														success(res) {
+															setTimeout(() => {
+																that.$u.put(
+																	`/app/device/${that.id}/reset?requiredIot=false`
+																	).then(res => {
+																	if (res
+																		.code ==
+																		200) {
+																		that.deviceInfo
+																			.status =
+																			1
+																		that.imgflag =
+																			false
+																		that.tdtxt =
+																			'关闭'
+																		that.timeday =
+																			0
+																		xBlufi.notifySendCustomData({
+																				customData: '@time0'
+																			})
+																		xBlufi.notifySendCustomData({
+																				customData: '@mmney0'
+																			})
+																		xBlufi.notifySendCustomData({
+																				customData: 'close'
+																			})
+																		uni.showToast({
+																			title: res.msg,
+																			icon: 'success',
+																			duration: 2000
+																		})
+																	} else {
+																		uni.showToast({
+																			title: res
+																				.msg,
+																			icon: 'none',
+																			duration: 2000
+																		})
+																	}
+																})
+															}, 1000)
+														},
+														fail(err) {
+															console.error('获取已连接蓝牙设备信息失败：',
+																err)
+														}
+													})
+												}
+											}
+										})
+									}
+								}
+							})
+						}
+					}
+				} 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
+					})
+				} else if (num == 4) { //设置
+					this.btnmsk = false
+					uni.navigateTo({
+						url: '/pages/daili/dailibing?id=' + this.id
+					})
+				} else if (num == 5) {
+					// if(this.deviceInfo.onlineStatus == 1){
+					// 	this.btnmsk = false
+					// 	let systemInfo = uni.getSystemInfoSync()
+					// 	if (systemInfo.platform == 'android') {
+					// 		// 当前设备是 Android  
+					// 		uni.navigateTo({
+					// 			url: '/page_components/wifilist/index?deviceId=' + this.deviceId + '&name=' + this.name
+					// 		})
+					// 	} else if (systemInfo.platform == 'ios') {
+					// 		// 当前设备是 iOS  
+					// 		uni.navigateTo({
+					// 			url: '/page_fenbao/device/wifivideo?deviceId=' + this.deviceId + '&name=' + this.name
+					// 		})
+					// 	}
+					// }else{
+					this.btnmsk = false
+					this.shibaiflag = false
+					this.bluetoothflag = true
+					console.log(this.deviceId, 'idididididdidii');
+					if (this.setMode == null) {
+						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)
+							}
+							let data = {
+								storeId: this.storeId,
+								mac: this.mac
+							}
+							this.$u.put('/app/device/bind', data).then((res) => {
+								if (res.code == 200) {
+									uni.hideLoading();
+									this.shibaiflag = false
+									this.bluetoothflag = false
+									uni.removeStorageSync('mac');
+									let systemInfo = uni.getSystemInfoSync()
+									if (systemInfo.platform == 'android') {
+										// 当前设备是 Android  
+										uni.navigateTo({
+											url: '/page_components/wifilist/index?deviceId=' + this
+												.deviceId + '&name=' + this.name
+										})
+									} else if (systemInfo.platform == 'ios') {
+										// 当前设备是 iOS  
+										uni.navigateTo({
+											url: '/page_fenbao/device/wifivideo?deviceId=' + this
+												.deviceId + '&name=' + this.name
+										})
+									}
+								} else if (res.msg == '设备编号和mac不能同时为空') {
+									this.shibaiflag = true
+									this.bluetoothflag = false
+								}
+							})
+						}, 2000)
+					} else {
+						let name = ''
+						let index = this.name.indexOf('-')
+						if (index !== -1) {
+							name = this.name.slice(index + 1)
+						}
+						let data = {
+							storeId: this.storeId,
+							mac: this.mac
+						}
+						this.$u.put('/app/device/bind', data).then((res) => {
+							if (res.code == 200) {
+								this.shibaiflag = false
+								this.bluetoothflag = false
+								uni.hideLoading();
+								uni.removeStorageSync('mac');
+								let systemInfo = uni.getSystemInfoSync()
+								if (systemInfo.platform == 'android') {
+									// 当前设备是 Android  
+									uni.navigateTo({
+										url: '/page_components/wifilist/index?deviceId=' + this.deviceId +
+											'&name=' + this.name
+									})
+								} else if (systemInfo.platform == 'ios') {
+									// 当前设备是 iOS  
+									uni.navigateTo({
+										url: '/page_fenbao/device/wifivideo?deviceId=' + this.deviceId +
+											'&name=' + this.name
+									})
+								}
+							} else {
+								if (res.msg == '设备编号和mac不能同时为空') {
+									this.shibaiflag = true
+									this.bluetoothflag = false
+									uni.hideLoading()
+								} else {
+									this.shibaiflag = true
+									this.bluetoothflag = false
+									uni.hideLoading()
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+										duration: 2000
+									})
+									// uni.navigateBack()
+								}
+							}
+						})
+					}
+					// }
+				} 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.cztime = ''
+						this.danwei = ''
+						this.btnmsk = false
+						this.shibaiflag = false
+						this.bluetoothflag = true
+						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
+							})
+						}, 1000)
+					} 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 == 4) {
+													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()
+												}
+											}, 1000)
+										},
+										fail(err) {
+											console.error('获取已连接蓝牙设备信息失败：', err)
+										}
+									})
+								}
+							}
+						})
+					}
+				}
+			},
+			btnqx() {
+				this.vipflag = false
+				this.cztime = ''
+			},
+			funListenDeviceMsgEvent: function(options) {
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
+						let loadPercent = options.data;
+						let loadText = '文件读取中'
+						// console.log("文件读取中", options.data)
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+						let ver_data = this.parseCustomData(options.data)
+						this.setMode = Math.floor(ver_data.setMode / 60)
+						this.bluetoothflag = false
+						console.log("1收到设备发来的自定义数据结果：", ver_data, this.setMode)
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+						if (options.result) {
+							let devicesarr = options.data
+							console.log(devicesarr, 'devicesarrdevicesarr')
+							devicesarr.forEach(device => {
+								const mac = device.name.substring(5)
+								// console.log(device.name,device.name(5,15), 'macmacmac')
+								if (device.name.slice(5, 17) == this.qrResult) {
+									this.deviceId = device.deviceId
+									this.name = device.name
+									this.mac = device.name.slice(5, 17)
+									// console.log(this.mac, this.deviceId, this.name, 'macmacmac')
+									// this.devicesList = uniqueDevicesList
+								}
+							})
+						}
+						break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
+						if (options.result) {
+							this.bluetoothflag = false
+							uni.hideLoading();
+							{
+								console.log("连接回调options.data.deviceId：" + options.data.deviceId,
+									"连接回调options.data.name：" + options.data.name)
+							}
+						} else {
+							this.shibaiflag = true
+							this.bluetoothflag = false
+							uni.hideLoading()
+						}
+
+						break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
+						if (!options.result) {
+							setTimeout(() => {
+								uni.hideLoading()
+								this.bluetoothflag = false
+							}, 3000)
+							console.log("蓝牙未开启", options)
+							this.shibaiflag = true
+							// uni.showToast({
+							// 	title: '蓝牙未开启',
+							// 	icon: 'none',
+							// 	duration: 3000
+							// });
+							return
+						} else {
+							// this.searching = true
+							//蓝牙搜索开始
+							// _this.setData({
+							// 	searching: true
+							// });
+						}
+
+						break;
+
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
+						if (options.result) {
+							let uniqueDevicesList = Array.from(new Set(this.devicesList))
+
+							// 将去重后的数组重新赋值给 this.devicesList
+							this.devicesList = uniqueDevicesList
+							let list = []
+							// filteredDevices.forEach(device => {
+							// 	// 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符）
+							// 	let macFromName = device.name.substring(device.name.length - 12)
+							// 	this.$u.get(`/app/device/${macFromName}/isBind`).then((res) => {
+							// 		if (res.data == false) {
+							// 			list.push(device)
+							// 		} else {
+
+							// 		}
+							// 	})
+
+							// });
+							setTimeout(() => {
+								this.devicesList = list
+							}, 200)
+
+							console.log('蓝牙停止搜索ok')
+						} else {
+							//蓝牙停止搜索失败
+							console.log('蓝牙停止搜索失败')
+						}
+						this.searching = false
+						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;
+
+		.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;
+		}
+
+		.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;
+						}
+
+						.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: 314rpx;
+				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/daili/index.vue b/pages/daili/index.vue
new file mode 100644
index 0000000..1b1d7e8
--- /dev/null
+++ b/pages/daili/index.vue
@@ -0,0 +1,2345 @@
+<template>
+	<view class="page">
+		<view class="title">
+			<image src="https://api.ccttiot.com/smartmeter/img/static/uyr6T0Vfkefty2blkDmU" mode=""
+				style="width: 52rpx;height: 52rpx;margin-right: 10rpx;vertical-align: bottom;vertical-align: bottom;"
+				@click="btnshouye"></image>
+			<text>代理设备列表</text>
+		</view>
+
+		<u-mask :show="showtip" @click="show = false" :z-index='1000' />
+
+		<view class="fd">
+			<!-- 刷新动画 -->
+			<view class="shuaxin" v-if="shuaxin">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uO9UFjzbzS9YlabzL4HV" mode=""></image>
+			</view>
+			
+			<view class="fd_top u-skeleton-fillet" style="display: flex;justify-content: space-between;align-items: center;">
+				<u-select v-model="pxshow" :list="pxlist" @confirm="pxconfirm"></u-select>
+				<view class="inpus">
+					<input type="text" placeholder="请输入搜索内容"/> <u-icon name="arrow-down" color="#000" size="28" style="margin-left: 30rpx;" @click="btnshanghu"></u-icon> 
+				</view>
+                <view class="seachsou">
+                	搜索
+                </view>
+				<view class="right">
+					<image style="width: 32rpx;height: 34rpx;margin-top: 10rpx;margin-left: 20rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uiZneL59hHNJ2EsOE557" mode="" @click="pxshow = true"></image>
+				</view>
+			</view>
+			<!-- 下拉展示名下商户 -->
+			<view class="mxshanghu" v-if="shanghuflag">
+				<view class="shanghu_item" v-for="(item,index) in shanghu" :key="index">
+					{{item.name}}
+				</view>
+			</view>
+			<view class="mxshanghuflag" v-if="shanghuflag"></view>
+			<u-mask :show="showfz" @click="showfz=false"></u-mask>
+
+			<view class="fz" v-show="showfz">
+				<view class="fz_top">
+					<view class="iconfont icon-shanchu" @click="showfz=false">
+
+					</view>
+					<view class="tit">
+						<!-- 店铺管理 -->
+					</view>
+					<view class="txt" @click="tosetpage()">
+						管理
+					</view>
+				</view>
+				<view class="card_cont">
+					<view class="cards" v-for="(item,index) in groupLists" :key="index">
+						<!-- //@click="changeGp(item)" groupLists -->
+						<view class="txt">
+							{{item.name}}
+						</view>
+						<view class="num">
+							{{item.deviceCount}}
+						</view>
+					</view>
+					<view class="zhanwei" style="width: 100%;height: 100rpx;">
+
+					</view>
+				</view>
+			</view>
+
+			<swiper class="swiper" style="height: 100%;" :current='curtitidx' @change="swiperchange"
+				@touchstart="touchStart" @touchend="touchEnd">
+				<swiper-item  class="">
+					<!-- <view class="" v-if="wateringList && wateringList.length == 0"
+						style="width: 100%;height: 200rpx;margin: auto;margin-top: 230rpx;text-align: center;">
+						<image style="width: 200rpx;height: 200rpx;"
+							src="https://api.ccttiot.com/smartmeter/img/static/uZFUpcz0YZZ4f4RjvGg2" mode=""></image>
+						<view class="" style="font-size: 28rpx;color: #808080;margin-top: 30rpx;"></view>
+					</view> -->
+					<view class="swiper_item">
+						<view class="card_box" v-for="(item,indexs) in wateringList" :key="indexs">
+							<view class="card">
+								<view class="card_left">
+									<view class="card_left_tit" @click="todetail(item.deviceId)">
+										{{item.deviceName}}
+									</view>
+									<view class="card_left_sta" @click="todetail(item.deviceId)">
+										网络:<view class="" style="width: 10rpx;"></view>
+										 <text v-if="item.wifi == null && !item.modelTags.some(tag => tag == 3) || item.wifi == '创特物联TP'" style="color: red;" @click.stop="btnwifi(item.mac)">未配网</text>
+										 <text v-else>
+											 <text v-if="item.onlineStatus == 0" style="color: red;">离线</text>
+											 <text v-else style="color: #00BA88;">在线</text>
+										 </text>
+										 <view class="" style="width: 20rpx;"></view>
+										状态:<view class="" style="width: 10rpx;"></view>
+										<view class="sta_txt" v-if="item.status==3">
+											维修中
+										</view>
+										<view class="sta_txt" v-if="item.status==2" style="color:red;">
+											使用中
+										</view>
+										<view class="sta_txt" v-if="item.status==1" style="color:#00BA88;">
+											空闲
+										</view>
+									</view>
+									<view class="card_left_no" :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
+										@click="todetail(item.deviceId)">
+										S/N码：{{item.deviceNo}}
+									</view>
+									<!-- @click="sremakes(item)" -->
+									<view  v-if="item.storeId == null" class="dianpu"
+										style="border: 1px solid #ccc;padding: 5rpx;font-size:26rpx: border-box;width: 180rpx;border-radius: 20rpx;color: #ccc;text-align: center;margin-top: 10rpx;">
+										未绑定商户
+									</view>
+									<view v-else :class="item.onlineStatus == 0 ? 'activewzgl' : ''"
+										style="color: #95989D;padding-top: 20rpx;font-size: 26rpx;"
+										@click="todetail(item.deviceId)">
+										归属商户：{{item.storeName == null ? '--' : item.storeName}}
+									</view>
+								</view>
+								<view class="card_right" @click="todetail(item.deviceId)">
+									<image v-if="item.customPicture" :src="item.customPicture" mode="aspectFit"
+										style="border-radius: 20rpx;"></image>
+									<image v-else :src="item.picture" mode="aspectFit"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<!-- 选择店铺 -->
+		<u-select v-model="showshop" :list="shoplist" @confirm="confirms"></u-select>
+
+		<image v-if="curtitidx == 0" class="saoyisao" @click="saoyisao"
+			src="https://api.ccttiot.com/smartmeter/img/static/uiDR6MnGHguBRNSYFTVw" mode=""></image>
+
+		<!-- <tab-bar :indexs='0'></tab-bar> -->
+
+		<view class="dd">
+			<u-select v-model="show" :list="list" title='添加方式' @confirm="confirm"></u-select>
+		</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=""></image>
+		</view>
+		
+		<!-- 蓝牙连接失败 -->
+		<view class="bluetoothbox" v-if="shibaiflag">
+			<image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uTb3vSlbcHdPMFQMBjyL" mode=""></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="btnwifis">
+					重新连接
+				</view>
+			</view>
+		</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>
+</template>
+
+<script>
+	var xBlufi = require("@/page_components/blufi/xBlufi.js")
+	import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas.vue'
+	import * as echarts from '@/components/uni-ec-canvas/echarts'
+	let chart = null
+	export default {
+		data() {
+			return {
+				shanghuflag:false,
+				shanghu:[
+					{
+						name:'商户1'
+					},{
+						name:'商户2'
+					},{
+						name:'商户3'
+					},{
+						name:'商户4'
+					},
+				],
+				pxshow: false,
+				pxlist: [
+					{
+						value: 'deviceName',
+						label: '按设备名称排序'
+					},
+					{
+						value: 'activationTime',
+						label: '按绑定时间排序'
+					},
+					{
+						value: 'onlineStatus',
+						label: '按在线状态排序'
+					}
+				],
+				
+				shuaxin: false,
+				showshop: false,
+				shoplist: [],
+				bgc: {
+					backgroundColor: "#8883f0",
+				},
+				ec: {
+					lazyLoad: true
+				},
+				deviceInfo: {},
+				loadings: false,
+				info: '',
+				tittxt: "商户中心",
+				titlist: '暂无店铺',
+				curtitidx: 0,
+				background: ['color1', 'color2', 'color3'],
+				indicatorDots: true,
+				autoplay: true,
+				interval: 2000,
+				duration: 500,
+				deviceList: [],
+				userType: '',
+				addflag: false,
+				sbflag: true,
+				show: false,
+				list: [{
+						value: '1',
+						label: '扫码添加'
+					},
+					{
+						value: '2',
+						label: '搜索附近设备添加'
+					}
+				],
+				qrResult: '',
+				showfz: false,
+				groupList: [],
+				groupLists: [],
+				total: '',
+				gps: {},
+				mac: '',
+				deviceId: '',
+				showtip: false,
+				orderinfo: [],
+				storeId: '',
+				pagenum: 1,
+				wateringList: [],
+				pagesize: 10,
+				isLoading: false,
+				noMoreData: false,
+				total: 0,
+				shujuflag: false,
+				id: '',
+
+				touchStartX: 0, // 触屏起始点x
+				touchStartY: 0, // 触屏起始点y  
+				
+				xiaflag:true,
+				isMch:false,
+				
+				bluetoothflag: false,
+				shibaiflag: false,
+				deviceInfo: {},
+				info: '',
+				checked: false,
+				focus: false,
+				timeday: '',
+				imglist: '',
+				userImgs: '',
+				imgflag: true,
+				devicesList: [],
+				setMode: null,
+				vipflag: false,
+				cztime: '',
+				opflag: true,
+				timer: null,
+				url: "",
+				deviceNo: '',
+				btnmsk:false,
+				pxzt:'onlineStatus',
+				qingqiuflag:true
+			}
+		},
+		onLoad() {
+          
+		},
+
+		onShow() {
+			// this.gettanc()
+			this.pagenum = 1
+			this.logins()
+			this.getlist()
+			// this.getgroup()
+			this.deviceId = uni.getStorageSync('deviceIds')
+			this.name = uni.getStorageSync('name')
+			let that = this
+			setTimeout(() => {
+				if (this.userType === '01') { // 注意 '01' 是一个字符串
+					if (uni.getStorageSync('mac')) {
+						this.mac = uni.getStorageSync('mac')
+						uni.getLocation({
+							type: 'wgs84',
+							success: function(lb) {
+								that.gps.lat = lb.latitude
+								that.gps.lon = lb.longitude
+								that.tobind()
+							},
+							fail: function(error) {
+								console.error('获取位置信息失败：', error)
+								that.gps.lat = 0
+								that.gps.lon = 0
+								that.tobind()
+							}
+						})
+					}
+				} else {
+					if (uni.getStorageSync('billNo')) {
+						let billNo = uni.getStorageSync('billNo')
+						this.$u.get(`/app/bill/recharge/${billNo}/bluetoothSuccess`).then((res) => {
+							if (res.code == 200) {
+								uni.removeStorageSync('billNo')
+								this.showtip = false
+								this.order()
+							}
+						})
+					}
+				}
+			}, 2000);
+		},
+		// 分享到好友（会话）
+		onShareAppMessage: function() {
+			return {
+				title: '创想物联',
+				path: '/pages/shouye/index'
+			}
+		},
+
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '创想物联',
+				query: '',
+				path: '/pages/shouye/index'
+			}
+		},
+		methods: {
+			btnshanghu(){
+				if(this.shanghuflag == true){
+					this.shanghuflag = false
+				}else{
+					this.shanghuflag = true
+				}
+			},
+			// 选择排序
+			pxconfirm(e){
+				this.pxzt = e[0].value
+				this.gettanc()
+				this.pagenum = 1
+				this.logins()
+				this.getgroup()
+			},
+			
+			funListenDeviceMsgEvent: function(options) {
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
+						let loadPercent = options.data;
+						let loadText = '文件读取中'
+						// console.log("文件读取中", options.data)
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+						let ver_data = this.parseCustomData(options.data)
+						this.setMode = Math.floor(ver_data.setMode / 60)
+						console.log("1收到设备发来的自定义数据结果：", ver_data, this.setMode)
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+						if (options.result) {
+							let devicesarr = options.data
+							// console.log(devicesarr,'devicesarrdevicesarr') 
+							devicesarr.forEach(device => {
+								const mac = device.name.substring(5)
+								if (device.name.slice(5, 17) == this.qrResult) {
+									this.deviceId = device.deviceId
+									this.name = device.name
+									this.mac = device.name.slice(5, 17)
+									// console.log(this.mac, 'macmacmac')
+									// this.devicesList = uniqueDevicesList
+								}
+							})
+						}
+						break;
+			
+					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
+						// console.log("连接回调：" + JSON.stringify(options))
+						if (options.result) {
+							this.bluetoothflag = false
+							uni.hideLoading();
+							// uni.showToast({
+							// 	title: '连接成功',
+							// 	icon: 'none'
+							// }); 
+							{
+								console.log("连接回调options.data.deviceId：" + options.data.deviceId,
+									"连接回调options.data.name：" + options.data.name)
+							}
+						} else {
+							this.shibaiflag = true
+							this.bluetoothflag = false
+							uni.hideLoading()
+							// uni.showToast({
+							// 	title: '设备离线或不在范围内',
+							// 	icon: 'none',
+							// 	duration: 2000
+							// })
+						}
+			
+						break;
+			
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
+						if (!options.result) {
+							setTimeout(() => {
+								uni.hideLoading()
+								this.bluetoothflag = false
+							}, 3000)
+							console.log("蓝牙未开启", options)
+							this.shibaiflag = true
+							// uni.showToast({
+							// 	title: '蓝牙未开启',
+							// 	icon: 'none',
+							// 	duration: 3000
+							// });
+							return
+						} else {
+							// this.searching = true
+							//蓝牙搜索开始
+							// _this.setData({
+							// 	searching: true
+							// });
+						}
+			
+						break;
+			
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
+						if (options.result) {
+							let uniqueDevicesList = Array.from(new Set(this.devicesList))
+			
+							// 将去重后的数组重新赋值给 this.devicesList
+							this.devicesList = uniqueDevicesList
+							let list = []
+			// 				filteredDevices.forEach(device => {
+			// 					// 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符）
+			// 					let macFromName = device.name.substring(device.name.length - 12)
+			// 					this.$u.get(`/app/device/${macFromName}/isBind`).then((res) => {
+			// 						if (res.data == false) {
+			// 							list.push(device)
+			// 						} else {
+			
+			// 						}
+			// 					})
+			
+			// 				});
+							setTimeout(() => {
+								this.devicesList = list
+							}, 200)
+			
+							console.log('蓝牙停止搜索ok')
+						} else {
+							//蓝牙停止搜索失败
+							console.log('蓝牙停止搜索失败')
+						}
+						this.searching = false
+						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;
+			},
+            btnlyqx() {
+            	this.shibaiflag = false
+            	this.bluetoothflag = false
+            },
+			// 未配网 进行配网
+			btnwifis(){
+				this.btnmsk = false
+				this.shibaiflag = false
+				this.bluetoothflag = true
+				// console.log(this.deviceId,'idididididdidii');
+				if (this.setMode == null) {
+					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)
+						}
+						let data = {
+							storeId: this.storeId,
+							mac: this.mac
+						}
+						this.$u.put('/app/device/bind', data).then((res) => {
+							if (res.code == 200) {
+								uni.hideLoading();
+								this.shibaiflag = false
+								this.bluetoothflag = false
+								uni.removeStorageSync('mac');
+								let systemInfo = uni.getSystemInfoSync()
+								if (systemInfo.platform == 'android') {
+									// 当前设备是 Android  
+									uni.navigateTo({
+										url: '/page_components/wifilist/index?deviceId=' + this
+											.deviceId + '&name=' + this.name
+									})
+								} else if (systemInfo.platform == 'ios') {
+									// 当前设备是 iOS  
+									uni.navigateTo({
+										url: '/page_fenbao/device/wifivideo?deviceId=' + this
+											.deviceId + '&name=' + this.name
+									})
+								}
+							} else if (res.msg == '设备编号和mac不能同时为空') {
+								this.shibaiflag = true
+								this.bluetoothflag = false
+							}
+						})
+					}, 1000)
+				} else {
+					let name = ''
+					let index = this.name.indexOf('-')
+					if (index !== -1) {
+						name = this.name.slice(index + 1)
+					}
+					let data = {
+						storeId: this.storeId,
+						mac: this.mac
+					}
+					this.$u.put('/app/device/bind', data).then((res) => {
+						if (res.code == 200) {
+							// uni.showToast({
+							// 	title: '绑定成功',
+							// 	icon: 'none',
+							// 	duration: 2000
+							// })
+							this.shibaiflag = false
+							this.bluetoothflag = false
+							uni.hideLoading()
+							uni.removeStorageSync('mac');
+							let systemInfo = uni.getSystemInfoSync()
+							if (systemInfo.platform == 'android') {
+								// 当前设备是 Android  
+								uni.navigateTo({
+									url: '/page_components/wifilist/index?deviceId=' + this.deviceId +
+										'&name=' + this.name
+								})
+							} else if (systemInfo.platform == 'ios') {
+								// 当前设备是 iOS  
+								uni.navigateTo({
+									url: '/page_fenbao/device/wifivideo?deviceId=' + this.deviceId +
+										'&name=' + this.name
+								})
+							}
+						} else {
+							if (res.msg == '设备编号和mac不能同时为空') {
+								this.shibaiflag = true
+								this.bluetoothflag = false
+								uni.hideLoading()
+								// uni.showToast({
+								// 	title: '连接失败',
+								// 	icon: 'none',
+								// 	duration: 2000
+								// })
+							} else {
+								this.shibaiflag = true
+								this.bluetoothflag = false
+								uni.hideLoading()
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								})
+								// uni.navigateBack()
+							}
+						}
+					})
+				}
+			},
+			
+			btnwifi(mac){
+				this.qrResult = mac
+				this.btnmsk = false
+				this.shibaiflag = false
+				this.bluetoothflag = true
+				// console.log(this.deviceId,'idididididdidii');
+				if (this.setMode == null) {
+					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)
+						}
+						let data = {
+							storeId: this.storeId,
+							mac: this.mac
+						}
+						this.$u.put('/app/device/bind', data).then((res) => {
+							if (res.code == 200) {
+								uni.hideLoading();
+								this.shibaiflag = false
+								this.bluetoothflag = false
+								uni.removeStorageSync('mac');
+								let systemInfo = uni.getSystemInfoSync()
+								if (systemInfo.platform == 'android') {
+									// 当前设备是 Android  
+									uni.navigateTo({
+										url: '/page_components/wifilist/index?deviceId=' + this
+											.deviceId + '&name=' + this.name
+									})
+								} else if (systemInfo.platform == 'ios') {
+									// 当前设备是 iOS  
+									uni.navigateTo({
+										url: '/page_fenbao/device/wifivideo?deviceId=' + this
+											.deviceId + '&name=' + this.name
+									})
+								}
+							} else if (res.msg == '设备编号和mac不能同时为空') {
+								this.shibaiflag = true
+								this.bluetoothflag = false
+							}
+						})
+					}, 1000)
+				} else {
+					let name = ''
+					let index = this.name.indexOf('-')
+					if (index !== -1) {
+						name = this.name.slice(index + 1)
+					}
+					let data = {
+						storeId: this.storeId,
+						mac: this.mac
+					}
+					this.$u.put('/app/device/bind', data).then((res) => {
+						if (res.code == 200) {
+							// uni.showToast({
+							// 	title: '绑定成功',
+							// 	icon: 'none',
+							// 	duration: 2000
+							// })
+							this.shibaiflag = false
+							this.bluetoothflag = false
+							uni.hideLoading();
+							uni.removeStorageSync('mac');
+							let systemInfo = uni.getSystemInfoSync()
+							if (systemInfo.platform == 'android') {
+								// 当前设备是 Android  
+								uni.navigateTo({
+									url: '/page_components/wifilist/index?deviceId=' + this.deviceId +'&name=' + this.name
+								})
+							} else if (systemInfo.platform == 'ios') {
+								// 当前设备是 iOS  
+								uni.navigateTo({
+									url: '/page_fenbao/device/wifivideo?deviceId=' + this.deviceId +'&name=' + this.name
+								})
+							}
+						} else {
+							if (res.msg == '设备编号和mac不能同时为空') {
+								this.shibaiflag = true
+								this.bluetoothflag = false
+								uni.hideLoading()
+								// uni.showToast({
+								// 	title: '连接失败',
+								// 	icon: 'none',
+								// 	duration: 2000
+								// })
+							} else {
+								this.shibaiflag = true
+								this.bluetoothflag = false
+								uni.hideLoading()
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								})
+								// uni.navigateBack()
+							}
+						}
+					})
+				}
+			},
+			
+			
+			
+			// 按下
+			touchStart(e) {
+				this.touchStartX = e.touches[0].clientX;
+				this.touchStartY = e.touches[0].clientY;
+			},
+			// 松开
+			touchEnd(e) {
+				let deltaX = e.changedTouches[0].clientX - this.touchStartX;
+				let deltaY = e.changedTouches[0].clientY - this.touchStartY;
+				if (Math.abs(deltaX) > 50 && Math.abs(deltaX) > Math.abs(deltaY)) {
+					if (deltaX >= 0) {
+						// console.log("左滑")  
+					} else {
+						// console.log("右滑")  
+					}
+				} else if (Math.abs(deltaY) > 50 && Math.abs(deltaX) < Math.abs(deltaY)) {
+					if (deltaY < 100) {
+						console.log("上滑")  
+						if(this.qingqiuflag == true){
+							let sum = this.total / this.pagesize
+							console.log(this.wateringList.length,this.total);
+							if (this.wateringList.length  < this.total) {
+								this.qingqiuflag = false
+								this.getlist() 
+							}
+						}
+					} else {
+						console.log(deltaY)
+						if (deltaY > 250) {
+							if(this.xiaflag){
+								this.xiaflag = false
+								this.shuaxin = true
+								this.pagenum = 1
+								setTimeout(() => {
+									this.getlist()
+								}, 1000)
+							}
+						}
+					}
+				}
+			},
+
+
+			// 扫一扫绑定设备
+			saoyisao() {
+				uni.scanCode({
+					onlyFromCamera: true,
+					scanType: ['qrCode'],
+					success: res => {
+						function getQueryParam(url, paramName) {
+							let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+							let results = regex.exec(url);
+							return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
+						}
+						let sceneValue = res.result
+						let decodedValue = decodeURIComponent(sceneValue)
+						let id = getQueryParam(decodedValue, 's')
+						// console.log(res, id)
+						let that = this
+						let data = {
+							deviceNo: id
+						}
+						that.$u.get(`/app/device/isBind?deviceNo=${id}`).then(res => {
+							if (res.data == 2) {
+								that.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
+									if (res.code == 200) {
+										uni.navigateTo({
+											url: '/page_components/fuwu/index?id=' + id
+										})
+									}
+								})
+							} else if (res.data == 1) {
+								uni.showModal({
+									title: '提示',
+									content: '该设备未绑定,你需进行绑定吗？',
+									success: function(res) {
+										if (res.confirm) {
+											that.$u.put("/app/device/bind", data).then(
+												res => {
+													if (res.code == 200) {
+														that.$u.get(`/app/device/${id}/bySn`).then((res) => {
+															if (res.code == 200) {
+																uni.navigateTo({
+																	url: '/pages/daili/devicexq?id=' + res.data.deviceId
+																})
+															}
+														})
+													}
+												})
+										} else if (res.cancel) {
+
+										}
+									}
+								})
+							} else if (res.data == 0) {
+								uni.showModal({
+									title: '提示',
+									content: '该设备未录入,你需进行录入吗？',
+									success: function(res) {
+										if (res.confirm) {
+											uni.navigateTo({
+												url: '/page_fenbao/zhuce?sn=' + id
+											})
+										} else if (res.cancel) {
+
+										}
+									}
+								})
+							}
+						})
+					},
+					fail: err => {
+						console.error('扫描失败：', err)
+						uni.showToast({
+							title: '扫描失败',
+							icon: 'none'
+						})
+					}
+				})
+			},
+
+			// 获取店铺
+			sremakes(item) {
+                if(this.shoplist.length == 0){
+                     uni.showModal({
+                     	title: '提示',
+                     	content: '未创建店铺，是否去创建店铺？',
+                     	success: function(res) {
+                     		if (res.confirm) {
+                     			uni.navigateTo({
+                     				url:'/page_fenbao/statulist/myshop/shopxx/index'
+                     			})
+                     		} else if (res.cancel) {
+                     			
+                     		}
+                     	}
+                     })
+				}else{
+					this.id = item.deviceId
+					this.showshop = true
+				}
+			},
+			gettanc() {
+				this.$u.get('/app/store/listCount').then((res) => {
+					if (res.code == 200) {
+						this.total = res.total
+						if (res.data.length > 0) {
+							// 有数据，追加到列表  
+							let arr = res.data.map(row => ({
+								value: row.storeId, // 将storeId赋值给value  
+								label: row.name // 将name赋值给label  
+							}))
+							this.shoplist = arr
+							this.shoplist = this.shoplist.slice(1)
+						}
+					}
+				})
+			},
+			confirms(e) {
+				this.pagenum = 1
+				let data = {
+					deviceId: this.id,
+					storeId: e[0].value
+				}
+				this.putdevice(data)
+			},
+			putdevice(data) {
+				this.$u.put('/app/device', data).then((res) => {
+					if (res.code == 200) {
+						this.getlist()
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						});
+
+					}
+				})
+			},
+			tocz() {
+				this.showtip = false
+				uni.navigateTo({
+					url: '/page_fenbao/device/czDevice?orderinfo=' + JSON.stringify(this.orderinfo)
+				})
+			},
+			checkModelTags(modelTags) {
+				return modelTags && modelTags.some(tag => tag === 2);
+			},
+			order() {
+				this.$u.get("/app/bill/recharge/device/fail/list").then((res) => {
+					if (res.data.length != 0) {
+						this.showtip = true
+						this.orderinfo = res.data[0]
+					} else {
+						this.orderinfo = null
+					}
+				})
+			},
+			towifi(mac) {
+				uni.navigateTo({
+					url: '/page_fenbao/device/wifiDevice?mac=' + mac
+				})
+			},
+			tobind() {
+				this.$u.put(`/app/device/bind/${this.mac}`, this.gps).then((res) => {
+					if (res.code === 200) {
+
+						let systemInfo = uni.getSystemInfoSync();
+						if (systemInfo.platform === 'android') {
+							// 当前设备是 Android  
+						} else if (systemInfo.platform === 'ios') {
+							// console.log('aaaaaaaaaaaa');
+							uni.navigateTo({
+								url: '/page_components/wifilist/index?deviceId=' + this.deviceId +
+									'&name=' + this.name
+							})
+						}
+						uni.showToast({
+							title: '绑定成功',
+							icon: 'none',
+							duration: 2000
+						});
+						uni.removeStorageSync('mac')
+						uni.removeStorageSync('deviceIds')
+						uni.removeStorageSync('name')
+						this.getDeviceList()
+					} else {
+						// 处理失败情况
+					}
+				});
+			},
+			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) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						setTimeout(() => {
+							this.getdevice()
+						}, 2000)
+						// this.initChart()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				}) 
+			},
+			getgroup() {
+				this.$u.get("/app/store/listCount").then((res) => {
+					if (res.data != 0) {
+						this.groupList = []
+						this.groupLists = res.data
+						this.groupList = res.data.filter(item => {
+							return item.name === '全部'
+						})
+						// console.log(this.groupLists,'第一')
+						this.storeId = this.groupList[0].storeId
+						this.getlist()
+					}
+				})
+			},
+			getlist() {
+				this.shujuflag = false
+				// if (this.storeId == null) {
+					this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}&orderByColumn=${this.pxzt}&isAsc=desc`).then((res) => {
+						if (res.code == 200) {
+							this.xiaflag = true
+							this.shuaxin = false
+							this.total = res.total
+							if (res.rows.length > 0) {
+								// 有数据，追加到列表  
+								this.shujuflag = false
+							} else {
+								// 没有更多数据  
+								this.shujuflag = true
+							}
+							if (this.pagenum > 1) {
+								this.pagenum++
+								// this.wateringList = []
+								this.wateringList = this.wateringList.concat(res.rows)
+								this.shujuflag = false
+								this.qingqiuflag = true
+                                // console.log(this.wateringList);
+								// this.groupLists.forEach(groupItem => {
+								//     groupItem.wateringList 
+								// })
+								// this.wateringList.forEach(wateringItem => {  
+								//     this.groupLists[0].wateringList.push(wateringItem)
+								// })
+								// this.wateringList.forEach(wateringItem => {  
+								//     this.groupLists.forEach(groupItem => {  
+								//         if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId == wateringItem.storeId) {  
+								//             if (!groupItem.wateringList.some(item => item.storeId === wateringItem.storeId)) {  
+								//                 groupItem.wateringList.push(wateringItem)
+								//             }  
+								//         }  
+								//     })  
+								// })
+								uni.hideLoading()
+							} else {
+								this.pagenum++
+								this.wateringList = res.rows  
+								this.qingqiuflag = true
+								// console.log(this.wateringList,'000')
+								// this.groupLists.forEach(groupItem => {  
+								//     groupItem.wateringList = []
+								// })
+								// this.wateringList.forEach(wateringItem => {  
+								//     this.groupLists[0].wateringList.push(wateringItem);  
+								// })
+								// this.wateringList.forEach(wateringItem => {  
+								//     this.groupLists.forEach(groupItem => {  
+								//        if (groupItem.storeId !== null && wateringItem.storeId !== null && groupItem.storeId == wateringItem.storeId) {  
+								//            groupItem.wateringList.push(wateringItem)
+								//        }
+								//     })
+								// })   
+								// console.log(this.groupLists)
+								uni.hideLoading()
+							} 
+							this.isLoading = false
+						} else {
+							this.shuaxin = false
+							this.xiaflag = true
+							uni.hideLoading()
+						}
+					})
+			},
+			changeGp(item, index) {
+				// console.log(item); 
+				this.pagenum = 1
+				this.showfz = false
+				if (item == 1) {
+					this.getDeviceList()
+				} else {
+					if (item.storeId == null) {
+						this.pagenum = 1
+						// this.wateringList = []
+						this.$u.get(`/app/device/list?pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
+							if (res.code == 200) {
+								this.total = res.total
+								if (res.rows.length > 0) {
+									// 有数据，追加到列表  
+									// this.wateringList = this.wateringList.concat(res.rows)
+									// this.pagenum++
+									this.shujuflag = false
+									uni.hideLoading()
+								} else {
+									// 没有更多数据  
+									this.shujuflag = true
+									uni.hideLoading()
+								}
+								if (this.pagenum > 1) {
+									this.wateringList = this.wateringList.concat(res.rows)
+									this.shujuflag = false
+								} else {
+									this.wateringList = res.rows
+								}
+								this.pagenum++
+								this.isLoading = false
+							}
+						})
+					} else {
+						this.pagenum = 1
+						// this.wateringList = []
+						this.$u.get(`/app/device/list?storeId=${item.storeId}&pageNum=${this.pagenum}&pageSize=${this.pagesize}`).then((res) => {
+							if (res.code == 200) {
+								this.total = res.total
+								// if(this.pagenum > 1){
+								// 	this.wateringList = this.wateringList.concat(res.rows)
+								// }else{
+								// 	this.wateringList = res.rows
+								// }
+								if (res.rows.length > 0) {
+									// 有数据，追加到列表  
+									// this.wateringList = this.wateringList.concat(res.rows)
+									// this.pagenum++
+									this.shujuflag = false
+									uni.hideLoading()
+								} else {
+									// 没有更多数据  
+									this.shujuflag = true
+									uni.hideLoading()
+								}
+								if (this.pagenum > 1) {
+									this.wateringList = this.wateringList.concat(res.rows)
+									this.shujuflag = false
+								} else {
+									this.wateringList = res.rows
+								}
+								this.pagenum++
+								this.isLoading = false
+							}
+						})
+					}
+				}
+			},
+			tosetpage() {
+				this.showfz = false
+				uni.navigateTo({
+					url: '/page_user/fenzu'
+				})
+			},
+			// 点击更换用户模式
+			confirm(e) {
+				let type = e[0].value
+				if (type == '1') {
+					this.scanQRCode()
+				} else if (type == '2') {
+					uni.navigateTo({
+						url: '/page_fenbao/device/index'
+					})
+				}
+				// console.log(e);
+				// this.mode = e[0].label
+				// this.gettype()
+			},
+			logins() {
+				if (uni.getStorageSync('userType')) {
+					this.userType = uni.getStorageSync('userType')
+					this.userType = '01'
+					if (this.userType == '01') {
+						// this.getDeviceList()
+					} else if (this.userType == '00') {
+						this.getdevice()
+					}
+				} else {
+
+				}
+				this.getuserinfo()
+			},
+			// 点击搜索附近设备进行跳转
+			btnserch() {
+				uni.navigateTo({
+					url: '/page_fenbao/device/index'
+				})
+			},
+			async initChart() {
+				let value = 100;
+				let value2 = this.deviceInfo.surplusElectriQuantity
+				const option = {
+					// backgroundColor:"#061740",
+					title: {
+						show: false,
+						text: `历史请求满意度`, // 图表标题
+						x: 'center',
+						y: '20',
+						textStyle: {
+							color: '#333', //'#fff',
+							fontSize: 20,
+						},
+					},
+					series: [{
+							type: 'pie', // 饼图类型
+							radius: ['98%', '70%'], // 饼图半径，第一个值是内半径，第二个值是外半径
+							silent: true,
+							clockwise: true,
+							startAngle: 90, // 起始角度
+							z: 0,
+							zlevel: 0,
+							data: [{
+									value: value,
+									name: '占比', // 数据项名称
+									itemStyle: {
+										normal: {
+											color: '#8883F0', // 数据项颜色
+										},
+									},
+									label: {
+										normal: {
+											position: 'center',
+											formatter: ` {a|${value2}}\n\n{b|剩余电量}`, // 标签内容格式
+											rich: {
+												a: {
+													fontSize: 15,
+													fontWeight: '700',
+													color: '#333',
+												},
+												b: {
+													fontSize: 11,
+													color: '#888',
+												},
+											},
+										},
+									},
+								},
+								{
+									value: 100 - value,
+									name: '',
+									label: {
+										normal: {
+											show: false,
+										},
+									},
+									itemStyle: {
+										normal: {
+											color: '#173164',
+										},
+									},
+								},
+							],
+						},
+						{
+							type: 'gauge', // 仪表盘类型
+							radius: '130%', // 仪表盘半径，占图表容器的百分比
+							center: ['50%', '50%'], // 仪表盘中心位置
+							startAngle: 359,
+							endAngle: 359.9,
+							splitNumber: 2, // 刻度分割段数
+							hoverAnimation: true,
+							axisTick: {
+								show: true, // 是否显示刻度线
+								length: 10, // 刻度线长度
+								lineStyle: {
+									color: 'auto',
+									width: 1,
+								},
+							},
+							splitLine: {
+								length: 0, // 刻度线分隔线长度
+								lineStyle: {
+									width: 1,
+									color: '#061740',
+								},
+							},
+							axisLabel: {
+								show: false, // 是否显示刻度标签
+							},
+							pointer: {
+								show: false, // 是否显示指针
+							},
+							axisLine: {
+								lineStyle: {
+									opacity: 0,
+								},
+							},
+							detail: {
+								show: false, // 是否显示仪表盘详情
+							},
+							data: [{
+								value: 0,
+								name: '',
+							}, ],
+						},
+					],
+				};
+				const chart = await this.$refs.chart.init(echarts)
+				chart.setOption(option)
+				return chart
+			},
+			// 获取设备详情
+			getDevice() {
+				this.$u.get("app/device/1").then((res) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						this.deviceInfo = res.data
+						this.loadings = true
+					}
+				})
+			},
+			getuserinfo() {
+				this.$u.get("/app/user/userInfo").then((res) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						// uni.setStorageSync('userType', res.data.userType)
+						this.userType = res.data.userType
+						this.isMch = res.data.isMch
+						if (this.userType == '01') {
+							this.getDeviceList()
+						} else if (this.userType == '00') {
+							this.getdevice()
+						}
+					} else {
+						this.jmlogin()
+					}
+				})
+			},
+			jmlogin() {
+				let taht = this
+				wx.login({
+					success(res) {
+						if (res.code) {
+							let data = {
+								loginCode: res.code,
+							}
+							taht.$u.post('/app/auth/wxLogin', data).then(res => {
+								if (res.code == 10003) {
+									uni.navigateTo({
+										url: '/pages/login/login'
+									})
+								} else if (res.code == 200) {
+									uni.setStorageSync('token', res.token)
+									taht.logins()
+								}
+							})
+						}
+					},
+				})
+			},
+			getDeviceList() {
+				this.$u.get("/app/device/list").then((res) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						this.deviceList = res.rows.filter(row => row.isDefault === true)
+						// console.log(this.deviceList)
+						this.total = res.total
+						if (this.deviceList == '') {
+							this.addflag = true
+							this.sbflag = false
+						} else {
+							this.addflag = false
+							this.sbflag = true
+						}
+					}
+				})
+			},
+			swiperchange(e) {
+				this.shuaxin = false
+				this.pagenum = 1
+				this.curtitidx = e.detail.current
+				this.storeId = this.groupLists[this.curtitidx].storeId
+			},
+
+			getdevice() {
+				this.$u.get("/app/device/tenant").then((res) => {
+					this.deviceInfo = res.rows.find(item => item.isDefault === true)
+					if (this.deviceInfo == undefined) {
+						this.addflag = true
+						this.sbflag = false
+					} else {
+						this.addflag = false
+						this.sbflag = true
+					}
+					uni.setStorageSync('deviceId', this.deviceInfo.deviceId)
+					// this.initChart()
+					this.order()
+				})
+			},
+			changeidx(index) {
+				this.pagenum = 1
+				this.curtitidx = index
+			},
+			// 点击导航栏回到我的
+			btnshouye() {
+				uni.reLaunch({
+					url: '/pages/my'
+				})
+			},
+
+			toydfx() {
+				uni.navigateTo({
+					url: "/page_components/eletj"
+				})
+			},
+			todetail(id) {
+				uni.navigateTo({
+					url:'/pages/daili/devicexq?id=' + id
+				})
+			},
+			// 跳转到抄表
+			tochaobiao() {
+				uni.navigateTo({
+					url: '/page_user/cbRecord'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	@keyframes slideDown {  
+	  from {  
+	    transform: translateY(-100%);  
+	    opacity: 0;  
+	  }  
+	  to {  
+	    transform: translateY(0);  
+	    // opacity: 1;  
+	  }  
+	}
+	.mxshanghu{
+		width: 490rpx;
+		max-height: 100vh;
+		padding-bottom: 20rpx;
+		background-color: #fff;
+		border-radius: 20rpx;	
+		position: fixed;
+		top: 320rpx;
+		left: 40rpx;
+		z-index: 999;
+		padding-top: 20rpx;
+		padding-left: 30rpx;
+		box-sizing: border-box;
+		animation: slideDown .5s ease-out forwards;
+		opacity: 1 !important;
+		.shanghu_item{
+			margin-top: 20rpx;
+		}
+	}
+	.mxshanghuflag{
+		width: 100%;
+		height: 90vh;
+		background-color: #000;
+		opacity: .5 !important;
+		border-radius: 20rpx;	
+		position: fixed;
+		top: 320rpx;
+		left:0;
+		z-index: 998;
+		animation: slideDown .5s ease-out forwards;
+	}
+	.inpus{
+		display: flex;
+		align-items: center;
+		border: 1px solid #000;
+		border-radius: 10rpx;
+		padding-right: 20rpx;
+		box-sizing: border-box;
+		input{
+			width: 400rpx;
+			height: 60rpx;
+			padding-left: 30rpx;
+			box-sizing: border-box;
+		}
+	}
+	.seachsou{
+		width: 120rpx;
+		height: 60rpx;
+		border-radius: 10rpx;
+		line-height: 60rpx;
+		text-align: center;
+		background-color: #8883F0;
+		color: #fff;
+	}
+	.shuaxin {
+		width: 100%;
+		height: 110rpx;
+		z-index: 99;
+		// animation: fadeIn 1s forwards;
+		text-align: center;
+
+		image {
+			width: 80rpx;
+			height: 80rpx;
+			// transform: translateX(-50%);
+			// animation: spin 1s linear infinite;
+		}
+
+		view {
+			// width: 100%;
+			height: 80rpx;
+			font-size: 30rpx;
+		}
+	}
+
+	@keyframes spin {
+		from {
+			transform: rotate(360deg);
+		}
+
+		to {
+			transform: rotate(0deg);
+		}
+	}
+
+	@keyframes fadeIn {
+		from {
+			opacity: 0.4;
+		}
+
+		to {
+			opacity: 1;
+		}
+	}
+
+	.saoyisao {
+		width: 90rpx;
+		height: 90rpx;
+		position: fixed;
+		bottom: 240rpx;
+		right: 60rpx;
+		z-index: 99;
+	}
+
+	.title {
+		padding-left: 32rpx;
+		font-size: 40rpx;
+		color: #fff;
+		margin-bottom: 30rpx;
+		padding-top: 100rpx;
+		height: 200rpx;
+		background-color: #8883F0;
+
+		text {
+			padding-left: 20%;
+		}
+	}
+    .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;
+    	}
+    }
+	page {
+		background-color: #F7FAFE;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+
+	.activewzgl {
+		color: #ccc !important;
+	}
+
+	.page {
+		height: 100%;
+		// padding-bottom: 200rpx;
+		overflow: hidden;
+
+		.tip_box {
+			position: fixed;
+			left: 72rpx;
+			top: 788rpx;
+			width: 610rpx;
+			background: #F7FAFE;
+			border-radius: 30rpx 30rpx 30rpx 30rpx;
+			z-index: 10000000;
+
+			.top {
+				padding: 52rpx 38rpx 42rpx 36rpx;
+
+				.txt {
+					width: 100%;
+					text-align: center;
+					font-weight: 500;
+					font-size: 32rpx;
+					color: #3D3D3D;
+				}
+			}
+
+			.bot {
+				border-top: 2rpx solid #D8D8D8;
+				display: flex;
+				flex-wrap: nowrap;
+				height: 100%;
+
+				.bot_left {
+					width: 50%;
+					height: 98rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-weight: 500;
+					font-size: 36rpx;
+					color: #3D3D3D;
+				}
+
+				.bot_right {
+					width: 50%;
+					height: 98rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border-left: 2rpx solid #D8D8D8;
+					font-weight: 500;
+					font-size: 36rpx;
+					color: #4C97E7;
+
+				}
+
+			}
+		}
+
+		.noDevice {
+			margin-top: 432rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-wrap: wrap;
+
+			.img_box {
+				width: 100%;
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: center;
+
+				image {
+					width: 252rpx;
+					height: 252rpx;
+				}
+
+				.tps {
+					margin-top: 4rpx;
+					width: 100%;
+					text-align: center;
+					font-weight: 700;
+					font-size: 32rpx;
+					color: #BDBCBC;
+				}
+			}
+
+			.addbutn {
+				margin-top: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 266rpx;
+				height: 96rpx;
+				background: #8883F0;
+				border-radius: 16rpx;
+				font-weight: 500;
+				font-size: 36rpx;
+				color: #FFFFFF;
+			}
+
+			.tip {
+				margin-top: 30rpx;
+				width: 100%;
+				text-align: center;
+				font-weight: 400;
+				font-size: 40rpx;
+				color: #BDBCBC;
+			}
+		}
+
+		.zhuhu {
+			margin-top: 20rpx;
+			padding: 0 40rpx;
+
+			.card1 {
+				padding: 34rpx 0 0 40rpx;
+				width: 670rpx;
+				height: 583rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 14rpx 35rpx 0rpx rgba(53, 140, 255, 0.1);
+				border-radius: 28rpx 28rpx 28rpx 28rpx;
+
+				.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;
+
+						.imgs {
+							width: 94rpx;
+							height: 94rpx;
+							vertical-align: bottom;
+						}
+
+						.img1 {
+							width: 76rpx;
+							height: 76rpx;
+						}
+					}
+				}
+
+				.mid {
+					margin-top: 54rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-content: flex-start;
+
+					.mid_left {
+						image {
+							width: 37rpx;
+							height: 98rpx;
+						}
+					}
+
+					.mid_right {
+						margin-left: 40rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.mid_top {
+							width: 100%;
+							font-size: 42rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+
+						.mid_bot {
+							display: flex;
+							flex-wrap: nowrap;
+							align-items: center;
+
+							.txt {
+								font-size: 26rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #95989D;
+							}
+
+							.tip {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								margin-left: 19rpx;
+								width: 38rpx;
+								height: 23rpx;
+								background: rgba(204, 204, 204, 0);
+								opacity: 1;
+								border: 2rpx solid #8883F0;
+								border-radius: 40rpx;
+								font-size: 14rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #8883F0;
+							}
+						}
+					}
+				}
+
+				.bot {
+					margin-top: 83rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+
+					.bot_left {
+						width: 210rpx;
+						height: 190.14rpx;
+						margin-right: 34rpx;
+
+						.echarts {
+							width: 210rpx;
+							height: 190.14rpx;
+						}
+					}
+
+					.bot_right {
+						display: flex;
+						flex-wrap: nowrap;
+
+						.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;
+							}
+						}
+					}
+				}
+			}
+
+			.card2 {
+				padding-top: 40rpx;
+				margin-top: 24rpx;
+				width: 670rpx;
+				height: 254rpx;
+				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: #8883F0;
+				}
+
+				.cont_box {
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-around;
+					text-align: center;
+
+					.cont {
+						width: 110rpx;
+						display: flex;
+						flex-wrap: wrap;
+						align-items: center;
+						justify-content: center;
+
+						.top {
+							font-size: 32rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+							width: 110rpx;
+						}
+
+						.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: 318rpx;
+				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: #8883F0;
+				}
+
+				.cont_box {
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					padding-left: 50rpx;
+					box-sizing: border-box;
+
+					.cont {
+						width: 100rpx;
+						display: flex;
+						flex-wrap: wrap;
+						align-items: center;
+						justify-content: center;
+						margin-right: 40rpx;
+
+						.top {
+							image {
+								width: 56rpx;
+								height: 56rpx;
+							}
+						}
+
+						.bot {
+							margin-top: 28rpx;
+							font-size: 28rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #808080;
+						}
+					}
+				}
+			}
+
+			.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;
+			}
+		}
+
+		@keyframes fadeIn {
+			from {
+				opacity: 0;
+			}
+
+			to {
+				opacity: 1;
+			}
+		}
+
+		.fd {
+			margin-top: 20rpx;
+			padding: 0 40rpx;
+			padding-bottom: 200rpx;
+			height: 100%;
+
+			.fz {
+				margin: 0 -40rpx;
+				position: fixed;
+				bottom: 0;
+				width: 750rpx;
+				height: 830rpx;
+				background: #F7FAFE;
+				border-radius: 30rpx 30rpx 0 0;
+				z-index: 10071;
+				opacity: 0;
+				animation-name: fadeIn;
+				animation-duration: 1s;
+				animation-fill-mode: forwards;
+
+				.fz_top {
+					margin: 18rpx 0 auto;
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-between;
+
+					.icon-shanchu {
+						margin-left: 40rpx;
+						font-size: 50rpx;
+					}
+
+					.tit {
+						font-size: 36rpx;
+						font-family: Source Han Sans, Source Han Sans;
+						font-weight: 400;
+						color: #000000;
+					}
+
+					.txt {
+						margin-right: 40rpx;
+						font-size: 36rpx;
+						font-family: Source Han Sans, Source Han Sans;
+						font-weight: 400;
+						color: #2A82E4;
+
+					}
+				}
+
+				.card_cont {
+					width: 750rpx;
+					padding-left: 30rpx;
+					height: 100%;
+					overflow-y: auto;
+					overflow-x: hidden;
+
+					.cards {
+						margin-top: 32rpx;
+						display: flex;
+						flex-wrap: nowrap;
+						align-items: center;
+						justify-content: space-between;
+						padding: 0 40rpx;
+						width: 682rpx;
+						border-radius: 30rpx;
+						height: 114rpx;
+						background: #FFFFFF;
+						box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+
+						.txt {
+							font-size: 36rpx;
+							font-family: Source Han Sans, Source Han Sans;
+							font-weight: 400;
+							color: #000000;
+						}
+
+						.num {
+							font-size: 36rpx;
+							font-family: Source Han Sans, Source Han Sans;
+							font-weight: 400;
+							color: #000000;
+						}
+					}
+				}
+			}
+
+			// .fd_top {
+			// 	display: flex;
+			// 	flex-wrap: nowrap;
+			// 	align-items: center;
+
+			// 	.fd_da {
+			// 		width: 600rpx;
+			// 		overflow: hidden;
+			// 		overflow-x: auto;
+			// 		white-space: nowrap;
+			// 		-ms-overflow-style: none;
+			// 		/* 去除IE和Edge的默认滚动条 */
+			// 		scrollbar-width: none;
+
+			// 		/* 去除Firefox的默认滚动条 */
+			// 		&::-webkit-scrollbar {
+			// 			display: none;
+			// 		}
+
+			// 		.fd_lt {
+			// 			display: flex;
+			// 			transition: transform 0.3s ease;
+			// 			padding-top: 10rpx;
+
+			// 			.fd_tit {
+			// 				text-align: center;
+			// 				padding: 0 15rpx;
+			// 				box-sizing: border-box;
+			// 				font-size: 34rpx;
+			// 				font-weight: 400;
+			// 				color: #666;
+
+			// 			}
+			// 		}
+			// 	}
+
+			// 	.act1 {
+			// 		font-size: 36rpx !important;
+			// 		font-weight: 700 !important;
+			// 		color: #000000 !important;
+			// 	}
+
+
+
+
+			// 	.right {
+			// 		margin-left: auto;
+			// 		display: flex;
+			// 		flex-wrap: nowrap;
+			// 		align-items: center;
+
+			// 		.fd_set {
+			// 			font-size: 60rpx;
+			// 		}
+
+			// 		.icon-liebiao {
+			// 			margin-top: 10rpx;
+			// 			margin-left: 20rpx;
+			// 			font-size: 40rpx;
+			// 		}
+			// 	}
+
+			// }
+
+			.shebei {
+				width: 750rpx;
+				height: 100vh;
+				position: fixed;
+				top: 0;
+				left: 0;
+				text-align: center;
+				padding-top: 300rpx;
+				font-size: 32rpx;
+				color: #ccc;
+			}
+
+			.swiper {
+
+				.swiper_item {
+					height: 100vh;
+					overflow-y: auto;
+					padding-bottom: 460rpx;
+                    margin-top: 20rpx;
+					.card_box {
+						margin-top: 34rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.card {
+							display: flex;
+							// margin-top: 20rpx;
+							width: 658rpx;
+							max-height: 300rpx;
+							padding-bottom: 20rpx;
+							box-sizing: border-box;
+							background: #fff;
+							// box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(255, 255, 255, 0);
+							 box-shadow: 0 4px 8px rgba(0,0,0,0.1); 
+							border-radius: 24rpx 24rpx 24rpx 24rpx;
+
+							.card_left {
+								width: 100%;
+								margin-top: 20rpx;
+								margin-left: 50rpx;
+
+								.card_left_tit {
+									font-size: 36rpx;
+									font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+									font-weight: 600;
+									color: #8883F0;
+								}
+
+								.card_left_sta {
+
+									padding-top: 15rpx;
+									display: flex;
+									flex-wrap: nowrap;
+									align-items: center;
+
+									image {
+										width: 23.32rpx;
+										height: 36.47rpx;
+
+									}
+
+									.sta_txt {
+										// margin-left: 15rpx;
+										color: #262B37;
+										font-size: 26rpx;
+										font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+										font-weight: 400;
+									}
+								}
+
+								.card_left_no {
+									padding-top: 15rpx;
+									font-size: 26rpx;
+									font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+									font-weight: 400;
+									color: #95989D;
+								}
+							}
+
+							.card_right {
+								margin-top: 30rpx;
+								margin-left: auto;
+								margin-right: 50rpx;
+
+								image {
+									width: 180rpx;
+									height: 180rpx;
+									border-radius: 10rpx;
+								}
+							}
+						}
+					}
+				}
+			}
+
+		}
+	}
+
+	.popup-content {
+		text-align: center;
+
+		text {
+			display: block;
+		}
+
+		.add {
+			margin-top: 10rpx;
+			font-size: 36rpx;
+			color: #000000;
+			line-height: 80rpx;
+		}
+
+		.saoma {
+			margin-top: 68rpx;
+			font-size: 40rpx;
+			color: #000000;
+			line-height: 54rpx;
+			border: 1px solid #ccc;
+			padding: 30rpx 0;
+			box-sizing: border-box;
+		}
+
+		.sousuo {
+			margin-top: 46rpx;
+			font-size: 40rpx;
+			color: #000000;
+			line-height: 54rpx;
+			border: 1px solid #ccc;
+			padding: 30rpx 0;
+			box-sizing: border-box;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/my.vue b/pages/my.vue
index 6526f14..1a74b60 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -17,10 +17,14 @@
 					</view>
 					<view class="" v-if="userinfo.deviceAdmin == true">
 						<view class="botcard" @click="btnsblr">
-							<!-- <image src="https://api.ccttiot.com/smartmeter/img/static/uYWpW30vIQ6M4svb7Vnb"></image> -->
 							<view class="txt">设备录入</view>
 						</view>
 					</view>
+					<view class="" v-if="userinfo.type == 3">
+						<view class="botcard" @click="btndaili">
+							<view class="txt">代理入口</view>
+						</view>
+					</view>
 				</view>
 				<!-- <view class="tit">
 					我的钱包
@@ -306,6 +310,12 @@
 				uni.navigateTo({
 					url:'/page_fenbao/zhuce'
 				})
+			},
+			// 代理入口
+			btndaili(){
+				uni.navigateTo({
+					url:'/pages/daili/index'
+				})
 			}
 		}
 	}