-
+
-
+
@@ -320,7 +320,7 @@
+ label-width="6vw" label-position="left">
+
-
+
+ label-width="6vw" label-position="left">
-
-
+
{
}
: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/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') : '' }}
From 50e46e42198f9bf2c149f3ae13c780b7850ba4ea Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Mon, 15 Dec 2025 15:01:14 +0800
Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=B8=82=E5=9C=BA?=
=?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E4=BA=A7=E5=93=81=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E5=88=97=E5=AE=BD=E4=BB=A5=E6=94=B9=E5=96=84=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/moneyManage/receiveDetail/receiveService.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index c2afb84..1d54c68 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -95,10 +95,10 @@
{{
From c49073805f4f28664164f7b1bfa9c771a64980d7 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Tue, 16 Dec 2025 14:25:06 +0800
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=20=E5=9C=A8=E5=B8=82=E5=9C=BA=E9=80=89=E6=8B=A9=E9=A1=B9?=
=?UTF-8?q?=E5=90=8E=E6=B7=BB=E5=8A=A0=E5=86=92=E5=8F=B7=E4=BB=A5=E6=94=B9?=
=?UTF-8?q?=E5=96=84=E7=94=A8=E6=88=B7=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/activityManage/activity.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue
index 56f820e..4286610 100644
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@@ -92,7 +92,7 @@
-
`; 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 } }, From a8f91902aae8affdc2a2d78e064591a81e5d66f9 Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Tue, 16 Dec 2025 16:57:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0=E5=B8=82=E5=9C=BA=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=B8=81=E7=A7=8D?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BB=A5=E6=94=B9=E5=96=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workspace/CashManagement.vue | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) 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('common_add.market') }}
+ {{ t('common_add.market') }}：
From 21c95b712203558f56e4cfdd2611bc2c119b8f16 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Tue, 16 Dec 2025 14:58:39 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=B6=88=E8=B4=B9?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=96=87=E6=9C=AC=E4=BB=A5=E4=BF=9D=E6=8C=81?=
=?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/locales/lang/zh-CN.js | 2 +-
src/components/workspace/CashManagement.vue | 4 ++--
src/components/workspace/GoldGraph.vue | 4 ++--
src/components/workspace/GoldGraphMarkets.vue | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
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..ee6cf21 100644
--- a/src/components/workspace/CashManagement.vue
+++ b/src/components/workspace/CashManagement.vue
@@ -280,7 +280,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 +291,7 @@ onMounted( async() => {
.text2-income {
color: #040a2d;
- font-size: 20px;
+ font-size: 40px;
font-weight: 900;
}
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') }}
`; 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 } }, From a8f91902aae8affdc2a2d78e064591a81e5d66f9 Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Tue, 16 Dec 2025 16:57:01 +0800 Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E5=8F=B0=E5=B8=82=E5=9C=BA=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=B9=B6=E6=B7=BB=E5=8A=A0=E5=B8=81=E7=A7=8D?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BB=A5=E6=94=B9=E5=96=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/workspace/CashManagement.vue | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) 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 {