diff --git a/src/components/workspace/CashManagement.vue b/src/components/workspace/CashManagement.vue
index ee6cf21..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],
};
});
@@ -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 {