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

# Conflicts:
#	pages/common/index/index.vue

pages/common/addBLE/addEquip.vue

@@ -185,7 +185,7 @@
 		},
 		onHide: function() {
 			this.Status.isPageHidden = true;
-			ble.StopSearch();
+			if (ble) ble.StopSearch();
 		},
 
 		onUnload() {
@@ -205,7 +205,6 @@
 			}
 		},
 		onLoad(option) {
-			debugger;
 			eventChannel = this.getOpenerEventChannel();
 
 			eventChannel.on('detailData', function(rec) {
@@ -351,11 +350,10 @@
 							// console.log("+++ 发现新设备，准备添加到列表:", JSON.stringify(device));
 
 							if (these.device && these.device.bluetoothName && device.name) {
-								if (these.device.bluetoothName === device.name || (device.name && device.name
-										.indexOf(these
-											.device.bluetoothName) > -1) || (device.name && this.device
-										.bluetoothName.indexOf(
-											device.name) > -1)) {
+								const bn = these.device.bluetoothName;
+								if (these.device.bluetoothName === device.name ||
+									(device.name.indexOf(bn) > -1) ||
+									(bn.indexOf(device.name) > -1)) {
 									device.isTarget = true;
 								}
 							}
@@ -635,7 +633,7 @@
 
 					if (f && f.macAddress) {
 
-						if (!this.device.deviceMac) { //走服务端验证
+						if (!these.device || !these.device.deviceMac) { //走服务端验证
 							console.error("走服务端验证")
 							request({
 								url: '/app/device/getDeviceInfoByDeviceMac',