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

# Conflicts:
#	pages/6155/deviceDetail.vue

utils/BleReceive.js

@@ -476,19 +476,18 @@ class BleReceive {
 
 				let recCnt = recArr.find(v => {
 
-					return v.key.replace(/\//g, "").toLowerCase() === f.device.detailPageUrl.replaceAll(
-						'/', '').toLowerCase();
+					return v.key.replace(/\//g, "").toLowerCase() === f.device.detailPageUrl.replace(/\//g, '').toLowerCase();
 
 					
 
 				});
 				if (!recCnt) {
 					if (batteryLevel <= 20) {
-
-						uni.showModal({
-							content: "设备电量低",
-							title: "提示"
-						});
+                          // 会弹出两个框,暂且注释掉这段代码
+						// uni.showModal({
+						// 	content: "设备电量低",
+						// 	title: "提示"
+						// });
 					}
 				}
 

utils/Common.js

@@ -218,13 +218,13 @@ export default {
 				value: "1",
 				label: "灯光模式",
 				checked: false,
-				type: ['210', '6170', '670']
+				type: ['6170', '670']
 			},
 			{
 				value: "2",
 				label: "激光模式",
 				checked: false,
-				type: ['210', '6170']
+				type: ['6170']
 			},
 			{
 				value: "3",
@@ -259,7 +259,37 @@ export default {
 				label: "SOS",
 				checked: false,
 				type: ['670']
-			}
+			},
+			{
+				value: "43",
+				label: "联机设备",
+				checked: false,
+				type: ['210']
+			},
+				{
+				value: "44",
+				label: "报警声音",
+				checked: false,
+				type: ['210']
+			},
+				{
+				value: "45",
+				label: "自动报警",
+				checked: false,
+				type: ['210']
+			},
+				{
+				value: "46",
+				label: "手动报警",
+				checked: false,
+				type: ['210']
+			},
+				{
+				value: "47",
+				label: "报警时长",
+				checked: false,
+				type: ['210']
+			},
 		]
 
 		let arr = [];