feat(设备数据): 在设备数据中添加title字段并更新引用
更新设备数据对象结构,添加title字段以支持更友好的设备标识 同时修改开机确认提示中设备编号的引用路径,优先使用title字段
This commit is contained in:
parent
de9af1f604
commit
ce2d4b8d16
3
app.js
3
app.js
@ -77,7 +77,8 @@ App({
|
|||||||
deviceData: {
|
deviceData: {
|
||||||
type: 'machine',
|
type: 'machine',
|
||||||
devicecode: '',
|
devicecode: '',
|
||||||
options: {}
|
options: {},
|
||||||
|
title: '',
|
||||||
},
|
},
|
||||||
protocol: {},
|
protocol: {},
|
||||||
tips: ""
|
tips: ""
|
||||||
|
@ -203,7 +203,7 @@ Page({
|
|||||||
var a = this;
|
var a = this;
|
||||||
wx.showModal({
|
wx.showModal({
|
||||||
title: "提示",
|
title: "提示",
|
||||||
content: "你当前将要使用的机器编号是:".concat(e.globalData.title || e.globalData.devicecode, ",确认开机吗?"),
|
content: "你当前将要使用的机器编号是:".concat(e.globalData.deviceData.title || e.globalData.deviceData.devicecode, ",确认开机吗?"),
|
||||||
success: function (i) {
|
success: function (i) {
|
||||||
i.confirm && (a.isSubmit = !0, wx.showLoading({
|
i.confirm && (a.isSubmit = !0, wx.showLoading({
|
||||||
title: "正在启动"
|
title: "正在启动"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user