diff --git a/pages/index/index.js b/pages/index/index.js index 3ac42ea..4ba9fba 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -90,7 +90,7 @@ Page({ getData: function () { var a = this; // 获取首页数据 - t.request('/v2/miniprogram/index/balance', {}, !0).then(function (e) { + t.request('/v2/miniprogram/index/balance', e.globalData.deviceData, !0).then(function (e) { a.setData({ user: e.data || [], }); diff --git a/pages/washing/washing.js b/pages/washing/washing.js index d2021bc..2373d54 100644 --- a/pages/washing/washing.js +++ b/pages/washing/washing.js @@ -10,7 +10,8 @@ Page({ agentname: '', devicecode: '', remainingTime: 0, - orderid: '' + orderid: '', + title: getApp().globalData.deviceData.title || getApp().globalData.deviceData.devicecode }, /** diff --git a/pages/washing/washing.wxml b/pages/washing/washing.wxml index bf361d5..d4a1cd9 100644 --- a/pages/washing/washing.wxml +++ b/pages/washing/washing.wxml @@ -2,7 +2,7 @@ {{agentname}} {{countdown}} - {{devicecode}} + {{title}}