diff --git a/page_components/HM-dragSorts/HM-dragSorts.vue b/page_components/HM-dragSorts/HM-dragSorts.vue
index ce4b844..9663ca8 100644
--- a/page_components/HM-dragSorts/HM-dragSorts.vue
+++ b/page_components/HM-dragSorts/HM-dragSorts.vue
@@ -52,8 +52,8 @@
 				<view class="card">
 					<view  class="card_left">
 						<view  class="txt" style="font-size: 28rpx;">
-							<text>{{row.name.length > 4 ? row.name.substring(0, 4) + '...' : row.name }}  </text>
-							<text v-if="row.value != null">
+							<text>{{row.name}}  </text>
+							<!-- <text v-if="row.value != null">
 								（通电时长：{{row.value}}
 								<text v-if="row.timeUnit == 1">日</text>
 								<text v-if="row.timeUnit == 2">时</text>
@@ -61,7 +61,20 @@
 								<text v-if="row.timeUnit == 4">秒</text>
                              ）</text> 
 							 <text v-else>(智能计时)</text>
-							<text>￥{{row.price}}</text>
+							<text>￥{{row.price}}</text> -->
+							<view class="">
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 1">计时收费</text>
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 2">按量收费</text>
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 3">分时段按量收费</text>
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 4">分时段按时收费</text>
+								(<text style="margin-top: 10rpx;" v-if="row.feeMode == 1">单次收费</text>
+								<text style="margin-top: 10rpx;" v-if="row.feeMode == 2">智能收费</text>)
+								<text style="width: 20rpx;display: inline-block;"></text>
+								<text style="margin-top: 10rpx;" v-if="row.feeType == 3 || row.feeType == 4">押金{{row.price}}</text>
+								<text style="margin-top: 10rpx;" v-if="row.timeUnit == 2 && row.feeType != 3 && row.feeType != 4">{{row.value}}时 {{row.price}}元</text>
+								<text style="margin-top: 10rpx;" v-if="row.timeUnit == 3 && row.feeType != 3 && row.feeType != 4">{{row.value}}分 {{row.price}}元</text>
+								<text style="margin-top: 10rpx;" v-if="row.timeUnit == 4 && row.feeType != 3 && row.feeType != 4">{{row.value}}秒 {{row.price}}元</text>
+							</view>
 						</view>
 						<view class="ccc">
 							<view class="bumday" v-if="row.description == null">
@@ -685,7 +698,7 @@
 				font-family: Source Han Sans, Source Han Sans;
 				font-weight: 400;
 				color: #000000;
-				display: flex;
+				// display: flex;
 				justify-content: space-between;
 				width: 570rpx;
 			}
diff --git a/page_fenbao/HM-dragSorts/HM-dragSorts.vue b/page_fenbao/HM-dragSorts/HM-dragSorts.vue
index cf4a093..45f09c9 100644
--- a/page_fenbao/HM-dragSorts/HM-dragSorts.vue
+++ b/page_fenbao/HM-dragSorts/HM-dragSorts.vue
@@ -72,7 +72,11 @@
 							<image src="https://api.ccttiot.com/smartmeter/img/static/uEcvOWAyC2VCw8WSiyBe" mode="" @click.stop="del(row.storeId)"></image>
 						</view> -->
 						<view  :class="['txt', { activewz: tcidlist.includes(row.suitId) }]" style="font-size: 28rpx;">
-							<text>{{row.name.length > 4 ? row.name.substring(0, 4) + '...' : row.name }}   </text>
+							<view class="" style="display: flex;justify-content: space-between;width: 100%;">
+								<text>{{row.name}}</text>
+								<text v-if="tcidlist.includes(row.suitId)">已应用</text>
+								<text v-else>未应用</text>
+							</view>
 							<!-- <text>
 								（通电时长：{{row.value}}
 								<text v-if="row.timeUnit == 1">日</text>
diff --git a/page_fenbao/fenxiang.vue b/page_fenbao/fenxiang.vue
new file mode 100644
index 0000000..1356f04
--- /dev/null
+++ b/page_fenbao/fenxiang.vue
@@ -0,0 +1,388 @@
+<template>
+	<view class="page">
+		<u-navbar title="分享二维码" :border-bottom="false" :background="bgc" back-icon-color="#000" title-color='#000'
+			title-size='36' height='50' id="navbar">
+		</u-navbar>
+        
+		<view class="tishi">
+			<text>微信“扫一扫” 使用小程序</text>
+			<text>选择您所需要的用电套餐</text>
+		</view>
+
+		<!-- 展示二维码 -->
+		<view class="imgewm" @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="btn"
+				@click="saveCanvas">
+				保存二维码
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	var xBlufi = require("@/page_components/blufi/xBlufi.js")
+	import uQRCode from '@/common/uqrcode.js'
+	import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas.vue'
+	import * as echarts from '@/components/uni-ec-canvas/echarts'
+	let chart = null
+	export default {
+		components: {
+			uniEcCanvas
+		},
+		data() {
+			return {
+				suitSurplus:'',
+				showflag: false,
+				imgflag: false,
+				wemflag: false,
+				btnmsk: false,
+				bluetoothflag: false,
+				shibaiflag: false,
+				danwei: '',
+				listdanwei: [{
+					value: 2,
+					label: '小时'
+				}, {
+					value: 3,
+					label: '分钟'
+				}, {
+					value: 4,
+					label: '秒钟'
+				}, {
+					value: 0,
+					label: '度'
+				}],
+				bgc: {
+					backgroundColor: "#F9F8FF ",
+				},
+				ec: {
+					lazyLoad: true
+				},
+				deviceInfo: {},
+				loadings: false,
+				info: '',
+				checked: false,
+				tittxt: "设备详情",
+				titlist: [],
+				tdtxt: '开启',
+				curtitidx: 0,
+				id: '',
+				focus: false,
+				timeday: '',
+				imglist: '',
+				token: '',
+				userImgs: '',
+				imgflag: true,
+				mac: "",
+				name: '',
+				deviceId: '',
+				storeId: '',
+				qrResult: '',
+				devicesList: [],
+				setMode: null,
+				vipflag: false,
+				cztime: '',
+				opflag: true,
+				timer: null,
+				url: "",
+				deviceNo: '',
+				modelId: [],
+				damweiid: '',
+				intervalId: null,
+				sklist:{},
+				sklistflag:false,
+			}
+		},
+		onLoad(option) {
+			this.deviceNo = option.id
+			this.qrFun()
+		},
+		// 分享到好友（会话）
+		onShareAppMessage: function() {
+			return {
+				title: '创想物联',
+				path: '/pages/shouye/index'
+			}
+		},
+
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '创想物联',
+				query: '',
+				path: '/pages/shouye/index'
+			}
+		},
+		onShow() {
+
+		},
+		mounted() {
+			this.drawCanvas()
+		},
+		methods: {
+
+			capture() {
+				var pages = getCurrentPages(); //获取当前页面信息
+				var page = pages[pages.length - 1];
+				var bitmap = null;
+				var currentWebview = page.$getAppWebview();
+				bitmap = new plus.nativeObj.Bitmap('amway_img');
+				// 将webview内容绘制到Bitmap对象中
+				currentWebview.draw(bitmap, function() {
+					// console.log('截屏绘制图片成功');
+					//这里我将文件名用四位随机数拼接了，不然会出现当前图片替换上一张图片只能保存一张图片的问题
+					let rand = Math.floor(Math.random() * 10000)
+					let saveUrl = '_doc/' + rand + 'a.jpg'
+					bitmap.save(saveUrl, {}, function(i) {
+						// console.log('保存图片成功：' + JSON.stringify(i));
+						uni.saveImageToPhotosAlbum({
+							filePath: i.target,
+							success: function() {
+								// bitmap.clear(); //销毁Bitmap图片
+								uni.showToast({
+									title: '保存图片成功',
+									mask: false,
+									duration: 1500
+								});
+							}
+						});
+					}, function(e) {
+						console.log('保存图片失败：' + JSON.stringify(e));
+					});
+				}, function(e) {
+					console.log('截屏绘制图片失败：' + JSON.stringify(e));
+				});
+				//currentWebview.append(amway_bit);
+			},
+
+
+			drawCanvas() {
+				const ctx = uni.createCanvasContext('qrcode', this);
+				ctx.setFillStyle('#fff');
+				ctx.fillRect(10, 10, 250, 250);
+				ctx.draw();
+			},
+			// 长按保存二维码
+			saveCanvas() {
+				uni.canvasToTempFilePath({
+					canvasId: 'qrcode',
+					success: (res) => {
+						console.log(res.tempFilePath); // 打印图片路径  
+						uni.saveImageToPhotosAlbum({
+							filePath: res.tempFilePath,
+							success: function() {
+								uni.showToast({
+									title: '保存成功',
+									icon: 'success'
+								});
+							}
+						});
+					},
+					fail: (err) => {
+						console.error(err);
+					}
+				});
+			},
+			//**生成二维码**//
+			qrFun: function() {
+				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
+			},
+
+			getQiniuToken() {
+				this.$u.get("/common/qiniu/uploadInfo").then((res) => {
+					if (res.code == 200) {
+						this.token = res.token
+					}
+				});
+			},
+
+
+			btnpic() {
+				uni.chooseImage({
+					count: 1,
+					success: (rst) => {
+						this.url = rst.tempFilePaths[0]
+					}
+				})
+			},
+			onok(ev) {
+				this.url = ""
+				this.path = ev.path;
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				wx.uploadFile({
+					url: 'https://up-z2.qiniup.com',
+					name: 'file',
+					filePath: _this.path,
+					formData: {
+						token: _this.token,
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						// console.log(res);
+						let str = JSON.parse(res.data)
+						_this.userImgs = 'https://api.ccttiot.com/' + str.key
+						_this.imglist = _this.userImgs
+						// console.log(_this.imglist,'_this.imglist_this.imglist')
+						let data = {
+							deviceId: _this.id,
+							customPicture: _this.imglist
+						}
+						_this.putdevice(data)
+					}
+				})
+			},
+			oncancel() {
+				// url设置为空，隐藏控件
+				this.url = ""
+			},
+			putdevice(data) {
+				this.$u.put('/app/device', data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: '修改成功',
+							icon: 'success',
+							duration: 2000
+						})
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+
+			opendevice() {
+				let stause = 0
+				if (this.deviceInfo.powerStatus == 1) {
+					stause = 0
+				} else {
+					stause = 1
+				}
+				// console.log(stause, 'stausestause');
+				this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
+					if (res.code == 200) {
+						// this.groupList=res.rows
+						setTimeout(() => {
+							this.getDevice(this.id)
+						}, 2000)
+
+						// this.loadings=true
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+					}
+				})
+			},
+			opendevices() {
+
+			},
+			swiperchange(e) {
+				this.curtitidx = e.detail.current
+				// console.log(e, 'aaaa');
+			},
+			changeidx(index) {
+				this.curtitidx = index
+			},
+
+			toydfx() {
+				uni.navigateTo({
+					url: "/page_components/eletj?id=" + this.id
+				})
+			},
+			
+	
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .panel {
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		z-index: 99 !important;
+		overflow: hidden;
+	}
+    .btn{
+		width:100%;
+		height: 94rpx;
+		background: #8883F0;
+		border-radius: 47rpx 47rpx 47rpx 47rpx;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 94rpx;
+		margin-top: 184rpx;
+	}
+	.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;
+		margin: auto;
+		margin-top: 104rpx;
+		// position: fixed;
+		// top:400rpx;
+		// left: 50%;
+		// transform: translateX(-50%);
+		z-index: 2;
+	}
+    .tishi{
+		width: 620rpx;
+		height: 180rpx;
+		background: rgba(217,216,255,0.3294);
+		border-radius: 20rpx 20rpx 20rpx 20rpx;
+		text-align: center;
+		padding: 36rpx 92rpx;
+		box-sizing: border-box;
+		margin: auto;
+		margin-top: 104rpx;
+		text{
+			margin-top: 16rpx;
+			display: block;
+			font-size: 36rpx;
+			color: #3D3D3D;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/page_fenbao/zhuce.vue b/page_fenbao/zhuce.vue
index 890cf69..4f5010e 100644
--- a/page_fenbao/zhuce.vue
+++ b/page_fenbao/zhuce.vue
@@ -4,6 +4,7 @@
 			back-icon-color="#fff" height='50'></u-navbar>
 		<view class="title">
 			<text>设备录入列表</text>
+			<text style="font-size: 28rpx;width: 160rpx;height: 60rpx;border-radius: 20rpx;background-color: #8883F0;text-align: center;color: #fff;line-height: 60rpx;margin-top: 20rpx;" @click="btnkzt">控制台</text>
 		</view>
 
 		<view class="dblist" v-for="(item, index) in devicesLists" :key="index">
@@ -138,6 +139,11 @@
 			// this.videoContext = uni.createVideoContext('myVideo', this)
 		},
 		methods: {
+			btnkzt(){
+				uni.navigateTo({
+					url:'/page_user/wifijoint/index' 
+				})
+			},
 			// 扫码sn
 			scanQRCode(item) {
 				this.snname = item.name
@@ -613,7 +619,8 @@
 	.title {
 		margin-bottom: 84rpx;
 		margin-top: 50rpx;
-
+        display: flex;
+		justify-content: space-between;
 		image {
 			display: inline-block;
 			width: 48rpx;
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index e9f4b1d..85ad9fa 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -98,6 +98,28 @@
                 </view>
 			</view>
 			
+			<view class="card2" style="padding-bottom: 40rpx;">
+				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;">设备剩余</view>
+				<view class="bot_right">
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{deviceInfo.surplusEle == null ? '--' : deviceInfo.surplusEle}}
+						</view>
+						<view class="txt">
+							剩余度数
+						</view>
+					</view>
+					<view class="cont" style="text-align: center;">
+						<view class="tit">
+							{{formattedTime}}
+						</view>
+						<view class="txt">
+							剩余时长
+						</view>
+					</view>
+				</view>
+			</view>
+			
 			<!-- 当前订单 -->
 			<view v-if="sklistflag" @click="btnshdd" class="card2" style="padding-bottom: 30rpx;box-sizing: border-box;margin-top: 20rpx;">
 				<view class="tit" style="border-left: 14rpx solid #8883F0;padding-left: 24rpx;display: flex;justify-content: space-between;padding-right: 40rpx;margin-bottom: 20rpx;">当前订单 <text style="color: #8883F0;font-size: 32rpx;font-weight: 400;">查看</text> </view>
@@ -142,8 +164,8 @@
 					<view class="">
 						<view class="cont" @click="topage(0)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/ucprXYT39GKWEVHlAaAb" mode=""
-									style="width: 58rpx;height: 58rpx;"></image>
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u2ALEsvAJrHnW7nhrTVD" mode=""
+									style="width: 44rpx;height: 40rpx;"></image>
 									<view class="bot">充值记录</view>
 							</view>
 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
@@ -151,7 +173,7 @@
 						<view class="cont" @click="topage(3)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/uJmpaxyrv34a1EW5lWQv" mode=""
-									style="width: 58rpx;height: 58rpx;"></image>
+									style="width: 44rpx;height: 44rpx;"></image>
 									<view class="bot">收费方式</view>
 							</view>
 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
@@ -159,14 +181,14 @@
 						<view class="cont" @click="topage(1)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/uhsqQVT62DOTdW8qW7ez" mode=""
-									style="width: 58rpx;height: 58rpx;"></image>
+									style="width: 44rpx;height: 44rpx;"></image>
 									<view class="bot">归零</view>
 							</view>
 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
 						</view>
 						<view class="cont" @click="topage(6)">
 							<view class="top">
-								<image style="width: 58rpx;height: 58rpx;"
+								<image style="width: 44rpx;height: 44rpx;"
 									src="https://api.ccttiot.com/smartmeter/img/static/u9vzIeLLorfYuoZnxBDZ" mode="">
 								</image>
 								<view class="bot">充值</view>
@@ -178,7 +200,7 @@
 						
 						<view class="cont" @click="topage(5)" v-if="modelId.some(tag => tag == 2)">
 							<view class="top">
-								<image style="width: 58rpx;height: 58rpx;"
+								<image style="width: 44rpx;height: 44rpx;"
 									src="https://api.ccttiot.com/smartmeter/img/static/ule3wEEDaXzfXCUCM1Ks" mode="">
 								</image>
 								<view class="bot">配网</view>
@@ -187,7 +209,7 @@
 						</view>
 						<view class="cont" @click="qrFun">
 							<view class="top">
-								<image style="width: 58rpx;height: 58rpx;"
+								<image style="width: 44rpx;height: 44rpx;"
 									src="https://api.ccttiot.com/smartmeter/img/static/uMdtTPOmGVJqcYIQvnUj" mode="">
 								</image>
 								<view class="bot">分享</view>
@@ -197,14 +219,14 @@
 						<view class="cont" @click="topage(2)">
 							<view class="top">
 								<image src="https://api.ccttiot.com/smartmeter/img/static/ueQ5V8QAidDZGt0FpqXb" mode=""
-									style="width: 58rpx;height: 58rpx;"></image>
+									style="width: 44rpx;height: 40rpx;"></image>
 									<view class="bot">上报异常</view>
 							</view>
 							<image class="jt" src="https://api.ccttiot.com/smartmeter/img/static/ukdy921M8MNe9XDid0WI" mode=""></image>
 						</view>
 						<view class="cont" @click="topage(4)">
 							<view class="top" style="border: 0;">
-								<image style="width: 58rpx;height: 58rpx;"
+								<image style="width: 44rpx;height: 44rpx;"
 									src="https://api.ccttiot.com/smartmeter/img/static/uOUM2aclDz2ZnRxOll9g" mode="">
 								</image>
 								<view class="bot">设置</view>
@@ -300,6 +322,7 @@
 		},
 		data() {
 			return {
+				suitSurplus:'',
 				showflag: false,
 				imgflag: false,
 				wemflag: false,
@@ -472,6 +495,7 @@
 						}else{
 							this.sklistflag = true
 							this.sklist = res.rows[0]
+							this.suitSurplus = res.rows[0].surplusEle
 						}
 						
 					}else{
@@ -581,18 +605,21 @@
 			},
 			//**生成二维码**//
 			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,
+				uni.navigateTo({
+					url:'/page_fenbao/fenxiang?id=' + this.deviceNo
 				})
+				// this.wemflag = true
+				// uQRCode.make({
+				// 	canvasId: 'qrcode',
+				// 	// componentInstance: this,
+				// 	text: 'https://kg.chuantewulian.cn/w?s=' + this.deviceNo,
+				// 	size: 250,
+				// 	margin: 0,
+				// 	backgroundColor: '#ffffff',
+				// 	foregroundColor: '#000000',
+				// 	fileType: 'jpg',
+				// 	errorCorrectLevel: uQRCode.errorCorrectLevel.H,
+				// })
 			},
 			ewmyc() {
 				this.wemflag = false
diff --git a/page_user/wifijoint/index.vue b/page_user/wifijoint/index.vue
index 513bbc2..c85353e 100644
--- a/page_user/wifijoint/index.vue
+++ b/page_user/wifijoint/index.vue
@@ -50,7 +50,7 @@
 				</view>
 			</view>
 			<view class="fanhui" @click="btnfh">
-				返回录入
+				返回
 			</view>
 		</view>
 		
@@ -72,8 +72,10 @@
 			}
 		},
 		onLoad(options) {
-            this.storeId = options.sn
-			this.getsn()
+			if(options.sn){
+				this.storeId = options.sn
+				this.getsn()
+			}
 		},
 		// 分享到好友（会话）
 		  onShareAppMessage: function () {  
@@ -150,9 +152,7 @@
 			 
 			 // 返回录入
 			 btnfh(){
-				uni.navigateBack({
-					delta:2
-				})
+				uni.navigateBack()
 			 },
 			 
 			 // 开启
diff --git a/pages.json b/pages.json
index f4ff45d..dd3db21 100644
--- a/pages.json
+++ b/pages.json
@@ -303,6 +303,16 @@
 						"navigationBarTextStyle": "#FFFFFF",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path": "fenxiang",
+					"style": {
+						"navigationBarTitleText": "添加设备",
+						"enablePullDownRefresh": false,
+						"navigationBarBackgroundColor": "#3996FD",
+						"navigationBarTextStyle": "#FFFFFF",
+						"navigationStyle": "custom"
+					}
 				},{
 					"path": "webview",
 					"style": {
diff --git a/pages/shanghudd.vue b/pages/shanghudd.vue
new file mode 100644
index 0000000..36f9833
--- /dev/null
+++ b/pages/shanghudd.vue
@@ -0,0 +1,1883 @@
+<template>
+	<view class="page">
+		<u-navbar :title="tittxt" :border-bottom="false" :background="bgc" back-icon-color="#fff" title-color='#fff'
+			:custom-back="btns" title-size='36' height='50' id="navbar">
+		</u-navbar>
+
+		<view class="dltop">
+			<view class="dian_list">
+				<view class="">
+					{{sbobj.voltage == undefined ? '--' : sbobj.voltage}}
+				</view>
+				<view class="">
+					{{sbobj.electricity == undefined ? '--' : sbobj.electricity}}
+				</view>
+				<view class="">
+					{{sbobj.realTimePower == undefined ? '--' : sbobj.realTimePower}}
+				</view>
+			</view>
+			<view class="dian_list">
+				<view class="">
+					电压（V）
+				</view>
+				<view class="">
+					电流（A）
+				</view>
+				<view class="">
+					功率（W）
+				</view>
+			</view>
+			<!-- <view class="botwz"> -->
+				<!-- 点击刷新实时信息 -->
+			<view @click="shuaxin" style="width: 100%;display: flex;color: #fff;justify-content: center;align-items: center;padding-top:40rpx;padding-bottom: 30rpx;box-sizing: border-box;">
+				点击刷新实时信息 
+			</view>
+			<!-- </view> -->
+		</view>
+
+		<view class="time_list">
+			<view class="time_top">
+				<!--      <view class="" v-if="detaobj.suitEndTime && detaobj.suitFeeType == 1">
+		        	{{formattedTime}}
+		        </view> -->
+				<view class="" v-if="detaobj.suitEndTime && detaobj.suitFeeType != 1">
+					已结束
+				</view>
+				<view class="" v-else>
+					<text
+						v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">{{timeDifferenceString == '' ? '1分' : timeDifferenceString}}</text>
+					<text v-if="detaobj.suitFeeType == 2">{{du}}度</text>
+					<text v-if="detaobj.suitFeeType == 1">{{formattedTime == '1秒' ? '0' : formattedTime}}</text>
+				</view>
+				<view class="" v-if="detaobj.suitEndTime">
+					￥{{detaobj.money}}
+				</view>
+				<view class="" v-else>
+					<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">￥{{feeprice}}</text> <text
+						v-else>￥{{detaobj.suitPrice == null ? '--' : detaobj.suitPrice}}</text>
+				</view>
+			</view>
+			<view class="time_bot" v-if="!detaobj.suitEndTime || detaobj.suitFeeType == 1">
+				<view class="">
+					<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">使用时长</text>
+					<text v-else>订单剩余</text>
+				</view>
+				<view class="">
+					<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">预估金额,以实际金额为准</text>
+					<text v-else>金额</text>
+				</view>
+			</view>
+		</view>
+		<view class="price_list">
+			<view class="top_price">
+				价格明细
+			</view>
+			<view class="qian">
+				<view class="yajin">
+					<text v-if="detaobj.suitFeeType == 1">{{detaobj.suitTime == null ? '--' : detaobj.suitTime}}<text
+							v-if="detaobj.suitTimeUnit == 2">时</text> <text v-if="detaobj.suitTimeUnit == 3">分钟</text>
+						<text v-if="detaobj.suitTimeUnit == 4">秒</text></text>
+					<text v-if="detaobj.suitFeeType == 2">{{detaobj.suitTime}}度</text>
+					<text v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">押金</text>
+				</view>
+				<view class="yuan">
+					{{detaobj.suitPrice == null ? '--' : detaobj.suitPrice}}元
+				</view>
+			</view>
+			<view class="jisuan">
+				计价方式：<text v-if="detaobj.suitFeeType == 1">计时收费</text>
+				<text v-if="detaobj.suitFeeType == 2">按量收费</text>
+				<text v-if="detaobj.suitFeeType == 3">分时段按量收费</text>
+				<text v-if="detaobj.suitFeeType == 4">分时段按时收费</text>
+			</view>
+			<view class="list_box" style="width: 100%" v-if="detaobj.suitFeeType == 3 || detaobj.suitFeeType == 4">
+				<view class="ulbox">
+					<view class="ulli">
+						<view class="li" v-for="(val,gearAmountindex) in newArr" :key="gearAmountindex">
+							{{val}}元
+						</view>
+					</view>
+					<view class="olli">
+						<view class="li" v-for="(vals,timeindex) in 24" :key="timeindex">
+							{{timeindex + ':00'}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="zujie">
+			<view class="toptit">
+				订单信息
+			</view> 
+			<view class="emilist">
+				<view class="">
+					订单编号
+				</view>
+				<view class="">
+					{{detaobj.billNo == null ? '--' : detaobj.billNo}}
+				</view>
+			</view>
+			<view class="emilist">
+				<view class="">
+					下单时间
+				</view>
+				<view class="">
+					{{detaobj.createTime == null ? '--' : detaobj.createTime}}
+				</view>
+			</view>
+			<view class="emilist"> 
+				<view class="">
+					开始时间
+				</view>
+				<view class="">
+					{{detaobj.suitStartTime == null ? '--' : detaobj.suitStartTime}}
+				</view>
+			</view>
+			<view class="emilist">
+				<view class="">
+					结束时间
+				</view>
+				<view class="">
+					{{detaobj.suitEndTime == null ? '--' : detaobj.suitEndTime}}
+				</view>
+			</view>
+			<view class="emilist">
+				<view class="">
+					店铺名称
+				</view>
+				<view class="">
+					{{detaobj.storeName == null ? '--' : detaobj.storeName}}
+				</view>
+			</view>
+			<view class="emilist">
+				<view class="">
+					用户
+				</view>
+				<view class="">
+					{{detaobj.userMobile == null ? '--' : detaobj.userMobile}}
+				</view>
+			</view>
+			<view class="emilist">
+				<view class="">
+					套餐名称
+				</view>
+				<view class="">
+					{{detaobj.suitName == null ? '--' : detaobj.suitName}}
+				</view>
+			</view>
+			<view class="emilist">
+				<view class="">
+					设备编号
+				</view>
+				<view class="">
+					{{detaobj.deviceNo == null ?'--' : detaobj.deviceNo}}
+				</view>
+			</view>
+		</view>
+
+		<!-- 订单暂停 -->
+		<!-- <view class="zujie" style="border-top:1px solid #D8D8D8;padding-top: 30rpx;box-sizing: border-box;">
+			<view class="toptit">
+				暂停订单
+			</view>
+           <view class="emilist" style="align-items: center;">
+           	  <view class="">
+           	  	  开关：关闭
+           	  </view>
+			  <u-switch v-model="checkeds" active-color="#8883f0"></u-switch>
+           </view>
+		</view>  v-if="detaobj.isFinished == false" -->
+		<view class="">
+			<view class="jieshu" >
+				<text @click="btnjieshu">结束订单</text>
+			</view>
+		</view>
+		<view class="mask" v-if="jieshufalg"></view>
+
+		<!-- 点击结束弹窗 -->
+		<view class="truebox" v-if="trueboxfalg">
+			<view class="titvalue">
+				您要提前结束此订单吗？
+			</view>
+			<view class="titvalue">
+				当前预估消费金额为{{Number(feeprice) < 0.01 ? '0.01' : feeprice}}元,实际消费以实际金额为准 <text
+					v-if="detaobj.suitFeeMode == 2 && detaobj.suitFeeType == 3">用电量为{{Number(totalElectriQuantity) - Number(suitStartEle)}}度</text>
+			</view>
+			<view class="truebtn">
+				<view class="quxiao" @click="trueboxfalg = false">
+					取消
+				</view>
+				<view class="queding" @click="btnbox">
+					确定
+				</view>
+			</view>
+		</view>
+		<view class="mask" v-if="trueboxfalg"></view>
+
+
+	</view>
+</template>
+
+<script>
+	var xBlufi = require("@/page_components/blufi/xBlufi.js")
+	import uniEcCanvas from '@/components/uni-ec-canvas/uni-ec-canvas.vue'
+	import * as echarts from '@/components/uni-ec-canvas/echarts'
+	let chart = null
+	export default {
+		components: {
+			uniEcCanvas
+		},
+		data() {
+			return {
+				checkeds: false,
+				trueboxfalg: false,
+				bgc: {
+					backgroundColor: "#8883f0",
+				},
+				ec: {
+					lazyLoad: true
+				},
+				deviceInfo: {},
+				loadings: false,
+				info: '',
+				tittxt: "订单详情",
+				titlist: [
+					"全部",
+					"电表",
+					"水表",
+
+				],
+				curtitidx: 0,
+				id: '',
+				timeday: '',
+				imglist: '',
+				token: '',
+				userImgs: '',
+				imgflag: true,
+				mac: "",
+				name: '',
+				deviceId: '',
+				storeId: '',
+				qrResult: '',
+				devicesList: [],
+				setMode: null,
+				vipflag: false,
+				cztime: '',
+				opflag: '',
+				timer: null,
+				newArr: [],
+				detaobj: {},
+				timeDifferenceString: 0,
+				timerId: null,
+				sbid: '',
+				onlineStatus: '',
+				billId: '',
+				orderno: '',
+				jieshuflag: false,
+				feeprice: '',
+				temperature: null,
+				du: '',
+				totalElectriQuantity: '',
+				suitStartEle: '',
+				sbobj: {},
+				jieshufalg:false,
+				channelId:''
+			}
+		},
+		onLoad(option) {
+			let id = option.id
+			this.id = id
+			this.$u.put(`/app/bill/${this.id}/refreshPayResult`).then(res => {
+				this.getDevice()
+			})
+			if (option.flag) {
+				this.opflag = option.flag
+			}
+		},
+		computed: {
+			formattedTime() {
+				if (this.timeday.days > 0) {
+					// 只展示天和小时  
+					return `${this.timeday.days}天${this.timeday.hours}小时`
+				} else if (this.timeday.hours > 0) {
+					// 展示小时和分钟  
+					return `${this.timeday.hours}小时${this.timeday.minutes}分钟`
+				} else if (this.timeday.minutes > 0) {
+					// 展示分钟和秒  
+					return `${this.timeday.minutes}分钟${this.timeday.seconds}秒`
+				} else if(this.timeday.seconds == 0){
+					this.getDevice()
+					this.timeday.seconds = 0
+				} else {
+					// 展示秒或0（如果秒也为0）  
+					return this.timeday.seconds > 0 ? `${this.timeday.seconds}秒` : '0'
+				}
+			}
+		},
+		onUnload: function() {
+			console.log("unload ");
+			xBlufi.listenDeviceMsgEvent(false, this.funListenDeviceMsgEvent);
+			wx.closeBLEConnection({
+				deviceId: this.deviceId,
+			})
+		},
+		// 分享到好友（会话）
+		onShareAppMessage: function() {
+			return {
+				title: '创想物联',
+				path: '/pages/shouye/index'
+			}
+		},
+
+		// 分享到朋友圈  
+		onShareTimeline: function() {
+			return {
+				title: '创想物联',
+				query: '',
+				path: '/pages/shouye/index'
+			}
+		},
+		onShow() {
+			setTimeout(() => {
+				this.startTimers()
+				if (this.id) {
+					//判断有没有id  没有的话则直接返回首页
+				} else {
+					uni.reLaunch({
+						url: '/pages/shouye/index'
+					})
+				}
+			}, 100)
+		},
+		onHide() {
+			this.stopTimer();
+		},
+		beforeDestroy() {
+			// 组件销毁前清除定时器，防止内存泄漏  
+			if (this.timer) {
+				clearInterval(this.timer)
+				this.timer = null;
+				console.log('已销毁')
+			}
+		},
+		onUnload() {
+			this.stopTimer();
+		},
+		methods: {
+			shuaxin(){
+				this.$u.get(`/app/device/${this.sbid}/refreshIot`).then((res) => {
+					if(res.code == 200){
+						this.getDevice()
+						this.getsb()
+						uni.showToast({
+							title: res.msg,
+							icon: 'success',
+							duration: 1500
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1500
+						})
+					}
+				})
+			},
+			
+			getzfqd(){
+				this.$u.get(`/app/channel/recharge/enabledList`).then(res =>{
+					if(res.code == 200){
+						this.channelId = res.data[0].channelId
+					}
+				})
+			},
+			btns() {
+				uni.navigateBack()
+			},
+			btnljzf() {
+				this.getzfqd()
+				let data = {
+					billNo: this.orderno,
+					channelId: this.channelId
+				}
+				this.$u.put(`/app/bill/pay`, data).then((res) => {
+					if (res.code == 200) {
+						let that = this
+						uni.requestPayment({
+							provider: 'wxpay',
+							timeStamp: res.data.payParams.timeStamp,
+							nonceStr: res.data.payParams.nonceStr,
+							package: res.data.payParams.packageVal,
+							signType: res.data.payParams.signType,
+							paySign: res.data.payParams.paySign,
+							success: (res) => {
+								that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`).then(
+									res => {})
+								// 支付成功逻辑
+								uni.showToast({
+									title: res.msg,
+									icon: 'success',
+									duration: 1000
+								})
+								setTimeout(() => {
+									that.jieshuflag = false
+									uni.reLaunch({
+										url: '/pages/shouye/index'
+									})
+								}, 2000)
+							},
+							fail(err) {
+								that.jieshuflag = false
+								// 支付失败逻辑
+								uni.showToast({
+									title: '支付失败',
+									icon: 'none',
+									duration: 2000
+								});
+							}
+						})
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				})
+			},
+			btnjieshu() {
+				this.getzfqd()
+				if (this.detaobj.suitFeeMode == 1) {
+					if (this.onlineStatus == 1) {
+						let that = this
+						uni.showModal({
+							title: '提示',
+							content: '您确定要提前结束用户订单吗？',
+							success: function(res) {
+								if (res.confirm) {
+									let data = {
+										billId: that.billId
+									}
+									that.$u.put(`/app/bill/endUse`, data).then(res => {
+										if (res.code == 200) {
+											if(res.data.deviceResult == false){
+												uni.showToast({
+													title: res.data.deviceMsg,
+													icon: 'none',
+													duration: 2000
+												})
+												setTimeout(()=>{
+													uni.navigateBack()
+												},1500)
+											}else{
+												uni.navigateBack()
+											}
+										} else {
+											uni.showToast({
+												title: res.msg,
+												icon: 'none',
+												duration: 1000
+											})
+										}
+									})
+								}
+							}
+						})
+					} else {
+						if (this.temperature == null) {
+							this.jieshufalg = true
+							uni.showLoading({
+								title: '切换中'
+							})
+							let that = this
+							xBlufi.initXBlufi(1);
+							xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': true
+							})
+							setTimeout(() => {
+								xBlufi.notifyStartDiscoverBle({
+									'isStart': false
+								})
+								if (that.devicesList.length > 0) {
+									xBlufi.notifyConnectBle({
+										isStart: true,
+										deviceId: that.deviceId,
+										name: that.name
+									})
+								}
+							}, 2000)
+							uni.showModal({
+								title: '温馨提示',
+								content: `检测到该设备未联网,为您切换为蓝牙模式,支付的时候靠近该设备,并打开蓝牙`,
+								showCancel: false,
+								success: function(res) {
+
+								}
+							})
+						} else {
+							this.jieshufalg = true
+							let data = {
+								billId: this.billId,
+							}
+							this.$u.put(`/app/bill/endUse`, data).then(res => {
+								if (res.code == 200) {
+									uni.getNetworkType({
+										success(res) {
+											if (res.networkType !== 'none') {
+												uni.getConnectedBluetoothDevices({
+													success(res) {
+														setTimeout(() => {
+															xBlufi.notifySendCustomData({
+																customData: 'close'
+															})
+															xBlufi.notifySendCustomData({
+																customData: '11close'
+															})
+															uni.showToast({
+																title: res.msg,
+																icon: 'success',
+																duration: 2000
+															})
+															this.jieshufalg = false
+															setTimeout(() => {
+																uni.navigateBack()
+															}, 1000)
+														}, 1500)
+													},
+													fail(err) {
+														console.error('获取已连接蓝牙设备信息失败：', err)
+													}
+												})
+											} else {
+												console.log('手机未连接网络')
+												// this.baiflag = false
+											}
+										}
+									})
+								} else {
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							})
+						}
+					}
+				} else {
+					this.getsb()
+					this.trueboxfalg = true
+				}
+			},
+			btnbox() {
+				this.trueboxfalg = false
+				this.jieshuflag = true
+				if (this.onlineStatus == 1) {
+					if (this.detaobj.suitFeeType == 1 || this.detaobj.suitFeeType == 2) {
+						let data = {
+							billId: this.billId
+						}
+						this.$u.put(`/app/bill/endUse`, data).then(res => {
+							if (res.code == 200) {
+								if(res.data.deviceResult == false){
+									uni.showToast({
+										title: res.data.deviceMsg,
+										icon: 'none',
+										duration: 2000
+									})
+									setTimeout(()=>{
+										this.jieshuflag = false
+										uni.reLaunch({
+											url: '/pages/shouye/index'
+										})
+									},1500)
+								}else{
+									this.jieshuflag = false
+									uni.reLaunch({
+										url: '/pages/shouye/index'
+									})
+								}
+							} else {
+								this.getDevice()
+								this.jieshuflag = false
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								})
+							}
+						})
+					} else {
+						if (this.detaobj.status == 1) {
+							let data = {
+								billNo: this.orderno,
+								channelId: this.channelId
+							}
+							this.$u.put(`/app/bill/pay`, data).then((res) => {
+								if (res.code == 200) {
+									let that = this
+									uni.requestPayment({
+										provider: 'wxpay',
+										timeStamp: res.data.payParams.timeStamp,
+										nonceStr: res.data.payParams.nonceStr,
+										package: res.data.payParams.packageVal,
+										signType: res.data.payParams.signType,
+										paySign: res.data.payParams.paySign,
+										success: (res) => {
+											that.$u.put(`/app/bill/${that.orderno}/refreshPayResult`)
+												.then(res => {})
+											// 支付成功逻辑
+											uni.showToast({
+												title: res.msg,
+												icon: 'success',
+												duration: 1000
+											})
+											setTimeout(() => {
+												that.jieshuflag = false
+												uni.reLaunch({
+													url: '/pages/shouye/index'
+												})
+											}, 1500)
+										},
+										fail(err) {
+											that.getDevice()
+											that.jieshuflag = false
+											// 支付失败逻辑
+											uni.showToast({
+												title: '支付失败',
+												icon: 'none',
+												duration: 2000
+											});
+										}
+									})
+								}else{
+						       uni.showToast({
+							   title: res.msg,
+							   icon: 'none',
+							   duration: 2000
+						})
+					}
+							})
+						} else {
+							let data = {
+								billId: this.billId
+							}
+							this.$u.put(`/app/bill/endUse`, data).then(res => {
+								if (res.code == 200) {
+									let data = {
+										billNo: this.orderno,
+										channelId: this.channelId
+									}
+									this.$u.put(`/app/bill/pay`, data).then((res) => {
+										if (res.code == 200) {
+											let that = this
+											uni.requestPayment({
+												provider: 'wxpay',
+												timeStamp: res.data.payParams.timeStamp,
+												nonceStr: res.data.payParams.nonceStr,
+												package: res.data.payParams.packageVal,
+												signType: res.data.payParams.signType,
+												paySign: res.data.payParams.paySign,
+												success: (res) => {
+													that.$u.put(
+														`/app/bill/${that.orderno}/refreshPayResult`
+														).then(res => {})
+													// 支付成功逻辑
+													uni.showToast({
+														title: res.msg,
+														icon: 'success',
+														duration: 1000
+													})
+													setTimeout(() => {
+														that.jieshuflag = false
+														uni.reLaunch({
+															url: '/pages/shouye/index'
+														})
+													}, 1500)
+												},
+												fail(err) {
+													that.jieshuflag = false
+													// 支付失败逻辑
+													uni.showToast({
+														title: '支付失败',
+														icon: 'none',
+														duration: 2000
+													});
+												}
+											})
+										}
+									})
+								} else {
+									this.getDevice()
+									this.jieshuflag = false
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							})
+						}
+					}
+				} else {
+					// console.log(this.temperature,'this.temperature');
+					if (this.temperature == null) {
+						uni.showLoading({
+							title: '切换中'
+						})
+						let that = this
+						xBlufi.initXBlufi(1);
+						xBlufi.listenDeviceMsgEvent(true, that.funListenDeviceMsgEvent);
+						xBlufi.notifyStartDiscoverBle({
+							'isStart': true
+						})
+						setTimeout(() => {
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': false
+							})
+							if (that.devicesList.length > 0) {
+								xBlufi.notifyConnectBle({
+									isStart: true,
+									deviceId: that.deviceId,
+									name: that.name
+								})
+							}
+						}, 2000)
+						uni.showModal({
+							title: '温馨提示',
+							content: `检测到该设备未联网,为您切换为蓝牙模式,支付的时候靠近该设备,并打开蓝牙`,
+							showCancel: false,
+							success: function(res) {
+
+							}
+						})
+					} else {
+						if (this.detaobj.suitFeeType == 1 || this.detaobj.suitFeeType == 2) {
+							let data = {
+								billId: this.billId,
+								totalEle: this.temperature
+							}
+							this.$u.put(`/app/bill/endUse`, data).then(res => {
+								if (res.code == 200) {
+									uni.getNetworkType({
+										success(res) {
+											if (res.networkType !== 'none') {
+												uni.getConnectedBluetoothDevices({
+													success(res) {
+														setTimeout(() => {
+															xBlufi.notifySendCustomData({
+																customData: 'close',
+															})
+															xBlufi.notifySendCustomData({
+																customData: '11close',
+															})
+															setTimeout(() => {
+																this.jieshuflag = false
+																uni.reLaunch({
+																	url: '/pages/shouye/index'
+																})
+															}, 1000)
+														}, 1500)
+													},
+													fail(err) {
+														console.error('获取已连接蓝牙设备信息失败：', err)
+													}
+												})
+											} else {
+												console.log('手机未连接网络')
+												// this.baiflag = false
+											}
+										}
+									})
+								} else {
+									this.jieshuflag = false
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							})
+						} else {
+							let data = {
+								billId: this.billId,
+								totalEle: this.temperature
+							}
+							this.$u.put(`/app/bill/endUse`, data).then(res => {
+								if (res.code == 200) {
+									let that = this
+									uni.getNetworkType({
+										success(res) {
+											if (res.networkType !== 'none') {
+												uni.getConnectedBluetoothDevices({
+													success(res) {
+														setTimeout(() => {
+															xBlufi.notifySendCustomData({
+																customData: 'close',
+															})
+															xBlufi.notifySendCustomData({
+																customData: '11close',
+															})
+															setTimeout(() => {
+																let data = {
+																	billNo: that.orderno,
+																	channelId: that.channelId
+																}
+																that.$u.put(`/app/bill/pay`,data).then((res) => {
+																		if (res.code ==200) {
+																			uni.requestPayment({
+																				provider: 'wxpay',
+																				timeStamp: res.data.payParams.timeStamp,
+																				nonceStr: res.data.payParams.nonceStr,
+																				package: res
+																					.data
+																					.payParams
+																					.packageVal,
+																				signType: res
+																					.data
+																					.payParams
+																					.signType,
+																				paySign: res
+																					.data
+																					.payParams
+																					.paySign,
+																				success: (
+																					res
+																					) => {
+																					that.$u
+																						.put(
+																							`/app/bill/${that.orderno}/refreshPayResult`
+																						)
+																						.then(
+																							res => {}
+																							)
+																					// 支付成功逻辑
+																					uni.showToast({
+																						title: res
+																							.msg,
+																						icon: 'success',
+																						duration: 1000
+																					})
+																					setTimeout
+																						(() => {
+																								that.jieshuflag =
+																									false
+																								uni.reLaunch({
+																									url: '/pages/shouye/index'
+																								})
+																							},
+																							1500
+																							)
+																				},
+																				fail(
+																					err
+																					) {
+																					that.jieshuflag =
+																						false
+																					// 支付失败逻辑
+																					uni.showToast({
+																						title: '支付失败',
+																						icon: 'none',
+																						duration: 2000
+																					});
+																				}
+																			})
+																		}
+																	})
+															}, 1000)
+														}, 1500)
+													},
+													fail(err) {
+														console.error('获取已连接蓝牙设备信息失败：', err)
+													}
+												})
+											} else {
+												console.log('手机未连接网络')
+												// this.baiflag = false
+											}
+										}
+									})
+								} else {
+									this.getDevice()
+									this.jieshuflag = false
+									uni.showToast({
+										title: res.msg,
+										icon: 'none',
+										duration: 2000
+									})
+								}
+							})
+						}
+
+					}
+				}
+			},
+
+			// 每一分钟请求更新一次
+			startTimers() {
+				// 确保没有重复的定时器  
+				if (this.timerId !== null) {
+					clearInterval(this.timerId)
+				}
+				// 设置定时器，每分钟执行一次 timerCallback 函数   
+				this.timerId = setInterval(this.getDevice, 60000)
+			},
+			// 销毁定时器  
+			stopTimer() {
+				if (this.timerId !== null) {
+					clearInterval(this.timerId)
+					this.timerId = null
+				}
+			},
+			// 预估金额
+			getprice() {
+				this.$u.get(`app/bill/calcPrice?billId=${this.billId}`).then(res => {
+					if (res.code == 200) {
+						this.feeprice = res.data.toFixed(2)
+					}
+				})
+			},
+
+			// 获取设备详情
+			getDevice() {
+				this.$u.get(`/app/bill/byNo/${this.id}`).then(res => {
+					if (res.code == 200) {
+						this.sbid = res.data.deviceId
+						this.suitStartEle = res.data.suitStartEle //设备开始前用电
+						this.getsb()
+						this.detaobj = res.data
+						this.billId = res.data.billId
+						this.orderno = res.data.billNo
+						this.getprice()
+						let dateTimeString = res.data.suitStartTime // 示例时间字符串  
+						this.timeDifferenceString = this.calculateTimeDifference(dateTimeString); // 调用函数  
+						// console.log(timeDifferenceString);
+						if (res.data.suitGearAmount.length > 0) {
+							this.newArr = []
+							for (let i = 0; i < res.data.suitGearTime.length; i++) {
+								let value = res.data.suitGearAmount[res.data.suitGearTime[i]];
+								this.newArr.push(value)
+							}
+						}
+						if (this.detaobj.suitEndEle) {
+							let du = Number(this.detaobj.suitEndEle) - Number(this.detaobj.deviceTotalEle)
+							this.du = du.toFixed(2)
+						}
+						if (this.detaobj.suitExpireTime == null) {
+							this.timeday = 0
+						} else {
+							let expireTimeStr = this.detaobj.suitExpireTime
+							let expireTimeParts = expireTimeStr.split(" ")
+							let expireDateParts = expireTimeParts[0].split("-")
+							let expireTimePartsTime = expireTimeParts[1].split(":")
+							let expireDate = new Date(expireDateParts[0], expireDateParts[1] - 1, expireDateParts[
+								2], expireTimePartsTime[0], expireTimePartsTime[1], expireTimePartsTime[2])
+							let now = new Date()
+							let differenceInMs = expireDate - now;
+							if (differenceInMs <= 0) {
+								this.timeday = 0
+							} else {
+								if (this.timeday == '') {
+									this.timeday = this.formatMilliseconds(differenceInMs)
+									this.startTimer()
+								}
+							}
+						}
+					}
+				})
+			},
+			getsb() {
+				this.$u.get(`/app/device/${this.sbid}`).then(res => {
+					if (res.code == 200) {
+						this.sbobj = res.data
+						this.onlineStatus = res.data.onlineStatus
+						this.qrResult = res.data.mac
+						this.totalElectriQuantity = res.data.totalElectriQuantity
+					}
+				})
+			},
+
+			calculateTimeDifference(dateTimeString) {
+				// 将时间字符串转换为Date对象  
+				const date = new Date(dateTimeString)
+				// 获取当前时间  
+				const now = new Date()
+
+				// 计算时间差（毫秒）  
+				const diff = now - date
+
+				// 将毫秒转换为天、小时、分钟和秒  
+				const days = Math.floor(diff / (1000 * 60 * 60 * 24))
+				const hours = Math.floor((diff % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+				const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60))
+				const seconds = Math.floor((diff % (1000 * 60)) / 1000)
+
+				// 创建一个对象来存储结果，并忽略零值  
+				const timeDifference = {
+					days: days > 0 ? days : undefined,
+					hours: hours > 0 ? hours : undefined,
+					minutes: minutes > 0 ? minutes : undefined,
+					seconds: seconds > 0 ? seconds : undefined
+				};
+
+				// 转换为字符串，忽略未定义的属性  
+				let result = ''
+				if (timeDifference.days !== undefined) {
+					result += `${timeDifference.days}天`
+				}
+				if (timeDifference.hours !== undefined) {
+					result += `${timeDifference.hours}时`
+				}
+				if (timeDifference.minutes !== undefined) {
+					result += `${timeDifference.minutes + 1}分`
+				}
+				// if (timeDifference.seconds !== undefined) {  
+				//   result += `${timeDifference.seconds}秒`
+				// }  
+				return result;
+			},
+
+
+
+			startTimer() {
+				this.timer = setInterval(() => {
+					if (this.timeday.seconds > 0) {
+						this.timeday.seconds--
+					} else if (this.timeday.minutes > 0) {
+						this.timeday.seconds = 59 // 重置秒数为59  
+						this.timeday.minutes--
+					} else if (this.timeday.hours > 0) {
+						this.timeday.minutes = 59 // 重置分钟数为59  
+						this.timeday.hours--
+						this.timeday.seconds = 0 // 同时重置秒数为0  
+					} else if (this.timeday.days > 0) {
+						this.timeday.hours = 23 // 重置小时数为23  
+						this.timeday.minutes = 59 // 重置分钟数为59  
+						this.timeday.seconds = 0 // 重置秒数为0  
+						this.timeday.days--
+					} else {
+						// 所有时间单位都已减为0，停止定时器  
+						clearInterval(this.timer)
+						this.timer = null;
+						console.log('时间已到期')
+					}
+				}, 1000); // 每秒执行一次  
+			},
+			// 计算天时分秒
+			formatMilliseconds(milliseconds) {
+				// 计算天数  
+				let days = Math.floor(milliseconds / (1000 * 60 * 60 * 24))
+				// 计算剩余的小时数  
+				let hours = Math.floor((milliseconds % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60))
+				// 计算剩余的分钟数  
+				let minutes = Math.floor((milliseconds % (1000 * 60 * 60)) / (1000 * 60))
+				// 计算剩余的秒数  
+				let seconds = Math.floor((milliseconds % (1000 * 60)) / 1000)
+				// 返回一个对象，包含天、小时、分钟和秒  
+				return {
+					days: days,
+					hours: hours,
+					minutes: minutes,
+					seconds: seconds
+				}
+			},
+			opendevice() {
+				let stause = 0
+				if (this.deviceInfo.powerStatus == 1) {
+					stause = 0
+				} else {
+					stause = 1
+				}
+				// console.log(stause, 'stausestause');
+				this.$u.put(`/app/device/${this.deviceInfo.deviceId}/changePower?status=` + stause).then((res) => {
+					// this.$forceUpdate()
+					if (res.code == 200) {
+						// this.groupList=res.rows
+						setTimeout(() => {
+							this.getDevice()
+						}, 2000)
+
+						// this.loadings=true
+						// this.initChart()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				});
+			},
+			opendevices() {
+
+			},
+			swiperchange(e) {
+				this.curtitidx = e.detail.current
+				// console.log(e, 'aaaa');
+			},
+			changeidx(index) {
+				this.curtitidx = index
+			},
+
+			toydfx() {
+				uni.navigateTo({
+					url: "/page_components/eletj?id=" + this.id
+				})
+			},
+
+
+			funListenDeviceMsgEvent: function(options) {
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+						if (options.result) {
+							let devicesarr = options.data
+							console.log(devicesarr, this.mac, '111');
+							devicesarr.forEach(device => {
+								const mac = device.name.substring(4);
+								if (device.name.slice(5, 17) == this.qrResult) {
+									this.deviceId = device.deviceId
+									this.name = device.name
+									// console.log(device.name,this.mac,'222');
+									this.devicesList.push(device);
+									let uniqueDevicesList = Array.from(new Set(this.devicesList));
+									// 将去重后的数组重新赋值给 this.devicesList
+									this.devicesList = uniqueDevicesList;
+								} else {
+									// uni.showToast({
+									// 	title: '未找到该设备，请确认该设备在附近',
+									// 	icon: 'none',
+									// 	duration: 3000
+									// })
+								}
+							})
+						}
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
+						console.log("连接回调：" + JSON.stringify(options));
+						if (options.result) {
+							// console.log('125451245')  
+							{
+								xBlufi.notifyInitBleEsp32({
+									deviceId: this.deviceId
+								});
+								xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents);
+								this.deviceIds = options.data.deviceId
+								this.name = this.name
+							}
+						} else {
+
+						}
+
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+						this.ver_data = this.parseCustomData(options.data)
+						console.log("1收到设备发来的自定义数据结果：", this.ver_data);
+						this.temperature = this.ver_data.temperature / 1000
+						setTimeout(() => {
+							// this.czflag = false
+							this.jieshuflag = false
+							this.jieshufalg = false
+							uni.hideLoading()
+						}, 1000)
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
+						if (options.result) {
+							let uniqueDevicesList = Array.from(new Set(this.devicesList));
+							let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) ===
+								"CTKG");
+							// 将过滤后的数组重新赋值给 this.devicesList
+							this.devicesList = filteredDevices;
+						}
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
+						if (!options.result) {
+							this.lanyaflag = true
+							uni.showToast({
+								title: '蓝牙未开启',
+								icon: 'none',
+								duration: 3000
+							});
+							return
+						} else {
+							this.lanyaflag = false
+						}
+						break;
+				}
+			},
+
+			parseCustomData(data) {
+				// 将字符串按照 "@" 分割成数组  
+				const dataArray = data.split('@');
+				// 初始化一个空对象来存储解析后的数据  
+				const parsedData = {};
+				// 前缀到属性名的映射  
+				const prefixMap = {
+					'V': 'voltage',
+					'S': 'switchState',
+					'A': 'current',
+					'P': 'power',
+					'M': 'remainingPower',
+					'T': 'setMode',
+					'W': 'temperature'
+				};
+				// 遍历数组并解析每个字段  
+				for (let i = 0; i < dataArray.length; i++) {
+					const field = dataArray[i];
+					for (const prefix in prefixMap) {
+						if (field.startsWith(prefix)) {
+							// 去除前缀并将剩余部分转换为适当的类型（这里默认为浮点数或字符串）  
+							const value = field.substring(1);
+							const propertyName = prefixMap[prefix];
+							// 根据需要，这里可以添加更复杂的类型转换逻辑  
+							// 但为了简单起见，我们总是尝试将其转换为浮点数，如果失败则保留为字符串  
+							parsedData[propertyName] = isNaN(parseFloat(value)) ? value : parseFloat(value);
+							// 找到了匹配的前缀，跳出内层循环  
+							break;
+						}
+					}
+				}
+				// 返回解析后的数据对象  
+				return parsedData;
+			},
+
+			// parseCustomData(data) {
+			// 	// 将字符串按照 "@" 分割成数组
+			// 	const dataArray = data.split('@');
+			// 	// 根据约定，解析各个字段的值
+			// 	const voltage = parseFloat(dataArray[0].substring(1)); // 去除前缀 "V"，并将字符串转换为浮点数
+			// 	const switchState = dataArray[1].substring(1); // 去除前缀 "S"
+			// 	const current = parseFloat(dataArray[2].substring(1)); // 去除前缀 "A"，并将字符串转换为浮点数
+			// 	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,
+			// 		switchState,
+			// 		current,
+			// 		power,
+			// 		remainingPower,
+			// 		setMode
+			// 	}
+			// },
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	/deep/ .u-title {
+		padding-bottom: 22rpx;
+	}
+
+	/deep/ .u-icon__icon {
+		padding-bottom: 22rpx;
+	}
+
+	page {
+		background-color: #F7FAFE;
+		padding: 0 30rpx;
+		box-sizing: border-box;
+		padding-bottom: 300rpx;
+		overflow: scroll;
+	}
+
+	.truebox {
+		width: 500rpx;
+		max-height: 380rpx;
+		border-radius: 20rpx;
+		background-color: #fff;
+		position: fixed;
+		top: 40%;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 99;
+		padding: 30rpx;
+		box-sizing: border-box;
+
+		.titvalue {
+			width: 100%;
+			text-align: center;
+			margin-top: 30rpx;
+			font-size: 32rpx;
+		}
+
+		.truebtn {
+			display: flex;
+			margin-top: 30rpx;
+
+			.quxiao {
+				border-right: 1px solid #ccc;
+			}
+
+			view {
+				width: 50%;
+				text-align: center;
+				height: 90rpx;
+				line-height: 90rpx;
+				border-top: 1px solid #ccc;
+			}
+		}
+	}
+
+	.jieshu {
+		width: 558rpx;
+		height: 90rpx;
+
+		text {
+			width: 558rpx;
+			height: 90rpx;
+			display: block;
+		}
+
+		line-height: 90rpx;
+		background: #8883F0;
+		border-radius: 54rpx 54rpx 54rpx 54rpx;
+		font-size: 36rpx;
+		color: #FFFFFF;
+		// font-weight: 600;
+		text-align: center;
+		position: fixed;
+		bottom: 76rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	.zujie {
+		margin-top: 32rpx;
+
+		.toptit {
+			font-size: 32rpx;
+			color: #333333;
+			font-weight: 600;
+		}
+
+		.emilist {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 28rpx;
+
+			view {
+				font-size: 24rpx;
+				color: #808080;
+			}
+		}
+	}
+
+	.price_list {
+		border-bottom: 1px solid #D8D8D8;
+		padding-bottom: 26rpx;
+		box-sizing: border-box;
+
+		.top_price {
+			font-size: 32rpx;
+			color: #333333;
+			font-weight: 600;
+			margin-top: 24rpx;
+			margin-bottom: 28rpx;
+		}
+
+		.jisuan {
+			font-size: 24rpx;
+			color: #333333;
+			margin-top: 24rpx;
+			margin-bottom: 30rpx;
+		}
+
+		.qian {
+			width: 100%;
+			display: flex;
+			justify-content: space-between;
+
+			.yuan {
+				font-size: 24rpx;
+				color: #333333;
+			}
+
+			.yajin {
+				font-size: 24rpx;
+				color: #808080;
+			}
+		}
+	}
+
+	.list_box {
+		.ulbox {
+			width: 100%;
+			overflow: scroll;
+
+			.ulli {
+				display: flex;
+				width: 170vh;
+
+				.li {
+					flex: 1;
+					border: 1rpx solid #ccc;
+					text-align: center;
+					font-size: 32rpx;
+					color: #8883F0;
+					height: 88rpx;
+					line-height: 88rpx;
+				}
+			}
+
+			.olli {
+				display: flex;
+				width: 170vh;
+
+				.li {
+					flex: 1;
+					border: 1rpx solid #ccc;
+					text-align: center;
+					font-size: 22rpx;
+					color: #262B37;
+					height: 88rpx;
+					line-height: 88rpx;
+				}
+			}
+		}
+	}
+
+	.time_list {
+		width: 100%;
+		border-bottom: 1px solid #D8D8D8;
+		padding-bottom: 34rpx;
+		box-sizing: border-box;
+
+		.time_top {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 20rpx;
+
+			view {
+				font-size: 40rpx;
+				color: #3D3D3D;
+				font-weight: 600;
+			}
+		}
+
+		.time_bot {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 30rpx;
+
+			view {
+				font-size: 24rpx;
+				color: #666666;
+			}
+		}
+	}
+
+	.dltop {
+		width: 100%;
+		height: 224rpx;
+		background: #8883F0;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		margin: auto;
+		margin-top: 36rpx;
+        padding-bottom: 20rpx;
+		box-sizing: border-box;
+		.dian_list {
+			display: flex;
+			justify-content: space-between;
+			text-align: center;
+			font-size: 34rpx;
+			color: #FFFFFF;
+
+			view {
+				width: 180rpx;
+				text-align: center;
+				margin-top: 22rpx;
+			}
+		}
+
+		.botwz {
+			font-size: 28rpx;
+			color: #FFFFFF;
+			width: 100%;
+			text-align: center;
+			margin-top: 16rpx;
+		}
+	}
+
+	.mask {
+		width: 750rpx;
+		height: 100vh;
+		background: #000000;
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		opacity: 0.2;
+		z-index: 1;
+		position: fixed;
+		top: 0;
+		left: 0;
+	}
+
+	.tanc {
+		width: 610rpx;
+		height: 282rpx;
+		background: #FFFFFF;
+		border-radius: 30rpx 30rpx 30rpx 30rpx;
+		position: fixed;
+		top: 628rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		z-index: 2;
+
+		.tit {
+			width: 100%;
+			text-align: center;
+			margin-top: 28rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #3D3D3D;
+		}
+
+		input {
+			width: 504rpx;
+			height: 62rpx;
+			background: #EEEEEE;
+			border-radius: 6rpx 6rpx 6rpx 6rpx;
+			margin: auto;
+			margin-top: 22rpx;
+			padding-left: 20rpx;
+		}
+
+		.xian {
+			width: 610rpx;
+			height: 2rpx;
+			background: #D8D8D8;
+			border-radius: 0rpx 0rpx 0rpx 0rpx;
+			margin-top: 26rpx;
+		}
+
+		.anniu {
+			display: flex;
+			justify-content: space-between;
+			height: 98rpx;
+
+			text {
+				padding: 24rpx;
+				text-align: center;
+				box-sizing: border-box;
+				font-weight: 500;
+				font-size: 36rpx;
+				color: #3D3D3D;
+				display: inline-block;
+				width: 100%;
+				height: 100rpx;
+			}
+		}
+	}
+
+	.page {
+		.zhuhu {
+			margin-top: 60rpx;
+			padding: 0 40rpx;
+
+			.card1 {
+				padding: 34rpx 0 0 40rpx;
+				width: 670rpx;
+				height: 260rpx;
+				background: #FFFFFF;
+				box-shadow: 0rpx 14rpx 35rpx 0rpx rgba(53, 140, 255, 0.1);
+				border-radius: 28rpx 28rpx 0rpx 0rpx;
+
+				.top {
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-between;
+					align-items: center;
+
+					.left {
+						font-size: 35rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 400;
+						color: #8883F0;
+					}
+
+					.right {
+						margin-right: 56rpx;
+
+						.img1 {
+							width: 76rpx;
+							height: 76rpx;
+						}
+					}
+				}
+
+				.mid {
+					margin-top: 20rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-content: flex-start;
+
+					.mid_left {
+						image {
+							width: 160rpx;
+							height: 160rpx;
+							border-radius: 20rpx;
+						}
+					}
+
+					.mid_right {
+						margin-left: 40rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.mid_top {
+							width: 100%;
+							font-size: 42rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+
+						.mid_bot {
+							display: flex;
+							flex-wrap: nowrap;
+							align-items: center;
+
+							.txt {
+								font-size: 26rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #95989D;
+							}
+
+							.tip {
+								display: flex;
+								align-items: center;
+								justify-content: center;
+								margin-left: 19rpx;
+								// width: 38rpx;
+								// height: 23rpx;
+								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-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #8883F0;
+							}
+						}
+					}
+				}
+
+				.bot {
+					margin-top: 53rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+
+					.bot_left {
+						width: 210rpx;
+						height: 180rpx;
+						margin-right: 34rpx;
+
+						.echarts {
+							// width: 210rpx;
+							height: 200rpx;
+
+							.uni-ec-canvas {
+								width: 100%;
+								height: 100rpx !important;
+								display: block;
+								// margin-top: 30rpx;
+							}
+						}
+					}
+
+					.bot_right {
+						// margin-top: 50rpx;
+						display: flex;
+						// flex-wrap: nowrap;
+						width: 100%;
+						justify-content: space-between;
+						padding-left: 210rpx;
+						padding-right: 80rpx;
+						box-sizing: border-box;
+
+						.cont {
+							.tit {
+								font-size: 28rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 600;
+								color: #262B37;
+								line-height: 49rpx;
+							}
+
+							.txt {
+								font-size: 26rpx;
+								font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+								font-weight: 400;
+								color: #262B37;
+							}
+						}
+					}
+				}
+			}
+
+			.bot_right {
+				// margin-top: 50rpx;
+				display: flex;
+				// flex-wrap: nowrap;
+				width: 100%;
+				justify-content: space-between;
+				padding-left: 220rpx;
+				padding-right: 80rpx;
+				box-sizing: border-box;
+
+				.cont {
+					.tit {
+						font-size: 28rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 600;
+						color: #262B37;
+						line-height: 49rpx;
+						margin-left: 0;
+					}
+
+					.txt {
+						font-size: 26rpx;
+						font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+						font-weight: 400;
+						color: #262B37;
+					}
+				}
+			}
+
+			.card2 {
+				padding-top: 0rpx;
+				width: 670rpx;
+				height: 60rpx;
+				background: #FFFFFF;
+				border-radius: 0 0 28rpx 28rpx;
+
+				.tit {
+					margin-left: 40rpx;
+
+					font-size: 35rpx;
+					font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+					font-weight: 400;
+					color: #8883F0;
+				}
+
+				.cont_box {
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-around;
+
+
+					.cont {
+						width: 25%;
+						display: flex;
+						flex-wrap: wrap;
+						align-items: center;
+						justify-content: center;
+						text-align: center;
+
+						.top {
+							width: 110rpx;
+							font-size: 32rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+
+						.bot {
+							margin-top: 20rpx;
+							font-size: 26rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #262B37;
+						}
+					}
+				}
+			}
+
+			.card3 {
+				padding-top: 40rpx;
+				margin-top: 24rpx;
+				width: 670rpx;
+				// height: 318rpx;
+				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;
+				}
+
+				.cont_box {
+					// padding-left: 30rpx;
+					// 	padding-right: 30rpx;
+					padding: 0 40rpx;
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					justify-content: space-around;
+
+					.cont:last-child {
+						margin-right: 0rpx;
+					}
+
+					.cont {
+						width: 112rpx;
+						display: flex;
+						flex-wrap: wrap;
+						align-items: center;
+						justify-content: center;
+						margin-right: 80rpx;
+
+						.top {
+							image {
+								width: 56rpx;
+								height: 56rpx;
+							}
+						}
+
+						.bot {
+							margin-top: 15rpx;
+							font-size: 28rpx;
+							font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+							font-weight: 400;
+							color: #808080;
+						}
+					}
+				}
+			}
+
+			.button {
+				margin-left: 76rpx;
+				margin-top: 178rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				width: 520rpx;
+				height: 104rpx;
+				background: #8883F0;
+				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+				border-radius: 52rpx 52rpx 52rpx 52rpx;
+
+				font-size: 32rpx;
+				font-family: HarmonyOS Sans SC, HarmonyOS Sans SC;
+				font-weight: 400;
+				color: #FFFFFF;
+			}
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/tj.vue b/pages/tj.vue
index e618528..a70a744 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -17,7 +17,7 @@
 						name="arrow-down-fill"></u-icon>
 				</view>
 				<view class="tit">
-					本月收入{{recharge}}（元） 累计收入{{totalRecharge}}（元）
+					本月收入{{recharge.toFixed(2)}}（元） 累计收入{{totalRecharge.toFixed(2)}}（元）
 				</view>
 
 				<view class="echarts" >