Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827

# Conflicts: # config/index.js
merge upstream
2026-02-06 08:34:27 +08:00 · 2026-02-06 08:32:25 +08:00 · 2026-02-05 10:28:08 +08:00 · 2026-02-05 10:15:11 +08:00 · 2026-02-04 09:08:59 +08:00
19 changed files with 926 additions and 297 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
@ -0,0 +1,187 @@
+<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,13 +2,13 @@
 const config = {
 	// 开发环境
 	development: {
-		BASE_URL: 'http://192.168.2.34:8000',//http://139.224.253.23:8000
+		BASE_URL: 'http://192.168.110.172:8000',//http://139.224.253.23:8000		
 		API_PREFIX: '',
 		// MQTT 配置
-		MQTT_HOST: '47.120.79.150',
-		MQTT_PORT: 9083,
+		MQTT_HOST: 'www.cnxhyc.com',
+		MQTT_PORT: 8083,
 		MQTT_USERNAME: 'admin',
-		MQTT_PASSWORD: '#YtvpSfCNG' 
+		MQTT_PASSWORD: '#YtvpSfCNG'    
 	},
 	// 生产环境
 	production: {
--- a/manifest.json
+++ b/manifest.json
@ -2,7 +2,7 @@
    "name" : "星汉物联",
    "appid" : "__UNI__A21EF43",
    "description" : "设备管控",
-    "versionName" : "1.0.15",
+    "versionName" : "1.0.16",
    "versionCode" : "100",
    "transformPx" : false,
    /* 5+App特有相关 */
--- a/pages.json
+++ b/pages.json
@ -414,6 +414,14 @@
 			{
 				"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"> {{ Math.floor((Number(deviceInfo.batteryRemainingTime)||0)/60) }}小时 {{ (Number(deviceInfo.batteryRemainingTime)||0)%60 }}分钟
+							<view class="bigTxt">{{ deviceInfo.batteryRemainingTime || '0' }}分钟
 							</view>
 							<view class="smallTxt">续航时间</view>
 						</view>
@ -43,26 +43,26 @@
 					<text class="value">{{ deviceInfo.onlineStatus === 0 ? '离线' : deviceInfo.onlineStatus
 						=== 2 ? '故障' : '在线' }}</text>
 				</view>
-			<view class="info-row">
-				<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
-				<view class="info-value status-running" @click="gpsPosition(deviceInfo)">
-					<view class="info-value status-running">
-						{{ deviceInfo && deviceInfo.longitude ? Number(deviceInfo.longitude).toFixed(4) : '' }}
-						{{ deviceInfo && deviceInfo.latitude ? Number(deviceInfo.latitude).toFixed(4) : '' }}
+				<view class="item">
+					<text class="lbl">定位信息</text>
+					<view class="info-value">
+						<view class="value" @click="gpsPosition(deviceInfo)">
+							{{ deviceInfo && deviceInfo.longitude ? Number(deviceInfo.longitude).toFixed(4) : '' }}
+							{{ deviceInfo && deviceInfo.latitude ? Number(deviceInfo.latitude).toFixed(4) : '' }}
+						</view>
+						<view class="locationGPS">
+							<uni-icons type="location" size="17" color="rgba(255, 255, 255, 0.8)"
+								style="vertical-align: bottom;" />
+							{{ deviceInfo.address }}
+						</view>
 					</view>
-					<view class="info-value status-running locationGPS">
-						<uni-icons type="location" size="17"
-							color="rgba(255, 255, 255, 0.8)" style="vertical-align: bottom;" />
-						{{ deviceInfo.address }}
-					</view>
-				</view>  
+				</view>
 			</view>
-			</view> 
 			<view class="lampMode">
 				<view class="sosContent">
 					<view class="btnSos openSos center" :class="{ active: formData.sta_SOSType === 1 }"
 						@click="sosSetting(1)">
-						{{ deviceInfo.voiceStrobeAlarm === 1 ? '报警中' : '强制报警' }}
+						{{ deviceInfo.chargeState === 1 ? '报警中' : '强制报警' }}
 					</view>
 					<view class="btnSos closeSos center" @click="sosSetting(0)">解除</view>
 				</view>
@ -80,7 +80,7 @@
 						<view class="arrow" @click.stop="openVolume(item, index)" v-if="item.show"
 							v-for="item, index in dic.sta_VoiceType" :class="{
 								'active': formData.sta_VoiceType === item.key,
-								'displayNone': !Status.usrToggle && index > 2
+								'displayNone': !Status.usrToggle && index > 3
 							}">
 							<view class="outCircle">
 								<view class="item">
@ -148,32 +148,32 @@
 				</view>
 				<view class="header paddingTop0">
 					<text class="sliderTxt">亮度</text>
-					<text class="sliderVal">{{ formData.lightBrightness }}%</text>
+					<text class="sliderVal">{{ formData.sta_LightDimmer }}%</text>
 				</view>
 				<view class="slider-container">
-					<slider min="10" max="100" step="10" :disabled="false" :value="formData.lightBrightness"
+					<slider min="10" max="100" step="10" :disabled="false" :value="formData.sta_LightDimmer"
 						activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
 						@change="onBrightnessChanging" @changing="onBrightnessChanging" class="custom-slider" />
 				</view>
 				<view class="line"></view>
 				<view class="header paddingTop0">
 					<text class="sliderTxt">频率</text>
-					<text class="sliderVal">{{ formData.strobeFrequency }}HZ</text>
+					<text class="sliderVal">{{ formData.sta_LightFreq }}HZ</text>
 				</view>
 				<view class="slider-container">
-					<slider min="0.5" max="10" step="0.5" :disabled="false" :value="formData.strobeFrequency"
+					<slider min="0.5" max="10" step="0.5" :disabled="false" :value="formData.sta_LightFreq"
 						activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
 						@change="onFreqChanging" @changing="onFreqChanging" class="custom-slider" />
 				</view>
 				<view class="line"></view>
 				<view class="header paddingTop0">
 					<text class="sliderTxt">音量</text>
-					<text class="sliderVal">{{ formData.volume }}</text>
+					<text class="sliderVal">{{ formData.sta_VoiceVolume }}</text>
 				</view>
 				<view class="slider-container">
-					<slider min="10" max="100" step="1" :disabled="false" :value="formData.volume" activeColor="#bbe600"
-						backgroundColor="#686767" block-size="20" block-color="#ffffffde" @change="onVolumeChanging"
-						@changing="onVolumeChanging" class="custom-slider" />
+					<slider min="1" max="8" step="1" :disabled="false" :value="formData.sta_VoiceVolume"
+						activeColor="#bbe600" backgroundColor="#686767" block-size="20" block-color="#ffffffde"
+						@change="onVolumeChanging" @changing="onVolumeChanging" class="custom-slider" />
 				</view>
 				<view class="proinfo lamp">
 					<text class="title">产品信息</text>
@ -211,7 +211,6 @@

 <script>
 	import gbk from '@/utils/gbk.js'
-	import MqttClient from '@/utils/mqtt.js';
 	import {
 		showLoading,
 		hideLoading,
@ -235,7 +234,6 @@
 	export default {
 		data() {
 			return {
-				mqttClient: null,
 				Status: {
 					isRightIconVisible: false,
 					navTitle: '',
@ -306,10 +304,10 @@
 					bleStatu: false,
 					sta_address: '',
 					sta_VoiceType: '0',
-					volume: 10,
+					sta_VoiceVolume: 1,
 					sta_LightType: '',
-					strobeFrequency: 0.5,
-					lightBrightness: 10,
+					sta_LightFreq: 0.5,
+					sta_LightDimmer: 10,
 					sta_system: '',
 					warnTime: 0,
 					sta_SOSType: 0
@ -365,7 +363,7 @@

 					sta_LightType: [{
 							key: "6",
-							name: '红蓝交替',
+							name: '红蓝',
 							show: true
 						},
 						{
@ -385,17 +383,17 @@
 						},
 						{
 							key: "3",
-							name: '红色顺时针',
+							name: '红流水',
 							show: true
 						},
 						{
 							key: "4",
-							name: '黄色顺时针',
+							name: '黄流水',
 							show: true
 						},
 						{
 							key: "5",
-							name: '红蓝顺时针',
+							name: '蓝流水',
 							show: true
 						},
 						{
@ -452,7 +450,6 @@
 				these.Status.navTitle = data.data.deviceName;
 				these.Status.apiType = data.apiType;
 				these.Status.isRightIconVisible = these.Status.apiType === 'listA';
-
 				if (data.apiType !== 'listA') {
 					Common.getdeviceShareId(data.data.id).then(res => {
 						if (res.code == 200) {
@ -463,20 +460,6 @@
 					});

 				}
-				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) {
-							
-				// 		}
-				// 	})
-				// })
 				console.log(data, 'datatatatat');
 				these.fetchDeviceDetail(data.data.id)
 			});
@ -504,24 +487,7 @@
 			fetchDeviceDetail(id) {
 				deviceDetail(id).then((res) => {
 					if (res.code == 200) {
-						const validData = Object.fromEntries(
-							Object.entries(res.data).filter(([key, value]) => {
-								// 过滤规则：值为 null/undefined/0 的字段都不参与合并
-								return value !== null && value !== undefined && value !== 0;
-							})
-						);
-						Object.assign(this.formData, validData);
-						this.deviceInfo = res.data;
-						// 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
-						this.formData.sta_LightType = (res.data.strobeMode ?? 0) + ''
-						// 0爆闪关闭, 1爆闪开启
-						const strobeEnable = res.data.strobeEnable ?? 0;
-						this.formData.sta_LightType = strobeEnable === 1 ? 1 : -1;
-						if (res.data.alarmMode == 7) {
-							this.formData.sta_VoiceType = res.data.voiceStrobeAlarm ?? 0;
-						} else {
-							this.formData.sta_VoiceType = res.data.alarmMode + ''
-						}
+						this.deviceInfo = res.data
 					}
 				})
 			},
@ -553,7 +519,6 @@
 			},
 			// 语音管理
 			audioManager(item) {
-				this.formData.sta_VoiceType = -1
 				if (this.Status.apiType !== 'listA') {}
 				uni.navigateTo({
 					url: '/pages/100J/audioManager/AudioList',
@ -568,18 +533,18 @@
 			},
 			//频率
 			onFreqChanging(e) {
-				this.formData.strobeFrequency = e.detail.value;
+				this.formData.sta_LightFreq = e.detail.value;
 				this.throttledFreqChange(e.detail.value);
 			},
 			//音量
 			onVolumeChanging(e) {
-				this.formData.volume = e.detail.value;
+				this.formData.sta_VoiceVolume = e.detail.value;
 				this.throttledVolumeChange(e.detail.value);
 			},

 			// 亮度调节
 			onBrightnessChanging(e) {
-				this.formData.lightBrightness = e.detail.value;
+				this.formData.sta_LightDimmer = e.detail.value;
 				this.throttledBrightnessChange(e.detail.value);
 			},
 			// 亮度调节
@ -733,7 +698,7 @@
 				this.formData.sta_VoiceType = val;
 				console.log(this.formData.sta_VoiceType, 'this.formData.sta_VoiceType')
 				// 模式类型为7时才去判断
-				if (val === '7' || val === '-1') {
+				if (val == '7') {
 					let data = {
 						deviceId: this.deviceInfo.deviceId,
 						voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1
@ -1004,14 +969,14 @@
 		border-radius: 16rpx;
 		background: rgba(26, 26, 26, 1);
 		box-sizing: border-box;
-		padding: 15rpx 30rpx;
+		padding: 15rpx 0rpx 40rpx 0rpx;
 	}

 	.eqinfo .item {
 		width: 100%;
 		height: 60rpx;
 		line-height: 60rpx;
-		/* padding: 0rpx 28rpx; */
+		padding: 0rpx 28rpx;
 		box-sizing: border-box;
 		display: flex;
 		flex-direction: row;
@ -1041,12 +1006,12 @@
 	}

 	.eqinfo .info-value {
-		/* margin-top: 30rpx; */
+		margin-top: 30rpx;
 	}

-	/* .eqinfo .status-running {
+	.eqinfo .status-running {
 		color: rgba(174, 214, 0, 1);
-	} */
+	}

 	.lamp {
 		margin-top: 24rpx;
@ -1749,32 +1714,4 @@
 		width: 100%;
 		font-size: 32rpx;
 	}
-	.info-row {
-		display: flex;
-		justify-content: space-between;
-	}
-	
-	.info-label {
-		font-size: 28rpx;
-		color: rgba(255, 255, 255, 0.87);
-		white-space: nowrap;
-	}
-	
-	.info-value {
-		font-size: 28rpx;
-		color: rgba(255, 255, 255, 0.6);
-	}
-	
-	.status-running {
-		/* color: rgba(255, 255, 255, 0.6); */
-		text-align: end;
-	}
-	
-	.locationGPS {
-		width: 88%;
-		text-align: end;
-		float: right;
-		line-height: 45rpx;
-		font-size: 28rpx;
-	}
 </style>
--- a/pages/100J/audioManager/AudioList.vue
+++ b/pages/100J/audioManager/AudioList.vue
@ -1,36 +1,34 @@
 <template>
 	<view class="maincontent contentBg">
-		<mescroll-uni class="device-list" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption"
+		<mescroll-uni class="device-list" @init="mescrollInit"  @down="downCallback" @up="upCallback" :up="upOption"
 			:down="downOption" :fixed="false" :style="{ height: mescrollHeight + 'px' }">
 			<uni-swipe-action ref="swipeAction">
 				<view v-for="(item, index) in dataListA" class="li" :key="index" :ref="'swipeItem_' + index">
-					<view class="itemIcon center"
-						:class="{ 'displayNone': !Status.isEdit, 'check': isCheck(item, index) }"
-						v-on:click.stop="checkToggle(item, index)">
-						<image class="img" :class="{ 'displayNone': !isCheck(item, index) }"
+					<view class="itemIcon center" :class="{'displayNone':!Status.isEdit,'check':isCheck(item,index)}"
+						v-on:click.stop="checkToggle(item,index)">
+						<image class="img" :class="{'displayNone':!isCheck(item,index)}"
 							src="/static/images/common/gou.png" mode="aspectFit"></image>
 					</view>
-					<view class="itemMain " :class="{ 'Edit': Status.isEdit }">
+					<view class="itemMain " :class="{'Edit':Status.isEdit}">
 						<uni-swipe-action-item :right-options="Options" @click="handleSwipeClick($event, item, index)"
 							class="device-card ">
-							<view @click.stop="handleFile(item, index)">
+							<view @click.stop="handleFile(item,index)">
 								<view class="item">
 									<view class="itemLeft ">
 										<view class="title">{{ item.fileNameExt }}</view>
 										<view class="smallTitle">
 											<!-- 展示前端生成的时间 -->
-											<text>{{ item.createTime || Common.DateFormat(new Date(),
-												"yyyy年MM月dd日") }}</text>
-											<text v-show="item.duration">{{ item.duration }}秒</text>
-											<image :class="{ 'displayNone': !item.fileUrl }" class="img"
+											<text>{{item.createTime || Common.DateFormat(new Date(), "yyyy年MM月dd日")}}</text>
+											<text v-show="item.duration">{{item.duration}}秒</text>
+											<image :class="{'displayNone':!item.fileUrl}" class="img"
 												src="/static/images/100/volume.png" mode="aspectFit"
-												@click.stop="play(item, index)"></image>
+												@click.stop="play(item,index)"></image>
 										</view>
 									</view>
 									<view class="itemRight ">
-										<view class="btn" @click.stop="Apply(item, index)"
-											:class="{ 'active': item.useStatus, 'btn-default': !item.useStatus }">
-											{{ item.useStatus == 1 ? '使用中' : '使用' }}
+										<view class="btn" @click.stop="Apply(item,index)"
+											:class="{'active':item.useStatus,'btn-default':!item.useStatus}">
+											{{item.useStatus==1 ?'使用中':'使用'}}
 										</view>
 									</view>
 									<view class="clear"></view>
@ -42,7 +40,7 @@
 			</uni-swipe-action>
 		</mescroll-uni>
 		<view class="footer">
-			<view class="addContent" :class="{ 'displayNone': Status.isEdit }">
+			<view class="addContent" :class="{'displayNone':Status.isEdit}">
 				<view class="addItem" @click="gotoRecord('Record')">
 					<view class="imgContent center">
 						<image class="img" src="/static/images/100/record.png" mode="aspectFit"></image>
@ -62,7 +60,7 @@
 					<view class="txt">文字转语音</view>
 				</view>
 			</view>
-			<view class="editContent" :class="{ 'displayNone': !Status.isEdit }">
+			<view class="editContent" :class="{'displayNone':!Status.isEdit}">
 				<view class="btn-del" @click.stop="delCheckList()">删除</view>
 			</view>
 		</view>
@ -82,12 +80,6 @@
 			<audio :src="cPlay.src" :id="cPlay.Id" :name="cPlay.name" author="">
 		</view> -->
 		<global-loading ref="loading"></global-loading>
-		<!-- 圆形进度条 + 全屏遮罩层（升级中显示） -->
-		<view v-if="isUpdating" class="mask-layer">
-			<view class="circle-progress-box">
-				<progress :percent="updateProgress" activeColor="#bbe600" backgroundColor="#686767" :border-radius='22' show-info stroke-width="15" class="custom-progress" />
-			</view>
-		</view>
 	</view>
 </template>

@ -99,7 +91,6 @@
 	var timeout = null;
 	import MescrollUni from '@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-uni.vue'
 	import BleTool from '@/utils/BleHelper.js'
-	import MqttClient from '@/utils/mqtt.js';
 	import {
 		deviceVoliceList,
 		videRenameAudioFile,
@ -123,7 +114,6 @@
 					isEdit: false,
 					playState: '',
 					playPath: '',
-					mqttClient: null,
 					Pop: {
 						showPop: false, //是否显示弹窗
 						popType: 'custom',
@ -203,10 +193,7 @@
 					createTime: "", //创建时间
 					fileUrl: "", //本地地址
 					fileUrl: "", //网络地址
-				},
-				updateProgress: 0, // 升级进度，0-100
-				isUpdating: false, // 是否正在升级（控制进度条显示/隐藏）
-				mqttSubscribeSuccess: false // MQTT订阅是否成功
+				}
 			}
 		},
 		onLoad() {
@ -225,10 +212,7 @@
 			console.log("页面返回")
 		},
 		onUnload() {
-			// 页面卸载时断开MQTT连接
-			if (this.mqttClient) {
-				this.mqttClient.disconnect();
-			}
+			console.log("页面卸载了");
 		},
 		methods: {
 			//语音管理列表
@ -468,72 +452,57 @@
 				}
 			},
 			Apply(item, index) {
-				this.mqttClient = new MqttClient();
-				this.updateProgress = 0;
-				this.isUpdating = true;
+				console.log(item, 'itemmm');
 				let data = {
 					id: item.id
 				}
 				deviceUpdateVoice(data).then((RES) => {
 					if (RES.code == 200) {
-						this.updateProgress = 0;
-						this.isUpdating = true;
-						this.mqttClient.connect(() => {
-							// 订阅来自设备的状态更新
-							const statusTopic = `status/894078/HBY100/${this.device.deviceImei}`;
-							this.mqttClient.subscribe(statusTopic, (payload) => {
-								console.log(payload, 'payloadpayloadpayload');
-								try {
-									// 解析MQTT返回的payload
-									const payloadObj = typeof payload === 'string' ? JSON.parse(
-										payload) : payload;
-									// 取出进度值（用可选链避免字段不存在报错）
-									const progress = payloadObj.data?.progress;
-									if (progress !== undefined && !isNaN(progress) && progress >=
-										0 && progress <= 100) {
-										this.updateProgress = progress;
-										console.log('当前升级进度：', progress + '%');
-										// 进度到100%时，触发升级完成逻辑
-										if (progress === 100) {
-											clearTimeout(this.upgradeTimer);
-											uni.showToast({
-												title: '升级完成！',
-												icon: 'success',
-												duration: 2000
-											});
-											this.isUpdating = false;
-											setTimeout(() => {
-												uni.navigateBack();
-											}, 1500);
-										}
-									}
-								} catch (e) {
-									 clearTimeout(this.upgradeTimer);
-									console.error('解析MQTT payload失败：', e);
-								}
-							})
-						})
-					} else {
 						uni.showToast({
 							title: RES.msg,
 							icon: 'none',
 							duration: 1000
 						});
-
+						console.log("状态修改完成");
+						// eventChannel.emit('audioApply', item.Id);
+						console.log("返回上一页");
+						setTimeout(()=>{
+							uni.navigateBack();
+						},1000)
+						
 					}
+
 				})
-				 this.upgradeTimer = setTimeout(() => {
-				    // 超时后执行：隐藏进度条+提示超时+重置进度
-				    uni.showToast({
-				      title: '升级进度同步超时',
-				      icon: 'none',
-				      duration: 2000
-				    });
-				    this.isUpdating = false; // 关闭进度条
-				    this.updateProgress = 0; // 重置进度值
-				    // 可选：如果需要取消MQTT订阅，加这行（根据需求选择）
-				    // this.mqttClient.unsubscribe(statusTopic);
-				  }, 6000); // 6000ms = 6秒，时间可直接修改
+
+				let task = () => {
+					//let fileList = uni.getStorageSync(Common.audioStorageKey);
+					// for (let i = 0; i < these.dataListA.length; i++) {
+					// 	let ele = these.dataListA[i];
+					// 	if (i === index) {
+					// 		these.$set(these.dataListA[index], "isApply", true);
+					// 		fileList.find(v => {
+					// 			if (!v.devices) {
+					// 				v.devices = [];
+					// 			}
+					// 			if (v.Id == ele.Id) {
+					// 				v.devices.push(these.device.id);
+					// 				return true;
+					// 			} else {
+					// 				for (let j = 0; j < v.devices.length; j++) {
+					// 					if (v.devices[j] === these.device.id) {
+					// 						v.devices.splice(j, 1);
+					// 						break
+					// 					};
+					// 				}
+					// 			}
+					// 			return false;
+					// 		});
+					// 	} else {
+					// 		these.$set(these.dataListA[i], "isApply", false);
+					// 	}
+					// }
+
+				}
 			},
 			closePop: function() {
 				this.Status.Pop.showPop = false;
@ -639,18 +608,7 @@
 	}
 </script>

-<style  lang="less">
-.custom-progress{
-	border-radius: 10rpx;
-}
-.custom-progress .uni-progress-bar{
-	border-radius: 10rpx !important;
-}
-.custom-progress .uni-progress-info{
-	color: #BBE600;
-	font-size: 40rpx;
-	font-weight: 600;
-}
+<style>
 	.popup-prompt {
 		width: 100%;
 		margin-top: 40rpx;
@ -687,6 +645,8 @@

 	}

+	.li .itemMain {}
+
 	.li .item {
 		width: 100%;
 		height: 200rpx;
@ -889,28 +849,4 @@
 		height: 100%;
 		justify-content: flex-end;
 	}
-
-	/* 全屏遮罩层：半透明黑色，覆盖整个页面，禁止底层滚动/点击 */
-	.mask-layer {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background-color: rgba(0, 0, 0, 0.7);
-		/* 半透明黑，可调整透明度 */
-		z-index: 9999;
-		/* 遮罩层层级拉满，确保在最上层 */
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		/* 让内部圆形进度条垂直+水平居中 */
-	}
-
-	/* 圆形进度条容器 */
-	.circle-progress-box {
-		position: relative;
-		width: 70%;
-		height: 100rpx;
-	}
 </style>
--- a/pages/6107/BJQ6107.vue
+++ b/pages/6107/BJQ6107.vue
@ -976,7 +976,7 @@
 						buttonBgColor: "#BBE600"
 					},
 					warn: {
-						icoUrl: '/static/images/6170/svg.png',
+						icoUrl: '/static/images/common/warning.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.formData.id,
+					url: '/pages/common/productDes/index?id=' + this.device.id,
 					success(ev) {

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

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

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

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

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

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

 					}
--- a/pages/common/addScan/ScanEquip.vue
+++ b/pages/common/addScan/ScanEquip.vue
@ -0,0 +1,396 @@
+<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,54 +497,57 @@ import BleReceive from '@/utils/BleReceive';
 				switch (item.action) {
 					case 'scan':
 						// 扫一扫
-						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) {
-
-								}
-								// 跳转并传递扫描结果
-								uni.navigateTo({
-									url: url
-								});
-							},
-							fail: (err) => {
-								console.log('扫码失败', err);
-								uni.showToast({
-									title: '扫码失败',
-									icon: 'none'
-								});
-							}
+						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)
+						// 					}
+						// 				}
+										
+						// 				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'
+						// 		});
+						// 	}
+						// });
 						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
@ -0,0 +1,162 @@
+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
liub	8d84309ce8	Merge branch 'new-20250827' of http://47.107.152.87:3000/liubiao/APP into new-20250827 # Conflicts: # config/index.js	2026-02-06 08:34:27 +08:00
liubiao	d3707c2229	merge upstream	2026-02-06 08:32:25 +08:00
liubiao	c3f33758eb	merge upstream	2026-02-05 10:28:08 +08:00
liub	7cbdc00ae0	再次封装Msg组件，扫码功能增加中转页面	2026-02-05 10:15:11 +08:00
liub	274c037eea	修复6155串数据的问题	2026-02-04 09:08:59 +08:00