Compare commits

...

3 Commits

4 changed files with 15 additions and 8 deletions

View File

@ -93,13 +93,13 @@ Page({
break; break;
case "meter": case "meter":
const { code, id } = e.detail.value; const { code, id } = e.detail.value;
this.handleGetMeterDetail(code) this.handleGetMeterDetail(id)
break; break;
} }
}, },
async handleGetMeterDetail(meterCode) { async handleGetMeterDetail(meterId) {
const { tenement } = this.data; 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) { if (code !== OK) {
alertInfo(message); alertInfo(message);
return; return;
@ -131,10 +131,14 @@ Page({
} }
if (!money) { if (!money) {
alertInfo("请先输入金额") alertInfo("请先输入金额")
return; return;
} }
console.log('this.data', this.data) if (!meter?.code) {
const { code, message, data } = await requestRecharge({ money: Number(money), meter: meter.code, tenement: tenement.id, park: park.id }) alertInfo("没有选择表计")
return;
}
const { code, message, data } = await requestRecharge({ money: Number(money), id: meter.id, tenement: tenement.id, park: park.id })
if (code !== OK) { if (code !== OK) {
alertInfo(message) alertInfo(message)
return; return;
@ -150,9 +154,11 @@ Page({
}, },
fail: (res) => { fail: (res) => {
console.log('fail', res) console.log('fail', res)
alertInfo("请稍后重试")
}, },
complete: (res) => { complete: (res) => {
console.log('complete') console.log('complete')
} }
}) })
console.log('data', data) console.log('data', data)
@ -197,7 +203,7 @@ Page({
async getMeters({ id }) { async getMeters({ id }) {
const { code, message, data } = await getTenementMeterList(id); const { code, message, data } = await getTenementMeterList(id);
if (code !== OK) { if (code !== OK) {
alertError(message) alertInfo(message)
return; return;
} }
this.setData({ this.setData({

View File

@ -32,7 +32,7 @@
<view class="card"> <view class="card">
<view class="cardTop"> <view class="cardTop">
<view class="cardTopLeft"> <view class="cardTopLeft">
<view wx:if="{{user.id}}"> 华昌宝能 - 软c307 </view> <view wx:if="{{user.id}}"> {{ tenement.shortName}} - {{ meter.address }} </view>
<view wx:else> -- </view> <view wx:else> -- </view>
</view> </view>
<van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="changeMeter" wx:if="{{user.id}}"> <van-button type="info" size="small" plain="{{true}}" class="loginBtn" bind:click="changeMeter" wx:if="{{user.id}}">

View File

@ -26,6 +26,7 @@
type="textarea" type="textarea"
border="{{ false }}" border="{{ false }}"
/> />
<van-field <van-field
value="{{detail.time}}" value="{{detail.time}}"
label="操作时间" label="操作时间"

View File

@ -6,6 +6,6 @@ export const getRechargeOperateType = (num) => {
export const getRechargeOperateWay = (num) => { export const getRechargeOperateWay = (num) => {
console.log('num', num) console.log('num', num)
const types = ["现金", "银行卡", "支付宝", "微信", "云闪付"] const types = ["现金", "银行卡", "支付宝", "微信", "云闪付","对公转账", "微信-支付"]
return types[num]; return types[num];
} }