Browse Source

Merge branch 'milestone-20251215-多语言二期2' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251215-多语言二期2

zhangrenyuan/feature-20260128093451-日常优化1.0
zhangrenyuan 1 month ago
parent
commit
6f3b643493
  1. 18
      src/components/locales/lang/zh-CN.js
  2. 4
      src/views/moneyManage/refundDetail/refundCharge.vue
  3. 4
      src/views/moneyManage/refundDetail/refundFinance.vue
  4. 3
      src/views/moneyManage/refundDetail/refundHeader.vue
  5. 2
      src/views/moneyManage/refundDetail/refundService.vue

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

@ -764,9 +764,9 @@ export default {
grabpay: "Grabpay",
nets: "Nets",
paypal: "PayPal",
stripe: "Stripe-链接收款",
ipay88: "Ipay88-链接收款",
paymentAsia: "PaymentAsia-链接收款",
stripe: "Stripe",
ipay88: "Ipay88",
paymentAsia: "PaymentAsia",
other: "其他",
},
// 金币退款审核 --------------------------------
@ -802,9 +802,9 @@ export default {
grabpay: "Grabpay",
nets: "Nets",
paypal: "PayPal",
stripe: "Stripe-链接收款",
ipay88: "Ipay88-链接收款",
paymentAsia: "PaymentAsia-链接收款",
stripe: "Stripe",
ipay88: "Ipay88",
paymentAsia: "PaymentAsia",
other: "其他",
},
// 金豆
@ -1095,9 +1095,9 @@ export default {
grabpay: "Grabpay",
nets: "Nets",
paypal: "PayPal",
stripe: "Stripe-链接收款",
ipay88: "Ipay88-链接收款",
paymentAsia: "PaymentAsia-链接收款",
stripe: "Stripe",
ipay88: "Ipay88",
paymentAsia: "PaymentAsia",
transfer: "E-Transfer",
},
statusList: {

4
src/views/moneyManage/refundDetail/refundCharge.vue

@ -247,6 +247,7 @@
}">
<div class="steps">
<div class="steps-content">
<div class="reject-reason" v-if="isReject">{{ t('common_list.rejectReason') }}{{ rejectReason }}</div>
<el-steps :active="currentStep" align-center>
<el-step>
<template #title>
@ -330,7 +331,7 @@
</el-step>
</el-steps>
</div>
<div class="reject-reason" v-if="isReject">{{ t('common_list.rejectReason') }}{{ rejectReason }}</div>
<div class="steps-btn">
<el-button type="primary" @click="showSteps = false">{{ t('common.confirm') }}</el-button>
</div>
@ -953,6 +954,7 @@ onMounted(() => {
background-color: white;
padding: 1vh;
border-radius: 10px;
margin-bottom: 10vh;
}
.steps-btn {

4
src/views/moneyManage/refundDetail/refundFinance.vue

@ -235,6 +235,7 @@
}">
<div class="steps">
<div class="steps-content">
<div class="reject-reason" v-if="isReject">{{ t('common_list.rejectReason') }}{{ rejectReason }}</div>
<el-steps :active="currentStep" align-center>
<el-step>
<template #title>
@ -304,7 +305,7 @@
</el-step>
</el-steps>
</div>
<div class="reject-reason" v-if="isReject">{{ t('common_list.rejectReason') }}{{ rejectReason }}</div>
<div class="steps-btn">
<el-button type="primary" @click="showSteps = false">{{ t('common.confirm') }}</el-button>
</div>
@ -911,6 +912,7 @@ onMounted(() => {
background-color: white;
padding: 1vh;
border-radius: 10px;
margin-bottom: 10vh;
}
.steps-btn {
height: 15vh;

3
src/views/moneyManage/refundDetail/refundHeader.vue

@ -247,6 +247,7 @@
}">
<div class="steps">
<div class="steps-content">
<div class="reject-reason" v-if="isReject">{{ t('common_list.rejectReason') }}{{ rejectReason }}</div>
<el-steps :active="currentStep" align-center>
<el-step>
<template #title>
@ -316,7 +317,6 @@
</el-step>
</el-steps>
</div>
<div class="reject-reason" v-if="isReject">{{ t('common_list.rejectReason') }}{{ rejectReason }}</div>
<div class="steps-btn">
<el-button type="primary" @click="showSteps = false">{{ t('common.confirm') }}</el-button>
</div>
@ -983,6 +983,7 @@ onMounted(() => {
background-color: white;
padding: 1vh;
border-radius: 10px;
margin-bottom: 10vh;
}
.steps-btn {
height: 15vh;

2
src/views/moneyManage/refundDetail/refundService.vue

@ -156,7 +156,7 @@
<div class="add-item" v-if="editRow.goodsName !== t('cash.coinRecharge')">
<el-text style="width:4vw;">{{ t('common_add.productNum') }}</el-text>
<el-input v-model="editRow.goodsNum" style="width:10vw;" disabled />
&nbsp;{{ t('cash.unit') }}
&nbsp;{{ editRow.numUnit }}
</div>
<div class="add-item" v-if="editRow.goodsName == t('cash.coinRecharge')">
<el-text style="width:4vw;">{{ t('refund.permanentGold') }}</el-text>

Loading…
Cancel
Save