diff --git a/app.json b/app.json index 88435f5..0412fd3 100644 --- a/app.json +++ b/app.json @@ -33,7 +33,7 @@ "style": "v2", "plugins": { "ppScale-plugin": { - "version": "0.0.23", + "version": "0.0.24", "provider": "wx0826af4e4908f524" } }, diff --git a/components/configureDevice_3/configureDevice_3.js b/components/configureDevice_3/configureDevice_3.js index 28b96cd..95c8cd2 100644 --- a/components/configureDevice_3/configureDevice_3.js +++ b/components/configureDevice_3/configureDevice_3.js @@ -36,13 +36,21 @@ Component({ const timer = setTimeout(() => { wx.hideLoading(); this.setData({ wifiStatus: 'failed' }); + // 延长时间 失败调用退出wifi配网 + activeProtocol.dataExitWifiConfig((res) => { + console.log("dataExitWifiConfig", res) + }) }, 15000); // 延时两秒后再调用接口 setTimeout(() => { activeProtocol.dataFindSurroundDevice((res) => { + console.log("wifi列表", res) clearTimeout(timer); wx.hideLoading(); - if (!Array.isArray(res)) { + if (res.length === 0) { + activeProtocol.dataExitWifiConfig((res) => { + console.log("dataExitWifiConfig", res) + }) this.setData({ wifiStatus: 'failed' }); return; } diff --git a/images/share/share.jpg b/images/share/share.jpg new file mode 100644 index 0000000..3d6c7fc Binary files /dev/null and b/images/share/share.jpg differ diff --git a/pages/home/home.js b/pages/home/home.js index 6a399d0..d9221c9 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -59,5 +59,13 @@ Page({ wx.navigateTo({ url: "/pages/help/help" }) + }, + + onShareAppMessage() { + return { + title: '智能蓝牙秤', + path: '/pages/home/home', + imageUrl: '/images/share/share.jpg', + } } }) \ No newline at end of file diff --git a/pages/my/my.js b/pages/my/my.js index 54cc19d..08fd0eb 100644 --- a/pages/my/my.js +++ b/pages/my/my.js @@ -78,5 +78,13 @@ Page({ } } }) + }, + + onShareAppMessage() { + return { + title: '智能蓝牙秤', + path: '/pages/home/home', + imageUrl: '/images/share/share.jpg', + } } }) \ No newline at end of file