feat(设备管理): 重构设备数据管理逻辑,统一使用deviceData对象
- 将分散的设备信息存储改为统一的deviceData对象 - 更新相关API请求参数传递方式 - 增加设备类型支持,动态构建API路径 - 修复设备信息初始化问题,确保数据一致性
This commit is contained in:
@@ -91,6 +91,7 @@ Page({
|
||||
title: "提示",
|
||||
content: e.message
|
||||
}), !1;
|
||||
t.globalData.deviceData = e.data || t.globalData.deviceData || {};
|
||||
t.globalData.devicecode = e.data.devicecode || t.globalData.devicecode, a.setData({
|
||||
isScan: !!e.data.devicecode
|
||||
}), a.getList();
|
||||
@@ -117,13 +118,17 @@ Page({
|
||||
var a = this;
|
||||
wx.showModal({
|
||||
title: "提示",
|
||||
content: "你当前将要使用的机器编号是:".concat(t.globalData.devicecode, ",确认开机吗?"),
|
||||
content: "你当前将要使用的机器编号是:".concat(t.globalData.deviceData.devicecode, ",确认开机吗?"),
|
||||
success: function (i) {
|
||||
|
||||
// 合并参数 t.globalData.deviceData 与 washcode
|
||||
let params = Object.assign(t.globalData.deviceData, {
|
||||
washcode: a.data.selectID
|
||||
});
|
||||
|
||||
i.confirm && (a.isSubmit = !0, wx.showLoading({
|
||||
title: "正在启动"
|
||||
}), e.request('/v2/miniprogram/machine/carwashcodestartup', {
|
||||
washcode: a.data.selectID
|
||||
}, !0).then(function (t) {
|
||||
}), e.request('/v2/miniprogram/' + t.globalData.deviceData.type + '/carwashcodestartup', params, !0).then(function (t) {
|
||||
// 成功后返回提示
|
||||
wx.showToast({ title: t.message || '启动成功', icon: 'success' });
|
||||
// 成功后跳转
|
||||
|
||||
Reference in New Issue
Block a user