Merge branch 'jiangcheng/feature-20260306102603-钱包体系' into milestone-20260304-钱包体系

src/components/locales/lang/en.js

@@ -637,6 +637,7 @@ export default {
     payMethodPlaceholder: "Select method",
     receiveArea: "Rcv Region",
     receiveAreaPlaceholder: "Select region",
+    receiveWalletPlaceholder: "Select wallet",
     price: "Price",
     goodsNamePlaceholder: "Select product",
     使用红包: "Use Red Envelope",
@@ -914,6 +915,7 @@ export default {
     isRefund: "Allow Refund",
     no: "No",
     yes: "Yes",
+    refundFailed:"Refund Failed",
   },
 
   // Client Count
@@ -1274,6 +1276,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

src/components/locales/lang/zh-CN.js

@@ -636,6 +636,7 @@ export default {
     payMethodPlaceholder: "请选择支付方式",
     receiveArea: "到账地区",
     receiveAreaPlaceholder: "请选择到账地区",
+    receiveWalletPlaceholder: "请选择到账钱包",
     price: "原价",
     orderStatus: "订单状态",
     goodsNamePlaceholder: "请选择商品",
@@ -919,6 +920,7 @@ export default {
     isRefund: "允许退款",
     no: "否",
     yes: "是",
+    refundFailed: "退款失败",
   },
 
   // 客户统计组
@@ -1293,6 +1295,17 @@ export default {
     refundSuccess: "退款成功",
     refundConfirmTitle: "退款确认",
     refundConfirmContent: "确定要对订单 {orderNo} 进行退款吗？",
+    //钱包
+    wallet:{
+      HongKongWallet: "香港钱包",
+      MalaysiaWallet: "马来西亚钱包",
+      CanadaWallet: "加拿大钱包",
+      SingaporeCMWallet: "新加坡CM钱包",
+      SingaporeHCWallet: "新加坡HC钱包",
+      ThailandHAWallet: "泰国HA钱包",
+      ThailandHSwallet: "泰国HS钱包",
+      VietnamHCMWallet: "越南钱包"
+    }
   },
 
   // 消息

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -244,7 +244,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)

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -266,13 +266,13 @@
                 <el-form-item :label="t('common_add.receiveArea')" prop="receivedMarket" v-show="isGold">
                     <div style="display: flex;">
                         <CurrencySelect v-model="addFormData.receivedMarket" :items="MoneyAddressOptions"
-                            :placeholder="t('选择到账地区')"
+                            :placeholder="t('common_add.receiveAreaPlaceholder')"
                             style="width: 125px;"
                             :disabled="isGroup"
                             @change="showWallet">
                         </CurrencySelect>
                         <CurrencySelect v-model="addFormData.receivedWallet" :items="MoneyWalletOptions"
-                            :placeholder="t('选择到账钱包')"
+                            :placeholder="t('common_add.receiveWalletPlaceholder')"
                             :disabled=" !selectWallet || isGroup "
                             style="width: 110px; padding-left: 5px;">
                         </CurrencySelect>
@@ -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')
     }
 }