diff --git a/src/components/workspace/CashManagement.vue b/src/components/workspace/CashManagement.vue
index dbeace5..c54d9de 100644
--- a/src/components/workspace/CashManagement.vue
+++ b/src/components/workspace/CashManagement.vue
@@ -44,7 +44,7 @@
代收{{ item.name }}:
{{ item.value.toLocaleString() }}
-
+
@@ -100,6 +100,7 @@ const startDate = `${currentYear}-01-01 00:00:00`;
const endDate = `${currentYear}-12-31 23:59:59`;
// 获取接口数据
const fetchCashData = async () => {
+ getAdminData()
try {
const res = await request({
url: '/workbench/getTotalRevenue',
@@ -131,7 +132,7 @@ const fetchCashData = async () => {
name: m.name,
value: resMap.get(m.name) ?? 0
}))
- } else {
+ } else if (marksFlag.value=== false) {
// 1. 定义币种中英文对照表
const currencyMap = {
sgd: '新币',
@@ -227,7 +228,7 @@ const renderChart = () => {
}
onMounted(() => {
- getAdminData()
+ // getAdminData()
fetchCashData()
})
diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 381150e..64f6355 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -148,9 +148,10 @@
退款类型
-
- {{ scope.row.refundModel === 1 ? '部分退款' : '全部退款' }}
-
+
+
+
+
付款币种
@@ -182,7 +183,7 @@
备注
-
@@ -217,7 +218,7 @@
:show-file-list="false">
+ style="width: 80px; height: 80px; object-fit: cover;">
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index f5d9717..1e6225f 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -111,11 +111,6 @@
- 退款金额
-
-
-
退款备注
@@ -188,7 +183,7 @@
到账时间
-
+
备注
@@ -816,7 +811,7 @@ onMounted(() => {
.top {
width: 30vw;
- height: 19vh;
+ height: 17vh;
.top-item {
display: flex;
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 71d785c..a55befd 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -111,10 +111,6 @@
- 退款金额
-
-
-
退款备注
@@ -187,7 +183,7 @@
到账时间
-
+
备注
@@ -866,10 +862,11 @@ onMounted(() => {
display: flex;
justify-content: center;
height: auto;
+ min-height: 40vh;
.top {
width: 30vw;
- height: 19vh;
+ height: 17vh;
.top-item {
display: flex;
@@ -932,6 +929,7 @@ onMounted(() => {
.bottom {
width: 30vw;
height: auto;
+ padding-bottom: 1vh;
.bottom-item {
display: flex;
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index f64fc0a..239b018 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -110,11 +110,6 @@
- 退款金额
-
-
-
退款备注
@@ -187,7 +182,7 @@
到账时间
-
+
备注
@@ -845,7 +840,7 @@ onMounted(() => {
.top {
width: 30vw;
- height: 19vh;
+ height: 17vh;
.top-item {
display: flex;