diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 134b800..c3a0345 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,8 +20,8 @@ const install = (Vue, vm) => {
 	// 	},
 	// }); 
 	Vue.prototype.$u.http.setConfig({
-			baseUrl: 'http://192.168.2.81:3302',
-			// baseUrl: 'https://kang.chuangtewl.com/prod-api',
+			// baseUrl: 'http://192.168.2.81:3302',
+			baseUrl: 'https://kang.chuangtewl.com/prod-api',
 			loadingText: '努力加载中~',
 			loadingTime: 800,
 			// 设置自定义头部content-type
diff --git a/components/blufi/xBlufi-wx-impl.js b/components/blufi/xBlufi-wx-impl.js
index b0a5566..ef1a3f3 100644
--- a/components/blufi/xBlufi-wx-impl.js
+++ b/components/blufi/xBlufi-wx-impl.js
@@ -1145,7 +1145,7 @@ function init() {
 												// 	&& devices.devices[0].name != 'SMART_R2XS'
 												// 	&& devices.devices[0].name != 'SMART_R2XS'
 												// ) 
-												if (devices.devices[0].name.indexOf("CTKG") != -1 || devices.devices[0].name.indexOf("CTPO") != -1 || devices.devices[0].name.indexOf("BBLE") != -1){
+												if (devices.devices[0].name.indexOf("CCYK") != -1 || devices.devices[0].name.indexOf("BBLE") != -1){
 													// console.log("跳过",devices.devices[0].name)
 													// isnotexist = false;
 													isnotexist = true;
diff --git a/page_fenbao/shiyong.vue b/page_fenbao/shiyong.vue
index b45f0be..324010b 100644
--- a/page_fenbao/shiyong.vue
+++ b/page_fenbao/shiyong.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar title="使用说明" :border-bottom="false" :background="bgc" title-color='#3D3D3D' back-icon-color="#3D3D3D"
-			title-size='36' height='44'></u-navbar>
+		<u-navbar :title="tit" :border-bottom="false" :background="bgc" title-color='#3D3D3D' back-icon-color="#3D3D3D"
+			title-size='38' height='44'></u-navbar>
         
       <!--  <view class="cont" v-html="cont">
         	
@@ -23,10 +23,12 @@
 				bgc: {
 					// background:'linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%)'
 				},
-                cont:''
+                cont:'',
+				tit:''
 			}
 		},
-		onLoad() {
+		onLoad(option) {
+			this.tit = option.tit
 			this.getwz()
 		},
 		// 分享到好友（会话）
@@ -70,6 +72,7 @@
 		height: 89vh;
 		overflow: scroll;
 		margin-top: 10rpx;
+		font-size: 32rpx;
 	}
 	page {
 		background: #F4F5F7;
diff --git a/page_user/changsuo.vue b/page_user/changsuo.vue
index 80047ff..2257fa7 100644
--- a/page_user/changsuo.vue
+++ b/page_user/changsuo.vue
@@ -36,19 +36,19 @@
          		<view class="shou">
          			<view class="shou_val">
          				<view class="one">日收</view>
-         				<view class="two">{{item.todayIncome}} <text>￥</text> </view>
+         				<view class="two"><text>￥</text>{{item.todayIncome == undefined ? '--' : item.todayIncome}}  </view>
          			</view>
          			<view class="shou_val">
          				<view class="one">月收</view>
-         				<view class="two">{{item.monthIncome}} <text>￥</text> </view>
+         				<view class="two"><text>￥</text>{{item.monthIncome == undefined ? '--' : item.monthIncome}}  </view>
          			</view>
          			<view class="shou_val">
          				<view class="one">上月收</view>
-         				<view class="two">{{item.lastMonthIncome}} <text>￥</text> </view>
+         				<view class="two"><text>￥</text>{{item.lastMonthIncome == uniCloud ? '--' : item.lastMonthIncome}} </view>
          			</view>
          			<view class="shou_val">
          				<view class="one">设备数</view>
-         				<view class="two">{{item.deviceCount}} <text>台</text> </view>
+         				<view class="two">{{item.deviceCount == undefined ? '--' : item.deviceCount}} <text>台</text> </view>
          			</view>
          		</view>
 				<view class="name" v-if="item.status == 2">
@@ -100,16 +100,30 @@
 				noMoreData: false, // 是否没有更多数据  
 				total: 0,
 				keyword: '',
-				showflag: false
+				showflag: false,
+				type:''
 			}
 		},
 		onLoad() {
-
+            this.$u.get(`/app/user/userInfo`).then(res => {
+            	if(res.code == 200){
+            		this.type = res.data.type
+            		if(res.data.type == 2){
+            			this.getlist()
+            		}else if(res.data.type == 4){
+            			this.getlistcyz()
+            		}else if(res.data.type == 3){
+						this.getlistywy()
+					}else{
+						this.getlistcs()
+					}
+            	}
+            })
 		},
 		onShow() {
 			this.pagenum = 1
 			this.wateringList = []
-			this.getlist()
+			// this.getlist()
 		},
 		// 分享到好友（会话）
 		onShareAppMessage: function() {
@@ -128,9 +142,10 @@
 			}
 		},
 		methods: {
+			// 经营场所
 			getlist() {
 				this.isLoading = true
-				this.$u.get(`app/store/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
+				this.$u.get(`/agent/store/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
 					if (res.code == 200) {
 						this.total = res.total
 						if (this.total > 0) {
@@ -148,11 +163,78 @@
 						}
 						this.isLoading = false
 					}
-				}).catch(error => {
-					console.error('获取店铺失败:', error)
-					this.isLoading = false // 加载失败也标记为完成  
 				})
 			},
+			// 投资人（创业者）
+			getlistcyz() {
+				this.isLoading = true
+				this.$u.get(`/investor/store/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
+					if (res.code == 200) {
+						this.total = res.total
+						if (this.total > 0) {
+							this.showflag = false
+						} else {
+							this.showflag = true
+						}
+						if (res.rows.length > 0) {
+							// 有数据，追加到列表  
+							this.wateringList = this.wateringList.concat(res.rows)
+							this.pagenum++
+						} else {
+							// 没有更多数据  
+							this.noMoreData = true
+						}
+						this.isLoading = false
+					}
+				})
+			},
+			// 业务员（渠道商）
+			getlistywy() {
+				this.isLoading = true
+				this.$u.get(`/biz/store/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
+					if (res.code == 200) {
+						this.total = res.total
+						if (this.total > 0) {
+							this.showflag = false
+						} else {
+							this.showflag = true
+						}
+						if (res.rows.length > 0) {
+							// 有数据，追加到列表  
+							this.wateringList = this.wateringList.concat(res.rows)
+							this.pagenum++
+						} else {
+							// 没有更多数据  
+							this.noMoreData = true
+						}
+						this.isLoading = false
+					}
+				})
+			},
+			// 经营场所
+			getlistcs() {
+				this.isLoading = true
+				this.$u.get(`/store/device/list?isDefault=true&pageNum=${this.pagenum}&pageSize=${this.pagesize}&keyword=${this.keyword}`).then(res => {
+					if (res.code == 200) {
+						this.total = res.total
+						if (this.total > 0) {
+							this.showflag = false
+						} else {
+							this.showflag = true
+						}
+						if (res.rows.length > 0) {
+							// 有数据，追加到列表  
+							this.wateringList = this.wateringList.concat(res.rows)
+							this.pagenum++
+						} else {
+							// 没有更多数据  
+							this.noMoreData = true
+						}
+						this.isLoading = false
+					}
+				})
+			},
+			
 			// 滚动到底部
 			onScrollToLower() {
 				if (this.total > this.wateringList.length) {
diff --git a/page_user/fuwu.vue b/page_user/fuwu.vue
index 19e0237..6d97bdd 100644
--- a/page_user/fuwu.vue
+++ b/page_user/fuwu.vue
@@ -72,28 +72,30 @@
 		 	<!-- 说明 -->
 		 	<view class="shuom">
 		 		<view class="shuomtit">
-		 			设备规格
-		 		</view>
-		 		<view class="shuomwz">
-		 			尺寸：{{obj.size == undefined ? '--' : obj.size}}
-		 		</view>
-		 		<view class="shuomwz">
-		 			面料：{{obj.fabric == undefined ? '--' : obj.fabric}}
-		 		</view>
-		 		<view class="shuomwz">
-		 			填充物：{{obj.fill == undefined ? '--' : obj.fill}}
-		 		</view>
-		 		<view class="shuomwz">
-		 			设备地址：{{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
+		 			功能介绍
 		 		</view>
+	            <view class="cont">
+	            	活动时间防护额翻江倒海剪发卡都发话东风湖恶妇活动经费呵呵核打击防护好大家复合地基阿加莎打开就是大街上打卡机就啊实打实大家hiu文化大精神会计师大数据都很好绝大部分合计等哈可接受的户外i很大刷卡机和含税单价和我iU盾哈刷卡机鼎汉技术孤岛惊魂上东国际花洒山东高速结婚蛋糕
+	            </view>
 		 	</view>
+			<view class="shuom" style="height: 160rpx;margin-top: 30rpx;">
+				<view class="shuomtit">
+					设备地址
+				</view>
+				<view class="shuomwz">
+				     {{obj.storeAddress == undefined ? '' : obj.storeAddress}}
+				</view>
+				<view class="shuomwz">
+				     {{obj.storeName == undefined ? '' : obj.storeName}} {{obj.room == undefined ? '--' : obj.room}}
+				</view>
+			</view>
 		 	
 		 	
 		 	<!-- 支付 -->
 		 	<view class="tongyi">
 		 		<u-checkbox-group>
 		 			<u-checkbox v-model="checked" @change="checkboxChange" active-color="#8883F0 ">我已同意
-		 			</u-checkbox><text>《用户服务协议》</text>
+		 			</u-checkbox><text @click="btnxieyi">《用户服务协议》</text>
 		 		</u-checkbox-group>
 		 		<view class="zf" @click="btnzhifu">
 		 			立即支付
@@ -273,7 +275,12 @@
 			// 		}
 			// 	}, 2000)
 			// },
-			
+			// 点击协议跳转
+			btnxieyi(){
+				uni.navigateTo({
+					url: '/page_fenbao/shiyong?tit=' + '用户服务协议'
+				})
+			},
 			
 			// 获取设备套餐列表
 			getlist() {
@@ -884,17 +891,20 @@
 
 		.shuom {
 			width: 650rpx;
-			height: 332rpx;
+			height: 100%;
 			background: #FFFFFF;
 			box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
 			filter: blur(0px);
 			margin: auto;
-			margin-top: 98rpx;
+			margin-top: 50rpx;
 			border-radius: 20rpx;
-			padding-top: 32rpx;
-			padding-left: 36rpx;
+			padding: 20rpx;
 			box-sizing: border-box;
-
+            .cont{
+				margin-top: 10rpx;
+				max-height: 142rpx;
+				overflow: scroll;
+			}
 			.shuomtit {
 				font-weight: 700;
 				font-size: 34rpx;
@@ -992,7 +1002,7 @@
 				line-height: 84rpx;
 				font-size: 36rpx;
 				color: #FFFFFF;
-				margin-top: 10rpx;
+				margin-top: 20rpx;
 			}
 		}
 
diff --git a/page_user/mydetail.vue b/page_user/mydetail.vue
index b1a6f36..8e4a196 100644
--- a/page_user/mydetail.vue
+++ b/page_user/mydetail.vue
@@ -7,7 +7,7 @@
 			剩余时长
 		</view>
 		<view class="time">
-			{{formattedTime}}
+			{{detailobj.isUsing == true ? formattedTime : 0}}
 		</view>
 		<view class="setmeal">
 			<view class="lt">
@@ -83,6 +83,45 @@
 			</view>
 		</view>
 
+		<view class="lishi" v-if="detailobj.isUsing == true">
+			<view class="lt">
+				临时开关
+			</view>
+			<view class="rt">
+				<image v-if="imgflag" @click="btnimg"
+					src="https://api.ccttiot.com/smartmeter/img/static/uccaWar4FDp37op7haWM " mode=""></image>
+				<image v-else @click="btnimgs" src="https://api.ccttiot.com/smartmeter/img/static/ur9HRtZKY7YcxGewJARz"
+					mode=""></image>
+			</view>
+		</view>
+		<!-- 结束订单 -->
+		<view class="jieshu" v-if="msakflag">
+			<view class="tishi">
+				温馨提示
+			</view>
+			<view class="img">
+				<image src="https://api.ccttiot.com/smartmeter/img/static/uKtJsax2r7z7vKwSrlS5" mode=""></image>
+			</view>
+			<view class="shuom">
+				结束订单后，设备也将被关闭<br>
+				套餐费用不予退还，是否结束?
+			</view>
+			<view class="anniu">
+				<view class="qux" @click="btnqx">
+					取消
+				</view>
+				<view class="qued" @click="btnqd">
+					确定
+				</view>
+			</view>
+		</view>
+		<view class="mask" v-if="msakflag"></view>
+
+
+		<view class="dels" @click="btnjieshu" v-if="detailobj.isUsing == true">
+			结束订单
+		</view>
+
 		<view class="del" @click="btndel" v-if="flag">
 			删除订单
 		</view>
@@ -91,6 +130,42 @@
 		</view>
 
 
+		<!-- 蓝牙连接 -->
+		<view class="bluetoothbox" v-if="bluetoothflag">
+			<view class="stop">
+				设备已离线，正在连接该设备蓝牙
+			</view>
+			<view class="xtop">
+				请将手机与设备尽量靠近，连接成功后可操作
+			</view>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/ucDphMKsozqwwllJTAKL" mode=""></image>
+		</view>
+
+		<!-- 蓝牙连接失败 -->
+		<view class="bluetoothbox" v-if="shibaiflag">
+			<image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uTb3vSlbcHdPMFQMBjyL" mode=""></image>
+			<view class="one">
+				蓝牙连接失败
+			</view>
+			<view class="two">
+				请确保手机足够靠近设备
+			</view>
+			<view class="thr">
+				并且设备处于上电状态
+			</view>
+			<view class="anfour">
+				<view class="qx" @click="btnlyqx">
+					取消
+				</view>
+				<view class="cx" @click="topage">
+					重新连接
+				</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 class="" style="position: fixed;top: 0;left: 0;width: 100%;height: 100vh;z-index: -1;">
 			<image style="width: 100%;height: 100vh;"
 				src="https://api.ccttiot.com/smartmeter/img/static/u5AWkMT3khOhGPKrUPMH" mode=""></image>
@@ -99,6 +174,7 @@
 </template>
 
 <script>
+	var xBlufi = require("@/components/blufi/xBlufi.js")
 	export default {
 		data() {
 			return {
@@ -106,7 +182,16 @@
 				detailobj: {},
 				billId: '',
 				timeday: '',
-				flag: true
+				flag: true,
+				imgflag: true,
+				msakflag: false,
+				bluetoothflag: false,
+				shibaiflag: false,
+				btnmsk: false,
+				deviceId: '',
+				name: '',
+				setMode: null,
+				qrResult: ''
 			}
 		},
 		onLoad(option) {
@@ -154,6 +239,281 @@
 			}
 		},
 		methods: {
+			// 蓝牙连接取消
+			btnlyqx() {
+				this.shibaiflag = false
+				this.bluetoothflag = false
+			},
+			// 蓝牙重新连接
+			topage() {
+				this.btnmsk = false
+				this.shibaiflag = false
+				this.bluetoothflag = true
+				if (this.setMode == null) {
+					xBlufi.initXBlufi(1)
+					xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+					xBlufi.notifyStartDiscoverBle({
+						'isStart': true
+					})
+					// 停止蓝牙搜索  
+					setTimeout(() => {
+						xBlufi.notifyStartDiscoverBle({
+							'isStart': false
+						})
+						xBlufi.notifyConnectBle({
+							isStart: true,
+							deviceId: this.deviceId,
+							name: this.name
+						})
+						xBlufi.notifyInitBleEsp32({
+							deviceId: this.deviceId
+						})
+					}, 1000)
+				}
+			},
+
+
+			// 结束订单
+			btnjieshu() {
+				this.msakflag = true
+			},
+			btnqx() {
+				this.msakflag = false
+			},
+			btnqd() {
+				if (this.detailobj.deviceOnlineStatus == 1) {
+					let data = {
+						billId: this.billId,
+						totalEle: 0
+					}
+					this.$u.put(`/app/bill/endUse`, data).then(res => {
+						if (res.code == 200) {
+							this.getlist()
+							this.msakflag = false
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 1000
+							})
+						}
+					})
+				} else {
+					if (this.setMode == null) {
+						this.btnmsk = false
+						this.shibaiflag = false
+						this.bluetoothflag = true
+						xBlufi.initXBlufi(1)
+						xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+						xBlufi.notifyStartDiscoverBle({
+							'isStart': true
+						})
+						// 停止蓝牙搜索  
+						setTimeout(() => {
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': false
+							})
+							xBlufi.notifyConnectBle({
+								isStart: true,
+								deviceId: this.deviceId,
+								name: this.name
+							})
+							xBlufi.notifyInitBleEsp32({
+								deviceId: this.deviceId
+							})
+						}, 1000)
+					} else {
+						let that = this
+						uni.getNetworkType({
+							success(res) {
+								if (res.networkType !== 'none') {
+									uni.getConnectedBluetoothDevices({
+										success(res) { 
+											setTimeout(() => {
+ 												xBlufi.notifySendCustomData({
+													customData: 'time0@'
+												}) 
+												uni.showToast({
+													title: '操作成功',
+													icon: 'success',
+													duration: 1000
+												})
+												let data = {
+													billId: that.billId,
+													totalEle: 0
+												}
+												that.$u.put(`/app/bill/endUse`, data).then(res => {
+													if (res.code == 200) {
+														that.getlist()
+														that.msakflag = false
+														that.btnmsk = false
+														that.shibaiflag = false 
+														that.bluetoothflag = false
+													} else {
+														uni.showToast({
+															title: res.msg,
+															icon: 'none',
+															duration: 1000
+														})
+													}
+												})
+											}, 1000)
+										},
+										fail(err) {
+											console.error('获取已连接蓝牙设备信息失败：', err)
+										}
+									})
+								}
+							}
+						})
+					}
+				}
+			},
+
+			// 点击临时开关
+			btnimg() {
+				if (this.detailobj.deviceOnlineStatus == 1) {
+					this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=false`).then(res => {
+						if (res.code == 200) {
+							this.imgflag = false
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 1000
+							})
+						}
+					})
+				}else{
+					if (this.setMode == null) {
+						this.btnmsk = false
+						this.shibaiflag = false
+						this.bluetoothflag = true
+						xBlufi.initXBlufi(1)
+						xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+						xBlufi.notifyStartDiscoverBle({
+							'isStart': true
+						})
+						// 停止蓝牙搜索  
+						setTimeout(() => {
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': false
+							})
+							xBlufi.notifyConnectBle({
+								isStart: true,
+								deviceId: this.deviceId,
+								name: this.name
+							})
+							xBlufi.notifyInitBleEsp32({
+								deviceId: this.deviceId
+							})
+						}, 1000)
+					} else {
+						let that = this
+						uni.getNetworkType({
+							success(res) {
+								if (res.networkType !== 'none') {
+									uni.getConnectedBluetoothDevices({
+										success(res) { 
+											setTimeout(() => {
+												xBlufi.notifySendCustomData({
+													customData: 'close'
+												}) 
+												uni.showToast({
+													title: '操作成功',
+													icon: 'success',
+													duration: 1000
+												})
+												this.imgflag = false
+												that.getlist()
+												that.msakflag = false
+												that.btnmsk = false
+												that.shibaiflag = false 
+												that.bluetoothflag = false
+											}, 1000)
+										},
+										fail(err) {
+											console.error('获取已连接蓝牙设备信息失败：', err)
+										}
+									})
+								}
+							}
+						})
+					}
+				}
+			},
+			btnimgs() {
+				if(this.detailobj.deviceOnlineStatus == 1){
+					this.$u.put(`/app/bill/switchDevice?billId=${this.billId}&open=true`).then(res => {
+						if (res.code == 200) {
+							this.imgflag = true
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 1000
+							})
+						}
+					})
+				}else{
+					if (this.setMode == null) {
+						this.btnmsk = false
+						this.shibaiflag = false
+						this.bluetoothflag = true
+						xBlufi.initXBlufi(1)
+						xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent)
+						xBlufi.notifyStartDiscoverBle({
+							'isStart': true
+						})
+						// 停止蓝牙搜索  
+						setTimeout(() => {
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': false
+							})
+							xBlufi.notifyConnectBle({
+								isStart: true,
+								deviceId: this.deviceId,
+								name: this.name
+							})
+							xBlufi.notifyInitBleEsp32({
+								deviceId: this.deviceId
+							})
+						}, 1000)
+					} else {
+						let that = this
+						uni.getNetworkType({
+							success(res) {
+								if (res.networkType !== 'none') {
+									uni.getConnectedBluetoothDevices({
+										success(res) { 
+											setTimeout(() => {
+												xBlufi.notifySendCustomData({
+													customData: 'open'
+												}) 
+												uni.showToast({
+													title: '操作成功',
+													icon: 'success',
+													duration: 1000
+												})
+												this.imgflag = true
+												that.getlist()
+												that.msakflag = false
+												that.btnmsk = false
+												that.shibaiflag = false 
+												that.bluetoothflag = false
+											}, 1000)
+										},
+										fail(err) {
+											console.error('获取已连接蓝牙设备信息失败：', err)
+										}
+									})
+								}
+							}
+						})
+					}
+				}
+			},
+
 			btndel() {
 				let that = this
 				uni.showModal({
@@ -196,6 +556,12 @@
 				this.$u.get(`/app/bill/${this.billId}`).then((res) => {
 					if (res.code == 200) {
 						this.detailobj = res.data
+						this.qrResult = res.data.deviceMac
+						if (res.data.devicePowerStatus == 1) {
+							this.imgflag = true
+						} else {
+							this.imgflag = false
+						}
 						if (this.detailobj.suitExpireTime == null) {
 							this.timeday = 0
 						} else {
@@ -203,7 +569,9 @@
 							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) {
@@ -259,6 +627,106 @@
 					seconds: seconds
 				}
 			},
+
+			// 搜索蓝牙部分
+			funListenDeviceMsgEvent: function(options) {
+				switch (options.type) {
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
+						let loadPercent = options.data;
+						let loadText = '文件读取中'
+						// console.log("文件读取中", options.data)
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
+						let ver_data = this.parseCustomData(options.data)
+						this.setMode = Math.floor(ver_data.setMode / 60)
+						console.log("1收到设备发来的自定义数据结果：", ver_data, this.setMode)
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
+						if (options.result) {
+							let devicesarr = options.data
+							console.log(devicesarr,'000');
+							devicesarr.forEach(device => {
+								const mac = device.name.substring(5)
+								if (device.name.slice(5, 17) == this.qrResult) {
+									this.deviceId = device.deviceId
+									this.name = device.name
+									this.mac = device.name.slice(5, 17)
+								}
+							})
+						}
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
+						// console.log("连接回调：" + JSON.stringify(options))
+						if (options.result) {
+							setTimeout(()=>{
+								this.bluetoothflag = false
+							},3000)
+							uni.hideLoading(); {
+								console.log("连接回调options.data.deviceId：" + options.data.deviceId,
+									"连接回调options.data.name：" + options.data.name)
+							}
+						} else {
+							this.shibaiflag = true
+							this.bluetoothflag = false
+							uni.hideLoading()
+						}
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
+						if (!options.result) {
+							setTimeout(() => {
+								uni.hideLoading()
+								this.bluetoothflag = false
+							}, 3000)
+							console.log("蓝牙未开启", options)
+							this.shibaiflag = true
+							return
+						}
+						break;
+					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
+						if (options.result) {
+							let uniqueDevicesList = Array.from(new Set(this.devicesList))
+							// 将去重后的数组重新赋值给 this.devicesList
+							this.devicesList = uniqueDevicesList
+							let list = []
+							setTimeout(() => {
+								this.devicesList = list
+							}, 200)
+							console.log('蓝牙停止搜索ok')
+						} else {
+							//蓝牙停止搜索失败
+							console.log('蓝牙停止搜索失败')
+						}
+						this.searching = false
+						break
+				}
+			},
+			parseCustomData(data) {
+				const dataArray = data.split('@');
+				const parsedData = {};
+				const prefixMap = {
+					'V': 'voltage',
+					'S': 'switchState',
+					'A': 'current',
+					'P': 'power',
+					'M': 'remainingPower',
+					'T': 'setMode',
+					'W': 'temperature'
+				};
+				// 遍历数组并解析每个字段  
+				for (let i = 0; i < dataArray.length; i++) {
+					const field = dataArray[i];
+					for (const prefix in prefixMap) {
+						if (field.startsWith(prefix)) {
+							const value = field.substring(1);
+							const propertyName = prefixMap[prefix];
+							parsedData[propertyName] = isNaN(parseFloat(value)) ? value : parseFloat(value);
+							break;
+						}
+					}
+				}
+				return parsedData;
+			},
+
 		}
 	}
 </script>
@@ -276,6 +744,183 @@
 		background: #F4F5F7;
 	}
 
+	.bluetoothbox {
+		width: 100%;
+		height: 100vh;
+		background-color: #f4f1f6;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		text-align: center;
+
+		.img {
+			margin-top: 400rpx;
+			width: 320rpx;
+			height: 320rpx;
+		}
+
+		.one {
+			font-size: 36rpx;
+			color: #000;
+		}
+
+		.two {
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+
+		.thr {
+			margin-top: 30rpx;
+			font-size: 28rpx;
+			color: #ccc;
+		}
+
+		.anfour {
+			display: flex;
+			margin-top: 30rpx;
+			justify-content: space-between;
+			padding: 0 220rpx;
+			box-sizing: border-box;
+
+			.qx {
+				width: 100rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				border: 1px solid #3D3D3D;
+				border-radius: 10rpx;
+			}
+
+			.cx {
+				width: 200rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				background-color: #8883F0;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+		}
+
+		.stop {
+			font-size: 36rpx;
+			color: #000;
+			margin-top: 380rpx;
+		}
+
+		.xtop {
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+
+		.xqx {
+			width: 530rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			border-radius: 20rpx;
+			text-align: center;
+			background-color: #fff;
+			margin: auto;
+			margin-top: 200rpx;
+		}
+
+		image {
+			width: 500rpx;
+			height: 500rpx;
+			margin-top: 100rpx;
+		}
+	}
+
+	.jieshu {
+		width: 500rpx;
+		height: 530rpx;
+		border-radius: 20rpx;
+		padding: 20rpx;
+		box-sizing: border-box;
+		position: fixed;
+		top: 30%;
+		left: 50%;
+		transform: translateX(-50%);
+		background-color: #fff;
+		z-index: 2;
+
+		.tishi {
+			font-size: 32rpx;
+			width: 100%;
+			text-align: center;
+		}
+
+		.img {
+			width: 100%;
+			text-align: center;
+
+			image {
+				width: 260rpx;
+				height: 260rpx;
+			}
+		}
+
+		.shuom {
+			width: 100%;
+			padding: 0 20rpx;
+			box-sizing: border-box;
+			text-align: center;
+		}
+
+		.anniu {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin-top: 30rpx;
+
+			.qux {
+				text-align: center;
+				width: 100%;
+				font-size: 30rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+				border-top: 1px solid #ccc;
+				border-right: 1px solid #ccc;
+			}
+
+			.qued {
+				text-align: center;
+				width: 100%;
+				font-size: 30rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+				border-top: 1px solid #ccc;
+			}
+		}
+	}
+
+	.lishi {
+		width: 100%;
+		height: 110rpx;
+		background-color: #fff;
+		padding: 24rpx;
+		box-sizing: border-box;
+		margin-top: 30rpx;
+		border-radius: 20rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+
+		.lt {
+			font-size: 32rpx;
+		}
+
+		.rt {
+			image {
+				width: 160rpx;
+				height: 80rpx;
+			}
+		}
+	}
+
 	.del {
 		position: fixed;
 		bottom: 100rpx;
@@ -283,7 +928,7 @@
 		transform: translateX(-50%);
 		// background-color: #fff;
 		// background: linear-gradient(to right, #FFEFEF 20%, #D9F6FF 100%);
-		background-color: red;
+		background-color: rgb(162, 91, 91);
 		padding-left: 50rpx;
 		padding-right: 50rpx;
 		width: 650rpx;
@@ -297,6 +942,36 @@
 		border-radius: 50rpx;
 	}
 
+	.dels {
+		position: fixed;
+		bottom: 200rpx;
+		left: 50%;
+		transform: translateX(-50%);
+		background-color: rgb(126, 126, 126);
+		padding-left: 50rpx;
+		padding-right: 50rpx;
+		width: 650rpx;
+		height: 84rpx;
+		// background: red;
+		filter: blur(0px);
+		text-align: center;
+		line-height: 84rpx;
+		font-size: 36rpx;
+		color: #fff;
+		border-radius: 50rpx;
+	}
+
+	.mask {
+		width: 100%;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background-color: #000;
+		opacity: .6;
+		z-index: 1;
+	}
+
 	.page {
 		width: 750rpx;
 		height: 100vh;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index e0fa92d..8f0e6d4 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -12,18 +12,18 @@
 						src="https://api.ccttiot.com/smartmeter/img/static/uEAmNMMt65U10qwijrsJ" mode=""></image>
 				</view>
 				<!-- 正在进行中的订单 -->
-				<view class="ongoing_order" v-if="sylist.length > 0">
+				<view class="ongoing_order" v-if="sylist.length > 0" @click="btnorder">
 					<view class="order_top">
 						<view class="order_lt">
 							<image src="https://api.ccttiot.com/smartmeter/img/static/u9ZhnYLz3vsCwamX3Gvv" mode="">
 							</image>
 							<text>您有正在使用中的设备...</text>
 						</view>
-						<u-icon @click="btnorder" v-if="!listflag" name="arrow-down" color="#000" size="28"></u-icon>
-						<u-icon @click="btnorders" v-if="listflag" name="arrow-up" color="#000" size="28"></u-icon>
+						<u-icon v-if="!listflag" name="arrow-down" color="#000" size="28"></u-icon>
+						<u-icon v-if="listflag" name="arrow-up" color="#000" size="28"></u-icon>
 					</view>
 					<view class="order_list" v-for="(item,index) in sylist" :key="index" v-if="listflag"
-						@click="btnitem(item.billId)">
+						@click.stop="btnitem(item.billId)">
 						<text>{{item.deviceName}}</text>
 						<u-icon name="arrow-right" color="#000" size="28"></u-icon>
 					</view>
@@ -366,10 +366,11 @@
 			},
 			// 点击显示使用中设备
 			btnorder() {
-				this.listflag = true
-			},
-			btnorders() {
-				this.listflag = false
+				if(this.listflag == true){
+					this.listflag = false
+				}else{
+					this.listflag = true
+				}
 			},
 
 			btnswiper(item) {
@@ -527,7 +528,7 @@
 				if (this.wangluo = true) { //判断是否有网络在进行点击
 					if (num == 2) {
 						uni.navigateTo({
-							url: '/page_fenbao/shiyong'
+							url: '/page_fenbao/shiyong?tit=' + '使用说明'
 						})
 					} else if (num == 3) {
 						uni.navigateTo({