fix: 报告 device_id 用 ble.getDeviceId()(修 P2 空归属)+手动入口接入 i18n(P3)
这个提交包含在:
@@ -18,7 +18,8 @@ module.exports = {
|
|||||||
start: '开始护理',
|
start: '开始护理',
|
||||||
starting: '启动中...',
|
starting: '启动中...',
|
||||||
noRegionSelected: '请至少选择一个区域',
|
noRegionSelected: '请至少选择一个区域',
|
||||||
startFailed: '启动失败'
|
startFailed: '启动失败',
|
||||||
|
entryLink: '手动选择波长护理 ›'
|
||||||
},
|
},
|
||||||
en: {
|
en: {
|
||||||
navTitle: 'Manual Care',
|
navTitle: 'Manual Care',
|
||||||
@@ -37,6 +38,7 @@ module.exports = {
|
|||||||
start: 'Start Care',
|
start: 'Start Care',
|
||||||
starting: 'Starting...',
|
starting: 'Starting...',
|
||||||
noRegionSelected: 'Please select at least one region',
|
noRegionSelected: 'Please select at least one region',
|
||||||
startFailed: 'Failed to start'
|
startFailed: 'Failed to start',
|
||||||
|
entryLink: 'Manual wavelength care ›'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -175,7 +175,8 @@ Page({
|
|||||||
var self = this
|
var self = this
|
||||||
var app = getApp()
|
var app = getApp()
|
||||||
var mask = self.data.regions || 0x1F
|
var mask = self.data.regions || 0x1F
|
||||||
var deviceId = (app.globalData.connectedDevice && app.globalData.connectedDevice.device_id) || null
|
// Same device-id source the treating page uses (services/ble getDeviceId + currentDevice fallback).
|
||||||
|
var deviceId = ble.getDeviceId() || (app.globalData.currentDevice && app.globalData.currentDevice.device_id) || null
|
||||||
var scannedAt = Date.now()
|
var scannedAt = Date.now()
|
||||||
|
|
||||||
function proceed(config) {
|
function proceed(config) {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
var ble = require('../../services/ble')
|
var ble = require('../../services/ble')
|
||||||
|
var i18n = require('../../i18n/index')
|
||||||
Page({
|
Page({
|
||||||
data: {
|
data: {
|
||||||
statusBarHeight: 44,
|
statusBarHeight: 44,
|
||||||
@@ -32,6 +33,7 @@ Page({
|
|||||||
onLoad: function () {
|
onLoad: function () {
|
||||||
var app = getApp()
|
var app = getApp()
|
||||||
this.setData({ statusBarHeight: app.globalData.statusBarHeight })
|
this.setData({ statusBarHeight: app.globalData.statusBarHeight })
|
||||||
|
i18n.bind(this)
|
||||||
this.checkSubscription()
|
this.checkSubscription()
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
开始使用
|
开始使用
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<view class="manual-entry" bindtap="onManual" style="text-align:center;color:#E8503A;font-size:26rpx;margin-top:28rpx;">手动选择波长护理 ›</view>
|
<view class="manual-entry" bindtap="onManual" style="text-align:center;color:#E8503A;font-size:26rpx;margin-top:28rpx;">{{i18n.manual.entryLink}}</view>
|
||||||
|
|
||||||
<view class="error-text" wx:if="{{error}}">{{error}}</view>
|
<view class="error-text" wx:if="{{error}}">{{error}}</view>
|
||||||
</view>
|
</view>
|
||||||
|
|||||||
在新工单中引用
屏蔽一个用户