huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

支付方式顺序修改

zhangyong/feature-20260211100322-日常优化2.0
ZhangYong 3 weeks ago
parent
ec9dcffc53
commit
cf3869aa06
5 changed files with 72 additions and 72 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/views/moneyManage/financialAccount/cashFlow.vue
  2. 38
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  3. 38
      src/views/moneyManage/receiveDetail/receiveManage.vue
  4. 16
      src/views/moneyManage/receiveDetail/receiveService.vue
  5. 26
      src/views/moneyManage/refundDetail/refundService.vue

26
src/views/moneyManage/financialAccount/cashFlow.vue
View File

@ -18,19 +18,19 @@ const { t } = useI18n()
const route = useRoute()
const paytypeList = [
t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'),
t('cash.payMethods.ipay88'),
t('cash.payMethods.bankTransfer'),
t('cash.payMethods.card'),
t('cash.payMethods.cash'),
t('cash.payMethods.check'),
t('cash.payMethods.grabpay'),
t('cash.payMethods.nets'),
t('cash.payMethods.transfer'),
t('cash.payMethods.paypal'),
t('cash.payMethods.stripe2'),
t('cash.payMethods.paysolution'),
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),// 银行转账
t('cash.payMethods.card'), // 刷卡
t('cash.payMethods.cash'), // 现金
t('cash.payMethods.check'), // 支票
]
const payPlatformOptions = ref([...paytypeList])

38
src/views/moneyManage/receiveDetail/receiveFinance.vue
View File

@ -376,7 +376,7 @@
<template #footer>
<span class="dialog-footer" v-if="!ifReject">
<el-button style="background-color: #7E91FF;" @click="ifReject = true">{{ t('common.reject')
}}</el-button>
}}</el-button>
<el-button :style="{
backgroundColor: isBtnDisabled ? '#E5E5E5FF' : '#2741DEFF',
marginLeft: '60px',
@ -385,7 +385,7 @@
</span>
<span class="dialog-footer" v-if="ifReject">
<el-button style="background-color: #7E91FF;" @click="closeAuditForm">{{ t('common.cancel')
}}</el-button>
}}</el-button>
<el-button style="background-color: #2741DE; margin-left: 2.5vw;" type="primary"
@click="throttledhandelAuditReject">{{ t('common.confirm') }}</el-button>
</span>
@ -553,7 +553,7 @@
<div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
<div style=" display: flex; align-items: center;justify-content: center; ">
<span style="color: #999999; white-space: nowrap;">{{ t('common_add.permanentGold')
}}：</span>
}}：</span>
<el-input style="padding-right: 10px; height: 30px; width: 70px;"
v-model="refundFormData.permanentGold" disabled />
</div>
@ -612,7 +612,7 @@
<div v-show="refundFormData.refundModel == '1'" style="display: flex; margin-bottom: 10px;">
<div style=" display: flex; align-items: center;justify-content: center; ">
<span style="color: #999999; white-space: nowrap;">{{ t('common_add.permanentGold')
}}：</span>
}}：</span>
<el-input style="padding-right: 10px; height: 30px; width: 70px;"
v-model="refundFormData.partRefundGold" dsabled />
</div>
@ -768,19 +768,19 @@ const customOptions = ref([
t('cash.currency.rmb'), // 人民币(CNY)
])
const paytypeList = [
t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'),
t('cash.payMethods.ipay88'),
t('cash.payMethods.bankTransfer'),
t('cash.payMethods.card'),
t('cash.payMethods.cash'),
t('cash.payMethods.check'),
t('cash.payMethods.grabpay'),
t('cash.payMethods.nets'),
t('cash.payMethods.transfer'),
t('cash.payMethods.paypal'),
t('cash.payMethods.stripe2'),
t('cash.payMethods.paysolution'),
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),// 银行转账
t('cash.payMethods.card'), // 刷卡
t('cash.payMethods.cash'), // 现金
t('cash.payMethods.check'), // 支票
];
const paytypeOptions = ref([...paytypeList]);
@ -1210,11 +1210,11 @@ watch(auditFormisible, (val) => {
const openEditForm = (row) => {
console.log('row.aaa', row.handlingCharge);
editFormData.value = {
editFormData.value = {
...row,
paymentCurrencyOrig: row.paymentCurrency,
paymentAmountOrig: row.paymentAmount,
};
};
// 区分金币产品与普通产品
if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true;
else isEditGold.value = false;

38
src/views/moneyManage/receiveDetail/receiveManage.vue
View File

@ -376,7 +376,7 @@
<template #footer>
<span class="dialog-footer" v-if="!ifReject">
<el-button style="background-color: #7E91FF;" @click="ifReject = true">{{ t('common.reject')
}}</el-button>
}}</el-button>
<el-button :style="{
backgroundColor: isBtnDisabled ? '#E5E5E5FF' : '#2741DEFF',
marginLeft: '60px',
@ -385,7 +385,7 @@
</span>
<span class="dialog-footer" v-if="ifReject">
<el-button style="background-color: #7E91FF;" @click="closeAuditForm">{{ t('common.cancel')
}}</el-button>
}}</el-button>
<el-button style="background-color: #2741DE; margin-left: 2.5vw;" type="primary"
@click="throttledhandelAuditReject">{{ t('common.confirm') }}</el-button>
</span>
@ -553,7 +553,7 @@
<div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
<div style=" display: flex; align-items: center;justify-content: center; ">
<span style="color: #999999; white-space: nowrap;">{{ t('common_add.permanentGold')
}}：</span>
}}：</span>
<el-input style="padding-right: 10px; height: 30px; width: 70px;"
v-model="refundFormData.permanentGold" disabled />
</div>
@ -612,7 +612,7 @@
<div v-show="refundFormData.refundModel == '1'" style="display: flex; margin-bottom: 10px;">
<div style=" display: flex; align-items: center;justify-content: center; ">
<span style="color: #999999; white-space: nowrap;">{{ t('common_add.permanentGold')
}}：</span>
}}：</span>
<el-input style="padding-right: 10px; height: 30px; width: 70px;"
v-model="refundFormData.partRefundGold" dsabled />
</div>
@ -768,19 +768,19 @@ const customOptions = ref([
t('cash.currency.rmb'), // 人民币(CNY)
])
const paytypeList = [
t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'),
t('cash.payMethods.ipay88'),
t('cash.payMethods.bankTransfer'),
t('cash.payMethods.card'),
t('cash.payMethods.cash'),
t('cash.payMethods.check'),
t('cash.payMethods.grabpay'),
t('cash.payMethods.nets'),
t('cash.payMethods.transfer'),
t('cash.payMethods.paypal'),
t('cash.payMethods.stripe2'),
t('cash.payMethods.paysolution'),
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),// 银行转账
t('cash.payMethods.card'), // 刷卡
t('cash.payMethods.cash'), // 现金
t('cash.payMethods.check'), // 支票
];
const paytypeOptions = ref([...paytypeList]);
@ -1210,11 +1210,11 @@ watch(auditFormisible, (val) => {
const openEditForm = (row) => {
console.log('row.aaa', row.handlingCharge);
editFormData.value = {
editFormData.value = {
...row,
paymentCurrencyOrig: row.paymentCurrency,
paymentAmountOrig: row.paymentAmount,
};
};
// 区分金币产品与普通产品
if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true;
else isEditGold.value = false;

16
src/views/moneyManage/receiveDetail/receiveService.vue
View File

@ -947,17 +947,17 @@ const customOptions = ref([
const paytypeOptions = ref([
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),// 银行转账
t('cash.payMethods.card'), // 刷卡
t('cash.payMethods.cash'), // 现金
t('cash.payMethods.check'), // 支票
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.stripe2'), // Stripe2
])
const MoneyAddressOptions = ref([
t('cash.markets.Malaysia'), // 马来西亚
@ -1217,17 +1217,17 @@ const getAdminData = async () => {
const paytypeList = ref([
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.bankTransfer'),// 银行转账
t('cash.payMethods.card'), // 刷卡
t('cash.payMethods.cash'), // 现金
t('cash.payMethods.check'), // 支票
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),// 银行转账
t('cash.payMethods.card'), // 刷卡
t('cash.payMethods.cash'), // 现金
t('cash.payMethods.check'), // 支票
])
const getMarket = async function () {
try {

26
src/views/moneyManage/refundDetail/refundService.vue
View File

@ -567,19 +567,19 @@ const currencies = computed(() => [
t('cash.currency.rmb'),
])
const channelOptions = computed(() => [
t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'),
t('cash.payMethods.ipay88'),
t('cash.payMethods.bankTransfer'),
t('cash.payMethods.card'),
t('cash.payMethods.cash'),
t('cash.payMethods.check'),
t('cash.payMethods.grabpay'),
t('cash.payMethods.nets'),
t('cash.payMethods.transfer'),
t('cash.payMethods.paypal'),
t('cash.payMethods.stripe2'),
t('cash.payMethods.paysolution'),
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),// 银行转账
t('cash.payMethods.card'), // 刷卡
t('cash.payMethods.cash'), // 现金
t('cash.payMethods.check'), // 支票
])
const reset = function () {

Write Preview
Loading…
Cancel
Save