体验性小优化

pages/common/addBLE/addEquip.vue

@@ -378,17 +378,11 @@
 					
 					// hideLoading(these);
 					
-					if (these.device) {
-						clearInterval(this.Status.intval);
-						showLoading(these, {
-							text: '蓝牙连接已恢复,正在验证设备'
-						});
-				
-						setTimeout(() => {
-							these.DeviceVerdict(res.deviceId);
-						}, 0);
-					} else {
+					if (!these.device) {						
 						hideLoading(these);
+					}else{
+						clearInterval(this.Status.intval);
+						these.DeviceVerdict(res.deviceId);
 					}
 				
 				
@@ -420,7 +414,7 @@
 								showLoading(these, {
 									text: '正在验证设备'
 								});
-
+								
 								setTimeout(() => {
 									these.DeviceVerdict(f.deviceId);
 								}, 0);
@@ -690,6 +684,7 @@
 						this.Status.intval = setInterval(() => {
 							this.Status.time = this.Status.time - 1;
 							if (this.Status.time < 0) {
+								hideLoading(these);
 								console.log("停止倒计时", this.Status.time);
 								clearInterval(this.Status.intval)
 								this.Status.intval = null;
@@ -708,7 +703,10 @@
 								return;
 							}
 
-							hideLoading(these);
+							updateLoading(these, {
+							
+								text: "等待设备上报Mac地址," + these.Status.time + 's'
+							});
 
 						}, 1000);
 
@@ -744,8 +742,7 @@
 						});
 						return;
 					}
-					// console.log("验证设备")
-					 these.DeviceVerdict(item.deviceId);
+				
 				}
 				let execLink = () => {
 					return new Promise((resolve, reject) => {
@@ -993,7 +990,7 @@
 		box-sizing: border-box;
 		padding: 20rpx;
 		border-radius: 8px;
-		background: #1a1a1a;
+		background: #1a1a1a9e;
 		display: flex;
 		flex-direction: row;
 		flex-wrap: nowrap;