diff --git a/src/subpackage/common/pages/pay_type_select.vue b/src/subpackage/common/pages/pay_type_select.vue index 4cfbf1f..a5ef322 100644 --- a/src/subpackage/common/pages/pay_type_select.vue +++ b/src/subpackage/common/pages/pay_type_select.vue @@ -147,9 +147,9 @@ export default { let _data = { payTypeName: this.getPayMethodsName(payMethodsID) || '', amount: +payAmount, - selectedCardNo: selectedCard?.card_no || '', remark: otherTypeRemark || '其它' } + if(payMethodsID === 3)_data['selectedCardNo'] = selectedCard?.card_no || ''; const eventChannel = this.getOpenerEventChannel(); eventChannel.emit('payConfirm', _data); routeTo(); diff --git a/src/subpackage/shower/pages/card/use_record.vue b/src/subpackage/shower/pages/card/use_record.vue index 7684549..fc2a7d0 100644 --- a/src/subpackage/shower/pages/card/use_record.vue +++ b/src/subpackage/shower/pages/card/use_record.vue @@ -21,7 +21,7 @@ {{ e.hardware_name || '-' }} {{ e.end_time || '-' }} - {{ e.settle_duration_text || '-' }} + {{ e.settle_duration || '-' }} @@ -100,7 +100,11 @@ export default { showLoad(); return server.get({ 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: '获取用水卡使用记录失败' }) .then(res => {