Merge branch 'milestone-20251215-多语言二期2' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251215-多语言二期2

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",

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,
       }