From 61b512335542c20b371f0ab0e1de4c429b6a4142 Mon Sep 17 00:00:00 2001 From: jiangcheng Date: Thu, 12 Mar 2026 18:03:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=A4=9A=E8=AF=AD=E8=A8=80=E9=85=8D=E7=BD=AE=20?= =?UTF-8?q?=E7=8E=B0=E9=87=91=E9=80=80=E6=AC=BE=E8=A7=84=E5=88=99=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/locales/lang/en.js | 12 ++++++++ src/components/locales/lang/zh-CN.js | 13 +++++++++ .../moneyManage/financialAccount/cashFlow.vue | 2 +- .../moneyManage/receiveDetail/receiveService.vue | 33 +++++++++++----------- 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 246c24a..60b60a2 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -628,6 +628,7 @@ export default { payMethodPlaceholder: "Select method", receiveArea: "Rcv Region", receiveAreaPlaceholder: "Select region", + receiveWalletPlaceholder: "Select wallet", price: "Price", goodsNamePlaceholder: "Select product", 使用红包: "Use Red Envelope", @@ -905,6 +906,7 @@ export default { isRefund: "Allow Refund", no: "No", yes: "Yes", + refundFailed:"Refund Failed", }, // Client Count @@ -1244,6 +1246,16 @@ export default { refundSuccess: "Refund Success", refundConfirmTitle: "Refund Confirmation", refundConfirmContent: "Are you sure you want to refund order {orderNo}?", + wallet:{ + HongKongWallet: "HongKong Wallet", + MalaysiaWallet: "Malaysia Wallet", + CanadaWallet: "Canada Wallet", + SingaporeCMWallet: "Singapore CM Wallet", + SingaporeHCWallet: "Singapore HC Wallet", + ThailandHAWallet: "Thailand HA Wallet", + ThailandHSwallet: "Thailand HS wallet", + VietnamHCMWallet: "VietnamHCM Wallet" + } }, // Message diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index 564cb1f..f4de5ee 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -627,6 +627,7 @@ export default { payMethodPlaceholder: "请选择支付方式", receiveArea: "到账地区", receiveAreaPlaceholder: "请选择到账地区", + receiveWalletPlaceholder: "请选择到账钱包", price: "原价", orderStatus: "订单状态", goodsNamePlaceholder: "请选择商品", @@ -910,6 +911,7 @@ export default { isRefund: "允许退款", no: "否", yes: "是", + refundFailed: "退款失败", }, // 客户统计组 @@ -1263,6 +1265,17 @@ export default { refundSuccess: "退款成功", refundConfirmTitle: "退款确认", refundConfirmContent: "确定要对订单 {orderNo} 进行退款吗？", + //钱包 + wallet:{ + HongKongWallet: "香港钱包", + MalaysiaWallet: "马来西亚钱包", + CanadaWallet: "加拿大钱包", + SingaporeCMWallet: "新加坡CM钱包", + SingaporeHCWallet: "新加坡HC钱包", + ThailandHAWallet: "泰国HA钱包", + ThailandHSwallet: "泰国HS钱包", + VietnamHCMWallet: "越南钱包" + } }, // 消息 diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index 3d04bc7..af92027 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -233,7 +233,7 @@ const handleRefund = async () => { refundDialog.value = false fetchData() } else { - ElMessage.error(res.msg || '退款失败') + ElMessage.error(res.msg || t('refund.refundFailed')) } } catch (error) { console.error(error) diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 908b67d..c52c0de 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -266,13 +266,13 @@
@@ -701,33 +701,32 @@ const ifGroup = () => { if (addFormData.value.payType === t('cash.payMethods.stripe') || addFormData.value.payType === t('cash.payMethods.paymentAsia')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.HongKong') - addFormData.value.receivedWallet='香港钱包' + addFormData.value.receivedWallet=t('cash.wallet.HongKongWallet') } else if (addFormData.value.payType === t('cash.payMethods.ipay88')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Malaysia') - addFormData.value.receivedWallet='马来西亚钱包' + addFormData.value.receivedWallet=t('cash.wallet.MalaysiaWallet') } else if (addFormData.value.payType === t('cash.payMethods.transfer')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Canada') - addFormData.value.receivedWallet='加拿大钱包' + addFormData.value.receivedWallet=t('cash.wallet.CanadaWallet') } else if (addFormData.value.payType === t('cash.payMethods.grabpay') || addFormData.value.payType === t('cash.payMethods.nets') || addFormData.value.payType === t('cash.payMethods.paypal')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Singapore') - addFormData.value.receivedWallet='新加坡CM钱包' + addFormData.value.receivedWallet=t('cash.wallet.SingaporeCMWallet') }else if (addFormData.value.payType === t('cash.payMethods.paysolution')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Thailand') - addFormData.value.receivedWallet='泰国HA钱包' + addFormData.value.receivedWallet=t('cash.wallet.ThailandHAWallet') } else if (addFormData.value.payType === t('cash.payMethods.stripe2')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Singapore') - addFormData.value.receivedWallet='新加坡HC钱包' + addFormData.value.receivedWallet=t('cash.wallet.SingaporeHCWallet') } else { isGroup.value = false selectWallet.value = true } } - //选择地区之后 钱包下拉框显示对应地区的钱包 const MoneyWalletOptions=ref([]) const showWallet =(receivedMarket)=>{ @@ -735,24 +734,24 @@ const showWallet =(receivedMarket)=>{ addFormData.value.receivedWallet='' if(receivedMarket===t('cash.markets.HongKong')){ selectWallet.value=false - addFormData.value.receivedWallet='香港钱包' + addFormData.value.receivedWallet=t('cash.wallet.HongKongWallet') }else if(receivedMarket===t('cash.markets.Malaysia')){ selectWallet.value=false - addFormData.value.receivedWallet='马来西亚钱包' + addFormData.value.receivedWallet=t('cash.wallet.MalaysiaWallet') }else if(receivedMarket===t('cash.markets.Singapore')){ selectWallet.value=true - MoneyWalletOptions.value.push('新加坡CM钱包') - MoneyWalletOptions.value.push('新加坡HC钱包') + MoneyWalletOptions.value.push(t('cash.wallet.SingaporeCMWallet')) + MoneyWalletOptions.value.push(t('cash.wallet.SingaporeHCWallet')) }else if(receivedMarket===t('cash.markets.Thailand')){ selectWallet.value=true - MoneyWalletOptions.value.push('泰国HS钱包') - MoneyWalletOptions.value.push('泰国HA钱包') + MoneyWalletOptions.value.push(t('cash.wallet.ThailandHSwallet')) + MoneyWalletOptions.value.push(t('cash.wallet.ThailandHAWallet')) }else if(receivedMarket===t('cash.markets.VietnamHCM')){ selectWallet.value=false - addFormData.value.receivedWallet='越南钱包' + addFormData.value.receivedWallet=t('cash.wallet.VietnamHCMWallet') }else if(receivedMarket===t('cash.markets.Canada') ){ selectWallet.value=false - addFormData.value.receivedWallet='加拿大钱包' + addFormData.value.receivedWallet=t('cash.wallet.CanadaWallet') } }