diff --git a/app.json b/app.json index b609523..8cd843a 100644 --- a/app.json +++ b/app.json @@ -32,7 +32,7 @@ "style": "v2", "plugins": { "ppScale-plugin": { - "version": "0.0.16", + "version": "0.0.19", "provider": "wx0826af4e4908f524" } }, diff --git a/pages/configureDevice/configureDevice.js b/pages/configureDevice/configureDevice.js index 31f03cf..c89774d 100644 --- a/pages/configureDevice/configureDevice.js +++ b/pages/configureDevice/configureDevice.js @@ -84,7 +84,8 @@ Page({ } else { ppScale.device.name = this.data.device.name; ppScale.device.connection = this.data.device; - ppScale.version = this.data.device.name.includes("YX") ? "domain2" : "domain1"; + const nameArr = this.data.device.name.split("-"); + ppScale.version = nameArr.length === 5 ? "domain2" : "domain1"; if(this.data.progressNext) { let scaleDeviceId = ppScale.device.mac.replace(/:/g, ''); let params = { diff --git a/pages/replaceNetwork/replaceNetwork.js b/pages/replaceNetwork/replaceNetwork.js index e74763f..ee3d59e 100644 --- a/pages/replaceNetwork/replaceNetwork.js +++ b/pages/replaceNetwork/replaceNetwork.js @@ -36,7 +36,8 @@ Page({ app.globalData.ppScale.device.name = this.data.device.name; app.globalData.ppScale.device.connection = this.data.device; - app.globalData.ppScale.version = this.data.device.name.includes("YX") ? "domain2" : "domain1"; + const nameArr = this.data.device.name.split("-"); + app.globalData.ppScale.version = nameArr.length === 5 ? "domain2" : "domain1"; wx.hideLoading(); this.selectComponent('#replaceNetwork1Component').getWiFiList();