From de9af1f6043d26511ce9efbbff97edd8687893ab Mon Sep 17 00:00:00 2001 From: XiaoMo Date: Wed, 2 Jul 2025 15:22:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9C=A8=E5=BC=80=E6=9C=BA=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E6=8F=90=E7=A4=BA=E4=B8=AD=E4=BC=98=E5=85=88=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=AE=BE=E5=A4=87=E6=A0=87=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当设备标题存在时，在开机确认提示中优先显示标题而非设备编号，提升用户体验 --- pages/duiquan/duiquan.js | 2 +- pages/index/index.js | 2 +- pages/washCodeList/washCodeList.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pages/duiquan/duiquan.js b/pages/duiquan/duiquan.js index 52770d2..f315037 100644 --- a/pages/duiquan/duiquan.js +++ b/pages/duiquan/duiquan.js @@ -99,7 +99,7 @@ Page({ wx.showModal({ title: "提示", - content: "你当前将要使用的机器编号是：".concat(getApp().globalData.deviceData.devicecode, "，确认开机吗？"), + content: "你当前将要使用的机器编号是：".concat(getApp().globalData.deviceData.title || getApp().globalData.deviceData.devicecode, "，确认开机吗？"), success: (res) => { if (res.confirm) { // 用户点击了确认按钮，执行开机操作 diff --git a/pages/index/index.js b/pages/index/index.js index e19bf1f..e54f31f 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.devicecode, "，确认开机吗？"), + content: "你当前将要使用的机器编号是：".concat(e.globalData.title || e.globalData.devicecode, "，确认开机吗？"), success: function (i) { i.confirm && (a.isSubmit = !0, wx.showLoading({ title: "正在启动" diff --git a/pages/washCodeList/washCodeList.js b/pages/washCodeList/washCodeList.js index 5ed4ae6..9834efb 100644 --- a/pages/washCodeList/washCodeList.js +++ b/pages/washCodeList/washCodeList.js @@ -118,7 +118,7 @@ Page({ var a = this; wx.showModal({ title: "提示", - content: "你当前将要使用的机器编号是：".concat(t.globalData.deviceData.devicecode, "，确认开机吗？"), + content: "你当前将要使用的机器编号是：".concat(t.globalData.deviceData.title || t.globalData.deviceData.devicecode, "，确认开机吗？"), success: function (i) { // 合并参数 t.globalData.deviceData 与 washcode