From d3bb88e173f983167d4ebba4afa566ea87eb2cb6 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Fri, 13 Sep 2024 17:22:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PagesStatistics/paymentSummary.vue    | 2 +-
 src/components/Dialog/TimeRangeFilter.vue | 5 ++++-
 src/pagesShipmentData/productSummary.vue  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/PagesStatistics/paymentSummary.vue b/src/PagesStatistics/paymentSummary.vue
index a2e6797..1831a41 100644
--- a/src/PagesStatistics/paymentSummary.vue
+++ b/src/PagesStatistics/paymentSummary.vue
@@ -31,7 +31,7 @@ const tableTitleList = reactive([
 function getList(params:any) {
   FinanceApi.getRevenuePaymentPage(params).then((res:any) => {
     if (res.code === 200) {
-      state.summary = res.data.map(item => {return {...item, paymentName: ['', '现金支付', '银行卡支付', '线上支付(微信)', '支付宝', '其他'][item.paymentMethod]}});
+      state.summary = res.data.map(item => {return {...item, paymentName: ['', '现金', '转账', '微信', '支付宝', '其他'][item.paymentMethod]}});
       let paymentPrice = 0;
       let revenuePrice = 0;
       res.data.forEach((item:any) => {
diff --git a/src/components/Dialog/TimeRangeFilter.vue b/src/components/Dialog/TimeRangeFilter.vue
index fa753e9..0822cb4 100644
--- a/src/components/Dialog/TimeRangeFilter.vue
+++ b/src/components/Dialog/TimeRangeFilter.vue
@@ -24,13 +24,15 @@ import { formatDate } from '@/utils';
 const props = defineProps<{
   show: boolean,
 }>()
+
+const beforeTime = ref(null)
 const emit = defineEmits(['handleDialog', 'handleOk']);
 const handleClose = () => {
   emit('handleDialog', false)
 }
 
 const handleOk = () => {
-  emit('handleOk', {startTime: state.startTime, endTime: state.endTime})
+  emit('handleOk', {startTime: state.startTime || beforeTime.value, endTime: state.endTime || beforeTime.value})
   emit('handleDialog', false)
 }
 
@@ -42,6 +44,7 @@ const state = reactive({
 const handleChangeDate = (v: any) => {
   const time1 = v.range.before;
   const time2 = v.range.after;
+  beforeTime.value = time1
   if (time1 && time2) {
     const date1 = new Date(time1);
     const date2 = new Date(time2);
diff --git a/src/pagesShipmentData/productSummary.vue b/src/pagesShipmentData/productSummary.vue
index 190e85b..e65cb53 100644
--- a/src/pagesShipmentData/productSummary.vue
+++ b/src/pagesShipmentData/productSummary.vue
@@ -42,7 +42,7 @@
       key: "payTotalPrice",
     },
     {
-      name: "未付金额/元",
+      name: "未收金额/元",
       key: "unPayTotalPrice",
     },
   ]);