fix: 在开机确认提示中优先显示设备标题

当设备标题存在时,在开机确认提示中优先显示标题而非设备编号,提升用户体验
This commit is contained in:
XiaoMo 2025-07-02 15:22:09 +08:00
parent 6739361d18
commit de9af1f604
3 changed files with 3 additions and 3 deletions

View File

@ -99,7 +99,7 @@ Page({
wx.showModal({ wx.showModal({
title: "提示", title: "提示",
content: "你当前将要使用的机器编号是:".concat(getApp().globalData.deviceData.devicecode, ",确认开机吗?"), content: "你当前将要使用的机器编号是:".concat(getApp().globalData.deviceData.title || getApp().globalData.deviceData.devicecode, ",确认开机吗?"),
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
// 用户点击了确认按钮,执行开机操作 // 用户点击了确认按钮,执行开机操作

View File

@ -203,7 +203,7 @@ Page({
var a = this; var a = this;
wx.showModal({ wx.showModal({
title: "提示", title: "提示",
content: "你当前将要使用的机器编号是:".concat(e.globalData.devicecode, ",确认开机吗?"), content: "你当前将要使用的机器编号是:".concat(e.globalData.title || e.globalData.devicecode, ",确认开机吗?"),
success: function (i) { success: function (i) {
i.confirm && (a.isSubmit = !0, wx.showLoading({ i.confirm && (a.isSubmit = !0, wx.showLoading({
title: "正在启动" title: "正在启动"

View File

@ -118,7 +118,7 @@ Page({
var a = this; var a = this;
wx.showModal({ wx.showModal({
title: "提示", title: "提示",
content: "你当前将要使用的机器编号是:".concat(t.globalData.deviceData.devicecode, ",确认开机吗?"), content: "你当前将要使用的机器编号是:".concat(t.globalData.deviceData.title || t.globalData.deviceData.devicecode, ",确认开机吗?"),
success: function (i) { success: function (i) {
// 合并参数 t.globalData.deviceData 与 washcode // 合并参数 t.globalData.deviceData 与 washcode