diff --git a/pages/duiquan/duiquan.js b/pages/duiquan/duiquan.js index c30c18c..7aa1fa1 100644 --- a/pages/duiquan/duiquan.js +++ b/pages/duiquan/duiquan.js @@ -7,7 +7,7 @@ Page({ code: '' }, onLoad() { - t.request('/v2/miniprogram/coupons', {}, !0).then((res) => { + t.request('/v2/miniprogram/coupons/index', {}, !0).then((res) => { if (res.code == 200) { this.setData({ tips: res.data.tips, @@ -23,7 +23,7 @@ Page({ success: function (i) { console.log(i), wx.showLoading({ title: "" - }), e.globalData.qrcode = i.result, t.request("/v2/miniprogram/identify", i, !0).then(function (t) { + }), e.globalData.qrcode = i.result, t.request("/v2/miniprogram/identify/index", i, !0).then(function (t) { console.log("data", t), wx.hideLoading(); // 保存设备编号 getApp().globalData.devicecode = t.data.devicecode || getApp().globalData.devicecode; diff --git a/pages/index/index.js b/pages/index/index.js index a5b45ff..32d64b0 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -157,7 +157,7 @@ Page({ success: function (i) { console.log(i), wx.showLoading({ title: "" - }), e.globalData.qrcode = i.result, t.request("/miniprogram/identify", i, !0).then(function (t) { + }), e.globalData.qrcode = i.result, t.request("/v2/miniprogram/identify/index", i, !0).then(function (t) { console.log("data", t), wx.hideLoading(), e.globalData.devicecode = t.data.devicecode || e.globalData.devicecode, a.setData({ isScan: !!t.data.devicecode @@ -205,7 +205,7 @@ Page({ success: function (i) { i.confirm && (a.isSubmit = !0, wx.showLoading({ title: "正在启动" - }), t.request(e.globalData.config.machine.startup, { + }), t.request('/v2/miniprogram/machine/startup', { washcode: a.data.selectID }, !0).then(function (e) { a.isSubmit = !1, wx.hideLoading(), 200 == e.code && (wx.showModal({ diff --git a/pages/washCodeList/washCodeList.js b/pages/washCodeList/washCodeList.js index 3547df4..5cddf7e 100644 --- a/pages/washCodeList/washCodeList.js +++ b/pages/washCodeList/washCodeList.js @@ -86,7 +86,7 @@ Page({ success: function (i) { wx.showLoading({ title: "" - }), t.globalData.qrcode = i.result, e.request("/v2/miniprogram/identify", i, !0).then(function (e) { + }), t.globalData.qrcode = i.result, e.request("/v2/miniprogram/identify/index", i, !0).then(function (e) { if (wx.hideLoading(), 200 != e.code) return wx.showModal({ title: "提示", content: e.message diff --git a/utils/login.js b/utils/login.js index c0dbd63..e1257f5 100644 --- a/utils/login.js +++ b/utils/login.js @@ -122,7 +122,7 @@ module.exports = { }, baseUrl: "https://t-jm.v0750.com/", getDevicecode: function (e, a) { - o = e, n("https://t-jm.v0750.com/miniprogram/identify/reload", a, !0).then(function (e) { + o = e, n("https://t-jm.v0750.com/v2/miniprogram/identify/reload", a, !0).then(function (e) { var a = e.data; console.log("onshow获取到的数据", a), o.globalData.devicecode = a.devicecode || o.globalData.devicecode; });