From ce2d4b8d164b5a338cd85340ad3c6fd6f03339cb Mon Sep 17 00:00:00 2001 From: XiaoMo Date: Wed, 2 Jul 2025 15:37:20 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=AE=BE=E5=A4=87=E6=95=B0=E6=8D=AE):=20?= =?UTF-8?q?=E5=9C=A8=E8=AE=BE=E5=A4=87=E6=95=B0=E6=8D=AE=E4=B8=AD=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0title=E5=AD=97=E6=AE=B5=E5=B9=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新设备数据对象结构,添加title字段以支持更友好的设备标识 同时修改开机确认提示中设备编号的引用路径,优先使用title字段 --- app.js | 3 ++- pages/index/index.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index f264764..fec3b41 100644 --- a/app.js +++ b/app.js @@ -77,7 +77,8 @@ App({ deviceData: { type: 'machine', devicecode: '', - options: {} + options: {}, + title: '', }, protocol: {}, tips: "" diff --git a/pages/index/index.js b/pages/index/index.js index e54f31f..3ac42ea 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -203,7 +203,7 @@ Page({ var a = this; wx.showModal({ title: "提示", - content: "你当前将要使用的机器编号是:".concat(e.globalData.title || e.globalData.devicecode, ",确认开机吗?"), + content: "你当前将要使用的机器编号是:".concat(e.globalData.deviceData.title || e.globalData.deviceData.devicecode, ",确认开机吗?"), success: function (i) { i.confirm && (a.isSubmit = !0, wx.showLoading({ title: "正在启动"