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