蓝牙模块添加在web平台默认成功方便调试功能,4877功能完成

pages/6331/BJQ6331.vue

@@ -247,6 +247,7 @@
 		data() {
 			return {
 				Status: {
+					pageHide: false,
 					showLightingSet: false,
 					showVolumeSet: false,
 					Pop: {
@@ -675,6 +676,9 @@
 			},
 
 			bleValueNotify: function(receive, device, path) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
 				console.log("收到设备的数据", receive)
 				let data = recei.ReceiveData(receive, device, pagePath);
 
@@ -717,13 +721,13 @@
 
 			showBleUnConnect() {
 
-				these.showPop({
+				this.showPop({
 					message: "蓝牙未连接过该设备,请使用蓝牙重新添加该设备",
 					iconUrl: "/static/images/6155/DeviceDetail/uploadErr.png",
 					borderColor: "#e034344d",
 					buttonBgColor: "#E03434",
 					buttonText: '去连接',
-					buttonTextColor: '#FFFFFFde',
+					buttonTextColor: '#232323de',
 					okCallback: function() {
 
 						uni.navigateTo({
@@ -731,7 +735,7 @@
 							events: {
 								BindOver: function(data) {
 									console.log(data)
-									these.formData.bleStatu=true;
+									these.formData.bleStatu = true;
 								}
 							},
 							success: function(res) {
@@ -797,6 +801,7 @@
 				}
 			},
 			showPop: function(option) {
+				hideLoading(this);
 				let def = {
 					showPop: true, //是否显示弹窗
 					popType: 'custom',
@@ -807,14 +812,16 @@
 					buttonTextColor: '#232323DE',
 					iconUrl: '',
 					message: '',
-					buttonText: '',
+					buttonText: '确定',
 					clickEvt: '',
 					visiblePrompt: false,
 					promptTitle: '',
 					modelValue: '',
 					visibleClose: false,
 					okCallback: null,
-					showSlot: false
+					showSlot: false,
+					buttonCancelText: '',
+					showCancel: false,
 				}
 
 				let keys = Object.keys(def);
@@ -824,14 +831,14 @@
 					if (key in option) {
 						continue;
 					}
-					these.Status.Pop[key] = def[key];
+					this.Status.Pop[key] = def[key];
 				}
 				if (option) {
 					keys = Object.keys(option);
 					for (let i = 0; i < keys.length; i++) {
 						let key = keys[i];
 
-						these.Status.Pop[key] = option[key];
+						this.Status.Pop[key] = option[key];
 					}
 				}