merge upstream

100J续航时间显示优化
merge upstream
2026-02-07 13:53:33 +08:00 · 2026-02-07 09:54:38 +08:00 · 2026-02-04 09:05:49 +08:00 · 2026-02-03 13:07:11 +08:00
18 changed files with 79 additions and 835 deletions
--- a/components/MessagePopup/MessagePopup.vue
+++ b/components/MessagePopup/MessagePopup.vue
@ -48,7 +48,7 @@
 		  
 		  <view
 		    class="popup-button-cancel" 
-			v-if="showCancel"
+			
 		   :style="{display:showCancel?'block':'none'}"
 		    @click="handleCancelClick"
 		  >{{ buttonCancelText?buttonCancelText:'取消' }}</view>
--- a/components/MsgBox/MsgBox.vue
+++ b/components/MsgBox/MsgBox.vue
@ -1,187 +0,0 @@
-<template>
-	<view class="msgBox" v-if="Msgboxs.length>0">
-		
-		<MessagePopup v-for="item,index in Msgboxs" :visible="item.showPop" :type="item.popType" :bgColor="item.bgColor"
-			:borderColor="item.borderColor" :textColor="item.textColor" :buttonBgColor="item.buttonBgColor"
-			:buttonTextColor="item.buttonTextColor" :iconUrl="item.iconUrl" :message="item.message"
-			:buttonText="item.buttonText" @buttonClick="okCallback(item,index)" :visiblePrompt="item.visiblePrompt"
-			:promptTitle="item.promptTitle" v-model="item.modelValue" @closePop="closePop(item)"
-			:buttonCancelText="item.buttonCancelText" :showCancel="item.showCancel" @cancelPop="cancelClick(item,index)" />
-	</view>
-</template>
-
-<script>
-	export default {
-		 name: 'MsgBox',
-		data() {
-			return {
-				Msgboxs:[]
-			}
-		},
-		methods: {
-			//确认按钮事件，如果回调函数返回true,将阻止关闭弹窗
-			okCallback(item,index){
-				let flag=false;
-				if(item.okCallback){
-					flag=item.okCallback(item,index)
-				}
-				
-				if(flag){
-					return;
-				}
-				this.closePop(item);
-			},
-			//取消按钮,如果回调函数返回true，将阻止关闭弹窗
-			cancelClick(item,index){
-				let flag=false;
-				if(item.cancelCallback){
-					flag=item.cancelCallback(item,index)
-				}
-				
-				if(flag){
-					return;
-				}
-				this.closePop(item);
-			},
-			closePop: function(item) {
-			
-				if (item) {
-					this.Msgboxs.find((v, i) => {
-						if (item.key === v.key) {
-							this.Msgboxs.splice(i, 1);
-						}
-					});
-			
-					if (item.cancelCallback) {
-						item.cancelCallback();
-					}
-				} else {
-					if (this.Msgboxs.length > 0) {
-						this.Msgboxs.splice(this.Msgboxs.length - 1, 1);
-					}
-			
-				}
-			
-			},
-			//根据传入的配置，自定义一个弹窗
-			showPop: function(option,isClear) {
-				let def = {
-					key: '',
-					showPop: true, //是否显示弹窗
-					popType: 'custom',
-					bgColor: '#383934bd',
-					borderColor: '#BBE600',
-					textColor: '#ffffffde',
-					buttonBgColor: '#BBE600',
-					buttonTextColor: '#232323DE',
-					iconUrl: '',
-					message: '',
-					buttonText: '确定',
-					clickEvt: '',
-					visiblePrompt: false,
-					promptTitle: '',
-					modelValue: '',
-					visibleClose: false,
-					okCallback: null,
-					showSlot: false,
-					buttonCancelText: '',
-					showCancel: false,
-					cancelCallback: null
-				}
-				let json = {};
-				let keys = Object.keys(def);
-			
-				for (let i = 0; i < keys.length; i++) {
-					let key = keys[i];
-			
-					json[key] = def[key];
-				}
-				if (option) {
-					keys = Object.keys(option);
-					for (let i = 0; i < keys.length; i++) {
-						let key = keys[i];
-			
-						json[key] = option[key];
-					}
-				}
-			
-				if (!json.borderColor) {
-					json.borderColor = '#BBE600';
-					json.buttonBgColor = '#BBE600';
-				}
-				json.showPop = true;
-				if (!('key' in json)) {
-					json.key = new Date().getTime();
-				}
-				
-				this.Msgboxs.push(json);
-				
-				return json;
-			},
-			//弹出预定好的三种弹窗
-			showMsg(msg,btnTxt, type,okCallback) {
-			
-				let cfg = {
-					error: {
-						icoUrl: '/static/images/6155/DeviceDetail/uploadErr.png',
-						borderColor: "#e034344d",
-						buttonBgColor: "#E03434"
-					},
-					succ: {
-						icoUrl: '/static/images/common/success.png',
-						borderColor: "#BBE600",
-						buttonBgColor: "#BBE600"
-					},
-					warn: {
-						icoUrl: '/static/images/common/warning.png',
-						borderColor: "#FFC84E",
-						buttonBgColor: "#FFC84E",
-					}
-				}
-			
-				if (!type) {
-					type = 'error';
-				}
-				if (!cfg[type]) {
-					type = 'error';
-				}
-			
-			
-				let guid =  new Date().getTime()+"";
-				let options = {
-					key: guid,
-					message: msg,
-					iconUrl: cfg[type].icoUrl,
-					borderColor: cfg[type].borderColor,
-					buttonBgColor: cfg[type].buttonBgColor,
-					buttonText: btnTxt?btnTxt:'确定',
-					okCallback: okCallback?okCallback:this.closePop
-				};
-				return this.showPop(options);
-				
-			},					
-			//清除所有弹窗
-			clearPops(){
-				this.Msgboxs=[];
-			},
-			//获取当前所有弹窗的数量
-			getPops(){
-				return this.Msgboxs.length;
-			}
-		}
-	}
-</script>
-
-<style>
-.msgBox{
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 9999;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-</style>
--- a/config/index.js
+++ b/config/index.js
@ -2,7 +2,7 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.110.172:8000',//http://139.224.253.23:8000		
+		BASE_URL: 'http://192.168.2.34:8000',//http://139.224.253.23:8000
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: '47.120.79.150',
--- a/manifest.json
+++ b/manifest.json
@ -2,7 +2,7 @@
    "name" : "星汉物联",
    "appid" : "__UNI__A21EF43",
    "description" : "设备管控",
-    "versionName" : "1.0.16",
+    "versionName" : "1.0.15",
    "versionCode" : "100",
    "transformPx" : false,
    /* 5+App特有相关 */
--- a/pages.json
+++ b/pages.json
@ -414,14 +414,6 @@
 			{
 				"navigationBarTitleText" : "录制语音"
 			}
-		},
-		{
-			"path" : "pages/common/addScan/ScanEquip",
-			"style" : 
-			{
-				"navigationBarTitleText" : "扫码",
-				"navigationStyle": "custom"	
-			}
 		}
 		

--- a/pages/100/HBY100.vue
+++ b/pages/100/HBY100.vue
@ -736,7 +736,7 @@
 								for (let i = 0; i < header.length; i++) {
 									dataView.setUint8(i, header[i]);
 								}
-								// console.log("curr=" + curr + "orderNo=", orderNo);
+								console.log("curr=" + curr + "orderNo=", orderNo);
 								dataView.setUint8(14, '0x' + orderNo.substring(0, 2));
 								dataView.setUint8(15, '0x' + orderNo.substring(2, 4));

@ -764,7 +764,7 @@
 											});
 										}

-										// console.log("发送成功," + curr + "/" + total);
+										console.log("发送成功," + curr + "/" + total);
 										this.Status.curr = curr;
 										curr++;

--- a/pages/100J/HBY100-J.vue
+++ b/pages/100J/HBY100-J.vue
@ -22,7 +22,7 @@
 					<view class="row">
 						<image class="img" src="/static/images/6155/DeviceDetail/time.png" mode="aspectFit"></image>
 						<view class="txt">
-							<view class="bigTxt">{{ deviceInfo.batteryRemainingTime || '0' }}分钟
+							<view class="bigTxt"> {{ Math.floor((Number(deviceInfo.batteryRemainingTime)||0)/60) }}小时 {{ (Number(deviceInfo.batteryRemainingTime)||0)%60 }}分钟
 							</view>
 							<view class="smallTxt">续航时间</view>
 						</view>
@ -464,19 +464,19 @@

 				}
 				this.mqttClient = new MqttClient();
-				this.mqttClient.connect(() => {
-					// 订阅来自设备的状态更新
-					const statusTopic = `status/894078/HBY100/${data.data.deviceImei}`;
-					this.mqttClient.subscribe(statusTopic, (payload) => {
-						try {
-							// 解析MQTT返回的payload
-							const payloadObj = typeof payload === 'string' ? JSON.parse(
-								payload) : payload;
-						} catch (e) {
+				// this.mqttClient.connect(() => {
+				// 	// 订阅来自设备的状态更新
+				// 	const statusTopic = `status/894078/HBY100/${data.data.deviceImei}`;
+				// 	this.mqttClient.subscribe(statusTopic, (payload) => {
+				// 		try {
+				// 			// 解析MQTT返回的payload
+				// 			const payloadObj = typeof payload === 'string' ? JSON.parse(
+				// 				payload) : payload;
+				// 		} catch (e) {
 							
-						}
-					})
-				})
+				// 		}
+				// 	})
+				// })
 				console.log(data, 'datatatatat');
 				these.fetchDeviceDetail(data.data.id)
 			});
--- a/pages/6107/BJQ6107.vue
+++ b/pages/6107/BJQ6107.vue
@ -976,7 +976,7 @@
 						buttonBgColor: "#BBE600"
 					},
 					warn: {
-						icoUrl: '/static/images/common/warning.png',
+						icoUrl: '/static/images/6170/svg.png',
 						borderColor: "#FFC84E",
 						buttonBgColor: "#FFC84E",
 					}
--- a/pages/6155/BJQ6155.vue
+++ b/pages/6155/BJQ6155.vue
@ -656,7 +656,7 @@
 			proParam: function() {

 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.device.id,
+					url: '/pages/common/productDes/index?id=' + this.formData.id,
 					success(ev) {

 					}
@ -664,7 +664,7 @@
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
 					success(ev) {

 					}
@ -672,7 +672,7 @@
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.device.id,
+					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
 					success(ev) {

 					}
--- a/pages/6155/deviceDetail.vue
+++ b/pages/6155/deviceDetail.vue
@ -649,7 +649,7 @@
 			proParam: function() {

 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.device.id,
+					url: '/pages/common/productDes/index?id=' + this.formData.id,
 					success(ev) {

 					}
@ -657,7 +657,7 @@
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
 					success(ev) {

 					}
@ -665,7 +665,7 @@
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.device.id,
+					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
 					success(ev) {

 					}
--- a/pages/7305/BJQ7305.vue
+++ b/pages/7305/BJQ7305.vue
@ -590,7 +590,7 @@ these.Status.apiType = data.apiType;
 			proParam: function() {

 				uni.navigateTo({
-					url: '/pages/common/productDes/index?id=' + this.device.id,
+					url: '/pages/common/productDes/index?id=' + this.formData.id,
 					success(ev) {

 					}
@ -598,7 +598,7 @@ these.Status.apiType = data.apiType;
 			},
 			handRemark: function() {
 				uni.navigateTo({
-					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
+					url: '/pages/common/operatingInstruct/index?id=' + this.formData.id,
 					success(ev) {

 					}
@ -606,7 +606,7 @@ these.Status.apiType = data.apiType;
 			},
 			handVideo: function() {
 				uni.navigateTo({
-					url: '/pages/common/operationVideo/index?id=' + this.device.id,
+					url: '/pages/common/operationVideo/index?id=' + this.formData.id,
 					success(ev) {

 					}
--- a/pages/common/addScan/ScanEquip.vue
+++ b/pages/common/addScan/ScanEquip.vue
@ -1,396 +0,0 @@
-<template>
-	<view class="maincontent contentBg">
-		<uni-nav-bar class="nvbar" leftIcon="left" @clickLeft="navigatorBack">
-			<view slot="left">
-				<uni-icons type="back" size="23" color="#FFFFFF"></uni-icons>
-			</view>
-			<view slot="default" class="center uninavebartext">
-				{{Status.navbar.title}}
-			</view>
-			<view slot="right">
-				<view class="navbarRight center">
-					<view class="imgContent" @click.stop="handleRightClick(item,index)"
-						v-for="item,index in Status.navbar.icons">
-						<image class="img" :src="item.src" mode="aspectFit"></image>
-						<view class="baber" v-if="item.math">{{item.math>9?'9+':item.math}}</view>
-					</view>
-
-				</view>
-
-			</view>
-
-		</uni-nav-bar>
-
-		<view class="scanPanel center">
-			<image @click.stop="scan" class="img" src="/static/images/common/scan.png" mode="aspectFit"></image>
-		</view>
-		<view class="txt">
-			对准二维码进行扫描
-		</view>
-
-		<view class="form">
-
-			<input class="formInput" type="text" v-model="formData.inputCode" placeholder="输入二维码内容"
-				placeholder-class="placeholder-class" cursor-spacing="30" cursor-color="#BBE600" />
-
-			<view class="btnOK" :class="{active:formData.inputCode}" @click.stop="addCode">确定</view>
-		</view>
-
-
-		<MsgBox ref="msgPop" />
-
-		<global-loading ref="loading" />
-	</view>
-</template>
-
-<script>
-	import request from '@/utils/request.js';
-	import {
-		showLoading,
-		hideLoading,
-		updateLoading
-	} from '@/utils/loading.js';
-
-	import {
-		MsgSuccess,
-		MsgError,
-		MsgClose,
-		MsgWarning,
-		showPop
-	} from '@/utils/MsgPops.js'
-	import Common from '@/utils/Common.js';
-	var eventChannel = null;
-	var these = null;
-
-	export default {
-		data() {
-			return {
-				Status: {
-					navbar: {
-						icons: [{
-							src: '/static/images/common/scane.png',
-							callback: this.scan
-						}],
-						title: '扫码'
-
-					},
-				},
-				formData: {
-					inputCode: ''
-				}
-			}
-		},
-		onLoad() {
-
-			these = this;
-			setTimeout(this.scan, 500)
-
-		},
-		methods: {
-			addCode() {
-				debugger;
-				if (!this.formData.inputCode) {
-					MsgWarning("请输入二维码内容","确定", this);
-					return;
-				}
-
-				let macStr = this.formData.inputCode;
-
-				if (macStr.indexOf(':') == -1) {
-					macStr = macStr.replace(/(.{2})/g, '$1:').slice(0, -1);
-				}
-				//通过mac地址查询
-				let p1 = new Promise((resolve, reject) => {
-
-					request({
-						url: '/app/device/getDeviceInfoByDeviceMac',
-						method: 'GET',
-						data: {
-							deviceMac: macStr
-						}
-					}).then(res => {
-
-						console.log("获取设备信息", res);
-						if (res && res.code == 200) {
-							console.log("res=", res);
-							let data = res.data;
-						
-							if (data && data.id) {
-								resolve(data);
-								return;
-							}
-
-						}
-						reject(null);
-					}).catch(() => {
-						reject(null);
-					});
-				});
-
-				p1.then(dev => {
-					//蓝牙产品
-					this.qrCodeResult(macStr, false, 'ble');
-				}).catch(() => {
-					this.qrCodeResult(this.formData.inputCode, false, 'imei');
-				})
-
-			},
-
-
-			handleRightClick(item, s) {
-				if (item && item.callback) {
-					item.callback(item, s);
-				} else {
-					uni.showModal({
-						content: '敬请期待'
-					})
-
-				}
-			},
-			navigatorBack() {
-				uni.navigateBack();
-			},
-			qrCodeResult(cleanedResult, isConvert, type) { //条码文本，是否尝试解析，已知类型
-
-
-				let url = `/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
-				try {
-					if (isConvert) {
-						let json = JSON.parse(cleanedResult);
-						if ('imei' in json) {
-							url =
-								`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(json.imei)}`;
-						} else if ('blue' in json || 'ble' in json) {
-							if (json.ble) {
-								json.blue = json.ble;
-							}
-							if (json.blue) {
-								if (!json.blue.includes(':')) {
-									json.blue = json.blue.replace(
-											/(.{2})/g, '$1:')
-										.slice(0, -1)
-								}
-							}
-
-							url = `/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(json.blue)}`;
-						}
-					} else {
-						if (type === 'imei') {
-							url = `/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
-						} else {
-							url = `/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(cleanedResult)}`;
-						}
-					}
-
-				} catch (ex) {
-					console.error("解析条码出现异常,", ex);
-				}
-				// 跳转并传递扫描结果
-				uni.navigateTo({
-					url: url
-				});
-			},
-			scan(item, s) {
-				debugger;
-				let systemInfo = uni.getSystemInfoSync();
-				if (systemInfo.uniPlatform == 'web') {
-					MsgError("Web平台不支持此功能,请手工录入条码", "确定", these);
-					return;
-				}
-
-				uni.scanCode({
-					autoDecodeCharset: true,
-					autoZoom: true,
-					barCodeInput: true,
-					success: (res) => {
-						console.log('条码内容：', res);
-						let cleanedResult = res.result.trim();
-						this.qrCodeResult(cleanedResult, true, null);
-					},
-					fail: (err) => {
-						this.showMsg("扫码失败:" + err.errMsg, MsgType.error);
-					}
-				});
-			},
-
-
-		}
-	}
-</script>
-
-<style scoped>
-	.scanPanel {
-		width: 100%;
-		height: 600rpx;
-	}
-
-	.scanPanel .img {
-		width: 350rpx;
-		height: 350rpx;
-	}
-
-	.txt {
-		width: 100%;
-		text-align: center;
-		color: rgba(255, 255, 255, 0.6);
-
-		font-family: 'PingFang SC';
-
-		font-size: 28rpx;
-		font-weight: 400;
-		line-height: 20px;
-		letter-spacing: 0px;
-
-	}
-
-	.form {
-		width: 100%;
-		height: 250rpx;
-		display: flex;
-		flex-direction: column;
-		flex-wrap: nowrap;
-		align-content: center;
-		align-items: center;
-		justify-content: flex-end;
-	}
-
-	.formInput {
-		width: 90%;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: 40rpx;
-		color: rgba(255, 255, 255, 0.87);
-
-		font-family: "PingFang SC";
-		font-style: Regular;
-		font-size: 28rpx;
-		font-weight: 400;
-		background: rgba(42, 42, 42, 1);
-		letter-spacing: 0px;
-		text-align: left;
-		text-indent: 30rpx;
-		margin-bottom: 30rpx;
-	}
-
-	/deep/.placeholder-class {
-		font-family: "PingFang SC";
-		font-style: Regular;
-		font-size: 26rpx;
-		font-weight: 400;
-		color: rgba(255, 255, 255, 0.6);
-		letter-spacing: 0px;
-		text-align: left;
-	}
-
-	.btnOK {
-		color: rgba(255, 255, 255, 0.6);
-		font-family: 'PingFang SC';
-		font-size: 30rpx;
-		font-weight: 400;
-		letter-spacing: 5rpx;
-	}
-
-	.btnOK.active {
-		color: #AED600;		
-	}
-
-	.navbarRight {
-		width: 40px;
-		height: 100%;
-
-	}
-
-	.navbarRight .imgContent {
-		width: 36rpx;
-		height: 36rpx;
-		position: relative;
-	}
-
-	.navbarRight .imgContent:first-child {
-
-		width: 38rpx !important;
-		height: 38rpx !important;
-		margin-top: -2rpx;
-	}
-
-	.navbarRight .imgContent .baber {
-		position: absolute;
-		z-index: 100;
-		width: 30rpx;
-		height: 30rpx;
-		line-height: 30rpx;
-		right: -15rpx;
-		top: -15rpx;
-		border-radius: 50%;
-		background: #f12828;
-		color: #ffffff;
-		font-family: 'PingFang SC';
-		font-style: Regular;
-		font-size: 20rpx;
-		font-weight: 400;
-
-		text-align: center;
-		overflow: hidden;
-		white-space: nowrap;
-
-	}
-
-	.navbarRight .imgContent .img {
-		width: 100%;
-		height: 100%;
-
-		box-sizing: border-box;
-		position: relative;
-	}
-
-	.navbarRight .imgContent .img:last-child {
-		padding: 1rpx;
-	}
-
-	.nvbar {
-		top: 0px;
-	}
-
-	/deep/ .uni-navbar--fixed {
-		top: 0px;
-	}
-
-	.uninavebartext {
-		width: 100%;
-		font-size: 32rpx;
-	}
-
-	.footer {
-		position: fixed;
-		width: 100%;
-		bottom: 0rpx;
-		left: 0rpx;
-	}
-
-	.footer .row {
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 20rpx;
-		display: flex;
-		flex-direction: row;
-		flex-wrap: nowrap;
-		align-content: center;
-		align-items: center;
-		justify-content: space-between;
-	}
-
-	.inputContent {
-		width: calc(100% - 110rpx);
-	}
-
-	.footer .btn {
-		width: 100rpx;
-		text-align: center;
-		background-color: #09a0f7;
-		color: #fff;
-		border-radius: 16rpx;
-		height: 70rpx;
-		line-height: 70rpx;
-	}
-</style>
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@ -497,57 +497,54 @@ import BleReceive from '@/utils/BleReceive';
 				switch (item.action) {
 					case 'scan':
 						// 扫一扫
-						uni.navigateTo({
-							url:'/pages/common/addScan/ScanEquip'
-						});
-						// uni.scanCode({
-						// 	autoDecodeCharset:true,
-						// 	autoZoom:true,
-						// 	barCodeInput:true,
-						// 	success: (res) => {
-						// 		console.log('条码内容：', res);
-						// 		// 清除之前的数据
-						// 		this.previousScanResult = null;
-						// 		// 处理新的扫码结果
-						// 		const cleanedResult = res.result.trim();
-						// 		console.log('扫码结果：', cleanedResult);
-						// 		let url =
-						// 			`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
-						// 		try {
-						// 			let json = JSON.parse(cleanedResult);
-						// 			if ('imei' in json) {
-						// 				url =
-						// 					`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(json.imei)}`;
-						// 			} else if ('blue' in json || 'ble' in json) {
-						// 				if(json.ble){
-						// 					json.blue=json.ble;
-						// 				}
-						// 				if(json.blue){
-						// 					if (!json.blue.includes(':')) {
-						// 						json.blue = json.blue.replace(
-						// 								/(.{2})/g, '$1:')
-						// 							.slice(0, -1)
-						// 					}
-						// 				}
+						uni.scanCode({
+							autoDecodeCharset:true,
+							autoZoom:true,
+							barCodeInput:true,
+							success: (res) => {
+								console.log('条码内容：', res);
+								// 清除之前的数据
+								this.previousScanResult = null;
+								// 处理新的扫码结果
+								const cleanedResult = res.result.trim();
+								console.log('扫码结果：', cleanedResult);
+								let url =
+									`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`;
+								try {
+									let json = JSON.parse(cleanedResult);
+									if ('imei' in json) {
+										url =
+											`/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(json.imei)}`;
+									} else if ('blue' in json || 'ble' in json) {
+										if(json.ble){
+											json.blue=json.ble;
+										}
+										if(json.blue){
+											if (!json.blue.includes(':')) {
+												json.blue = json.blue.replace(
+														/(.{2})/g, '$1:')
+													.slice(0, -1)
+											}
+										}
 										
-						// 				url =`/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(json.blue)}`;
-						// 			}
-						// 		} catch (ex) {
+										url =`/pages/common/addBLE/LinkBle?mac=${encodeURIComponent(json.blue)}`;
+									}
+								} catch (ex) {

-						// 		}
-						// 		// 跳转并传递扫描结果
-						// 		uni.navigateTo({
-						// 			url: url
-						// 		});
-						// 	},
-						// 	fail: (err) => {
-						// 		console.log('扫码失败', err);
-						// 		uni.showToast({
-						// 			title: '扫码失败',
-						// 			icon: 'none'
-						// 		});
-						// 	}
-						// });
+								}
+								// 跳转并传递扫描结果
+								uni.navigateTo({
+									url: url
+								});
+							},
+							fail: (err) => {
+								console.log('扫码失败', err);
+								uni.showToast({
+									title: '扫码失败',
+									icon: 'none'
+								});
+							}
+						});
 						break;
 					case 'bluetooth':
 						uni.navigateTo({
--- a/static/images/common/scan.png
+++ b/static/images/common/scan.png
--- a/static/images/common/warning.png
+++ b/static/images/common/warning.png
--- a/utils/BleHelper.js
+++ b/utils/BleHelper.js
@ -784,18 +784,18 @@ class BleHelper {

 					if (this.cfg.receivDataCallback.length > 0) {

-						 console.log("有人订阅消息")
+						// console.log("有人订阅消息")
 						this.cfg.receivDataCallback.forEach((
 							rec) => {
-							 console.log("有人订阅消息111", )
+							// console.log("有人订阅消息111", )
 							if (rec.callback) {
 								try {
-									 console.log("正在处理订阅消息",rec);
+									// console.log("正在处理订阅消息",rec);
 									rec.callback(recData, f,
 										rec.key, this.cfg
 										.receivDataCallback
 									);
-									 console.log("处理订阅消息完毕");
+									// console.log("处理订阅消息完毕");
 								} catch (err) {
 									console.error(
 										"订阅消息出现异常",
--- a/utils/MsgPops.js
+++ b/utils/MsgPops.js
@ -1,162 +0,0 @@
-var MsgType = {
-	error: "error",
-	succ: "succ",
-	warn: "warn"
-}
-var time = null;
-// 显示成功
-export const MsgSuccess = (msg, btnTxt, ev) => {
-
-	if (!ev) {
-
-		return null;
-	}
-	if (!ev.$refs.msgPop) {
-
-		return null;
-	}
-	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.succ);
-
-	createClear(ev);
-	return option;
-}
-//显示失败
-export const MsgError = (msg, btnTxt, ev) => {
-
-	if (!ev) {
-
-		return null;
-	}
-	if (!ev.$refs.msgPop) {
-
-		return null;
-	}
-
-	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.error);
-	createClear(ev);
-	return option;
-}
-//显示警告
-export const MsgWarning = (msg, btnTxt, ev, isClear) => {
-	if (!ev) {
-
-		return null;
-	}
-	if (!ev.$refs.msgPop) {
-
-		return null;
-	}
-	let option = ev.$refs.msgPop.showMsg(msg, btnTxt, MsgType.warn);
-	if (isClear === undefined || isClear) {
-		createClear(ev);
-	}
-
-	return option;
-
-
-}
-
-
-// 隐藏loading
-export const MsgClose = (options, ev) => {
-
-
-	if (!ev) {
-
-		return;
-	}
-	if (!ev.$refs.msgPop) {
-
-		return;
-	}
-	if (typeof(options) == 'string') {
-		options = {
-			key: options
-		}
-	}
-	ev.$refs.msgPop.closePop(options);
-
-}
-
-
-
-export const showPop = (options, ev, isClear) => {
-
-
-	if (!ev) {
-
-		return null;
-	}
-	if (!ev.$refs.msgPop) {
-
-		return null;
-	}
-	let option = ev.$refs.msgPop.showPop(options);
-
-	if (isClear === undefined || isClear) {
-		createClear(ev);
-	}
-
-	return option;
-}
-
-const createClear = (ev) => {
-	let cnt = getPops(ev);
-	if (cnt >= 5) {
-		clearTimeout(time);
-		time = setTimeout(() => {
-			let key = new Date().getTime();
-			showPop({
-				key: key,
-				message: "消息太多, 是否全部关闭",
-				iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
-				borderColor: "#e034344d",
-				buttonBgColor: "#E03434",
-				buttonText: '全部关闭',
-				buttonTextColor: '#232323de',
-				showCancel: true,
-				buttonCancelText: "取消",
-				cancelCallback: () => {
-
-					MsgClose(key, ev);
-				},
-				okCallback: function() {
-
-					MsgClear(ev);
-				}
-
-			}, ev, false);
-		}, 500);
-
-
-	}
-}
-
-//获取当前弹窗数量
-export const getPops = (ev) => {
-	if (!ev) {
-
-		return null;
-	}
-	if (!ev.$refs.msgPop) {
-
-		return null;
-	}
-	return ev.$refs.msgPop.getPops();
-
-}
-
-
-//清空所有弹窗
-export const MsgClear = (ev) => {
-	if (!ev) {
-
-		return null;
-	}
-	if (!ev.$refs.msgPop) {
-
-		return null;
-	}
-	return ev.$refs.msgPop.clearPops();
-
-}
--- a/utils/request.js
+++ b/utils/request.js
@ -22,7 +22,7 @@ const request = (options) => {
 				.map(key => `${encodeURIComponent(key)}=${encodeURIComponent(options.data[key])}`)
 				.join('&');
 			url += `?${params}`;
-		}
+		}  

 		const config = {
 			url: url,
Author	SHA1	Message	Date
liubiao	9b6a5e095c	merge upstream	2026-02-07 13:53:33 +08:00
fengerli	3fecf3380a	100J续航时间显示优化	2026-02-07 09:54:38 +08:00
liubiao	7735abc2a1	merge upstream	2026-02-04 09:05:49 +08:00
liubiao	c626f3766e	merge upstream	2026-02-03 13:07:11 +08:00