diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index bf98dde..87b9240 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -39,7 +39,7 @@ export default {
productNamePlaceholder: "Enter product",
type: "Type",
typePlaceholder: "Select type",
- customerBelong: "Cust. Region",
+ customerBelong: "Customer Region",
activityBelong: "Activity Region",
articleVideoID: "Post/Video ID",
articleVideoIDPlaceholder: "Enter ID",
@@ -1126,6 +1126,7 @@ export default {
recalled: "Recalled",
refunded: "Refunded",
rejected: "Rejected",
+ inProgress: "In Progress",
},
pending: "Pending",
refundSuccess: "Refund Success",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 15b9bb8..63f39d5 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -951,7 +951,7 @@ export default {
// 筛选统计表
gold: "金币",
recharge: "充值",
- consume: "消费",
+ consumes: "消费",
rank: "排名",
allTypes: "全部类型",
region: "地区",
diff --git a/src/components/workspace/CashManagement.vue b/src/components/workspace/CashManagement.vue
index 89c860d..97fefaf 100644
--- a/src/components/workspace/CashManagement.vue
+++ b/src/components/workspace/CashManagement.vue
@@ -42,8 +42,8 @@
{{ market.value.toLocaleString() }} {{ t('workbench.SGD') }}
- {{ t('workbench.collect')}}{{ item.name }}:
- {{ item.value.toLocaleString() }}
+ {{ item.name }}{{ t('workbench.collect') }}:
+ {{ item.value.toLocaleString() }} {{ item.currencyLabel }}
@@ -135,7 +135,15 @@ const fetchCashData = async () => {
value: resMap.get(m.name) ?? 0
}))
} else if (marksFlag.value=== false) {
-// 1. 定义币种中英文对照表 代收地区的币种
+ const currencyCollectMarketMap = {
+ sgd: t('workbench.Singapore'),
+ myr: t('workbench.Malaysia'),
+ hkd: t('workbench.HongKong'),
+ cad: t('workbench.Canada'),
+ thb: t('workbench.Thailand'),
+ vdn: t('workbench.VietnamHCM'),
+ };
+
const currencyMap = {
sgd: t('workbench.SGD'),
myr: t('workbench.MYR'),
@@ -165,8 +173,9 @@ const fetchCashData = async () => {
: 0;
return {
- name: currencyMap[lowerCurrency],
+ name: currencyCollectMarketMap[lowerCurrency],
value: total,
+ currencyLabel: currencyMap[lowerCurrency],
};
});
@@ -280,7 +289,7 @@ onMounted( async() => {
.text2 {
margin: 13px;
width: 95%;
- height: 48px;
+ height: 10vh;
border-radius: 8px;
background: linear-gradient(90deg, #E4F0FC 0%, #C1DCF8 50%, #E4F0FC 100%);
box-shadow: 0 2px 2px 0 #00152940;
@@ -291,7 +300,7 @@ onMounted( async() => {
.text2-income {
color: #040a2d;
- font-size: 20px;
+ font-size: 40px;
font-weight: 900;
}
@@ -305,12 +314,12 @@ onMounted( async() => {
.market-data {
display: flex;
- width: 245px;
+ width: 265px;
flex-direction: column;
align-items: flex-start;
gap: 20px;
padding: 10px;
- margin-left: 40px;
+ margin-left: 20px;
}
.market-item {
diff --git a/src/components/workspace/GoldGraph.vue b/src/components/workspace/GoldGraph.vue
index 5675178..7b7285e 100644
--- a/src/components/workspace/GoldGraph.vue
+++ b/src/components/workspace/GoldGraph.vue
@@ -54,7 +54,7 @@
- {{ t('workbench.gold') }}{{ activeTab === 'recharge' ? t('workbench.recharge') : t('workbench.consume') }}{{ t('workbench.rank') }}
+ {{ t('workbench.gold') }}{{ activeTab === 'recharge' ? t('workbench.recharge') : t('workbench.consumes') }}{{ t('workbench.rank') }}
@@ -595,7 +595,7 @@ const updateChart = (chartData) => {
result += `${param.seriesName}: ${param.value.toLocaleString()}
`;
total += param.value;
})
- result += `${t('workbench.all')}${activeTab.value === 'recharge' ? t('workbench.recharge') : t('workbench.consume')}: ${total.toLocaleString()}`;
+ result += `${t('workbench.all')}${activeTab.value === 'recharge' ? t('workbench.recharge') : t('workbench.consumes')}: ${total.toLocaleString()}`;
return result
}
},
diff --git a/src/components/workspace/GoldGraphMarkets.vue b/src/components/workspace/GoldGraphMarkets.vue
index 9bc0d63..a25be38 100644
--- a/src/components/workspace/GoldGraphMarkets.vue
+++ b/src/components/workspace/GoldGraphMarkets.vue
@@ -493,7 +493,7 @@ const updateChart = (chartData) => {
result += `${param.seriesName}: ${param.value.toLocaleString()}
`
total += param.value
})
- result += `${t('workbench.all')}${activeTab.value === 'recharge' ? t('workbench.recharge') : t('workbench.consume')}: ${total.toLocaleString()}`
+ result += `${t('workbench.all')}${activeTab.value === 'recharge' ? t('workbench.recharge') : t('workbench.consumes')}: ${total.toLocaleString()}`
return result
}
},
diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue
index 66dded4..4286610 100644
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@@ -92,7 +92,7 @@
- {{ t('common_add.market') }}
+ {{ t('common_add.market') }}:
@@ -114,7 +114,7 @@
- {{ t('common_add.activity') }}
+ {{ t('common_add.activity') }}:
diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index d189446..65f6e2c 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -103,7 +103,7 @@
{{ scope.row.permanentGold / 100 }}
-
+
{{ (scope.row.freeGold) / 100 }}
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index 272d928..77d0413 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -95,7 +95,7 @@
-
+
{{ row.sumGold / 100 }}
@@ -105,12 +105,12 @@
{{ row.permanentGold / 100 }}
-
+
{{ (row.freeJune + row.freeDecember) / 100 }}
-
+
{{ row.taskGold / 100 }}
diff --git a/src/views/channelManage/fans/fans.vue b/src/views/channelManage/fans/fans.vue
index a3cdb44..6b3fbc6 100644
--- a/src/views/channelManage/fans/fans.vue
+++ b/src/views/channelManage/fans/fans.vue
@@ -559,12 +559,12 @@ const getTagText = (state) => {
-
+
-
-
+
+
-
+
{{consumeTypes.find(item => item.value === Number(scope.row.type))?.label || t('common_list.unknownType')}}
diff --git a/src/views/channelManage/reward/reward.vue b/src/views/channelManage/reward/reward.vue
index b7cd3f8..f2e0e16 100644
--- a/src/views/channelManage/reward/reward.vue
+++ b/src/views/channelManage/reward/reward.vue
@@ -600,7 +600,7 @@ const getTagText = (state) => {
-
+
@@ -609,8 +609,8 @@ const getTagText = (state) => {
{{ scope.row.isBackpack == 1 ? t('common_list.yes') : t('common_list.no') }}
-
-
+
+
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 99672a5..c3fc12e 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -576,7 +576,7 @@ const getTagText = (state) => {
-
+
{{
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 0d05d20..8194cd6 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -559,7 +559,7 @@ const getTagText = (state) => {
-
+
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index 3977315..b3aecf9 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -600,7 +600,7 @@ const getTagText = (state) => {
-
+
diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue
index 7ebe52b..a8f29ad 100644
--- a/src/views/consume/gold/coinConsumeDetail.vue
+++ b/src/views/consume/gold/coinConsumeDetail.vue
@@ -601,7 +601,7 @@ const getMarket = async function () {
-
+
{{ $t('common.consumePlatform') }}:
@@ -687,12 +687,12 @@ _list
{{ scope.row.permanentGold }}
-
+
{{ scope.row.freeGold }}
-
+
{{ scope.row.taskGold }}
diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 5b86943..79df52b 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -64,7 +64,7 @@
-
+
{{ scope.row.refundModel === 1 ? t('common_list.refundModelPart') : t('common_list.refundModelAll') }}
diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 248cd4b..0c8fdc9 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -133,7 +133,7 @@
{{ scope.row.goodNum }}
-
+
-
+
-
+
-
+
@@ -486,7 +486,7 @@
+ label-width="6vw" label-position="left">
@@ -1698,7 +1698,7 @@ const handlePagination = (type, val) => {
}
:deep(.adddialog .el-form-item__label) {
- min-width: 80px;
+ min-width: 100px;
width: auto;
font-weight: 800;
padding-bottom: 15px;
diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue
index 7ef59c4..3cb4d60 100644
--- a/src/views/moneyManage/receiveDetail/receiveHead.vue
+++ b/src/views/moneyManage/receiveDetail/receiveHead.vue
@@ -232,10 +232,10 @@
-
+
-
+
@@ -320,7 +320,7 @@
+ label-width="6vw" label-position="left">
@@ -1467,7 +1467,7 @@ const handlePagination = (type, val) => {
}
:deep(.adddialog .el-form-item__label) {
- min-width: 80px;
+ min-width: 100px;
width: auto;
font-weight: 800;
padding-bottom: 15px;
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index 3aaac91..fb94303 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -133,7 +133,7 @@
{{ scope.row.goodNum }}
-
+
-
+
-
+
-
+
@@ -486,7 +486,7 @@
+ label-width="6vw" label-position="left">
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index e35b7fd..1d54c68 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -95,10 +95,10 @@
-
+
-
+
{{
@@ -106,7 +106,7 @@
{{ scope.row.goodNum }}
-
+
@@ -201,8 +201,8 @@
-
-
+
{
}
:deep(.adddialog .el-form-item__label) {
- min-width: 80px;
+ min-width: 120px;
width: auto;
font-weight: 800;
padding-bottom: 15px;
diff --git a/src/views/moneyManage/receiveDetail/utils/staticData.js b/src/views/moneyManage/receiveDetail/utils/staticData.js
index 8520a33..e15e4c7 100644
--- a/src/views/moneyManage/receiveDetail/utils/staticData.js
+++ b/src/views/moneyManage/receiveDetail/utils/staticData.js
@@ -213,7 +213,7 @@ export const MarketNameForId = (name) => {
return 24018
} else if (name == t('cash.markets.VietnamHCM') || name == '越南HCM' || name == 'Vietnam HCM') {
return 24022
- } else if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters' || name == 'HQ') {
+ } else if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters') {
return '总部'
} else {
return name
@@ -221,7 +221,7 @@ export const MarketNameForId = (name) => {
}
export const normalizeSubmitterMarket = (name) => {
- if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters' || name == 'HQ') {
+ if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters') {
return '总部'
} else {
return name
diff --git a/src/views/recharge/gold/coinRechargeDetail.vue b/src/views/recharge/gold/coinRechargeDetail.vue
index b167f99..005bbf4 100644
--- a/src/views/recharge/gold/coinRechargeDetail.vue
+++ b/src/views/recharge/gold/coinRechargeDetail.vue
@@ -687,9 +687,9 @@ const getTagText = (state) => {
-
-
-
+
+
+
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index 6dab78e..7d64066 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/src/views/refund/gold/coinRefundDetail.vue
@@ -598,7 +598,7 @@ const getMarket = async function () {
-
+
{{ scope.row.refundModel === 0 ? $t('common_list.refundModelAll') : scope.row.refundModel === 1 ? $t('common_list.refundModelPart') : '' }}