Merge branch 'develop1.0' into wt_from_develop1.0

VVT789

2025-02-13 e2dced9dcd39fb53566020c53e131400daac01e6

 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 {