From 6a2118234e47802b6f2f1c734eef976470daaf53 Mon Sep 17 00:00:00 2001
From: "liujw155@outlook.com" <liujw155@outlook.com>
Date: Mon, 10 Mar 2025 18:19:49 +0800
Subject: [PATCH] fix for md0726

---
 src/subpackage/common/pages/pay_type_select.vue | 2 +-
 src/subpackage/shower/pages/card/use_record.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

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 @@
                     <block v-if="e.type === 0">
                         <kv-line label="设备名称：">{{ e.hardware_name || '-' }}</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>
                 </view>
             </view>
@@ -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 => {