Guoguo
b80e872600
Server: - Block startup with default JWT secrets in production - Make subscription verify admin-only (no payment integration yet) - Add device ownership validation on command/result, event, treatment/sync - Remove admin token from request body fallback - Add pageParams boundary protection (pageSize capped at 100) - Fix COS getObjectUrl to use callback-based Promise - Add settings key whitelist matching frontend fields - Add user existence check before subscription creation - Fix firmware always returning has_update:true - Replace hardcoded trial subscription with actual DB query - Extract shared utilities (limitClause, toMysqlDate, formatDate) Miniprogram: - Replace fake PD random data with placeholder - Mark client-timer treatment completions with source field - Disable mock.js - Fix BLE listener leaks (save refs, cleanup in onUnload) - Fix ble.off clearing all listeners (pass specific callback) - Add BLE disconnect detection via onBLEConnectionStateChange - Fix subscription status type consistency (number not string) - Fix scan callback accumulation in ble.js - Fix history stats accumulation across pages - Fix subscribe-success/treatment-done hardcoded values - Fix profile subscription view logic - Replace purchase flow with admin-contact modal - Add error logging in command-sync report Admin console: - Fix AdminLayout logout (require->import, logout->clearToken) - Remove all mock data from production request.js - Replace dashboard fake data with real API calls - Replace monthly_revenue with subscription_count - Fix subscription stats fallback (|| -> ??) - Add token expiry tracking (7 days) - Unify device status map and subscription status text - Fix user page record link navigation - Fix subscription createForm.user_id type handling - Add error feedback in all empty catch blocks - Remove unused remember checkbox and uview-plus dependency - Extract common CSS to shared stylesheet (-900 lines) - Extract formatDate to shared utils/format.js - Show real admin name in layout header
88 行
2.4 KiB
JavaScript
88 行
2.4 KiB
JavaScript
var ble = require('../../services/ble')
|
|
var http = require('../../utils/request')
|
|
var app = getApp()
|
|
var SCAN_TIMEOUT = 15000
|
|
|
|
Page({
|
|
data: {
|
|
statusBarHeight: 44,
|
|
deviceId: '',
|
|
bindToken: '',
|
|
state: 'scanning',
|
|
error: ''
|
|
},
|
|
|
|
onLoad: function (options) {
|
|
this.setData({ statusBarHeight: app.globalData.statusBarHeight })
|
|
this.setData({
|
|
deviceId: options.device_id || '',
|
|
bindToken: options.bind_token || ''
|
|
})
|
|
this.startBleConnect()
|
|
},
|
|
|
|
onUnload: function () {
|
|
clearTimeout(this._scanTimer)
|
|
ble.stopScan()
|
|
if (this._onBindResult) ble.off('bind_result', this._onBindResult)
|
|
},
|
|
|
|
startBleConnect: function () {
|
|
var self = this
|
|
self.setData({ state: 'scanning', error: '' })
|
|
|
|
self._scanTimer = setTimeout(function () {
|
|
ble.stopScan()
|
|
self.setData({ state: 'error', error: '搜索超时，请确认设备已开机并在附近' })
|
|
}, SCAN_TIMEOUT)
|
|
|
|
ble.startScan({
|
|
onFound: function (device) {
|
|
clearTimeout(self._scanTimer)
|
|
self.setData({ state: 'connecting' })
|
|
},
|
|
onConnected: function (device) {
|
|
clearTimeout(self._scanTimer)
|
|
self.setData({ state: 'binding' })
|
|
self.doBind()
|
|
},
|
|
onError: function (err) {
|
|
clearTimeout(self._scanTimer)
|
|
self.setData({ state: 'error', error: err.msg || '连接失败' })
|
|
}
|
|
})
|
|
},
|
|
|
|
doBind: function () {
|
|
var self = this
|
|
var userId = app.globalData.userId || ''
|
|
this._onBindResult = function (result) {
|
|
if (result.success) {
|
|
http.post('/api/v1/device/bind/confirm', {
|
|
device_id: self.data.deviceId,
|
|
bind_token: self.data.bindToken
|
|
}).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 || '后台确认绑定失败' })
|
|
})
|
|
} else {
|
|
self.setData({ state: 'error', error: '设备绑定失败' })
|
|
}
|
|
}
|
|
ble.on('bind_result', this._onBindResult)
|
|
|
|
ble.bindDevice(userId, self.data.bindToken).catch(function (err) {
|
|
self.setData({ state: 'error', error: err.error_msg || '绑定命令失败' })
|
|
})
|
|
},
|
|
|
|
onRetry: function () {
|
|
ble.disconnect()
|
|
this.startBleConnect()
|
|
}
|
|
})
|