From e45ea38de9b847964aa802f18417cd89925973dc Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Fri, 27 Mar 2026 11:06:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E7=9A=84=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/locales/lang/en.js | 2 ++ src/components/locales/lang/zh-CN.js | 2 ++ src/views/moneyManage/executor/executor.vue | 4 +++- src/views/moneyManage/financialAccount/cashFlow.vue | 2 ++ src/views/moneyManage/financialAccount/performanceAttribution.vue | 2 ++ src/views/moneyManage/receiveDetail/receiveFinance.vue | 2 ++ src/views/moneyManage/receiveDetail/receiveHead.vue | 2 ++ src/views/moneyManage/receiveDetail/receiveManage.vue | 2 ++ src/views/moneyManage/receiveDetail/receiveService.vue | 6 +++++- src/views/moneyManage/receiveDetail/utils/staticData.js | 6 +++++- src/views/moneyManage/refundDetail/refundCharge.vue | 2 ++ src/views/moneyManage/refundDetail/refundFinance.vue | 2 ++ src/views/moneyManage/refundDetail/refundHeader.vue | 2 ++ src/views/moneyManage/refundDetail/refundService.vue | 2 ++ 14 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 5b92c46..51b75b4 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -1137,6 +1137,8 @@ export default { ipay88: "Ipay88", paymentAsia: "PaymentAsia", transfer: "E-Transfer", + iotPay: "IOT Pay", + stripe3:'Stripe3', paysolution:'paysolution', stripe2:'Stripe2', }, diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index 06fda8c..b971247 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -1149,6 +1149,8 @@ export default { ipay88: "Ipay88", paymentAsia: "PaymentAsia", transfer: "E-Transfer", + iotPay: "IOT Pay", + stripe3:'Stripe3', paysolution:'paysolution', stripe2:'Stripe2', }, diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index 5e5ab51..2e0dedb 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -469,6 +469,8 @@ const channelOptions = ref([ t('cash.payMethods.grabpay'), t('cash.payMethods.nets'), t('cash.payMethods.transfer'), + t('cash.payMethods.iotPay'), + t('cash.payMethods.stripe3'), t('cash.payMethods.paypal'), ]) @@ -655,4 +657,4 @@ onMounted(() => { } } } - \ No newline at end of file + diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index 2bd2f08..dc59718 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -25,6 +25,8 @@ const paytypeList = [ t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.nets'), // Nets t('cash.payMethods.transfer'), // E-Transfer + t('cash.payMethods.iotPay'), // IOT Pay + t('cash.payMethods.stripe3'), // Stripe3 t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.paysolution'), // Paysolution t('cash.payMethods.bankTransfer'),// 银行转账 diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue index 2482311..3dd6c69 100644 --- a/src/views/moneyManage/financialAccount/performanceAttribution.vue +++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue @@ -24,6 +24,8 @@ const paytypeList = [ t('cash.payMethods.grabpay'), t('cash.payMethods.nets'), t('cash.payMethods.transfer'), + t('cash.payMethods.iotPay'), + t('cash.payMethods.stripe3'), t('cash.payMethods.paypal'), ] diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index e6bb56c..55b6078 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -779,6 +779,8 @@ const paytypeList = [ t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.nets'), // Nets t('cash.payMethods.transfer'), // E-Transfer + t('cash.payMethods.iotPay'), // IOT Pay + t('cash.payMethods.stripe3'), // Stripe3 t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.paysolution'), // Paysolution t('cash.payMethods.bankTransfer'),// 银行转账 diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue index de1702e..803b5c2 100644 --- a/src/views/moneyManage/receiveDetail/receiveHead.vue +++ b/src/views/moneyManage/receiveDetail/receiveHead.vue @@ -764,6 +764,8 @@ const paytypeList = ref([ t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.nets'), // Nets t('cash.payMethods.transfer'), // E-Transfer + t('cash.payMethods.iotPay'), // IOT Pay + t('cash.payMethods.stripe3'), // Stripe3 t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.bankTransfer'),// 银行转账 t('cash.payMethods.card'), // 刷卡 diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index e6bb56c..55b6078 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -779,6 +779,8 @@ const paytypeList = [ t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.nets'), // Nets t('cash.payMethods.transfer'), // E-Transfer + t('cash.payMethods.iotPay'), // IOT Pay + t('cash.payMethods.stripe3'), // Stripe3 t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.paysolution'), // Paysolution t('cash.payMethods.bankTransfer'),// 银行转账 diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 1b83307..36f1786 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -697,7 +697,7 @@ const ifGroup = () => { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Malaysia') addFormData.value.receivedWallet = t('cash.wallet.MalaysiaWallet') - } else if (addFormData.value.payType === t('cash.payMethods.transfer')) { + } else if (addFormData.value.payType === t('cash.payMethods.transfer') || addFormData.value.payType === t('cash.payMethods.iotPay') || addFormData.value.payType === t('cash.payMethods.stripe3')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Canada') addFormData.value.receivedWallet = t('cash.wallet.CanadaWallet') @@ -1034,6 +1034,8 @@ const paytypeOptions = ref([ t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.nets'), // Nets t('cash.payMethods.transfer'), // E-Transfer + t('cash.payMethods.iotPay'), // IOT Pay + t('cash.payMethods.stripe3'), // Stripe3 t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.paysolution'), // Paysolution t('cash.payMethods.bankTransfer'),// 银行转账 @@ -1330,6 +1332,8 @@ const paytypeList = ref([ t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.nets'), // Nets t('cash.payMethods.transfer'), // E-Transfer + t('cash.payMethods.iotPay'), // IOT Pay + t('cash.payMethods.stripe3'), // Stripe3 t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.paysolution'), // Paysolution t('cash.payMethods.bankTransfer'),// 银行转账 diff --git a/src/views/moneyManage/receiveDetail/utils/staticData.js b/src/views/moneyManage/receiveDetail/utils/staticData.js index 573d983..425d53c 100644 --- a/src/views/moneyManage/receiveDetail/utils/staticData.js +++ b/src/views/moneyManage/receiveDetail/utils/staticData.js @@ -291,6 +291,10 @@ export const normalizePayType = (name) => { return 'PaymentAsia' } else if (name == t('cash.payMethods.transfer') || name == 'E-Transfer') { return 'E-Transfer' + } else if (name == t('cash.payMethods.iotPay') || name == 'IOT Pay') { + return 'IOT Pay' + } else if (name == t('cash.payMethods.stripe3') || name == 'Stripe3') { + return 'Stripe3' } else if (name == t('cash.payMethods.grabpay') || name == 'Grabpay') { return 'Grabpay' } else if (name == t('cash.payMethods.nets') || name == 'Nets') { @@ -388,4 +392,4 @@ export const WalletForId = (walletName) => { }else if(walletName==t('cash.wallet.BeijingWallet')){ return 10 } -} \ No newline at end of file +} diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue index 59f2966..f1fcfb6 100644 --- a/src/views/moneyManage/refundDetail/refundCharge.vue +++ b/src/views/moneyManage/refundDetail/refundCharge.vue @@ -441,6 +441,8 @@ const channelOptions = computed(() => [ t('cash.payMethods.grabpay'), t('cash.payMethods.nets'), t('cash.payMethods.transfer'), + t('cash.payMethods.iotPay'), + t('cash.payMethods.stripe3'), t('cash.payMethods.paypal') ]) const statusList = computed(() => [ diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index 9e01232..2ba0383 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -420,6 +420,8 @@ const channelOptions = computed(() => [ t('cash.payMethods.grabpay'), t('cash.payMethods.nets'), t('cash.payMethods.transfer'), + t('cash.payMethods.iotPay'), + t('cash.payMethods.stripe3'), t('cash.payMethods.paypal') ]) const statusList = computed(() => [ diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 9dce2f4..e76c531 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -441,6 +441,8 @@ const channelOptions = computed(() => [ t('cash.payMethods.grabpay'), t('cash.payMethods.nets'), t('cash.payMethods.transfer'), + t('cash.payMethods.iotPay'), + t('cash.payMethods.stripe3'), t('cash.payMethods.paypal') ]) const statusList = computed(() => [ diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index b21c6cb..7b2d782 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -580,6 +580,8 @@ const channelOptions = computed(() => [ t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.nets'), // Nets t('cash.payMethods.transfer'), // E-Transfer + t('cash.payMethods.iotPay'), // IOT Pay + t('cash.payMethods.stripe3'), // Stripe3 t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.paysolution'), // Paysolution t('cash.payMethods.bankTransfer'),// 银行转账 From 40cf8eb0f43d872b71c890bb841e855732d16bf9 Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Fri, 27 Mar 2026 13:53:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/usergold/gold/clientCountWallet.vue | 52 ++++++++++++++++++++------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/src/views/usergold/gold/clientCountWallet.vue b/src/views/usergold/gold/clientCountWallet.vue index fc49a9e..e06c512 100644 --- a/src/views/usergold/gold/clientCountWallet.vue +++ b/src/views/usergold/gold/clientCountWallet.vue @@ -82,6 +82,7 @@ const getObj = ref({ // 新增排序字段和排序方式 const sortField = ref('') const sortOrder = ref('') +const sortWalletId = ref('') // 方法 // 搜索=========================================================================== @@ -120,6 +121,18 @@ const get = async function (val) { params.market = String(selectData.value.markets[0]) } + if (sortField.value) { + params.sortField = sortField.value + } + + if (sortOrder.value) { + params.sortOrder = sortOrder.value + } + + if (sortWalletId.value !== '') { + params.sortWalletId = sortWalletId.value + } + console.log('最终请求参数', params) const result = await API({ @@ -185,6 +198,7 @@ const reset = function () { } sortField.value = '' sortOrder.value = '' + sortWalletId.value = '' selectedMarketPath.value = [] // 重置页码 getObj.value.pageNum = 1 @@ -297,10 +311,23 @@ const handleWalletDetailCurrentChange = (val) => { const handleSortChange = (column) => { console.log('排序字段：', column.prop) console.log('排序方式：', column.order) - if (column.prop) { - sortField.value = column.prop.replace(/([A-Z])/g, "_$1").toLowerCase(); + + if (!column.prop || !column.order) { + sortField.value = '' + sortOrder.value = '' + sortWalletId.value = '' + getObj.value.pageNum = 1 + get() + return + } + + if (propToWalletId[column.prop]) { + sortField.value = 'currentPermanentGold' + sortWalletId.value = propToWalletId[column.prop] } + sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC' + getObj.value.pageNum = 1 get() } @@ -388,8 +415,7 @@ const exportExcelOnlyOne = async function () { pageNum: 1, // 导出通常从第一页开始 pageSize: 10000, // 导出大量数据，或者不传让后端处理全部？通常传大值 userWalletRecord: { - // id从1开始，后端walletId从2开始，需要+1 - walletId: selectWalletForm.value.companyWalletId + 1, + walletId: selectWalletForm.value.companyWalletId, jwcode: selectData.value.jwcode ? Number(selectData.value.jwcode) : null } } @@ -434,39 +460,39 @@ const closeSelectWallet = () => { const selectWalletForm = ref({}) const companyWalletList = ref([ { - id: 1, + id: 2, name: t('clientCount.market.hkGold') + t('clientCount.wallet') }, { - id: 2, + id: 3, name: t('clientCount.market.sgHcGold') }, { - id: 3, + id: 4, name: t('clientCount.market.myGold') }, { - id: 4, + id: 5, name: t('clientCount.market.sgCmGold') }, { - id: 5, + id: 6, name: t('clientCount.market.caGold') }, { - id: 6, + id: 7, name: t('clientCount.market.thHsGold') }, { - id: 7, + id: 8, name: t('clientCount.market.thHaGold') }, { - id: 8, + id: 9, name: t('clientCount.market.vnGold') }, { - id: 9, + id: 10, name: t('clientCount.market.bjGold') } ])