diff --git a/miniprogram/pages/index/index.js b/miniprogram/pages/index/index.js index e2c707e..9a7ec4e 100644 --- a/miniprogram/pages/index/index.js +++ b/miniprogram/pages/index/index.js @@ -18,8 +18,11 @@ Page({ loading: true }, - onShow: function () { + onLoad: function () { this.setData({ devMode: config.__DEV__ || false }) + }, + + onShow: function () { this.checkState() this._onStatus = this.onBleStatus.bind(this) ble.on('status', this._onStatus) @@ -48,7 +51,8 @@ Page({ return } - self.setData({ connected: ble.isConnected(), loading: true }) + var isFirstLoad = self.data.loading + self.setData({ connected: ble.isConnected() }) var p1 = api.getDevices().then(function (data) { var devices = data.devices || [] @@ -74,7 +78,7 @@ Page({ }) Promise.all([p1, p2]).then(function () { - self.setData({ loading: false }) + if (isFirstLoad) self.setData({ loading: false }) }) }, @@ -180,8 +184,6 @@ Page({ }, onViewSubscription: function () { - if (!this.data.subscription || this.data.subscription.status !== 'active') { - wx.navigateTo({ url: '/pages/subscribe-plans/subscribe-plans' }) - } + wx.navigateTo({ url: '/pages/subscribe-plans/subscribe-plans' }) } })