From 128b548e5199f354936ecea399952c7fd7bfbd3b Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Sun, 25 Jan 2026 18:59:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E8=B4=A2=E5=8A=A1=E8=B4=A6=E6=88=B7):?= =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=87=BA=E6=97=B6=E6=94=AF?= =?UTF-8?q?=E4=BB=98=E7=B1=BB=E5=9E=8B=E5=8F=82=E6=95=B0=E6=9C=AA=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 使用 normalizePayType 函数统一处理查询参数,确保 API 调用时支付类型格式正确 --- src/views/moneyManage/financialAccount/cashFlow.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index ec6d81a..2187064 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -9,6 +9,7 @@ import { Moneyfunds, refundOnline, exportFunds } from '@/api/cash/financialAccou import { useAdminStore } from '@/store/index.js' import { storeToRefs } from 'pinia' import _ from 'lodash'; +import { normalizePayType } from '@/views/moneyManage/receiveDetail/utils/staticData.js' const adminStore = useAdminStore() const { adminData } = storeToRefs(adminStore) @@ -96,7 +97,7 @@ const fetchData = async () => { localMarket:queryParams.markets, startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', - payType: queryParams.payType, + payType: normalizePayType(queryParams.payType || ''), orderCode: queryParams.orderCode, statuses: queryParams.statuses, markets:[], @@ -234,7 +235,7 @@ const handleExport = async () => { markets: queryParams.markets, startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', - payType: queryParams.payType, + payType: normalizePayType(queryParams.payType || ''), orderCode: queryParams.orderCode, statuses: queryParams.statuses, } From efed6f833c6156175a92d02a3905cd2d664ad939 Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Sun, 25 Jan 2026 19:27:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E5=A4=9A=E8=AF=AD=E8=A8=80):=20?= =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=80=80=E6=AC=BE=E5=92=8C=E5=8F=AC=E5=9B=9E?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/locales/lang/en.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 0db6533..4419fed 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -157,8 +157,8 @@ export default { deleteRecord: "Delete Record!", deleteTranslationRecord: "Delete translation", deleteActivityRecord: "Delete activity data", - willRefundOrder: "Will refund this order!", - willRecallOrder: "Will recall this order!", + willRefundOrder: "refund this order!", + willRecallOrder: "recall this order!", // Markets markets: { headquarters: "HQ",