Browse Source

Merge branch 'milestone-20251215-多语言二期2'

master
ZhangYong 4 weeks ago
parent
commit
add782bed4
  1. 6
      src/views/audit/gold/rechargeAudit.vue
  2. 2
      src/views/moneyManage/executor/executor.vue
  3. 6
      src/views/moneyManage/receiveDetail/receiveHead.vue
  4. 12
      src/views/moneyManage/receiveDetail/receiveService.vue
  5. 12
      src/views/moneyManage/receiveDetail/utils/staticData.js
  6. 6
      src/views/recharge/gold/addCoinRecharge.vue

6
src/views/audit/gold/rechargeAudit.vue

@ -332,15 +332,15 @@ const payModel = [
label: t('audit.payMethods.paypal') label: t('audit.payMethods.paypal')
}, },
{ {
value: 'Stripe-链接收款',
value: 'Stripe',
label: t('audit.payMethods.stripe') label: t('audit.payMethods.stripe')
}, },
{ {
value: 'Ipay88-链接收款',
value: 'Ipay88',
label: t('audit.payMethods.ipay88') label: t('audit.payMethods.ipay88')
}, },
{ {
value: 'PaymentAsia-链接收款',
value: 'PaymentAsia',
label: t('audit.payMethods.paymentAsia') label: t('audit.payMethods.paymentAsia')
}, },
{ {

2
src/views/moneyManage/executor/executor.vue

@ -451,7 +451,7 @@ const currencies = ref([
t('cash.currency.vnd'), // (VND) t('cash.currency.vnd'), // (VND)
t('cash.currency.krw') // (KRW) t('cash.currency.krw') // (KRW)
]) ])
// const channelOptions = ref(["Stripe-", "PaymentAsia-", "Ipay88-", "", "", "", "", "Grabpay", "Nets", "E-Transfer", "Paypal"])
// const channelOptions = ref(["Stripe", "PaymentAsia", "Ipay88", "", "", "", "", "Grabpay", "Nets", "E-Transfer", "Paypal"])
const channelOptions = ref([ const channelOptions = ref([
t('cash.payMethods.stripe'), t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'), t('cash.payMethods.paymentAsia'),

6
src/views/moneyManage/receiveDetail/receiveHead.vue

@ -754,9 +754,9 @@ const customOptions = ref([
]) ])
// - 使cash.payMethods // - 使cash.payMethods
const paytypeList = ref([ const paytypeList = ref([
t('cash.payMethods.stripe'), // Stripe-
t('cash.payMethods.paymentAsia'), // PaymentAsia-
t('cash.payMethods.ipay88'), // Ipay88-
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer t('cash.payMethods.transfer'), // E-Transfer

12
src/views/moneyManage/receiveDetail/receiveService.vue

@ -914,9 +914,9 @@ const customOptions = ref([
]) ])
// - 使cash.payMethods // - 使cash.payMethods
const paytypeOptions = ref([ const paytypeOptions = ref([
t('cash.payMethods.stripe'), // Stripe-
t('cash.payMethods.paymentAsia'), // PaymentAsia-
t('cash.payMethods.ipay88'), // Ipay88-
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer t('cash.payMethods.transfer'), // E-Transfer
@ -1182,9 +1182,9 @@ const getAdminData = async () => {
// //
// - 使cash.payMethods // - 使cash.payMethods
const paytypeList = ref([ const paytypeList = ref([
t('cash.payMethods.stripe'), // Stripe-
t('cash.payMethods.paymentAsia'), // PaymentAsia-
t('cash.payMethods.ipay88'), // Ipay88-
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.bankTransfer'),// t('cash.payMethods.bankTransfer'),//
t('cash.payMethods.card'), // t('cash.payMethods.card'), //
t('cash.payMethods.cash'), // t('cash.payMethods.cash'), //

12
src/views/moneyManage/receiveDetail/utils/staticData.js

@ -279,12 +279,12 @@ export const normalizeGoodsName = (name) => {
} }
export const normalizePayType = (name) => { export const normalizePayType = (name) => {
if (name == t('cash.payMethods.stripe') || name == 'Stripe' || name == 'Stripe-链接收款') {
return 'Stripe-链接收款'
} else if (name == t('cash.payMethods.ipay88') || name == 'Ipay88' || name == 'Ipay88-链接收款') {
return 'Ipay88-链接收款'
} else if (name == t('cash.payMethods.paymentAsia') || name == 'PaymentAsia' || name == 'PaymentAsia-链接收款') {
return 'PaymentAsia-链接收款'
if (name == t('cash.payMethods.stripe') || name == 'Stripe' || name == 'Stripe') {
return 'Stripe'
} else if (name == t('cash.payMethods.ipay88') || name == 'Ipay88' || name == 'Ipay88') {
return 'Ipay88'
} else if (name == t('cash.payMethods.paymentAsia') || name == 'PaymentAsia' || name == 'PaymentAsia') {
return 'PaymentAsia'
} else if (name == t('cash.payMethods.transfer') || name == 'E-Transfer') { } else if (name == t('cash.payMethods.transfer') || name == 'E-Transfer') {
return 'E-Transfer' return 'E-Transfer'
} else if (name == t('cash.payMethods.grabpay') || name == 'Grabpay') { } else if (name == t('cash.payMethods.grabpay') || name == 'Grabpay') {

6
src/views/recharge/gold/addCoinRecharge.vue

@ -590,15 +590,15 @@ const payModel = [
label: t('audit.payMethods.paypal') label: t('audit.payMethods.paypal')
}, },
{ {
value: 'Stripe-链接收款',
value: 'Stripe',
label: t('audit.payMethods.stripe') label: t('audit.payMethods.stripe')
}, },
{ {
value: 'Ipay88-链接收款',
value: 'Ipay88',
label: t('audit.payMethods.ipay88') label: t('audit.payMethods.ipay88')
}, },
{ {
value: 'PaymentAsia-链接收款',
value: 'PaymentAsia',
label: t('audit.payMethods.paymentAsia') label: t('audit.payMethods.paymentAsia')
}, },
{ {

Loading…
Cancel
Save