list

pages/connectedDevice/connectedDevice.js

@@ -53,7 +53,7 @@ Page({
 											})
 											setTimeout(() => {
 												wx.navigateBack({
-													delta: 1
+													delta: 2
 												})
 											}, 1500);
 										});

pages/searchDevice/searchDevice.js

@@ -164,8 +164,13 @@ Page({
 			this.setData({
 				devicesList: res
 			});
+			this.selectDevice();
 		});
+	},
+
+	selectDevice() {
 		setTimeout(() => {
+			if(this.data.devicesList && this.data.devicesList.length) {
 				this.setData({
 					getDeviceSetting: false,
 					initText: "设备搜索完成"
@@ -195,6 +200,9 @@ Page({
 						}
 					})
 				}
-		}, 3000)
+			} else {
+				this.selectDevice();
+			}
+		}, 3000);
 	}
 })