From e2dced9dcd39fb53566020c53e131400daac01e6 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期四, 13 二月 2025 14:28:08 +0800
Subject: [PATCH] Merge branch 'develop1.0' into wt_from_develop1.0
---
zhitan-vue/src/views/index.vue | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/zhitan-vue/src/views/index.vue b/zhitan-vue/src/views/index.vue
index 2474cd7..168b68f 100644
--- a/zhitan-vue/src/views/index.vue
+++ b/zhitan-vue/src/views/index.vue
@@ -20,10 +20,11 @@
<div class="top-right">
<div class="right-name">
{{ item.energyName }}
+ <span v-if="item.energyUnit" class="unit">({{ item.energyUnit }})</span>
</div>
<div class="right-value">
<span> {{ item.count }}</span>
- <span class="unit">{{ item.energyUnit }}</span>
+ <!-- <span class="unit">{{ item.energyUnit }}</span> -->
</div>
</div>
</div>
@@ -889,18 +890,23 @@
display: flex;
.top-icon {
- width: 69px;
- height: 69px;
+ width: 50px;
+ height: 50px;
background-size: 100% 100%;
}
.top-right {
- margin-left: 16px;
+ margin-left: 12px;
.right-name {
font-weight: bold;
font-size: 16px;
font-family: OPPOSans-Bold;
+ .unit {
+ margin-left: 2px;
+ font-size: 16px;
+ font-weight: normal;
+ }
}
.right-value {
--
Gitblit v1.9.3