diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index cc98208..aed5b92 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -10,38 +10,42 @@
 						设备
 					</view>
 					<view class="right">
-						<!-- <image class="img1" src="https://api.ccttiot.com/smartmeter/img/static/uGvS4RQvbw7OOfhzy6xf" mode="" style="margin-right: 30rpx;" @click="opendevices"></image>
-						<image class="img1" src="https://api.ccttiot.com/smartmeter/img/static/uNEKwe2WKsJdtQzOdEay" mode="" @click="toewm()"></image> -->
+						
 					</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">
+						<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>
-	
+
+						<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>
-							<div class="tip" v-if="deviceInfo.status==1" style="color: seagreen;border: 2rpx solid;">空闲</div>
-							<div class="tip" v-if="deviceInfo.status==2" style="color: seagreen;border: 2rpx solid;">使用中</div>
+							<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>
+							<div class="tip" v-if="deviceInfo.status==1" style="color: seagreen;border: 2rpx solid;">空闲
+							</div>
+							<div class="tip" v-if="deviceInfo.status==2" style="color: seagreen;border: 2rpx solid;">使用中
+							</div>
 							<div class="tip" v-if="deviceInfo.status==3" style="color: red;">维修中</div>
 						</view>
 					</view>
@@ -79,34 +83,36 @@
 						</view>
 					</view>
 				</view>
-				
-				
+
+
 			</view>
 			<view class="card3" v-if="opflag">
 				<view class="tit">其他</view>
 				<view class="cont_box" style="display: block;">
 					<view class="" style="display: flex;">
-						<view class="cont"  @click="topage(0)">
+						<view class="cont" @click="topage(0)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/uKrpw3p37UHW56IypPJU" mode=""
 									style="width: 58rpx;height: 58rpx;"></image>
 							</view>
 							<view class="bot">充值记录</view>
 						</view>
-						<view class="cont"  @click="topage(1)">
+						<view class="cont" @click="topage(1)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/uaS4iFmD786AtBt2tKFs" mode=""
 									style="width: 58rpx;height: 58rpx;"></image>
 							</view>
 							<view class="bot">归零</view>
 						</view>
-						<view class="cont"  @click="topage(6)">
+						<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=""></image>
+								<image style="width: 58rpx;height: 58rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uAnBmmayp3tVGwXntdaM" mode="">
+								</image>
 							</view>
 							<view class="bot">充值</view>
 						</view>
-						<view class="cont"  @click="topage(2)">
+						<view class="cont" @click="topage(2)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/ue0X00T1C3fh7TCgjopm" mode=""
 									style="width: 58rpx;height: 58rpx;"></image>
@@ -122,91 +128,110 @@
 							</view>
 							<view class="bot">收费方式</view>
 						</view>
-						<view class="cont"  @click="topage(5)">
+						<view class="cont" @click="topage(5)">
 							<view class="top">
-								<image style="width: 58rpx;height: 58rpx;" src="https://api.ccttiot.com/smartmeter/img/static/uik9veDG6pMVG5M1Vxze" mode="">
+								<image style="width: 58rpx;height: 58rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/uik9veDG6pMVG5M1Vxze" mode="">
 								</image>
 							</view>
 							<view class="bot">配网</view>
 						</view>
-						<view class="cont"  @click="topage(4)">
+						<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 style="width: 58rpx;height: 58rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/u2Uco0iXf8aure0H2ihz" mode="">
 								</image>
 							</view>
 							<view class="bot">设置</view>
 						</view>
-						
-						<view class="cont"  @click="btnkq">
+						<view class="cont" @click="qrFun">
 							<view class="top">
-								<u-switch v-model="checked" active-color="#8883F0"></u-switch>
+								<image style="width: 58rpx;height: 58rpx;"
+									src="https://api.ccttiot.com/smartmeter/img/static/u7o1YnOGEKxM6KZ4WGXO" mode="">
+								</image>
 							</view>
-							<view class="bot" style="margin-top: 12rpx;">{{tdtxt}}</view>
+							<view class="bot">分享</view>
 						</view>
-						
 					</view>
 				</view>
 				<view class="cont_box" style="padding-left: 30rpx;">
 
 				</view>
 			</view>
+
+			<view class="conts" @click="btnkq">
+				<view class="top">
+					<u-switch v-model="checked" active-color="#8883F0"></u-switch>
+				</view>
+				<view class="bot" >手动操作:{{tdtxt}}</view>
+			</view>
 		</view>
-         
-		 <view class="tanc" v-if="vipflag">
-		 	<view class="tit">请输入您需要充值的时长(分钟)</view>
-		 	<input type="number" :focus="focus" v-model="cztime" />
-		 	<view class="xian"></view>
-		 	<view class="anniu">
-		 		<text @click="btnqx">取消</text> <text style="border-left: 1px solid #D8D8D8;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="tanc" v-if="vipflag">
+			<view class="tit">请输入您需要充值的时长(分钟)</view>
+			<input type="number" :focus="focus" v-model="cztime" />
+			<view class="xian"></view>
+			<view class="anniu">
+				<text @click="btnqx">取消</text> <text style="border-left: 1px solid #D8D8D8;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 class="xqx" @click="bluetoothflag = false">
-				取消连接
-			</view> -->
-		 </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 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>
-		 </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>
+				<view class="cx" @click="topage(5)">
+					重新连接
+				</view>
+			</view>
+		</view>
+
+		<!-- 展示二维码 -->
+		<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: 400rpx;" @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
@@ -216,9 +241,10 @@
 		},
 		data() {
 			return {
-				btnmsk:false,
-				bluetoothflag:false,
-				shibaiflag:false,
+				wemflag: false,
+				btnmsk: false,
+				bluetoothflag: false,
+				shibaiflag: false,
 				bgc: {
 					backgroundColor: "#8883f0",
 				},
@@ -228,18 +254,13 @@
 				deviceInfo: {},
 				loadings: false,
 				info: '',
-				checked:false,
+				checked: false,
 				tittxt: "设备详情",
-				titlist: [
-					"全部",
-					"电表",
-					"水表",
-
-				],
-				tdtxt:'开启',
+				titlist: [],
+				tdtxt: '开启',
 				curtitidx: 0,
 				id: '',
-				focus:false,
+				focus: false,
 				timeday: '',
 				imglist: '',
 				token: '',
@@ -251,23 +272,24 @@
 				storeId: '',
 				qrResult: '',
 				devicesList: [],
-				setMode:null,
-				vipflag:false,
-				cztime:'',
-				opflag:true,
+				setMode: null,
+				vipflag: false,
+				cztime: '',
+				opflag: true,
 				timer: null,
 				url: "",
+				deviceNo: ''
 			}
 		},
 		onLoad(option) {
 			let id = option.id
 			this.id = id
 			// this.getDevice(id)
-             if(option.flag){
-				 this.opflag = false
-			 }else{
-				 this.opflag = true
-			 }
+			if (option.flag) {
+				this.opflag = false
+			} else {
+				this.opflag = true
+			}
 			// xBlufi.initXBlufi(1);
 			// xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
 			// xBlufi.notifyStartDiscoverBle({
@@ -292,69 +314,118 @@
 
 		},
 		// 分享到好友（会话）
-		  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 {  
-		         // 展示秒或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) {
-			 	  clearInterval(this.timer)
-			 	  this.timer = null
-			 	  console.log('已销毁')
-			 	}  
-			 },
+		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 {
+					// 展示秒或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) {
+				clearInterval(this.timer)
+				this.timer = null
+				console.log('已销毁')
+			}
+		},
 		onShow() {
 			setTimeout(() => {
 				this.getDevice(this.id)
 			}, 100)
 			this.getQiniuToken()
 		},
-
+		mounted() {
+			this.drawCanvas()
+		},
 		methods: {
-			btnlyqx(){
+			
+			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() {
+				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 == '开启'){
+			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 = '关闭'
@@ -364,7 +435,7 @@
 									icon: 'success',
 									duration: 2000
 								})
-							}else{
+							} else {
 								this.checked = false
 								uni.showToast({
 									title: res.msg,
@@ -373,7 +444,7 @@
 								})
 							}
 						})
-					}else{
+					} else {
 						this.$u.put(`/app/device/${this.id}/changePower?status=1`).then((res) => {
 							if (res.code == 200) {
 								this.checked = true
@@ -383,7 +454,7 @@
 									icon: 'success',
 									duration: 2000
 								})
-							}else{
+							} else {
 								this.checked = false
 								uni.showToast({
 									title: res.msg,
@@ -393,90 +464,90 @@
 							}
 						})
 					}
-				}else{
-                    if(this.setMode == null){
+				} 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.checked = false
-                    		}else{
-                    			this.checked = true
-                    		}
-                    	}, 1000)
-                    }else{
+						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.checked = false
+							} else {
+								this.checked = true
+							}
+						}, 1000)
+					} else {
 						// console.log(this.tdtxt,'020202');
-                        if(this.tdtxt == '开启'){	
+						if (this.tdtxt == '开启') {
 							let that = this
-                    		uni.getNetworkType({
-                    			success(res) {
-                    				if (res.networkType !== 'none') {
-                    					uni.getConnectedBluetoothDevices({
-                    						success(res) { 
-                    							setTimeout(()=> {
+							uni.getNetworkType({
+								success(res) {
+									if (res.networkType !== 'none') {
+										uni.getConnectedBluetoothDevices({
+											success(res) {
+												setTimeout(() => {
 													// console.log('close关闭');
 													that.tdtxt = '关闭'
 													that.checked = false
-                    								xBlufi.notifySendCustomData({
-                    										customData: 'close'
-                    									})
-                    							},1000)
-                    						},
-                    						fail(err) {
-                    							console.error('获取已连接蓝牙设备信息失败：',err)
-                    						}
-                    					})
-                    				} 
-                    			}
-                    		})
-                    	}else{
+													xBlufi.notifySendCustomData({
+														customData: 'close'
+													})
+												}, 1000)
+											},
+											fail(err) {
+												console.error('获取已连接蓝牙设备信息失败：', err)
+											}
+										})
+									}
+								}
+							})
+						} else {
 							let that = this
-                    		uni.getNetworkType({
-                    			success(res) {
-                    				if (res.networkType !== 'none') {
-                    					uni.getConnectedBluetoothDevices({
-                    						success(res) { 
-                    							setTimeout(()=> {
+							uni.getNetworkType({
+								success(res) {
+									if (res.networkType !== 'none') {
+										uni.getConnectedBluetoothDevices({
+											success(res) {
+												setTimeout(() => {
 													// console.log('open开启');
 													that.tdtxt = '开启'
 													that.checked = true
-                    								xBlufi.notifySendCustomData({
-                    										customData: 'open'
-                    									})
-                    							},1000)
-                    						},
-                    						fail(err) {
-                    							console.error('获取已连接蓝牙设备信息失败：',err)
-                    						}
-                    					})
-                    				} 
-                    			}
-                    		})
-                    	}
-                    }
+													xBlufi.notifySendCustomData({
+														customData: 'open'
+													})
+												}, 1000)
+											},
+											fail(err) {
+												console.error('获取已连接蓝牙设备信息失败：', err)
+											}
+										})
+									}
+								}
+							})
+						}
+					}
 				}
 			},
 			getQiniuToken() {
@@ -486,8 +557,8 @@
 					}
 				});
 			},
-			
-			
+
+
 			btnpic() {
 				uni.chooseImage({
 					count: 1,
@@ -506,7 +577,7 @@
 					name: 'file',
 					filePath: _this.path,
 					formData: {
-						token: _this.token, 
+						token: _this.token,
 						key: 'smartmeter/img/' + math
 					},
 					success: function(res) {
@@ -516,8 +587,8 @@
 						_this.imglist = _this.userImgs
 						// console.log(_this.imglist,'_this.imglist_this.imglist')
 						let data = {
-							deviceId:_this.id,
-							customPicture:_this.imglist
+							deviceId: _this.id,
+							customPicture: _this.imglist
 						}
 						_this.putdevice(data)
 					}
@@ -548,10 +619,10 @@
 			// 获取设备详情
 			getDevice(id) {
 				this.$u.get("/app/device/" + id).then((res) => {
-					// this.$forceUpdate()
 					if (res.code == 200) {
 						this.deviceInfo = res.data
 						this.storeId = res.data.storeId
+						this.deviceNo = res.data.deviceNo
 						// this.qrResult = 'CTKG-' + res.data.mac
 						this.qrResult = res.data.mac
 						if (res.data.customPicture != null) {
@@ -559,14 +630,14 @@
 						} else {
 							this.imglist = res.data.picture
 						}
-						if(this.deviceInfo.expireTime == null){
+						if (this.deviceInfo.expireTime == null) {
 							this.timeday = 0
-						}else{
+						} 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 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) {
@@ -576,10 +647,10 @@
 								this.startTimer()
 							}
 						}
-						if(res.data.powerStatus == 0){
+						if (res.data.powerStatus == 0) {
 							this.checked = false
 							this.tdtxt = '关闭'
-						}else{
+						} else {
 							this.checked = true
 							this.tdtxt = '开启'
 						}
@@ -587,47 +658,47 @@
 					}
 				})
 			},
-			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); // 每秒执行一次  
-				},
+			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  
-			  }
+			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
@@ -638,7 +709,6 @@
 				}
 				// console.log(stause, 'stausestause');
 				this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
-					// this.$forceUpdate()
 					if (res.code == 200) {
 						// this.groupList=res.rows
 						setTimeout(() => {
@@ -646,7 +716,6 @@
 						}, 2000)
 
 						// this.loadings=true
-						// this.initChart()
 					} else {
 						uni.showToast({
 							title: res.msg,
@@ -672,7 +741,6 @@
 				})
 			},
 
-
 			// 其他部分 点击进行跳转
 			topage(num) {
 				this.btnmsk = true
@@ -685,67 +753,67 @@
 					let that = this
 					uni.showModal({
 						title: '提示',
-						content: '您确定要将电表时间归零吗？',
+						content: '您确定要将设备时间归零吗？',
 						success: function(res) {
 							if (res.confirm) {
 								that.btnmsk = false
-							    //归零
-							    that.$u.put(`/app/device/${that.id}/reset`).then((res) => {
-							    	if (res.code == 200) {
-							    		// console.log(res.data);
-							    		uni.showToast({
-							    			title: res.msg,
-							    			icon: 'none',
-							    			duration: 2000
-							    		})
-							    		that.getDevice(that.id)
+								//归零
+								that.$u.put(`/app/device/${that.id}/reset`).then((res) => {
+									if (res.code == 200) {
+										// console.log(res.data);
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										})
+										that.getDevice(that.id)
 										this.checked = false
 										this.tdtxt = '关闭'
-							    	} else if (res.msg == '设备剩余时间不足，无需归零') {
-							    		uni.showToast({
-							    			title: '设备剩余时间不足，无需归零',
-							    			icon: 'none',
-							    			duration: 2000
-							    		})
-							    	}else if(res.code == 500){
-							    		uni.showToast({
-							    			title: res.msg,
-							    			icon: 'none',
-							    			duration: 2000
-							    		})
-							    		// uni.showLoading({
-							    		// 	title: '充值中...'
-							    		// })
-							    		// let vm = this; // 将外部的 this 绑定到 vm 上
-							    		// uni.getNetworkType({
-							    		// 	success(res) {
-							    		// 		if (res.networkType !== 'none') {
-							    		// 			uni.getConnectedBluetoothDevices({
-							    		// 				success(res) {
-							    		// 					console.log('已连接的蓝牙设备信息：', res);
-							    		// 					xBlufi.notifySendCustomData({
-							    		// 						customData: "time@" + 0
-							    		// 					});
-							    		// 				},
-							    		// 				fail(err) {
-							    		// 					console.error('获取已连接蓝牙设备信息失败：', err);
-							    		// 				}
-							    		// 			})
-							    		// 			// vm.$u.get(`/app/bill/recharge/${vm.billNo}/bluetoothSuccess`).then(res => {
-							    		// 			// 	if(res.code == 200){
-							    		// 			// 		setTimeout(()=>{
-							    		// 			// 			uni.hideLoading()
-							    		// 			// 			uni.navigateBack()
-							    		// 			// 		},1000)
-							    		// 			// 	}
-							    		// 			// })
-							    		// 		} else {
-							    		// 			console.log('手机未连接网络');
-							    		// 		}
-							    		// 	}
-							    		// })
-							    	}
-							    })
+									} else if (res.msg == '设备剩余时间不足，无需归零') {
+										uni.showToast({
+											title: '设备剩余时间不足，无需归零',
+											icon: 'none',
+											duration: 2000
+										})
+									} else if (res.code == 500) {
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										})
+										// uni.showLoading({
+										// 	title: '充值中...'
+										// })
+										// let vm = this; // 将外部的 this 绑定到 vm 上
+										// uni.getNetworkType({
+										// 	success(res) {
+										// 		if (res.networkType !== 'none') {
+										// 			uni.getConnectedBluetoothDevices({
+										// 				success(res) {
+										// 					console.log('已连接的蓝牙设备信息：', res);
+										// 					xBlufi.notifySendCustomData({
+										// 						customData: "time@" + 0
+										// 					});
+										// 				},
+										// 				fail(err) {
+										// 					console.error('获取已连接蓝牙设备信息失败：', err);
+										// 				}
+										// 			})
+										// 			// vm.$u.get(`/app/bill/recharge/${vm.billNo}/bluetoothSuccess`).then(res => {
+										// 			// 	if(res.code == 200){
+										// 			// 		setTimeout(()=>{
+										// 			// 			uni.hideLoading()
+										// 			// 			uni.navigateBack()
+										// 			// 		},1000)
+										// 			// 	}
+										// 			// })
+										// 		} else {
+										// 			console.log('手机未连接网络');
+										// 		}
+										// 	}
+										// })
+									}
+								})
 							} else if (res.cancel) {
 								that.btnmsk = false
 								console.log('用户点击了取消')
@@ -754,17 +822,17 @@
 					})
 
 				} else if (num == 2) { //异常
-			     	this.btnmsk = false
+					this.btnmsk = false
 					uni.navigateTo({
 						url: '/page_fenbao/statulist/fault/yichang/index'
 					})
 				} else if (num == 3) {
-                    this.btnmsk = false
+					this.btnmsk = false
 					uni.navigateTo({
 						url: "/page_fenbao/statulist/taocanlist/index?id=" + this.id
 					})
 				} else if (num == 4) { //设置
-				   this.btnmsk = false
+					this.btnmsk = false
 					uni.navigateTo({
 						url: '/page_user/setting?id=' + this.id
 					})
@@ -776,13 +844,13 @@
 					this.shibaiflag = false
 					this.bluetoothflag = true
 					// console.log(this.deviceId,'idididididdidii');
-					if(this.setMode == null){
+					if (this.setMode == null) {
 						xBlufi.initXBlufi(1)
 						xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
 						xBlufi.notifyStartDiscoverBle({
 							'isStart': true
 						})
-						
+
 						// 停止蓝牙搜索  
 						setTimeout(() => {
 							xBlufi.notifyStartDiscoverBle({
@@ -815,15 +883,15 @@
 									if (systemInfo.platform == 'android') {
 										// 当前设备是 Android  
 										uni.navigateTo({
-											url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
+											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
+											url: '/page_fenbao/device/wifivideo?deviceId=' + this.deviceId + '&name=' + this.name
 										})
 									}
-								}else if(res.msg == '设备编号和mac不能同时为空'){
+								} else if (res.msg == '设备编号和mac不能同时为空') {
 									this.shibaiflag = true
 									this.bluetoothflag = false
 									// uni.showToast({
@@ -841,7 +909,7 @@
 								}
 							})
 						}, 1000)
-					}else{
+					} else {
 						let name = ''
 						let index = this.name.indexOf('-')
 						if (index !== -1) {
@@ -863,33 +931,35 @@
 								uni.hideLoading();
 								uni.removeStorageSync('mac');
 								let systemInfo = uni.getSystemInfoSync()
-								if (systemInfo.platform == 'android') { 
+								if (systemInfo.platform == 'android') {
 									// 当前设备是 Android  
 									uni.navigateTo({
-										url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
+										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
+										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 {
+								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,
+										title: res.msg,
 										icon: 'none',
 										duration: 2000
 									})
@@ -898,21 +968,21 @@
 							}
 						})
 					}
-				}else if (num == 6){
+				} else if (num == 6) {
 					this.btnmsk = false
 					this.vipflag = true
 					this.focus = true
 				}
 			},
-			trueje(){
+			trueje() {
 				if (this.timer) {
-				  clearInterval(this.timer)
-				  this.timer = null
-				}  
+					clearInterval(this.timer)
+					this.timer = null
+				}
 				let id = this.deviceInfo.deviceId
 				this.vipflag = false
 				this.$u.put('/app/device/addTime/' + id + '?amount=' + this.cztime).then(res => {
-					if(res.code == 200){
+					if (res.code == 200) {
 						uni.showToast({
 							title: '充值成功',
 							icon: 'success',
@@ -920,12 +990,12 @@
 						})
 						this.getDevice(this.id)
 						this.cztime = ''
-					}else if(res.code == 500){
+					} else if (res.code == 500) {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none',
 							duration: 2000
-						}) 
+						})
 						// let vm = this; // 将外部的 this 绑定到 vm 上
 						// uni.getNetworkType({
 						// 	success(res) {
@@ -957,7 +1027,7 @@
 					}
 				})
 			},
-			btnqx(){
+			btnqx() {
 				this.vipflag = false
 				this.cztime = ''
 			},
@@ -971,9 +1041,9 @@
 						// console.log("文件读取中", options.data)
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
-						let ver_data =  this.parseCustomData(options.data) 
+						let ver_data = this.parseCustomData(options.data)
 						this.setMode = Math.floor(ver_data.setMode / 60)
-						console.log("1收到设备发来的自定义数据结果：", ver_data,this.setMode)
+						console.log("1收到设备发来的自定义数据结果：", ver_data, this.setMode)
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
 						if (options.result) {
@@ -1020,11 +1090,12 @@
 
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
 						if (!options.result) {
-							setTimeout(()=>{
+							setTimeout(() => {
 								uni.hideLoading()
 								this.bluetoothflag = false
-							},3000)
+							}, 3000)
 							console.log("蓝牙未开启", options)
+							this.shibaiflag = true
 							// uni.showToast({
 							// 	title: '蓝牙未开启',
 							// 	icon: 'none',
@@ -1077,7 +1148,7 @@
 			// parseCustomData(data) {
 			// 	// 将字符串按照 "@" 分割成数组
 			// 	const dataArray = data.split('@')
-			
+
 			// 	// 根据约定，解析各个字段的值
 			// 	const voltage = parseFloat(dataArray[0].substring(1)) // 去除前缀 "V"，并将字符串转换为浮点数
 			// 	const switchState = dataArray[1].substring(1)// 去除前缀 "S"
@@ -1085,7 +1156,7 @@
 			// 	const power = parseFloat(dataArray[4].substring(1)) // 去除前缀 "P"，并将字符串转换为浮点数
 			// 	const remainingPower = parseFloat(dataArray[5].substring(1)) // 去除前缀 "M"，并将字符串转换为浮点数
 			// 	const setMode = dataArray[6].substring(1) // 去除前缀 "T"
-			
+
 			// 	// 返回解析后的数据对象
 			// 	return {
 			// 		voltage,
@@ -1096,45 +1167,45 @@
 			// 		setMode
 			// 	};
 			// },
-			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;  
+			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;
 			},
 
 		}
@@ -1142,20 +1213,62 @@
 </script>
 
 <style lang="scss">
-
-	/deep/ .panel{
+	/deep/ .panel {
 		position: fixed;
-		    width: 100%;
-		    height: 100%;
-		    top: 0;
-		    bottom: 0;
-		    left: 0;
-		    z-index: 99 !important;
-		    overflow: hidden;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 99 !important;
+		overflow: hidden;
 	}
-	
-	
-	.bluetoothbox{
+
+	.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: 20%;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 2;
+	}
+
+	.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;
+		}
+	}
+
+	.bluetoothbox {
 		width: 100%;
 		height: 100vh;
 		background-color: #f4f1f6;
@@ -1164,32 +1277,38 @@
 		left: 0;
 		z-index: 99;
 		text-align: center;
-		.img{
+
+		.img {
 			margin-top: 400rpx;
 			width: 320rpx;
 			height: 320rpx;
 		}
-		.one{
+
+		.one {
 			font-size: 36rpx;
 			color: #000;
 		}
-		.two{
+
+		.two {
 			margin-top: 30rpx;
 			font-size: 24rpx;
 			color: #ccc;
 		}
-		.thr{
+
+		.thr {
 			margin-top: 30rpx;
 			font-size: 28rpx;
 			color: #ccc;
 		}
-		.anfour{
+
+		.anfour {
 			display: flex;
 			margin-top: 30rpx;
 			justify-content: space-between;
 			padding: 0 220rpx;
 			box-sizing: border-box;
-			.qx{
+
+			.qx {
 				width: 100rpx;
 				height: 70rpx;
 				line-height: 70rpx;
@@ -1197,7 +1316,8 @@
 				border: 1px solid #3D3D3D;
 				border-radius: 10rpx;
 			}
-			.cx{
+
+			.cx {
 				width: 200rpx;
 				height: 70rpx;
 				line-height: 70rpx;
@@ -1207,17 +1327,20 @@
 				border-radius: 10rpx;
 			}
 		}
-		.stop{
+
+		.stop {
 			font-size: 36rpx;
 			color: #000;
 			margin-top: 380rpx;
 		}
-		.xtop{
+
+		.xtop {
 			margin-top: 30rpx;
 			font-size: 24rpx;
 			color: #ccc;
 		}
-		.xqx{
+
+		.xqx {
 			width: 530rpx;
 			height: 90rpx;
 			line-height: 90rpx;
@@ -1227,12 +1350,14 @@
 			margin: auto;
 			margin-top: 200rpx;
 		}
-		image{
+
+		image {
 			width: 500rpx;
 			height: 500rpx;
 			margin-top: 100rpx;
 		}
 	}
+
 	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
@@ -1244,6 +1369,7 @@
 	page {
 		background-color: #F7FAFE;
 	}
+
 	.maskss {
 		width: 750rpx;
 		height: 100vh;
@@ -1255,6 +1381,7 @@
 		top: 0;
 		left: 0;
 	}
+
 	.tanc {
 		width: 610rpx;
 		height: 282rpx;
@@ -1265,7 +1392,7 @@
 		left: 50%;
 		transform: translateX(-50%);
 		z-index: 2;
-	
+
 		.tit {
 			width: 100%;
 			text-align: center;
@@ -1274,7 +1401,7 @@
 			font-size: 32rpx;
 			color: #3D3D3D;
 		}
-	
+
 		input {
 			width: 504rpx;
 			height: 62rpx;
@@ -1284,7 +1411,7 @@
 			margin-top: 22rpx;
 			padding-left: 20rpx;
 		}
-	
+
 		.xian {
 			width: 610rpx;
 			height: 2rpx;
@@ -1292,12 +1419,12 @@
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
 			margin-top: 26rpx;
 		}
-	
+
 		.anniu {
 			display: flex;
 			justify-content: space-between;
 			height: 98rpx;
-	
+
 			text {
 				padding: 24rpx;
 				text-align: center;
@@ -1320,7 +1447,7 @@
 			.card1 {
 				padding: 34rpx 0 0 40rpx;
 				width: 670rpx;
-				height: 300rpx;
+				height: 320rpx;
 				background: #FFFFFF;
 				box-shadow: 0rpx 14rpx 35rpx 0rpx rgba(53, 140, 255, 0.1);
 				border-radius: 28rpx 28rpx 28rpx 28rpx;
@@ -1363,7 +1490,7 @@
 					}
 
 					.mid_right {
-						margin-left: 40rpx;
+						margin-left: 20rpx;
 						display: flex;
 						flex-wrap: wrap;
 
@@ -1379,6 +1506,7 @@
 							display: flex;
 							flex-wrap: nowrap;
 							align-items: center;
+							margin-top: 6rpx;
 
 							.txt {
 								font-size: 26rpx;
@@ -1457,6 +1585,7 @@
 					}
 				}
 			}
+
 			.bot_right {
 				display: flex;
 				width: 100%;
@@ -1464,7 +1593,8 @@
 				padding-left: 80rpx;
 				padding-right: 80rpx;
 				box-sizing: border-box;
-			    margin-top: 30rpx;
+				margin-top: 30rpx;
+
 				.cont {
 					.tit {
 						font-size: 28rpx;
@@ -1474,7 +1604,7 @@
 						line-height: 49rpx;
 						margin-left: 0;
 					}
-			
+
 					.txt {
 						font-size: 26rpx;
 						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
diff --git a/page_user/yetx.vue b/page_user/yetx.vue
index 730486a..f298989 100644
--- a/page_user/yetx.vue
+++ b/page_user/yetx.vue
@@ -93,7 +93,6 @@
 				sjmeoey:'',
 				txlist:'',
 				channelId:'',
-				
 				listflag:true
 			}
 		},