diff --git a/pages/deviceInfo/deviceInfo.js b/pages/deviceInfo/deviceInfo.js index f01fe33..c86a8a4 100644 --- a/pages/deviceInfo/deviceInfo.js +++ b/pages/deviceInfo/deviceInfo.js @@ -55,12 +55,10 @@ Page({ app.globalData.ppScale.plugin.Blue.setDeviceSetting(seviceList); app.globalData.ppScale.plugin.Blue.start(seviceList[0].deviceName, false); app.globalData.ppScale.plugin.bus.subscribe("devicesList", (res) => { - console.log("deviceInfo ===> devicesList", res); let fIndex = res.findIndex(item => item.deviceId === this.data.deviceInfo.deviceId); - if (fIndex >= 0) { + if (fIndex > -1) { app.globalData.ppScale.plugin.Blue.stopBluetoothDevicesDiscovery(); app.globalData.ppScale.plugin.Blue.createBLEConnection(res[fIndex]); - return; } }); } diff --git a/pages/setNetworkSuccessful/setNetworkSuccessful.js b/pages/setNetworkSuccessful/setNetworkSuccessful.js index 6f1f6bf..f3acebe 100644 --- a/pages/setNetworkSuccessful/setNetworkSuccessful.js +++ b/pages/setNetworkSuccessful/setNetworkSuccessful.js @@ -16,6 +16,7 @@ Page({ userInfo: wx.getStorageSync("userInfo"), ssid: app.globalData.ppScale.wifi.ssid }); + this.getSubUser(); }, completeClick() { @@ -90,7 +91,6 @@ Page({ resetDevice() { app.globalData.ppScale.device = { - setting: [], list: [], mac: null, name: "",