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'),// 银行转账