diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 9c734f5..dec621d 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.81:10002',
-			baseUrl: 'https://kg.chuangtewl.com/prod-api',
+			baseUrl: 'http://192.168.2.81:10002',
+			// baseUrl: 'https://kg.chuangtewl.com/prod-api',
 			// loadingText: '努力加载中~',
 			// loadingTime: 1000,
 			// 设置自定义头部content-type
diff --git a/page_components/fuwu/index.vue b/page_components/fuwu/index.vue
index b8d2566..3ba2e3a 100644
--- a/page_components/fuwu/index.vue
+++ b/page_components/fuwu/index.vue
@@ -113,7 +113,7 @@
 			<view class="tongyi" v-if="deviceobj.suitList != null">
 				<u-checkbox-group>
 					<u-checkbox v-model="checked" @change="checkboxChange" active-color="#8883F0 ">我已同意
-					</u-checkbox><text @click="btnyinsi">《用户服务协议》</text>
+					</u-checkbox><text @click="btnyonghu">《用户服务协议》</text> <text @click="btnyinsi">《隐私政策》</text>
 				</u-checkbox-group>
 				<view class="zf" @click="btnzhifu" v-if="zhifuflag"> 
 					立即支付
@@ -350,8 +350,13 @@
 				})
 			},
 			
-			// 用户服务协议
+			//
 			btnyinsi(){
+				uni.navigateTo({
+					url: '/page_fenbao/statulist/about/index?tit=' + '隐私政策'
+				})
+			},
+			btnyonghu(){
 				uni.navigateTo({
 					url: '/page_fenbao/statulist/about/index?tit=' + '用户服务协议'
 				})
diff --git a/page_components/shebeixz.vue b/page_components/shebeixz.vue
index 884ad6b..edca7f3 100644
--- a/page_components/shebeixz.vue
+++ b/page_components/shebeixz.vue
@@ -7,8 +7,11 @@
 			<view class="box_list" v-for="(item, index) in list" :key="index" @click="btnactive(item.deviceId,index,item)" >
 				<view :class="['boxlist', { active: tcidlist.includes(item.deviceId) }]">
 					<view :class="['toptime', { activewz: tcidlist.includes(item.deviceId) }]">
-						<text>{{item.deviceName.length > 5 ? item.deviceName.substring(0,4) + '...' : item.deviceName}}</text>
-							<text>SN:{{item.deviceNo}}</text>
+						<text>{{item.deviceName.length > 5 ? item.deviceName.substring(0,4) + '...' : item.deviceName}}
+						      <text style="display: block;margin-top: 10rpx;">SN:{{item.deviceNo}}</text>
+						</text>
+							<text v-if="tcidlist.includes(item.deviceId)">已应用</text>
+							<text v-else>未应用</text>
 						</view>
 					</view>
 					<view class="ccc">
diff --git a/page_components/wifilist/index.vue b/page_components/wifilist/index.vue
index d676b94..0076cdf 100644
--- a/page_components/wifilist/index.vue
+++ b/page_components/wifilist/index.vue
@@ -535,22 +535,11 @@
 					});
 					return;
 				}
-				// uni.showLoading({
-				// 	title: '正在配网',
-				// 	mask: true
-				// })
 				this.textwifi = '连接中...'
 				
 			    xBlufi.notifySendCustomData({
 			          customData: "ssid@" + this.ssid + "pass@" + this.password
 			     })
-				// xBlufi.notifySendCustomData({
-				// 	customData: "ssid@" + this.name
-				// })
-			
-				// xBlufi.notifySendCustomData({
-				// 	customData: "pass@" + this.password
-				// })
 			},
 			
 			
diff --git a/page_fenbao/statulist/about/index.vue b/page_fenbao/statulist/about/index.vue
index d6f8c5d..909382f 100644
--- a/page_fenbao/statulist/about/index.vue
+++ b/page_fenbao/statulist/about/index.vue
@@ -41,8 +41,10 @@
 			this.tit = option.tit
 			if (option.tit == '关于我们') {
 				this.getabout()
-			}else{
+			}else if(option.tit == '隐私政策'){
 				this.getabouts()
+			}else if(option.tit == '用户服务协议'){
+				this.getaboutss()
 			}
 		},
 		methods: {
@@ -55,7 +57,7 @@
 					}
 				})
 			},
-			// 用户隐私协议
+			// 隐私政策
 			getabouts() {
 				let type = 'privacy'
 				this.$u.get(`/app/article/licence/${type}`).then((res) => {
@@ -63,6 +65,15 @@
 						this.obj = res.data
 					}
 				})
+			},
+			// 用户协议
+			getaboutss() {
+				let type = 'user'
+				this.$u.get(`/app/article/licence/${type}`).then((res) => {
+					if (res.code == 200) {
+						this.obj = res.data
+					}
+				})
 			}
 		}
 	}
diff --git a/page_fenbao/statulist/myorder/detailxq/index.vue b/page_fenbao/statulist/myorder/detailxq/index.vue
index e16f2a1..eba462b 100644
--- a/page_fenbao/statulist/myorder/detailxq/index.vue
+++ b/page_fenbao/statulist/myorder/detailxq/index.vue
@@ -4,6 +4,9 @@
 			height='50'></u-navbar>
         <view class="box">
         	<view class="listxq">
+				<view class="nav">
+					<text class="shen">订单号</text><text class="qian">{{detailobj.billNo == undefined ? '--' : detailobj.billNo}}</text>
+				</view>
         		<view class="nav">
         			<text class="shen">订单状态</text>
 					<text class="qian" v-if="detailobj.status == 2">
@@ -29,34 +32,7 @@
 					</text>
         		</view>
 				<view class="nav">
-					<text class="shen">设备编号</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
-				</view>
-				<!-- <view class="nav">
-					<text class="shen">服务模式</text><text class="qian">{{detailobj.suitName == undefined ? '--' : detailobj.suitName}}</text>
-				</view> -->
-				<view class="nav">
-					<text class="shen">用户</text><text class="qian">{{detailobj.userName == undefined ? '--' : detailobj.userName}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">用户手机号</text><text class="qian">{{detailobj.userMobile == undefined ? '--' : detailobj.userMobile}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">收款人手机号</text><text class="qian"  @click="call">{{detailobj.mchName == undefined ? '--' : detailobj.mchName}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">消费时间</text><text class="qian">{{detailobj.createTime == undefined ? '--' : detailobj.createTime}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">套餐开始时间</text><text class="qian">{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">套餐结束时间</text><text class="qian">{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">套餐失效时间</text><text class="qian">{{detailobj.suitExpireTime == undefined ? '--' : detailobj.suitExpireTime}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">订单号</text><text class="qian">{{detailobj.billNo == undefined ? '--' : detailobj.billNo}}</text>
+					<text class="shen">设备名称</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
 				</view>
 				<view class="nav">
 					<text class="shen">支付方式</text><text class="qian">{{detailobj.channelName == undefined ? '--' : detailobj.channelName}}</text>
@@ -64,14 +40,17 @@
 				<view class="nav">
 					<text class="shen">套餐名称</text><text class="qian">{{detailobj.suitName == undefined ? '--' : detailobj.suitName}}</text>
 				</view>
-				<view class="nav">
-					<text class="shen">套餐金额</text><text class="qian">{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
+				<view class="nav"> 
+					<text class="shen">套餐金额</text><text class="qian">￥{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
+				</view>
+				<view class="nav" v-if="detailobj.status == 3"> 
+					<text class="shen">退款金额</text><text class="qian" style="color: red;">￥{{detailobj.refundAmount == undefined ? '--' : detailobj.refundAmount}}</text>
 				</view>
 				<view class="nav">
-					<text class="shen">计时模式</text><text class="qian">{{detailobj.suitFeeMode == 1 ? '单次计时' : '智能计时'}}</text>
+					<text class="shen">收费模式</text><text class="qian">{{detailobj.suitFeeMode == 1 ? '单次收费' : '智能收费'}}</text>
 				</view>
 				<view class="nav">
-					<text class="shen">收费模式</text><text class="qian">
+					<text class="shen">收费方式</text><text class="qian"> 
 					<text v-if="detailobj.suitFeeType == 1">计时收费</text>
 					<text v-if="detailobj.suitFeeType == 2">按量收费</text>
 					<text v-if="detailobj.suitFeeType == 3">分时段按量收费</text>
@@ -85,25 +64,23 @@
 					<text v-if="detailobj.suitTimeUnit == 1">天</text>  <text v-if="detailobj.suitTimeUnit == 2">时</text> <text v-if="detailobj.suitTimeUnit == 3">分钟</text> <text v-if="detailobj.suitTimeUnit == 4">秒</text>
 					</text>
 				</view>
-				<view class="xian"></view>
+				<view class="nav">
+					<text class="shen">支付时间</text><text class="qian">{{detailobj.payTime == undefined ? '--' : detailobj.payTime}}</text>
+				</view>
+				<view class="nav">
+					<text class="shen">套餐开始时间</text><text class="qian">{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}}</text>
+				</view>
+				<view class="nav">
+					<text class="shen">套餐结束时间</text><text class="qian">{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}}</text>
+				</view>
+				<!-- <view class="xian"></view>
 				<view class="nav">
 					<text class="shen">共计</text><text class="qian">￥{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
-				</view>
+				</view> -->
         	</view>
-			<view class="sb" v-if="userflag" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
-				border-radius: 20rpx 20rpx 20rpx 20rpx;
-				margin: auto;
-				padding: 32rpx 24rpx;
-				box-sizing: border-box;	font-size: 28rpx;
-						color: #3D3D3D;
-				margin-top: 30rpx;align-items: center;">
-				<!-- <text class="shen">设备详情</text><u-icon name="arrow-right" color="#3D3D3D" size="28"></u-icon> -->
-				<text class="shen">￥{{detailobj.money == undefined ? '--' : detailobj.money}}</text> <text>退款</text>
-			</view>
-			
-			<view class="pic" @click="btnad">
+			<!-- <view class="pic" @click="btnad">
 				<image :src="imgad" mode="" class="pic"></image>
-			</view>
+			</view> -->
         </view>
 		<!-- 退款弹窗 -->
 		<view class="tanc" v-if="maskflag">
@@ -146,7 +123,7 @@
 			if(option.billId){
 				this.billId = option.billId
 				this.getlist()
-				this.getad()
+				// this.getad()
 			}
 		},
 		// 分享到好友（会话）
@@ -203,6 +180,9 @@
 								icon: 'success',
 								duration: 3000
 							})
+							setTimeout(()=>{
+								this.getlist()
+							},1000)
 						}else{
 							uni.showToast({
 								title: res.msg,
diff --git a/page_user/mapditu/orderxq.vue b/page_user/mapditu/orderxq.vue
index 35385ac..ee3830f 100644
--- a/page_user/mapditu/orderxq.vue
+++ b/page_user/mapditu/orderxq.vue
@@ -4,6 +4,9 @@
 			height='50'></u-navbar>
         <view class="box">
         	<view class="listxq">
+				<view class="nav">
+					<text class="shen">订单号</text><text class="qian">{{detailobj.billNo == undefined ? '--' : detailobj.billNo}}</text>
+				</view>
         		<view class="nav">
         			<text class="shen">订单状态</text>
 					<text class="qian" v-if="detailobj.status == 2">
@@ -29,11 +32,8 @@
 					</text>
         		</view>
 				<view class="nav">
-					<text class="shen">设备编号</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
+					<text class="shen">设备名称</text><text class="qian">{{detailobj.deviceName == undefined ? '--' : detailobj.deviceName}}</text>
 				</view>
-				<!-- <view class="nav">
-					<text class="shen">服务模式</text><text class="qian">{{detailobj.suitName == undefined ? '--' : detailobj.suitName}}</text>
-				</view> -->
 				<view class="nav">
 					<text class="shen">用户</text><text class="qian">{{detailobj.userName == undefined ? '--' : detailobj.userName}}</text>
 				</view>
@@ -41,22 +41,7 @@
 					<text class="shen">用户手机号</text><text class="qian">{{detailobj.userMobile == undefined ? '--' : detailobj.userMobile}}</text>
 				</view>
 				<view class="nav">
-					<text class="shen">收款人手机号</text><text class="qian"  @click="call">{{detailobj.mchName == undefined ? '--' : detailobj.mchName}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">消费时间</text><text class="qian">{{detailobj.createTime == undefined ? '--' : detailobj.createTime}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">套餐开始时间</text><text class="qian">{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">套餐结束时间</text><text class="qian">{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">套餐失效时间</text><text class="qian">{{detailobj.suitExpireTime == undefined ? '--' : detailobj.suitExpireTime}}</text>
-				</view>
-				<view class="nav">
-					<text class="shen">订单号</text><text class="qian">{{detailobj.billNo == undefined ? '--' : detailobj.billNo}}</text>
+					<text class="shen">支付时间</text><text class="qian">{{detailobj.payTime == undefined ? '--' : detailobj.payTime}}</text>
 				</view>
 				<view class="nav">
 					<text class="shen">支付方式</text><text class="qian">{{detailobj.channelName == undefined ? '--' : detailobj.channelName}}</text>
@@ -65,13 +50,16 @@
 					<text class="shen">套餐名称</text><text class="qian">{{detailobj.suitName == undefined ? '--' : detailobj.suitName}}</text>
 				</view>
 				<view class="nav">
-					<text class="shen">套餐金额</text><text class="qian">{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
+					<text class="shen">套餐金额</text><text class="qian">￥{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
+				</view>
+				<view class="nav" v-if="detailobj.status == 3">
+					<text class="shen">退款金额</text><text class="qian" style="color: red;">￥{{detailobj.refundAmount == undefined ? '--' : detailobj.refundAmount}}</text>
 				</view>
 				<view class="nav">
-					<text class="shen">计时模式</text><text class="qian">{{detailobj.suitFeeMode == 1 ? '单次计时' : '智能计时'}}</text>
+					<text class="shen">收费模式</text><text class="qian">{{detailobj.suitFeeMode == 1 ? '单次计时' : '智能计时'}}</text>
 				</view>
 				<view class="nav">
-					<text class="shen">收费模式</text><text class="qian">
+					<text class="shen">收费方式</text><text class="qian">
 					<text v-if="detailobj.suitFeeType == 1">计时收费</text>
 					<text v-if="detailobj.suitFeeType == 2">按量收费</text>
 					<text v-if="detailobj.suitFeeType == 3">分时段按量收费</text>
@@ -85,26 +73,28 @@
 					<text v-if="detailobj.suitTimeUnit == 1">天</text>  <text v-if="detailobj.suitTimeUnit == 2">时</text> <text v-if="detailobj.suitTimeUnit == 3">分钟</text> <text v-if="detailobj.suitTimeUnit == 4">秒</text>
 					</text>
 				</view>
-				
-				<view class="xian"></view>
+				<view class="nav">
+					<text class="shen">套餐开始时间</text><text class="qian">{{detailobj.suitStartTime == undefined ? '--' : detailobj.suitStartTime}}</text>
+				</view>
+				<view class="nav">
+					<text class="shen">套餐结束时间</text><text class="qian">{{detailobj.suitEndTime == undefined ? '--' : detailobj.suitEndTime}}</text>
+				</view>
+				<!-- <view class="xian"></view>
 				<view class="nav">
 					<text class="shen">共计</text><text class="qian">￥{{detailobj.money == undefined ? '--' : detailobj.money}}</text>
-				</view>
+				</view> -->
         	</view>
-			<view class="sb" v-if="userflag" @click="btntz" style="width:680rpx;height: 100rpx;display: flex;justify-content: space-between;background: #FFFFFF;
+			<view class="sb" v-if="userflag && detailobj.status == 2" @click="btntz" style="width:680rpx;height: 100rpx;background: #8883F0;
 				border-radius: 20rpx 20rpx 20rpx 20rpx;
-				margin: auto;
-				padding: 32rpx 24rpx;
-				box-sizing: border-box;	font-size: 28rpx;
-						color: #3D3D3D;
+				margin: auto;font-weight: 600;
+				padding: 32rpx 24rpx;color:#fff;font-size: 32rpx;
+				box-sizing: border-box;text-align: center;
 				margin-top: 30rpx;align-items: center;">
-				<!-- <text class="shen">设备详情</text><u-icon name="arrow-right" color="#3D3D3D" size="28"></u-icon> -->
-				<text class="shen">￥{{detailobj.money == undefined ? '--' : detailobj.money}}</text> <text>退款</text>
+				退款
 			</view>
-			
-			<view class="pic" @click="btnad">
+			<!-- <view class="pic" @click="btnad">
 				<image :src="imgad" mode="" class="pic"></image>
-			</view>
+			</view> -->
         </view>
 		<!-- 退款弹窗 -->
 		<view class="tanc" v-if="maskflag">
@@ -147,7 +137,7 @@
 			if(option.billId){
 				this.billId = option.billId
 				this.getlist()
-				this.getad()
+				// this.getad()
 			}
 		},
 		// 分享到好友（会话）
@@ -204,6 +194,9 @@
 								icon: 'success',
 								duration: 3000
 							})
+							setTimeout(()=>{
+								this.getlist()
+							},1000)
 						}else{
 							uni.showToast({
 								title: res.msg,
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 7f30985..ef9404f 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -1,53 +1,58 @@
 <template>
 	<view class="page">
-		<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff'
+		<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="top">
 					<view class="left">
 						设备
 					</view>
 					<view class="right">
 
 					</view>
-				</view>
+				</view> -->
 				<view class="mid">
-					<view class="mid_left">
-						<view v-if="opflag"
-							style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;"
-							@click="btnpic">
-							<image :src="imglist" mode="aspectFit"
-								style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image>
-						</view>
-						<image v-else :src="imglist" mode="aspectFit"
-							style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image>
-
-						<ksp-cropper mode="free" :width="142" :height="142" :maxWidth="1024" :maxHeight="1024"
-							:url="url" @cancel="oncancel" @ok="onok"></ksp-cropper>
-					</view>
 					<view class="mid_right">
 						<view class="mid_top">
 							{{ deviceInfo.deviceName == null ? '' : deviceInfo.deviceName }}
-							<view class="" style="font-size: 26rpx;margin-top: 8rpx;">
-								更新时间：{{deviceInfo.lastPullTime == null ? '--' : deviceInfo.lastPullTime}}</view>
-							<text
-								style="font-size: 24rpx;color: #8883F0;display: inline-block;border: 1px solid #8883F0;padding: 5rpx;box-sizing: border-box;border-radius: 10rpx;">{{deviceInfo.model == undefined ? '' : deviceInfo.model}}</text>
 						</view>
 						<view class="mid_bot">
-							<view class="txt" v-if="deviceInfo">
-								S/N码：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}</view>
-							<div class="tip" v-if="deviceInfo.onlineStatus==1"
-								style="color: seagreen;border: 2rpx solid;">在线</div>
-							<div class="tip" v-if="deviceInfo.onlineStatus==0" style="color: red;border: 2rpx solid;">离线
+							<div class="tip" v-if="deviceInfo.onlineStatus==1">
+								<text>网络：</text> <text style="color: #00BA88;">在线</text>
 							</div>
-							<div class="tip" v-if="deviceInfo.status==1" style="color: seagreen;border: 2rpx solid;">空闲
+							<div class="tip" v-if="deviceInfo.onlineStatus==0">
+								<text>网络：</text> <text style="color: red;">离线</text>
 							</div>
-							<div class="tip" v-if="deviceInfo.status==2" style="color: seagreen;border: 2rpx solid;">使用中
+							<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>
+							<div class="tip" v-if="deviceInfo.status==3">
+								<text>状态：</text> <text style="color: red;">维修中</text>维修中
 							</div>
-							<div class="tip" v-if="deviceInfo.status==3" style="color: red;">维修中</div>
 						</view>
+						<view class="txt" v-if="deviceInfo">
+							SN：{{ deviceInfo.deviceNo == null ? '' : deviceInfo.deviceNo }}</view>
+						<view class="" style="font-size: 24rpx;margin-top: 8rpx;color: #95989D;">
+							更新时间：{{deviceInfo.lastPullTime == null ? '--' : deviceInfo.lastPullTime}}</view>
+					</view>
+					<view class="mid_left" style="position: relative;">
+						<view v-if="opflag"
+							style="border: 0;outline: none;width: 196rpx;padding-left: 0rpx;height: 196rpx;border-radius: 16rpx;"
+							@click="btnpic">
+							<image :src="imglist" mode="aspectFit"
+								style="width: 196rpx;height: 196rpx;border-radius: 0rpx;"></image>
+						</view>
+						<image v-else :src="imglist" mode="aspectFit"
+							style="width: 196rpx;height: 196rpx;border-radius: 0rpx;"></image>
+						<text class="lanyalx">{{deviceInfo.model == undefined ? '' : deviceInfo.model}}</text>
+
+						<ksp-cropper mode="free" :width="142" :height="142" :maxWidth="1024" :maxHeight="1024"
+							:url="url" @cancel="oncancel" @ok="onok"></ksp-cropper>
 					</view>
 				</view>
 				<view class="bot">
@@ -55,103 +60,161 @@
 				</view>
 			</view>
 			<view class="card2">
-				<view class="tit">实时</view>
+				<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.orderAmount == null ? 0 : deviceInfo.orderAmount}}
+							{{deviceInfo.voltage == null ? 0 : deviceInfo.voltage}}
 						</view>
 						<view class="txt">
-							订单金额
+							电压（V）
 						</view>
 					</view>
 					<view class="cont" style="text-align: center;">
 						<view class="tit">
-							{{deviceInfo.orderCount == null ? 0 : deviceInfo.orderCount}}
+							{{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}}
-							<!-- sb:{{setMode}} -->
 						</view>
 						<view class="txt">
 							剩余时长
 						</view>
-					</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>
+			
+			<!-- 当前订单 -->
+			<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;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;">
+			    			<!-- <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="card3" v-if="opflag">
-				<view class="tit">其他</view>
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">其他功能</view>
 				<view class="cont_box" style="display: block;">
-					<view class="" style="display: flex;">
+					<view class="">
 						<view class="cont" @click="topage(0)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/uKrpw3p37UHW56IypPJU" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/ucprXYT39GKWEVHlAaAb" mode=""
 									style="width: 58rpx;height: 58rpx;"></image>
+									<view class="bot">充值记录</view>
 							</view>
-							<view class="bot">充值记录</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/uaS4iFmD786AtBt2tKFs" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uhsqQVT62DOTdW8qW7ez" mode=""
 									style="width: 58rpx;height: 58rpx;"></image>
+									<view class="bot">归零</view>
 							</view>
-							<view class="bot">归零</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: 58rpx;height: 58rpx;"
-									src="https://api.ccttiot.com/smartmeter/img/static/uAnBmmayp3tVGwXntdaM" mode="">
+									src="https://api.ccttiot.com/smartmeter/img/static/u9vzIeLLorfYuoZnxBDZ" mode="">
 								</image>
+								<view class="bot">充值</view>
 							</view>
-							<view class="bot">充值</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/ue0X00T1C3fh7TCgjopm" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/ueQ5V8QAidDZGt0FpqXb" mode=""
 									style="width: 58rpx;height: 58rpx;"></image>
+									<view class="bot">上报异常</view>
 							</view>
-							<view class="bot">上报异常</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
 						</view>
 					</view>
-					<view class="" style="display: flex;margin-top: 20rpx;padding-right: 5rpx;box-sizing: border-box;">
+					<view class="">
 						<view class="cont" @click="topage(3)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uJmpaxyrv34a1EW5lWQv" mode=""
 									style="width: 50rpx;height: 58rpx;"></image>
+									<view class="bot">收费方式</view>
 							</view>
-							<view class="bot">收费方式</view>
+							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
 						</view>
 						<view class="cont" @click="topage(5)" v-if="modelId.some(tag => tag == 2)">
 							<view class="top">
 								<image style="width: 58rpx;height: 58rpx;"
-									src="https://api.ccttiot.com/smartmeter/img/static/uik9veDG6pMVG5M1Vxze" mode="">
+									src="https://api.ccttiot.com/smartmeter/img/static/ule3wEEDaXzfXCUCM1Ks" mode="">
 								</image>
+								<view class="bot">配网</view>
 							</view>
-							<view class="bot">配网</view>
-						</view>
-						<view class="cont" @click="topage(4)">
-							<view class="top">
-								<image style="width: 58rpx;height: 58rpx;"
-									src="https://api.ccttiot.com/smartmeter/img/static/u2Uco0iXf8aure0H2ihz" mode="">
-								</image>
-							</view>
-							<view class="bot">设置</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: 58rpx;height: 58rpx;"
-									src="https://api.ccttiot.com/smartmeter/img/static/u7o1YnOGEKxM6KZ4WGXO" mode="">
+									src="https://api.ccttiot.com/smartmeter/img/static/uMdtTPOmGVJqcYIQvnUj" mode="">
 								</image>
+								<view class="bot">分享</view>
 							</view>
-							<view class="bot">分享</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;padding-bottom: 0;">
+								<image style="width: 58rpx;height: 58rpx;"
+									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>
 
@@ -159,23 +222,6 @@
 
 				</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;">
-				<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="tanc" v-if="vipflag">
@@ -278,7 +324,7 @@
 					label: '度'
 				}],
 				bgc: {
-					backgroundColor: "#8883f0",
+					backgroundColor: "#F9F8FF ",
 				},
 				ec: {
 					lazyLoad: true
@@ -312,13 +358,15 @@
 				url: "",
 				deviceNo: '',
 				modelId: [],
-				damweiid:''
+				damweiid: '',
+				intervalId: null,
+				sklist:{}
 			}
 		},
 		onLoad(option) {
 			let id = option.id
 			this.id = id
-			
+			// this.startIntervals();
 			// this.getDevice(id)
 			if (option.flag) {
 				this.opflag = false
@@ -354,11 +402,11 @@
 				} 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 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'
@@ -374,14 +422,22 @@
 			}
 		},
 		onHide() {
-			if (this.timer) {
+			if (this.timer || this.intervalId) {
+				clearInterval(this.intervalId);
 				clearInterval(this.timer)
 				this.timer = null
+				this.intervalId = null;
 				console.log('已销毁')
 			}
 		},
 		onUnload: function() {
-			console.log("unload ");
+			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,
@@ -390,22 +446,65 @@
 		onShow() {
 			this.getshuax()
 			this.getQiniuToken()
+			// if (!this.intervalId) {
+			// 	this.startIntervals();
+			// }
 		},
 		mounted() {
 			this.drawCanvas()
 		},
 		methods: {
-			getshuax(){
+			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){
+						this.sklist = res.rows[0]
+					}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(); //获取当前页面信息
@@ -708,6 +807,7 @@
 						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 {
@@ -727,6 +827,8 @@
 							if (differenceInMs <= 0) {
 								this.timeday = 0
 							} else {
+								clearInterval(this.timer)
+								this.timer = null
 								this.timeday = this.formatMilliseconds(differenceInMs)
 								this.startTimer()
 							}
@@ -825,6 +927,7 @@
 				})
 			},
 
+
 			// 其他部分 点击进行跳转
 			topage(num) {
 				this.btnmsk = true
@@ -834,8 +937,8 @@
 						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){
+					console.log(this.deviceInfo.onlineStatus, 'this.deviceInfo.onlineStatusthis.deviceInfo.onlineStatus');
+					if (this.deviceInfo.onlineStatus == 1) {
 						let that = this
 						uni.showModal({
 							title: '提示',
@@ -876,7 +979,7 @@
 								}
 							}
 						})
-					}else{
+					} else {
 						if (this.setMode == null) {
 							this.btnmsk = false
 							this.shibaiflag = false
@@ -898,7 +1001,7 @@
 								})
 								xBlufi.notifyInitBleEsp32({
 									deviceId: this.deviceId
-								})	
+								})
 							}, 1000)
 						} else {
 							let that = this
@@ -907,51 +1010,66 @@
 								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)
-	                                   				}
-	                                   			})
-	                                   		}
-	                                   	}
-	                                   })
-									} 
+										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)
+														}
+													})
+												}
+											}
+										})
+									}
 								}
 							})
 						}
@@ -972,9 +1090,21 @@
 						url: '/page_user/setting?id=' + this.id
 					})
 				} else if (num == 5) {
-					// uni.showLoading({
-					// 	title: '蓝牙连接中...'
-					// })
+					// 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
@@ -985,7 +1115,6 @@
 						xBlufi.notifyStartDiscoverBle({
 							'isStart': true
 						})
-
 						// 停止蓝牙搜索  
 						setTimeout(() => {
 							xBlufi.notifyStartDiscoverBle({
@@ -1031,18 +1160,6 @@
 								} else if (res.msg == '设备编号和mac不能同时为空') {
 									this.shibaiflag = true
 									this.bluetoothflag = false
-									// uni.showToast({
-									// 	title: '连接失败',
-									// 	icon: 'none',
-									// 	duration: 2000
-									// });
-								} else {
-									// uni.showToast({
-									// 	title: res.msg,
-									// 	icon: 'none',
-									// 	duration: 2000
-									// });
-									// uni.navigateBack()
 								}
 							})
 						}, 2000)
@@ -1058,11 +1175,6 @@
 						}
 						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();
@@ -1086,11 +1198,6 @@
 									this.shibaiflag = true
 									this.bluetoothflag = false
 									uni.hideLoading()
-									// uni.showToast({
-									// 	title: '连接失败',
-									// 	icon: 'none',
-									// 	duration: 2000
-									// })
 								} else {
 									this.shibaiflag = true
 									this.bluetoothflag = false
@@ -1105,16 +1212,18 @@
 							}
 						})
 					}
+					// }
 				} else if (num == 6) {
 					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 => {})
+			getaddtime() {
+				this.$u.put('/app/device/addTime/' + this.id + '?amount=' + this.cztime + '&timeUnit=' + this.damweiid +
+					'&withIot=false').then(res => {})
 			},
-			trueje() { 
+			trueje() {
 				if (this.timer) {
 					clearInterval(this.timer)
 					this.timer = null
@@ -1122,30 +1231,31 @@
 				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()
-							this.getDevice(this.id)
-							setTimeout(()=>{
-								this.cztime = ''
-								this.danwei = ''
-								this.deviceInfo.status = 2
-								this.tdtxt = '开启'
-								this.imgflag = true
-							},1000)
-						} else if (res.code == 500) {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							})
-						}
-					})
+					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()
+								this.getDevice(this.id)
+								setTimeout(() => {
+									this.cztime = ''
+									this.danwei = ''
+									this.deviceInfo.status = 2
+									this.tdtxt = '开启'
+									this.imgflag = true
+								}, 1000)
+							} else if (res.code == 500) {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
 				} else {
 					if (this.setMode == null) {
 						this.cztime = ''
@@ -1170,7 +1280,7 @@
 							})
 							xBlufi.notifyInitBleEsp32({
 								deviceId: this.deviceId
-							})	
+							})
 						}, 1000)
 					} else {
 						let that = this
@@ -1183,15 +1293,16 @@
 												that.deviceInfo.status = 2
 												that.imgflag = true
 												that.tdtxt = '开启'
-												if(that.damweiid == 4){
+												if (that.damweiid == 4) {
 													xBlufi.notifySendCustomData({
 														customData: 'mmney@' + that.cztime
 													})
 													xBlufi.notifySendCustomData({
-														customData: '11mmney@' + that.cztime
+														customData: '11mmney@' + that
+															.cztime
 													})
 													that.getaddtime()
-												}else if(that.damweiid == 4){
+												} else if (that.damweiid == 4) {
 													xBlufi.notifySendCustomData({
 														customData: 'time@' + that.cztime
 													})
@@ -1199,20 +1310,24 @@
 														customData: '11time@' + that.cztime
 													})
 													that.getaddtime()
-												}else if(that.damweiid == 3){
+												} else if (that.damweiid == 3) {
 													xBlufi.notifySendCustomData({
-														customData: 'time@' + that.cztime * 60
+														customData: 'time@' + that.cztime *
+															60
 													})
 													xBlufi.notifySendCustomData({
-														customData: '11time@' + that.cztime * 60
+														customData: '11time@' + that
+															.cztime * 60
 													})
 													that.getaddtime()
-												}else if(that.damweiid == 2){
+												} else if (that.damweiid == 2) {
 													xBlufi.notifySendCustomData({
-														customData: 'time@' + that.cztime * 60 * 60
+														customData: 'time@' + that.cztime *
+															60 * 60
 													})
 													xBlufi.notifySendCustomData({
-														customData: '11time@' + that.cztime * 60 * 60
+														customData: '11time@' + that
+															.cztime * 60 * 60
 													})
 													that.getaddtime()
 												}
@@ -1261,7 +1376,7 @@
 									// console.log(this.mac, this.deviceId, this.name, 'macmacmac')
 									// this.devicesList = uniqueDevicesList
 								}
-							}) 
+							})
 						}
 						break;
 
@@ -1448,6 +1563,19 @@
 		z-index: 2;
 	}
 
+	.lanyalx {
+		display: inline-block;
+		text-align: center;
+		font-size: 28rpx;
+		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;
@@ -1579,7 +1707,7 @@
 	}
 
 	page {
-		background-color: #F7FAFE;
+		background-color: #F9F8FF;
 	}
 
 	.maskss {
@@ -1651,18 +1779,30 @@
 		}
 	}
 
+	.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: 60rpx;
+			margin-top: 46rpx;
 			padding: 0 40rpx;
 
 			.card1 {
-				padding: 34rpx 0 0 40rpx;
+				// padding: 34rpx 0 0 40rpx;
 				width: 670rpx;
-				height: 320rpx;
-				background: #FFFFFF;
-				box-shadow: 0rpx 14rpx 35rpx 0rpx rgba(53, 140, 255, 0.1);
-				border-radius: 28rpx 28rpx 28rpx 28rpx;
+				// height: 320rpx;
 
 				.top {
 					display: flex;
@@ -1692,6 +1832,7 @@
 					display: flex;
 					flex-wrap: nowrap;
 					align-content: flex-start;
+					justify-content: space-between;
 
 					.mid_left {
 						image {
@@ -1715,34 +1856,30 @@
 						}
 
 						.mid_bot {
+							width: 100%;
 							display: flex;
-							flex-wrap: nowrap;
-							align-items: center;
+							justify-content: space-between;
+							padding-right: 102rpx;
+							box-sizing: border-box;
+							// flex-wrap: nowrap;
+							// align-items: center;
 							margin-top: 6rpx;
 
-							.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: 10rpx;
-
-								padding: 0 10rpx;
+								// 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;
-								border: 2rpx solid #8883F0;
-								border-radius: 15rpx;
-								font-size: 26rpx;
+								font-size: 28rpx;
 								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
 								font-weight: 400;
-								color: #8883F0;
+								color: #5B5B5B;
 							}
 						}
 					}
@@ -1802,14 +1939,14 @@
 				display: flex;
 				width: 100%;
 				justify-content: space-between;
-				padding-left: 80rpx;
-				padding-right: 80rpx;
+				padding-left: 60rpx;
+				padding-right: 60rpx;
 				box-sizing: border-box;
 				margin-top: 30rpx;
 
 				.cont {
 					.tit {
-						font-size: 28rpx;
+						font-size: 32rpx;
 						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
 						font-weight: 600;
 						color: #262B37;
@@ -1818,7 +1955,7 @@
 					}
 
 					.txt {
-						font-size: 26rpx;
+						font-size: 32rpx;
 						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
 						font-weight: 400;
 						color: #262B37;
@@ -1828,20 +1965,27 @@
 
 			.card2 {
 				padding-top: 40rpx;
-				margin-top: 24rpx;
+				margin-top: 70rpx;
 				width: 670rpx;
-				height: 254rpx;
+				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: 35rpx;
-					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
-					font-weight: 400;
-					color: #8883F0;
+					font-size: 36rpx;
+					color: #3D3D3D;
+					font-weight: 600;
 				}
 
 				.cont_box {
@@ -1885,15 +2029,13 @@
 				background: #FFFFFF;
 				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(53, 140, 255, 0.1);
 				border-radius: 28rpx;
-				padding-bottom: 20rpx;
-
 				.tit {
 					margin-left: 40rpx;
 
 					font-size: 35rpx;
 					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
 					font-weight: 400;
-					color: #8883F0;
+					color: #3D3D3D;
 				}
 
 				.cont_box {
@@ -1908,22 +2050,33 @@
 					}
 
 					.cont {
-						width: 25%;
-						text-align: center;
-
-						.top {
-							image {
-								width: 56rpx;
-								height: 56rpx;
-							}
+						width: 100%;
+                        display: flex;
+						justify-content: space-between;
+						align-items: center;
+						.jt{
+							width: 15rpx;
+							height: 26rpx;
 						}
-
-						.bot {
-							margin-top: 8rpx;
-							font-size: 28rpx;
-							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
-							font-weight: 400;
-							color: #808080;
+						.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;
+							}
 						}
 					}
 				}