6155完成部分协议对接

pages/650/HBY650.vue

@@ -309,6 +309,7 @@
 				these.formData.deviceName = device.deviceName;
 				these.formData.img = device.devicePic;
 				these.formData.id = device.id;
+				these.formData.deviceId=f.deviceId;
 				ble.LinkBlue(f.deviceId, f.writeServiceId, f.wirteCharactId, f.notifyCharactId);
 				these.setBleFormData();
 
@@ -321,9 +322,7 @@
 
 		},
 		onBackPress(e) {
-
-
-
+			ble.removeReceiveCallback();
 		},
 		computed: {
 			RSSIRemark: function() {
@@ -488,7 +487,8 @@
 			},
 			getDevice: function() {
 
-
+				console.log("LinkedList=",ble.data.LinkedList);
+				console.log("formData=",these.formData);
 				let f = ble.data.LinkedList.find((v) => {
 					return v.deviceId == these.formData.deviceId;
 				});
@@ -1112,6 +1112,10 @@
 					let key = keys[i];
 					these.Status.Pop[key] = option[key];
 				}
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
 				these.Status.Pop.showPop = true;
 			},
 			sendUsr: function() {
@@ -1126,9 +1130,7 @@
 
 				];
 
-				showLoading(this, {
-					text: "请稍候..."
-				});
+
 				let f = this.getDevice();
 				if (!f) {
 					these.showPop({
@@ -1139,7 +1141,9 @@
 					});
 					return;
 				}
-
+				showLoading(this, {
+					text: "请稍候..."
+				});
 				var sendText = function() {