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: "正在启动"