From dee8cf3e577da69688b9c4b793fa0a005b6fe9d4 Mon Sep 17 00:00:00 2001 From: jiangcheng Date: Mon, 9 Mar 2026 15:36:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=B6=E6=AC=BE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../moneyManage/receiveDetail/receiveService.vue | 73 ++++++++++++++++++++-- .../moneyManage/receiveDetail/utils/staticData.js | 24 +++++++ 2 files changed, 91 insertions(+), 6 deletions(-) diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index c09247d..68ed7d2 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -257,11 +257,28 @@ :placeholder="t('common_add.payMethodPlaceholder')" @change="ifGroup"> - + + + +
+ + + + +
+ + @@ -445,7 +462,7 @@ import _ from 'lodash' import { isNumber } from 'lodash' // 导入客服相关规则和静态数据 import { addFormRule as getAddFormRule } from './utils/recriveFormRules.js' -import { productList, MarketNameForId, CurrencyForId, marketList,statusList, normalizeSubmitterMarket, normalizeGoodsName, normalizePayType } from './utils/staticData.js' +import { productList, MarketNameForId, CurrencyForId, marketList,statusList, normalizeSubmitterMarket, normalizeGoodsName, normalizePayType ,WalletForId } from './utils/staticData.js' // 国际化 import { useI18n } from 'vue-i18n' @@ -607,7 +624,7 @@ const handlePagination = (type, val) => { // ===================== 客服新增/编辑收款弹窗 ===================== const addFormisible = ref(false) // 弹窗显隐 -const addFormData = ref({ name: '', market: '', goodsName: '' }) // 表单数据 +const addFormData = ref({ name: '', market: '', goodsName: '' , receivedWallet:'' }) // 表单数据 const addFormRef = ref(null) // 表单引用 const addOrEdit = ref(0) // 1=新增，2=编辑 const isGold = ref(false) // 是否为金币充值产品 @@ -677,29 +694,68 @@ watch(() => addFormData.value.goodsName, () => { // 支付方式变更：判断是否为默认归属平台 const isGroup = ref(false) +const selectWallet=ref(false) const ifGroup = () => { + addFormData.value.receivedMarket='' + addFormData.value.receivedWallet='' 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='香港钱包' } else if (addFormData.value.payType === t('cash.payMethods.ipay88')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Malaysia') + addFormData.value.receivedWallet='马来西亚钱包' } else if (addFormData.value.payType === t('cash.payMethods.transfer')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Canada') + addFormData.value.receivedWallet='加拿大钱包' } 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钱包' }else if (addFormData.value.payType === t('cash.payMethods.paysolution')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Thailand') + addFormData.value.receivedWallet='泰国HA钱包' } else if (addFormData.value.payType === t('cash.payMethods.stripe2')) { isGroup.value = true addFormData.value.receivedMarket = t('cash.markets.Singapore') + addFormData.value.receivedWallet='新加坡HC钱包' } else { isGroup.value = false + selectWallet.value = true } } + +//选择地区之后 钱包下拉框显示对应地区的钱包 +const MoneyWalletOptions=ref([]) +const showWallet =(receivedMarket)=>{ + MoneyWalletOptions.value=[] + addFormData.value.receivedWallet='' + if(receivedMarket===t('cash.markets.HongKong')){ + selectWallet.value=false + addFormData.value.receivedWallet='香港钱包' + }else if(receivedMarket===t('cash.markets.Malaysia')){ + selectWallet.value=false + addFormData.value.receivedWallet='马来西亚钱包' + }else if(receivedMarket===t('cash.markets.Singapore')){ + selectWallet.value=true + MoneyWalletOptions.value.push('新加坡CM钱包') + MoneyWalletOptions.value.push('新加坡HC钱包') + }else if(receivedMarket===t('cash.markets.Thailand')){ + selectWallet.value=true + MoneyWalletOptions.value.push('泰国HS钱包') + MoneyWalletOptions.value.push('泰国HA钱包') + }else if(receivedMarket===t('cash.markets.VietnamHCM')){ + selectWallet.value=false + addFormData.value.receivedWallet='越南钱包' + }else if(receivedMarket===t('cash.markets.Canada') ){ + selectWallet.value=false + addFormData.value.receivedWallet='加拿大钱包' + } +} + //失焦和回车查询仅选一个 const jwcodeQueriedInFocus = ref(false) const handleJwcodeFocus = () => { @@ -833,7 +889,7 @@ const handleAddForm = async () => { } } - if (addFormData.value.numUnit == '') { + if ( !isGold.value && addFormData.value.numUnit == '') { ElMessage.error(t('elmessage.checkNumUnit')); return; } @@ -847,6 +903,7 @@ const handleAddForm = async () => { if (addFormData.value.payTime) { addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss') } + ifAddDone.value = true const result = await request({ url: '/cashCollection/add', @@ -861,7 +918,10 @@ const handleAddForm = async () => { paymentCurrency: CurrencyForId(addFormData.value.paymentCurrency) || '', receivedMarket: MarketNameForId(addFormData.value.receivedMarket) || '', paymentAmount: (addFormData.value.paymentAmount) * 100, - submitterMarket: normalizeSubmitterMarket(adminData.value.markets) + submitterMarket: normalizeSubmitterMarket(adminData.value.markets), + ...(isGold. value ? { + walletId:WalletForId(addFormData.value.receivedWallet) + } : {}) } }) if (result.code == 200) { @@ -902,7 +962,8 @@ const handleEditForm = async () => { return; } } - if (addFormData.value.numUnit == '') { + + if (!isGold.value && addFormData.value.numUnit == '') { ElMessage.error(t('elmessage.checkNumUnit')); return; } diff --git a/src/views/moneyManage/receiveDetail/utils/staticData.js b/src/views/moneyManage/receiveDetail/utils/staticData.js index c43e5ab..abd51f7 100644 --- a/src/views/moneyManage/receiveDetail/utils/staticData.js +++ b/src/views/moneyManage/receiveDetail/utils/staticData.js @@ -360,3 +360,27 @@ export const statusList = [ ] export const numUnitList = [t('cash.unit'), t('cash.year'), t('cash.month')] + +export const WalletForId = (walletName) => { + if(walletName=='历史钱包'){ + return 1 + }else if(walletName=='香港钱包'){ + return 2 + }else if(walletName=='新加坡HC钱包'){ + return 3 + }else if(walletName=='马来西亚钱包'){ + return 4 + }else if(walletName=='新加坡CM钱包'){ + return 5 + }else if(walletName=='加拿大钱包'){ + return 6 + }else if(walletName=='泰国HS钱包'){ + return 7 + }else if(walletName=='泰国HA钱包'){ + return 8 + }else if(walletName=='越南公司钱包'){ + return 9 + }else if(walletName=='北京公司钱包'){ + return 10 + } +} \ No newline at end of file From 91e54fd667969b40df21b4ab6ac0f4ff1ded390f Mon Sep 17 00:00:00 2001 From: jiangcheng Date: Mon, 9 Mar 2026 15:38:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=83=E4=B9=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/receiveDetail/receiveService.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 68ed7d2..908b67d 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -967,7 +967,7 @@ const handleEditForm = async () => { ElMessage.error(t('elmessage.checkNumUnit')); return; } - // 处理时间格式 + // 时间格式 if (addFormData.value.payTime) { addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss') }