diff --git a/pages/home/index.js b/pages/home/index.js index f4f6d89..c21b3d0 100644 --- a/pages/home/index.js +++ b/pages/home/index.js @@ -93,13 +93,13 @@ Page({ break; case "meter": const { code, id } = e.detail.value; - this.handleGetMeterDetail(code) + this.handleGetMeterDetail(id) break; } }, - async handleGetMeterDetail(meterCode) { + async handleGetMeterDetail(meterId) { const { tenement } = this.data; - const { code, message, data } = await getMeterDetail({ tenement: tenement?.id, code: meterCode }); + const { code, message, data } = await getMeterDetail({ tenement: tenement?.id, id: meterId }); if (code !== OK) { alertInfo(message); return; @@ -138,7 +138,7 @@ Page({ alertInfo("没有选择表计") return; } - const { code, message, data } = await requestRecharge({ money: Number(money), meter: meter.code, tenement: tenement.id, park: park.id }) + const { code, message, data } = await requestRecharge({ money: Number(money), id: meter.id, tenement: tenement.id, park: park.id }) if (code !== OK) { alertInfo(message) return; @@ -154,9 +154,11 @@ Page({ }, fail: (res) => { console.log('fail', res) + alertInfo("请稍后重试") }, complete: (res) => { console.log('complete') + } }) console.log('data', data) diff --git a/pages/home/index.wxml b/pages/home/index.wxml index ec33690..5f6a7de 100644 --- a/pages/home/index.wxml +++ b/pages/home/index.wxml @@ -32,7 +32,7 @@ - 华昌宝能 - 软c307 + {{ tenement.shortName}} - {{ meter.address }} -- diff --git a/pages/rechargeDetail/index.wxml b/pages/rechargeDetail/index.wxml index a87a999..599e2f3 100644 --- a/pages/rechargeDetail/index.wxml +++ b/pages/rechargeDetail/index.wxml @@ -26,6 +26,7 @@ type="textarea" border="{{ false }}" /> + { export const getRechargeOperateWay = (num) => { console.log('num', num) - const types = ["现金", "银行卡", "支付宝", "微信", "云闪付"] + const types = ["现金", "银行卡", "支付宝", "微信", "云闪付","对公转账", "微信-支付"] return types[num]; } \ No newline at end of file