fix: auto-scan onNext goes directly to treating instead of looping back to setup
这个提交包含在:
@@ -154,11 +154,25 @@ Page({
|
|||||||
},
|
},
|
||||||
|
|
||||||
onNext: function () {
|
onNext: function () {
|
||||||
var mask = this.data.regions || 0x1F
|
var self = this
|
||||||
var scanData = this._scanResults || []
|
var mask = self.data.regions || 0x1F
|
||||||
var param = scanData.length > 0 ? '&scan=' + encodeURIComponent(JSON.stringify(scanData)) : ''
|
|
||||||
wx.redirectTo({
|
ble.setParams({
|
||||||
url: '/pages/treatment-setup/treatment-setup?regions=' + mask + param
|
region_mask: mask,
|
||||||
|
wavelength: 2,
|
||||||
|
brightness: 200,
|
||||||
|
duration_ms: 600000,
|
||||||
|
mode: 1,
|
||||||
|
control: 0x02
|
||||||
|
}).then(function () {
|
||||||
|
return ble.startTreatment(mask)
|
||||||
|
}).then(function () {
|
||||||
|
wx.redirectTo({
|
||||||
|
url: '/pages/treating/treating?regions=' + mask +
|
||||||
|
'&wavelength=2&duration=600000&mode=1'
|
||||||
|
})
|
||||||
|
}).catch(function (err) {
|
||||||
|
wx.showToast({ title: err.error_msg || '启动失败', icon: 'none' })
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
在新工单中引用
屏蔽一个用户