Browse Source

fix for md0726

md0726
刘嘉炜 3 months ago
parent
commit
6a2118234e
  1. 2
      src/subpackage/common/pages/pay_type_select.vue
  2. 8
      src/subpackage/shower/pages/card/use_record.vue

2
src/subpackage/common/pages/pay_type_select.vue

@ -147,9 +147,9 @@ export default {
let _data = { let _data = {
payTypeName: this.getPayMethodsName(payMethodsID) || '', payTypeName: this.getPayMethodsName(payMethodsID) || '',
amount: +payAmount, amount: +payAmount,
selectedCardNo: selectedCard?.card_no || '',
remark: otherTypeRemark || '其它' remark: otherTypeRemark || '其它'
} }
if(payMethodsID === 3)_data['selectedCardNo'] = selectedCard?.card_no || '';
const eventChannel = this.getOpenerEventChannel(); const eventChannel = this.getOpenerEventChannel();
eventChannel.emit('payConfirm', _data); eventChannel.emit('payConfirm', _data);
routeTo(); routeTo();

8
src/subpackage/shower/pages/card/use_record.vue

@ -21,7 +21,7 @@
<block v-if="e.type === 0"> <block v-if="e.type === 0">
<kv-line label="设备名称:">{{ e.hardware_name || '-' }}</kv-line> <kv-line label="设备名称:">{{ e.hardware_name || '-' }}</kv-line>
<kv-line label="结束时间:">{{ e.end_time || '-' }}</kv-line> <kv-line label="结束时间:">{{ e.end_time || '-' }}</kv-line>
<kv-line label="时长合计:">{{ e.settle_duration_text || '-' }}</kv-line>
<kv-line label="时长合计:">{{ e.settle_duration || '-' }}</kv-line>
</block> </block>
</view> </view>
</view> </view>
@ -100,7 +100,11 @@ export default {
showLoad(); showLoad();
return server.get({ return server.get({
url: SHOWER_API.CardUseRecord, url: SHOWER_API.CardUseRecord,
data: { brand_id, water_card_no, page, page_size, start_time, end_time },
data: {
brand_id, water_card_no, page, page_size,
start_time: `${start_time} 00:00:00`,
end_time: `${end_time} 23:59:59`
},
failMsg: '获取用水卡使用记录失败' failMsg: '获取用水卡使用记录失败'
}) })
.then(res => { .then(res => {

Loading…
Cancel
Save