diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss index 66d451c..06c6daa 100644 --- a/miniprogram/app.wxss +++ b/miniprogram/app.wxss @@ -244,6 +244,7 @@ page { color: rgba(255, 255, 255, 0.85); padding: 8rpx 0; margin-bottom: 8rpx; + text-align: left; } .nav-back-light { diff --git a/miniprogram/pages/ble-connect/ble-connect.js b/miniprogram/pages/ble-connect/ble-connect.js index 320cfbd..c805b16 100644 --- a/miniprogram/pages/ble-connect/ble-connect.js +++ b/miniprogram/pages/ble-connect/ble-connect.js @@ -96,38 +96,35 @@ Page({ this.startBleConnect() }, - onMockConnect: function () { + _mockConfirmBind: function () { var self = this - clearTimeout(this._scanTimer) - ble.stopScan() self.setData({ state: 'binding' }) - // Skip BLE bind, confirm directly with server - http.post('/api/v1/device/bind/confirm', { - device_id: self.data.deviceId, - bind_token: self.data.bindToken + http.post('/api/v1/device/bind', { + device_id: self.data.deviceId + }).then(function (data) { + return http.post('/api/v1/device/bind/confirm', { + device_id: data.device_id, + bind_token: data.bind_token + }) }).then(function () { self.setData({ state: 'done' }) wx.redirectTo({ url: '/pages/bind-success/bind-success?device_id=' + self.data.deviceId }) }).catch(function (err) { - self.setData({ state: 'error', error: err.message || '模拟确认失败' }) + self.setData({ state: 'error', error: err.message || '模拟绑定失败' }) }) }, - onMockBindSuccess: function () { - var self = this + onMockConnect: function () { clearTimeout(this._scanTimer) ble.stopScan() - http.post('/api/v1/device/bind/confirm', { - device_id: self.data.deviceId, - bind_token: self.data.bindToken - }).then(function () { - wx.redirectTo({ - url: '/pages/bind-success/bind-success?device_id=' + self.data.deviceId - }) - }).catch(function (err) { - self.setData({ state: 'error', error: err.message || '模拟确认失败' }) - }) + this._mockConfirmBind() + }, + + onMockBindSuccess: function () { + clearTimeout(this._scanTimer) + ble.stopScan() + this._mockConfirmBind() } }) diff --git a/server/src/lib/utils.js b/server/src/lib/utils.js index 310fba3..420b6b0 100644 --- a/server/src/lib/utils.js +++ b/server/src/lib/utils.js @@ -2,7 +2,8 @@ function toMysqlDate(value) { if (!value) return null const d = new Date(value) if (Number.isNaN(d.getTime())) return null - return d.toISOString().slice(0, 19).replace('T', ' ') + const pad = n => String(n).padStart(2, '0') + return d.getFullYear() + '-' + pad(d.getMonth() + 1) + '-' + pad(d.getDate()) + ' ' + pad(d.getHours()) + ':' + pad(d.getMinutes()) + ':' + pad(d.getSeconds()) } function formatDate(date) {