From f6bcb51eac030126bcd67bdc5f6641c5b996c6e7 Mon Sep 17 00:00:00 2001
From: lhl <analsak@163.com>
Date: Tue, 26 Aug 2025 15:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E4=B8=9A=E6=94=B9=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=85=AB=E7=99=BE=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/bean/beanAudit.vue             |  10 +-
 src/views/audit/gold/refundAudit.vue           |   2 +-
 src/views/consume/bean/addBeanConsume.vue      |  86 ++++++---------
 src/views/consume/bean/articleVideo.vue        |   2 +-
 src/views/consume/bean/dieHardFan.vue          |   2 +-
 src/views/consume/bean/liveStream.vue          |   5 +-
 src/views/consume/gold/coinConsumeDetail.vue   |   4 +-
 src/views/home.vue                             | 145 +++++++------------------
 src/views/recharge/bean/addBeanRecharge.vue    |   2 +-
 src/views/recharge/bean/beanOnlineRecharge.vue |   2 +-
 src/views/recharge/bean/beanSystemRecharge.vue |   3 +-
 src/views/refund/gold/coinRefundDetail.vue     |   4 +-
 src/views/usergold/bean/userbean.vue           |   4 -
 src/views/workspace/index.vue                  |   6 +-
 14 files changed, 96 insertions(+), 181 deletions(-)

diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue
index 4d59a62..243953a 100644
--- a/src/views/audit/bean/beanAudit.vue
+++ b/src/views/audit/bean/beanAudit.vue
@@ -206,9 +206,13 @@ const get = async function () {
         searchForm.value.createStartTime = ''
         searchForm.value.createEndTime = ''
       }
-      // if (searchForm.value.market === '总部' || searchForm.value.market === '研发部') {
-      //   searchForm.value.market = '';
-      // }
+        if(checkTab.value === 'pending'){
+          sortField.value = 'createTime'
+          sortOrder.value = 'desc'
+        }else{
+          sortField.value = 'auditTime'
+          sortOrder.value = 'desc'
+        }
       const params = {
         pageNum: pagination.value.pageNum,//页码
         pageSize: pagination.value.pageSize,//页面大小
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index 3570ad2..d05f654 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card style="margin-bottom: 0.5vh;width:82vw">
+  <el-card style="margin-bottom: 0.5vh;">
     <el-col style="margin-bottom: 0.5vh">
       <el-text size="large">精网号：</el-text>
       <el-input v-model="searchForm.jwcode" placeholder="请输入精网号" style="width: 12vw;margin-right:1vw" clearable/>
diff --git a/src/views/consume/bean/addBeanConsume.vue b/src/views/consume/bean/addBeanConsume.vue
index c1ed50c..a235cd4 100644
--- a/src/views/consume/bean/addBeanConsume.vue
+++ b/src/views/consume/bean/addBeanConsume.vue
@@ -223,9 +223,6 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
           <el-input v-model="consumeForm.remark" style="width: 300px" :rows="5" maxlength="100" show-word-limit
             type="textarea" />
         </el-form-item>
-        <!-- <el-form-item prop="adminName" label="提交人">
-        <el-input style="width: 300px" :value="adminData.adminName" disabled placeholder="提交人姓名" />
-      </el-form-item> -->
         <el-button @click="deleteConsumeForm" style="margin-left: 280px" type="success">重置</el-button>
         <el-button type="primary" :disabled="addDisabled" @click="handleConsumeForm"> 提交 </el-button>
       </el-form>
@@ -233,57 +230,36 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
     <div class="right">
       <!-- 客户信息栏 -->
       <el-card v-if="user.jwcode" class="customer-info">
-        <el-form :model="user" label-width="auto" label-position="left">
-          <el-text size="large" style="min-width: 600px;">客户信息</el-text>
+          <el-form :model="user" label-width="auto" label-position="left">
+            <el-text size="large" style="margin-left: 7vw">客户信息</el-text>
+            <!-- 第一行：姓名 + 当前付费金豆 -->
+            <div style="margin-top: 0.5vw;display:flex;">
+              <p style="width:6vw;">姓名:</p>
+              <p style="color: #2fa1ff;width:6vw;">{{ user.name }}</p>
+              <p style="width:7vw;">当前付费金豆:</p>
+              <p v-if="!isNaN(Number(user.permanentBean))" style="color: #2fa1ff;">{{ Number(user.permanentBean) }}</p>
+              <!-- 如果不是有效的数字，显示默认值 -->
+              <p v-else></p>
+            </div>
 
-          <!-- 第一行：姓名 + 当前付费金豆 -->
-          <el-row style="margin-top: 20px">
-            <el-col :span="9">
-              <el-form-item label="姓名:">
-                <p style="color: #2fa1ff; margin-right: 5px">{{ user.name }}</p>
-              </el-form-item>
-            </el-col>
-            <el-col :span="14">
-              <el-form-item label="当前付费金豆:">
-                <p style="color: #2fa1ff; margin-right: 5px" v-if="!isNaN(Number(user.permanentBean))">
-                  {{ Number(user.permanentBean) }}
-                </p>
-                <!-- 如果不是有效的数字，显示默认值 -->
-                <p v-else></p>
-              </el-form-item>
-            </el-col>
-          </el-row>
+            <!-- 第二行：精网号 + 免费金豆 -->
+            <div style="display:flex;margin-top: 2vw;">
+              <p style="width:6vw;">精网号:</p>
+              <p style="color: #2fa1ff;width:6vw;">{{ user.jwcode }}</p>
+              <p style="width:7vw;">当前免费金豆:</p>
+              <p v-if="user.freeBean !== undefined" style="color: #2fa1ff;">{{ user.freeBean }}</p>
+            </div>
 
-          <!-- 第二行：精网号 + 免费金豆 -->
-          <el-row>
-            <el-col :span="9">
-              <el-form-item label="精网号">
-                <p style="color: #2fa1ff; margin-right: 5px">{{ user.jwcode }}</p>
-              </el-form-item>
-            </el-col>
-            <el-col :span="14">
-              <el-form-item label="当前免费金豆:">
-                <span style="color: #2fa1ff; margin-right: 5px" v-if="user.freeBean !== undefined">{{ user.freeBean }}
-                </span>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <!-- 第三行：消费次数 + 所属门店 -->
-          <el-row>
-            <el-col :span="9">
-              <el-form-item label="所属门店">
-                <p style="color: #2fa1ff">{{ user.market }}</p>
-              </el-form-item>
-            </el-col>
-            <el-col :span="9">
-              <el-form-item label="消耗金豆总数">
-                <p style="color: #2fa1ff; margin-right: 5px" v-if="user.consumeSum != null">{{ user.consumeSum }}</p>
-                <p style="color: #2fa1ff; margin-right: 5px" v-else>{{ 0 }}</p>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </el-card>
+            <!-- 第三行：消费次数 + 所属门店 -->
+            <div style="display:flex;margin-top: 2vw;">
+              <p style="width:6vw;">所属门店:</p>
+              <p style="color: #2fa1ff;width:6vw;">{{ user.market }}</p>
+              <p style="width:7vw;">消耗金豆总数:</p>
+              <p style="color: #2fa1ff;" v-if="user.consumeSum != null">{{ user.consumeSum }}</p>
+              <p style="color: #2fa1ff;" v-else>{{ 0 }}</p>
+            </div>
+          </el-form>
+        </el-card>
     </div>
   </div>
 </template>
@@ -306,12 +282,14 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, {
   .right {
     flex: 1;
     display: flex;
+    margin-left: 10%;
 
     .customer-info {
       width: 35vw;
-      height:28vh;
-      float: right;
+      height: 28vh;
       margin-top: 5vh;
+      display: flex;
+      justify-content: center;
     }
   }
 }
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index d063267..e61b364 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -523,7 +523,7 @@ const getTagText = (state) => {
       免费金豆数：{{ format3(Math.abs(freeBean)) }}
     </div>
     <div style="overflow-y: auto">
-      <el-table :data="tableData" style="width: 82vw" height="55vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="width: 82vw" height="57vh" @sort-change="handleSortChange">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 79ebbce..32e980e 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -506,7 +506,7 @@ const getTagText = (state) => {
           免费金豆数：{{ format3(Math.abs(freeBean)) }}
         </div>
         <div style="overflow-y: auto">
-          <el-table :data="tableData" style="width: 82vw" height="55vh" @sort-change="handleSortChange">
+          <el-table :data="tableData" style="width: 82vw" height="57vh" @sort-change="handleSortChange">
             <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
                 <span>{{
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index 0fa8beb..6062e20 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -502,7 +502,7 @@ const getTagText = (state) => {
 </script>
 
 <template>
-  <el-card style="margin-bottom: 1vh;width:80vw;">
+  <el-card style="margin-bottom: 1vh;">
     <div style="margin-bottom: 1vh;display: flex;">
       <div style="width: 18vw;margin-right: 1vw;display: flex;align-items: center;">
         <el-text>精网号：</el-text>
@@ -556,9 +556,8 @@ const getTagText = (state) => {
       付费金豆数：{{ format3(Math.abs(permanentBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
       免费金豆数：{{ format3(Math.abs(freeBean)) }}
     </div>
-    <!-- 设置表格容器的高度和滚动样式 -->
     <div style="overflow-y: auto">
-      <el-table :data="tableData" style="width: 82vw" height="55vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="width: 82vw" height="56vh" @sort-change="handleSortChange">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{
diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue
index c019607..653cceb 100644
--- a/src/views/consume/gold/coinConsumeDetail.vue
+++ b/src/views/consume/gold/coinConsumeDetail.vue
@@ -613,8 +613,8 @@ const getMarket = async function () {
       免费金币：{{ format3(Math.abs(freeGolds)) }}&nbsp;&nbsp;&nbsp;&nbsp;
       任务金币：{{ format3(Math.abs(taskGolds)) }}
     </div>
-    <div style="height: 55vh;">
-      <el-table :data="tableData" style="height: 95%" @sort-change="handleSortChange">
+    <div style="height: 58vh;">
+      <el-table :data="tableData" style="height: 60vh" @sort-change="handleSortChange">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{
diff --git a/src/views/home.vue b/src/views/home.vue
index b64b3a9..03c9a71 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -1,13 +1,13 @@
 <script setup>
 // 导航栏在这
-import {computed, ref} from 'vue'
-import {useRoute, useRouter} from 'vue-router'
-import {ElMessage} from 'element-plus'
+import { computed, ref } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+import { ElMessage } from 'element-plus'
 import dmmn from '../assets/link.png'
 import ChangePassword from '@/components/changePassword.vue'
-import {useAdminStore} from '@/store'
-import {storeToRefs} from 'pinia'
-import {filterMenu, getRoutePath} from "@/utils/menuUtils.js";
+import { useAdminStore } from '@/store'
+import { storeToRefs } from 'pinia'
+import { filterMenu, getRoutePath } from "@/utils/menuUtils.js";
 
 // 存储接口返回的菜单数据
 const menuList = ref([])
@@ -15,7 +15,7 @@ const menuList = ref([])
 // 获取仓库实例
 const adminStore = useAdminStore()
 // 解构状态（保持响应式） 获得 adminData（用户信息） 和 menuTree（菜单树）
-const {adminData, menuTree} = storeToRefs(adminStore)
+const { adminData, menuTree } = storeToRefs(adminStore)
 
 // 筛选权限菜单 ,menuTree 是组件通信拿的
 menuList.value = filterMenu(menuTree.value)
@@ -76,7 +76,7 @@ const openChangePassword = () => {
   showPasswordDialog.value = true
 }
 //关闭后清空密码表单
-function onPwdDialogClosed () {
+function onPwdDialogClosed() {
   // 调用子组件暴露的 resetFields
   pwdRef.value?.resetFields()
 }
@@ -93,57 +93,32 @@ function logout() {
 </script>
 
 <template>
-
-  <div class="common-layout">
+  <div>
     <el-container>
-      <el-aside style="
-          width: 15%;
-          max-width: 20%;
-          position: fixed; /* 固定位置 */
-          top: 0;
-          left: 0;
-          height: 100vh; /* 高度占满视口 */
-          z-index: 100; /* 确保侧边栏在其他元素之上 */
-        ">
+      <el-aside >
         <div class="logo">
-          <img src="../assets/新logo.png" alt="logo" style="width: 80px; height: 80px"/>
-          <!-- <div style="font-size: 16px; font-weight: bold; color: black; text-align: center;" ><h1>海外金币管理系统</h1></div> -->
+          <img src="../assets/新logo.png" alt="logo" style="width: 9vh; height: 9vh" />
         </div>
-        <el-card style="min-height: 90%;">
-
-          <el-menu
-              :router="true"
-              class="el-menu-vertical-demo"
-              :default-active="activeMenu"
-          >
+          <el-menu :router="true" :default-active="activeMenu" style="min-height: 80vh;border:none;">
             <!-- 递归渲染菜单层级 -->
             <template v-for="menu in menuList" :key="menu.id">
               <!-- 有子菜单的父级菜单（menuType=2 且存在children） -->
-              <el-sub-menu
-                  v-if="menu.children && menu.children.length > 0"
-                  :index="menu.id.toString()"
-              >
+              <el-sub-menu v-if="menu.children && menu.children.length > 0" :index="menu.id.toString()">
                 <template #title>
                   <el-icon>
-                    <Folder/>
+                    <Folder />
                   </el-icon>
                   <span>{{ menu.menuName }}</span>
                 </template>
                 <!-- 子菜单 -->
                 <template v-for="child in menu.children" :key="child.id">
                   <!-- 子菜单为叶子节点（无children） -->
-                  <el-menu-item
-                      v-if="!child.children || child.children.length === 0"
-                      :index="getRoutePath(child)"
-                  >
+                  <el-menu-item v-if="!child.children || child.children.length === 0" :index="getRoutePath(child)">
                     <span>{{ child.menuName }}</span>
                   </el-menu-item>
 
                   <!-- 子菜单有下级 -->
-                  <el-sub-menu
-                      v-else
-                      :index="child.id.toString()"
-                  >
+                  <el-sub-menu v-else :index="child.id.toString()">
                     <template #title>
                       <span>{{ child.menuName }}</span>
                     </template>
@@ -158,49 +133,31 @@ function logout() {
               </el-sub-menu>
 
               <!-- 无子菜单的一级菜单 -->
-              <el-menu-item
-                  v-else
-                  :index="getRoutePath(menu)"
-              >
+              <el-menu-item v-else :index="getRoutePath(menu)">
                 <el-icon>
-                  <Folder/>
+                  <Folder />
                 </el-icon>
                 <span>{{ menu.menuName }}</span>
               </el-menu-item>
             </template>
           </el-menu>
-
-        </el-card>
       </el-aside>
-      <el-container style="margin-left: 15%; min-width: 180px">
-        <!-- 修改 el-header 样式 -->
-        <el-header style="
-            position: fixed;
-            top: 0;
-            left: 15%;
-            right: 0;
-            z-index: 80;
-            background: white;
-          ">
-
-
+      <el-container style="margin-left: 15vw;">
+        <el-header class="header">
           <el-menu class="el-menu-demo" mode="horizontal" :ellipsis="false">
-
-            <el-sub-menu index="1" class="admin">
+            <el-sub-menu index="1">
               <template #title>
-                <el-image :src="imgrule1" alt="错误" style="width: 50px; height: 50px"/>
+                <el-image :src="imgrule1" style="width: 50px; height: 50px" />
                 <span style="margin-left: 10px">{{ adminData.name }}</span>
               </template>
               <el-menu-item @click="message()">查看个人信息</el-menu-item>
               <el-menu-item @click="openChangePassword">修改密码</el-menu-item>
               <el-menu-item @click="logout">退出登录</el-menu-item>
-
             </el-sub-menu>
 
           </el-menu>
         </el-header>
-        <el-main style="margin-top: 60px">
-          <!-- 60px 是 el-header 的大致高度，可根据实际情况调整 -->
+        <el-main style="margin-top: 6vh;height: auto;">
           <router-view></router-view>
         </el-main>
       </el-container>
@@ -223,68 +180,50 @@ function logout() {
         </el-form-item>
       </el-form>
       <template #footer>
-        <div class="dialog-footer">
+        <div>
           <el-button text @click="closeMessage()">关闭</el-button>
         </div>
       </template>
     </el-dialog>
 
     <!-- 自定义密码修改弹窗组件 -->
-    <el-dialog
-        v-model="showPasswordDialog"
-        :center="true"
-        width="470px"
-        @closed="onPwdDialogClosed"
-    >
-      <ChangePassword
-  ref="pwdRef"
-  @confirm="showPasswordDialog = false"
-/>
+    <el-dialog v-model="showPasswordDialog" :center="true" width="470px" @closed="onPwdDialogClosed">
+      <ChangePassword ref="pwdRef" @confirm="showPasswordDialog = false" />
     </el-dialog>
-
-
   </div>
 </template>
 
 <style scoped>
+.header {
+  position: fixed;
+  right: 0;
+  z-index: 80;
+  background: white;
+  height: 8vh;
+}
+
 .message-font {
   font-size: 16px;
   font-weight: bold;
 }
 
-.item {
-  margin-top: 20px;
-  margin-right: 40px;
-}
-
-.admin {
-  margin-left: auto;
-}
-
 .el-aside {
-  min-height: 100vh;
-  width: 200px;
+  width: 15vw;
+  position: fixed;
+  z-index: 100;
+  height: 90vh;
 }
 
-/* background-color: #BFD8D2; */
 .logo {
-  margin: 20px 0px 20px 20px;
   display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 12vh;
 }
 
 .el-menu-demo {
   border: none;
-  /* 去除边框 */
   padding: 0;
-  /* 去除内边距 */
   float: right;
-  /* 将菜单向右浮动 */
-}
-
-.el-menu-vertical-demo:not(.el-menu--collapse) {
-  width: 240px;
-  min-height: 400px;
-  border: none;
-  /* 去除边框 */
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/src/views/recharge/bean/addBeanRecharge.vue b/src/views/recharge/bean/addBeanRecharge.vue
index d4023fa..c93f3d9 100644
--- a/src/views/recharge/bean/addBeanRecharge.vue
+++ b/src/views/recharge/bean/addBeanRecharge.vue
@@ -270,7 +270,7 @@ const handleAddForm = async () => {
     float: left;
 
     .customer-info {
-      width: 30vw;
+      width: 35vw;
       height: 28vh;
       margin-top: 5vh;
       display: flex;
diff --git a/src/views/recharge/bean/beanOnlineRecharge.vue b/src/views/recharge/bean/beanOnlineRecharge.vue
index 8cd9cf8..262d84c 100644
--- a/src/views/recharge/bean/beanOnlineRecharge.vue
+++ b/src/views/recharge/bean/beanOnlineRecharge.vue
@@ -384,7 +384,7 @@ onMounted(async function () {
     </div>
     <!-- 设置表格容器的高度和滚动样式 -->
     <div>
-      <el-table :data="tableData" style="width:80vw;" height="55vh" @sort-change="handleSortChange">
+      <el-table :data="tableData" style="width:80vw;" height="60vh" @sort-change="handleSortChange">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{
diff --git a/src/views/recharge/bean/beanSystemRecharge.vue b/src/views/recharge/bean/beanSystemRecharge.vue
index bb06d45..00ea779 100644
--- a/src/views/recharge/bean/beanSystemRecharge.vue
+++ b/src/views/recharge/bean/beanSystemRecharge.vue
@@ -365,7 +365,7 @@ onMounted(async function () {
             免费金豆数：{{ format3(freeBean) }}
         </div>
         <div>
-            <el-table :data="tableData" style="width: 82vw;height:55vh;" @sort-change="handleSortChange">
+            <el-table :data="tableData" style="width: 82vw;height:60vh;" @sort-change="handleSortChange">
                 <el-table-column type="index" label="序号" width="80px" fixed="left">
                     <template #default="scope">
                         <span>{{
@@ -428,7 +428,6 @@ onMounted(async function () {
 </template>
 <style scoped>
 .condition {
-    width: 82vw;
     height: 6vw;
     margin-bottom: 0.5vh;
     display: flex;
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index 63125c7..5018ca6 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/src/views/refund/gold/coinRefundDetail.vue
@@ -577,8 +577,8 @@ const getMarket = async function () {
       任务金币：{{ format3(Math.abs(taskGolds).toFixed(2)) }}
     </div>
     <!-- 设置表格容器的高度和滚动样式 -->
-    <div style="height: 55vh; overflow-y: auto;">
-      <el-table :data="tableData" style="width: 82vw;height:55vh" @sort-change="handleSortChange">
+    <div style="height: 58vh; overflow-y: auto;">
+      <el-table :data="tableData" style="width: 82vw;" @sort-change="handleSortChange">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{
diff --git a/src/views/usergold/bean/userbean.vue b/src/views/usergold/bean/userbean.vue
index 24cdf22..55c4289 100644
--- a/src/views/usergold/bean/userbean.vue
+++ b/src/views/usergold/bean/userbean.vue
@@ -196,8 +196,4 @@ onMounted(() => {
 </script>
 
 <style scoped>
-/* .stats-card {
-    background-color: #EBEEF5;
-    padding: 5px;
-} */
 </style>
\ No newline at end of file
diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue
index 447eeb1..e038363 100644
--- a/src/views/workspace/index.vue
+++ b/src/views/workspace/index.vue
@@ -15,7 +15,7 @@
         <div class="card-title">当前金币余量</div>
         <div>
           <span style="font-weight: bold">{{ currentGold / 100
-          }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;较前一日
+          }}</span>&nbsp;&nbsp;&nbsp;&nbsp;较前一日
           {{ dailyChange / 100 }}
           <template v-if="dailyChange > 0">
             <el-icon style="color:red">
@@ -123,11 +123,11 @@
         </el-tabs>
       </div>
       <div class="condition">
-        <div class="stats">合计&nbsp;&nbsp;
+        <div class="stats">
+          <div v-if="activeTab === 'consume'">合计：{{ sumConsume / 100 }}</div>&nbsp;&nbsp;
           永久金币: {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }}&nbsp;&nbsp;
           免费金币: {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }}&nbsp;&nbsp;
           任务金币: {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }}&nbsp;&nbsp;
-          <div v-if="activeTab === 'consume'">合计 {{ sumConsume / 100 }}</div>
         </div>
         <div>
           <el-button @click="getYes()" size="small" :type="activeTimeRange === 'yes' ? 'primary' : ''">昨天