diff --git a/page_user/luruone.vue b/page_user/luruone.vue
index bc34a26..72c8e80 100644
--- a/page_user/luruone.vue
+++ b/page_user/luruone.vue
@@ -30,8 +30,33 @@
 			版本介绍：{{hardwareInfo.instructions}}
 		</view>
 		<u-select v-model="show" :list="list" title='选择型号' @confirm="confirm"></u-select>
-
-		<view class="imgs" style="margin-top: 330rpx;">
+        <view class="lanyasj">
+        	<view class="" v-if="ver_data.power">
+        		电压/V:<text v-if="ver_data.power">{{ver_data.power / 100}}</text> <text v-else>--</text>
+        	</view>
+        	<view class="" v-if="ver_data.MIC">
+        		声音频率/Hz:<text v-if="ver_data.MIC">{{ver_data.MIC}}</text> <text v-else>--</text>
+        	</view>
+        	<view class="" v-if="ver_data.temp_n">
+        		内部温度/°C:<text>{{ver_data.temp_n}}</text>
+        	</view>
+        	<view class="" v-if="ver_data.temp_w">
+        		外部温度/°C:<text>{{ver_data.temp_w}}</text>
+        	</view>
+        	<view class="" v-if="ver_data.hp_n">
+        		内部湿度/%:<text v-if="ver_data.hp_n">{{ver_data.hp_n}}</text> <text v-else>--</text>
+        	</view>
+        	<view class="" v-if="ver_data.hp_w">
+        		外部湿度/%:<text v-if="ver_data.hp_w">{{ver_data.hp_w}}</text> <text v-else>--</text>
+        	</view>
+        	<view class="" v-if="ver_data.weight">
+        		当前重量/g:<text>{{ver_data.weight}}</text>
+        	</view>
+        	<view class="" v-if="ver_data.out_day">
+        		当天出勤/次:<text>{{ver_data.out_day}}</text>
+        	</view>
+        </view>
+		<view class="imgs" style="margin-top: 130rpx;">
 			<image src="https://lxnapi.ccttiot.com/bike/img/static/u9wFJhLZGm7rboSDySV4" mode="" @click="qrcode()">
 			</image>
 		</view>
@@ -40,19 +65,19 @@
 		</view>
 		<view class="bot_btn">
 
-			<!-- <view class="btn1" @click="Binddevice()">
+			<view class="btn1" @click="Binddevice()">
 				蓝牙连接
-			</view> -->
+			</view>
 			<!-- <view class="btn1" @click="ring()" v-if="carstause">
 				响铃寻车
 			</view> -->
 
-			<view class="btn1" @click="open()" v-if="carstause">
+			<!-- <view class="btn1" @click="open()" v-if="carstause">
 				蓝牙开启
 			</view>
 			<view class="btn1" @click="close()" v-if="carstause">
 				蓝牙关闭
-			</view>
+			</view> -->
 			<!-- <view class="btn1" @click="reboot()" v-if="carstause">
 				设备重启
 			</view>
@@ -91,7 +116,7 @@
 
 <script>
 	const app = getApp();
-	// var xBlufi = require("@/page_components/blufi/xBlufi.js");
+	var xBlufi = require("@/components/blufi/xBlufi.js"); 
 	let _this = null;
 	export default {
 		data() {
@@ -111,7 +136,7 @@
 				Bluetoothmac: '',
 				mac: '',
 				ishave: false,
-				ver_data: null,
+				ver_data: {},
 				deviceInfoss: {},
 				gps: {},
 				isband: false,
@@ -142,7 +167,7 @@
 		onLoad(e) {
 			console.log(e);
 			this.mac = e.mac
-			// this.Binddevice()
+			this.Binddevice()
 			this.isbands = false
 			this.carstause = false
 			if(uni.getStorageSync('banben') || uni.getStorageSync('banbenid')){
@@ -511,94 +536,69 @@
 								title: '连接成功',
 								icon: 'none'
 							}); {
-
 								xBlufi.notifyInitBleEsp32({
 									deviceId: options.data.deviceId
 								});
-
-								xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents);
-
 								this.deviceIds = options.data.deviceId
 								this.name = options.data.name
-								// 连接成功绑定设备
-								// let params = {
-								// 	mac: this.Bluetoothmac,
-								// 	userId: this.$store.state.user.userId
-								// }
-								let systemInfo = uni.getSystemInfoSync();
-								if (systemInfo.platform === 'android') {
-									// 当前设备是 Android  
-
-								} else if (systemInfo.platform === 'ios') {
-									// 当前设备是 iOS  
-									// uni.navigateTo({
-									// 	url: '/pages/wifilist/index?deviceId=' + options
-									// 		.data.deviceId + '&name=' + options.data.name
-									// })
-								}
 							}
 						}
 
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
-
-						// this.ver_data = this.parseCustomData(options.data)
+                       // let data = '@power56@hp_n15@hp_w32@out_day1211@temp_n45@temp_w12@MIC230@weight1002'
+						this.ver_data = this.parseBluetoothData(options.data)
 						if (options.data) {
 							this.carstause = true
 						}
-						// console.log("1收到设备发来的自定义数据结果：", this.ver_data);
+						console.log("1收到设备发来的自定义数据结果：", options.data,this.ver_data);
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
 						if (options.result) {
-							// let uniqueDevicesList = Array.from(new Set(this.devicesList));
-
-							// 过滤出名称字段的前五个字母为 "CTPOW" 的项
-							// let filteredDevices = uniqueDevicesList.filter(device => device.name.substring(0, 4) === "BBLE");
-
-							// 将过滤后的数组重新赋值给 this.devicesList
-							// this.devicesList = filteredDevices;
-
-							// console.log('蓝牙停止搜索ok',this.devicesList);
+							
 						} else {
-							//蓝牙停止搜索失败
-							// console.log('蓝牙停止搜索失败');
+
 						}
 						this.searching = false
-						// _this.setData({
-						// 	searching: false
-						// });
-
-						break;
+						break
 				}
 			},
-
+            parseBluetoothData(data) {
+              const result = {}
+              const parts = data.split('@')
+              parts.forEach(part => {
+                if (part) {
+                  const keyEndIndex = part.search(/[0-9:]/) // 匹配数字或冒号
+                  if (keyEndIndex !== -1) {
+                    const key = part.slice(0, keyEndIndex) // 提取键
+                    const value = part.slice(keyEndIndex) // 提取值
+                    result[key] = value
+                  } else {
+                    result[part] = ''
+                  }
+                }
+              })
+              return result
+            },
 
 			//4、建立连接
 			createBLEConnection(e) {
-				console.log('调用了');
+				console.log('调用了')
 				xBlufi.notifyStartDiscoverBle({
 					'isStart': false
-				});
+				})
 				console.log(e, '蓝牙信息')
 				const deviceId = e.deviceId
 				this.deviceId = e.deviceId
 				this.Bluetoothmac = e.localName.substring(5) //从第七位开始截取 只取后面的mac号
-				console.log(this.Bluetoothmac, '11111');
+				console.log(this.Bluetoothmac, '11111')
 				let name = e.name;
-				console.log('点击了，蓝牙准备连接的deviceId:' + e.deviceId);
+				console.log('点击了，蓝牙准备连接的deviceId:' + e.deviceId)
 				xBlufi.notifyConnectBle({
 					isStart: true,
 					deviceId: e.deviceId,
 					name
-				});
-				// for (var i = 0; i < this.devicesList.length; i++) {
-				// 	if (e.deviceId === this.devicesList[i].deviceId) {
-
-				// 		uni.showLoading({
-				// 			title: '连接蓝牙设备中...'
-				// 		});
-				// 	}
-				// }
+				})
 			},
 			// 点击重新搜索
 			Search() {
@@ -637,61 +637,6 @@
 						}
 					}, 2000)
 				}
-
-
-			},
-			funListenDeviceMsgEvents: function(options) {
-				let that = this;
-				switch (options.type) {
-					case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED: {
-						console.log('状态', options.result)
-						if (options.result == false) {
-							this.carstause = false
-							uni.showToast({
-								title: '设备断开链接，请重新点击蓝牙链接',
-								icon: 'none'
-							});
-							// uni.showModal({
-							// 	title: '很抱歉提醒你！',
-							// 	content: '小程序与设备异常断开',
-							// 	showCancel: false,
-							// 	success: function(res) {
-							// 		// uni.navigateBack({
-							// 		// 	url: '../search/search'
-							// 		// });
-							// 	}
-							// });
-							// this.statusflag = false
-							uni.hideLoading();
-						}
-					}
-					break;
-
-					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
-						this.loadPercent = options.data;
-						this.loadText = '文件读取中'
-						console.log("文件读取中", options.data);
-						break;
-					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
-						// this.isband = true
-						// this.ver_data = this.parseCustomData(options.data)
-						console.log("1收到设备发来的自定义数据结果：", options.data);
-						if (options.data) {
-							this.carstause = true
-						}
-						break;
-
-					case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
-						uni.hideLoading();
-						if (options.result) {
-							console.log('初始化成功');
-						} else {
-							console.log('初始化失败');
-
-
-						}
-						break;
-				}
 			},
 			// 点击隐藏没有设备提示
 			btnhd() {
@@ -706,7 +651,18 @@
 		overflow-x: hidden;
 		background-color: #F3F3F3;
 	}
-
+    .lanyasj{
+    	display: flex;
+    	justify-content: space-between;
+    	flex-wrap: wrap;
+    	padding:0 50rpx;
+    	box-sizing: border-box;
+    	view{
+    		width: 50%;
+    		margin-top: 20rpx;
+    		text-align: left;
+    	}
+    }
 	.page {
 		padding-bottom: 250rpx;
 		width: 750rpx;
diff --git a/page_user/lurutwo.vue b/page_user/lurutwo.vue
index 02dc335..9b501df 100644
--- a/page_user/lurutwo.vue
+++ b/page_user/lurutwo.vue
@@ -21,13 +21,13 @@
 			总重量：{{(obj.totalWeight == undefined ? '--' : (Number(obj.totalWeight / 1000)).toFixed(2)) + 'kg'}}
 		</view>
 		<view class="machao">
-			<text class="one">箱内温度：{{obj.innerTemperature == undefined ? '--' : obj.innerTemperature + '°C'}}</text>  <input type="text" v-model="wdxsn" /> <view class="" @click="btnone">校准</view>
+			<text class="one">箱内温度：{{obj.innerTemperature == undefined ? '--' : obj.innerTemperature + '°C'}}</text>  <input type="text" v-model="wdxsn" /> <view class="" @click="btnone">校准</view> {{xsN}}
 		</view>
 		<view class="machao">
 			箱内湿度：{{obj.innerHumidity == undefined ? '--' : obj.innerHumidity + '%'}}
 		</view>
 		<view class="machao">
-			<text class="one">箱外温度：{{obj.outerTemperature == undefined ? '--' : obj.outerTemperature + '°C'}}</text> <input type="text" v-model="wdxsw" />  <view class="" @click="btntwo">校准</view>
+			<text class="one">箱外温度：{{obj.outerTemperature == undefined ? '--' : obj.outerTemperature + '°C'}}</text> <input type="text" v-model="wdxsw" />  <view class="" @click="btntwo">校准</view> {{xsW}}
 		</view>
 		<view class="machao">
 			箱外湿度：{{obj.outerHumidity == undefined ? '--' : obj.outerHumidity + '%'}}
@@ -65,15 +65,15 @@
         </view>
 		<view class="list">
 			<view class="anniulist">
-				<view class="anniu" @click="btnkq">
-					开启蜂鸣
-				</view>
 				<view class="anniu" @click="btngbkq">
 					开启风扇
 				</view>
 				<view class="anniu" @click="btngb">
 					关闭风扇
 				</view>
+				<view class="anniu" @click="btnkq">
+					开启蜂鸣
+				</view>
 				<view class="anniu" @click="btnsx">
 					刷新
 				</view>
@@ -216,6 +216,11 @@
 				 this.$u.put(`/app/beehive/admin/wdxsn?sn=${this.storeId}&wdxsn=${num}`).then(res=>{
 					 if(res.code == 200){
 						 this.obj.innerTemperature = Number(this.obj.innerTemperature) + Number(num)
+						 uni.showToast({
+						 	title:'校准成功',
+						 	icon: 'success',
+						 	duration:2000
+						 }) 
 					 }else{
 						uni.showToast({
 							title:res.msg,
@@ -231,6 +236,11 @@
 				this.$u.put(`/app/beehive/admin/wdxsw?sn=${this.storeId}&wdxsw=${num}`).then(res=>{
 					 if(res.code == 200){
 						this.obj.outerTemperature = Number(this.obj.outerTemperature) + Number(num)
+						uni.showToast({
+							title:'校准成功',
+							icon: 'success',
+							duration:2000
+						}) 
 					 }else{
 						uni.showToast({
 							title:res.msg,
@@ -328,11 +338,6 @@
 							} else if (res.data.powerStatus == 1) {
 								this.powerStatus = '开启'
 							}
-							uni.showToast({
-								title: res.msg,
-								icon: 'success',
-								duration: 2000,
-							})
 						}
 					} else {
 						uni.showToast({
@@ -490,6 +495,7 @@
 			background-color: #ce9e10;
 			color: #fff;
 			border-radius: 10rpx;
+			margin-right: 10rpx;
 		}
 	}
 	.title {