From 68867b1e8196b531eee540c12e32b43ffe4e3bb8 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 21 Nov 2025 22:46:26 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/receiveDetail/receiveDetail1.vue | 1 -
 src/views/moneyManage/receiveDetail/receiveFinance.vue | 1 -
 src/views/moneyManage/receiveDetail/receiveHead.vue    | 1 -
 src/views/moneyManage/receiveDetail/receiveManage.vue  | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveDetail1.vue b/src/views/moneyManage/receiveDetail/receiveDetail1.vue
index d3cb174..9dd27e9 100644
--- a/src/views/moneyManage/receiveDetail/receiveDetail1.vue
+++ b/src/views/moneyManage/receiveDetail/receiveDetail1.vue
@@ -714,7 +714,6 @@ const getTime = ref([])
 
 const search = () => {
   getlist()
-  ElMessage.success('查询成功')
 }
 const reset = () => {
   searchData.value = {}
diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 59706cc..ced3576 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -997,7 +997,6 @@ const submitRefund = async () => {
 // 2.2 搜索与重置
 const search = () => {
     getlist();
-    ElMessage.success('查询成功');
 };
 
 const reset = () => {
diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue
index 0320d88..521e423 100644
--- a/src/views/moneyManage/receiveDetail/receiveHead.vue
+++ b/src/views/moneyManage/receiveDetail/receiveHead.vue
@@ -878,7 +878,6 @@ const submitRefund = async () => {
 // 2.2 搜索与重置
 const search = () => {
     getlist();
-    ElMessage.success('查询成功');
 };
 
 const reset = () => {
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index b5c2ed0..a168426 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -993,7 +993,6 @@ const submitRefund = async () => {
 // 2.2 搜索与重置
 const search = () => {
     getlist();
-    ElMessage.success('查询成功');
 };
 
 const reset = () => {

From 3aef566c83d3aea0f89fcc4980fd743404463a59 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Wed, 26 Nov 2025 09:26:58 +0800
Subject: [PATCH 2/7] bug

---
 src/views/moneyManage/refundDetail/refundCharge.vue |  4 ++--
 .../moneyManage/refundDetail/refundFinance.vue      |  4 ++--
 src/views/moneyManage/refundDetail/refundHeader.vue |  4 ++--
 .../moneyManage/refundDetail/refundService.vue      | 21 +++++++++++++++++++++
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 5a64898..865886b 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -117,11 +117,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 7a4b1de..5a5eb87 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -116,11 +116,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index fd0d6cb..734000e 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -117,11 +117,11 @@
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">永久金币</el-text>
-                <el-input v-model="auditRow.permanentGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.gold" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">免费金币</el-text>
-                <el-input v-model="auditRow.freeGold" size="small" style="width:10vw;" disabled />&nbsp;个
+                <el-input v-model="auditRow.free" size="small" style="width:10vw;" disabled />&nbsp;个
             </div>
             <div class="top-item">
                 <el-text style="width:4vw;" size="small">退款理由</el-text>
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index e763ee4..bac3cf2 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -369,6 +369,27 @@ const submitEdit = async function () {
     }
     try {
         console.log(editRow.value)
+        if(!editForm.value.refundModel) {
+            ElMessage.error('请选择退款方式')
+            return
+        }else if(!editForm.value.refundReason) {
+            ElMessage.error('请输入退款理由')
+            return
+        }else if(editForm.value.refundModel == 1 && (!editForm.value.partRefundGold || !editForm.value.partRefundFree)) {
+            ElMessage.error('请输入退款金币数和免费金币数')
+            return
+        }else if (editForm.value.refundModel == 1 && (editForm.value.partRefundGold || editForm.value.partRefundFree)) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(editForm.value.partRefundGold)
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的永久金币数')
+                return
+            }
+            const isPositiveInteger1 = /^[1-9]\d*$/.test(editForm.value.partRefundFree)
+            if (!isPositiveInteger1) {
+                ElMessage.error('请输入正确的免费金币数')
+                return
+            }
+        }
         let params = {
             id: editRow.value.id,
             status: editRow.value.status,

From 1f777f76a41dbcd4a98bc7882417ce554b4b9300 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Thu, 27 Nov 2025 11:34:16 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activityManage/activity.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue
index bc74406..13c5c28 100644
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@@ -193,6 +193,10 @@ const editForm = ref({
 })
 const marketOptions = ref([])
 const getActivity = async function () {
+    if (!hasMenuPermission(permissionMapping.view_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const rechargeActivity = {
         activityName: searchForm.value.activityName,
         businessBelong: searchForm.value.businessBelong,
@@ -219,6 +223,10 @@ const getActivity = async function () {
     }
 }
 const handleAdd = async function () {
+    if (!hasMenuPermission(permissionMapping.add_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const activityName = addForm.value.activityName
     if (!validateActivityName(activityName)) return
 
@@ -274,6 +282,10 @@ const handleAdd = async function () {
 // 新增节流
 const throttleGetActivity = _.throttle(handleAdd, 5000, { trailing: false });
 const handleEdit = async function () {
+    if (!hasMenuPermission(permissionMapping.edit_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     const activityName = editForm.value.activityName
     if (!validateActivityName(activityName)) return
 
@@ -323,6 +335,10 @@ const handleEdit = async function () {
     }
 }
 const handleDel = async function (row) {
+    if (!hasMenuPermission(permissionMapping.delete_activity)) {
+        ElMessage.error('无此权限')
+        return
+    }
     if (!currentDelRow.value) {
         ElMessage.error('当前选择无数据')
         return

From b33c9f01378311f44871b8034cbcd129fdc82a01 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 27 Nov 2025 13:19:06 +0800
Subject: [PATCH 4/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20=E9=87=91?=
 =?UTF-8?q?=E5=B8=81=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84=E9=93=81?=
 =?UTF-8?q?=E7=B2=89=E5=92=8C=E7=9B=B4=E6=92=AD=E6=B2=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/bean/articleVideo.vue |   6 +-
 src/views/consume/bean/dieHardFan.vue   |   5 +-
 src/views/consume/bean/liveStream.vue   | 102 ++--
 src/views/workspace/index_.vue          | 911 --------------------------------
 4 files changed, 63 insertions(+), 961 deletions(-)
 delete mode 100644 src/views/workspace/index_.vue

diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 5e3e238..5ea2851 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -195,7 +195,9 @@ const ConsumeSelectBy = async function (val) {
           endTime: beanConsumeArticle.value.endTime,
           sortField: beanConsumeArticle.value.sortField,
           sortOrder: beanConsumeArticle.value.sortOrder,
-          flag: flag.value 
+          flag: flag.value ,
+          roleId: adminData.value.roleId
+
         }
       }
     })
@@ -394,6 +396,8 @@ const exportExcel = async function () {
       ...beanConsumeArticle.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      roleId: adminData.value.roleId
+
     },
   }
   const res = await API({ url: '/export/exportArticle', data: params })
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 1984a67..8e6fbf9 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -196,7 +196,8 @@ const ConsumeSelectBy = async function (val) {
           endTime: beanConsumeFan.value.endTime || '',
           sortField: beanConsumeFan.value.sortField || 'consumeTime',
           sortOrder: beanConsumeFan.value.sortOrder || 'desc',
-          flag: flag.value 
+          flag: flag.value,
+          roleId: adminData.value.roleId
         }
       }
     })
@@ -398,6 +399,8 @@ const exportExcel = async function () {
       ...beanConsumeFan.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      roleId: adminData.value.roleId
+
     },
   }
   const res = await API({ url: '/export/exportFan', data: params })
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index b700ae2..9dd6326 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -1,16 +1,17 @@
 <script setup>
-import { computed, onMounted, ref, watch } from 'vue'
-import { dayjs, ElMessage } from 'element-plus'
+import {computed, onMounted, ref, watch} from 'vue'
+import {dayjs, ElMessage} from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
 import moment from 'moment'
-import { useAdminStore } from "@/store/index.js";
-import { storeToRefs } from "pinia";
+import {useAdminStore} from "@/store/index.js";
+import {storeToRefs} from "pinia";
+
 const adminStore = useAdminStore();
-const { flag } = storeToRefs(adminStore);
+const {flag} = storeToRefs(adminStore);
 
 // 监听全局flag状态变化
- watch(flag, (newFlag, oldFlag) => {
+watch(flag, (newFlag, oldFlag) => {
   // 当flag状态改变时，重新发送请求
   if (newFlag !== oldFlag) {
     selectLiveBy()
@@ -62,7 +63,7 @@ const getGift = async function () {
   try {
     const result = await request({
       url: '/beanConsume/getLiveGift', // todo 换成实际接口地址
-      data: { account: adminData.value.account }
+      data: {account: adminData.value.account}
     })
     console.log('请求礼物列表成功', result)
     // 存储礼物数据
@@ -84,7 +85,7 @@ const getChannel = async function () {
   try {
     const result = await request({
       url: '/beanConsume/getLiveChannel', // todo 换成实际接口地址
-      data: { account: adminData.value.account }
+      data: {account: adminData.value.account}
     })
     console.log('请求频道列表成功', result)
     // 存储频道数据
@@ -101,12 +102,12 @@ const getChannel = async function () {
 
 // 抽离类型选项到响应式数组
 const consumeTypes = ref([
-  { label: '发礼物', value: 1 },
-  { label: '发红包', value: 2 },
-  { label: '发福袋', value: 3 },
-  { label: '付费直播', value: 4 },
-  { label: '加入粉丝团', value: 5 },
-  { label: '发弹幕', value: 6 }
+  {label: '发礼物', value: 1},
+  {label: '发红包', value: 2},
+  {label: '发福袋', value: 3},
+  {label: '付费直播', value: 4},
+  {label: '加入粉丝团', value: 5},
+  {label: '发弹幕', value: 6}
 ])
 // 处理类型选择变化
 const handleTypeChange = (value) => {
@@ -149,7 +150,7 @@ const getDept = async function () {
       // url: '/general/dept',
 
       url: '/beanConsume/getDept', // todo 换成实际接口地址
-      data: { account: adminData.value.account }
+      data: {account: adminData.value.account}
     })
     console.log('请求地区列表成功', result)
     // 存储地区数据
@@ -237,7 +238,8 @@ const selectLiveBy = async function (val) {
           endTime: beanConsumeLive.value.endTime || '',
           sortField: beanConsumeLive.value.sortField || 'consumeTime',
           sortOrder: beanConsumeLive.value.sortOrder || 'desc',
-          flag: flag.value 
+          flag: flag.value,
+          roleId: adminData.value.roleId
         }
       }
     })
@@ -253,7 +255,7 @@ const selectLiveBy = async function (val) {
       payType: 1, // 固定传入 payType 值 1 是直播
       beanConsumeLive: {
         ...beanConsumeLive.value,
-        flag: flag.value 
+        flag: flag.value
       }
     };
 
@@ -418,7 +420,9 @@ const exportExcel = async function () {
       startTime: beanConsumeLive.value.startTime || '',
       endTime: beanConsumeLive.value.endTime || '',
       sortField: sortField.value || 'consumeTime',
-      sortOrder: sortOrder.value || 'desc'
+      sortOrder: sortOrder.value || 'desc',
+      roleId: adminData.value.roleId
+
     }
   }
   // 打印请求参数，方便调试
@@ -426,7 +430,7 @@ const exportExcel = async function () {
 
   try {
     console.log('2')
-    const res = await API({ url: '/export/exportLive', data: params });
+    const res = await API({url: '/export/exportLive', data: params});
     console.log('导出请求响应:', res);
     if (res.code === 200) {
       ElMessage.success('导出成功');
@@ -455,7 +459,7 @@ const exportListLoading = ref(false)
 const getExportList = async () => {
   exportListLoading.value = true
   try {
-    const result = await API({ url: '/export/export' })
+    const result = await API({url: '/export/export'})
     if (result.code === 200) {
       const filteredData = result.data.filter(item => {
         return item.type === 6; //6是直播
@@ -520,31 +524,32 @@ const getTagText = (state) => {
       <div class="select">
         <div class="selectRow">
           <el-text class="text">精网号：</el-text>
-          <el-input class="selectContent" v-model="beanConsumeLive.jwcode" placeholder="请输入精网号" clearable />
+          <el-input class="selectContent" v-model="beanConsumeLive.jwcode" placeholder="请输入精网号" clearable/>
         </div>
         <div class="selectRow">
           <el-text class="text">地区：</el-text>
           <el-select class="selectContent" v-model="beanConsumeLive.dept" placeholder="请选择地区" clearable>
-            <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
+            <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item"/>
           </el-select>
         </div>
         <div class="selectRow" style="width: 14vw;">
           <el-text class="text">礼物名称：</el-text>
-          <el-select class="selectContent" v-model="beanConsumeLive.gift" placeholder="请选择礼物名称" clearable filterable
-            allow-create default-first-option>
-            <el-option v-for="(item, index) in gifts" :key="index" :label="item" :value="item" />
+          <el-select class="selectContent" v-model="beanConsumeLive.gift" placeholder="请选择礼物名称" clearable
+                     filterable
+                     allow-create default-first-option>
+            <el-option v-for="(item, index) in gifts" :key="index" :label="item" :value="item"/>
           </el-select>
         </div>
         <div class="selectRow" style="width: 12vw;">
           <el-text class="textB" size="large">频道：</el-text>
           <el-select class="selectContent" v-model="beanConsumeLive.liveChannel" placeholder="请选择频道" clearable
-            filterable allow-create default-first-option>
-            <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
+                     filterable allow-create default-first-option>
+            <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item"/>
           </el-select>
         </div>
         <div class="selectRow" style="width: 12vw;">
           <el-text class="textB" size="large">直播间：</el-text>
-          <el-input class="selectContent" v-model="beanConsumeLive.liveName" placeholder="请输入直播间" clearable />
+          <el-input class="selectContent" v-model="beanConsumeLive.liveName" placeholder="请输入直播间" clearable/>
         </div>
       </div>
     </el-col>
@@ -553,8 +558,8 @@ const getTagText = (state) => {
         <div class="selectRow" style="width: 31.4vw;">
           <el-text class="text">消费时间：</el-text>
           <el-date-picker class="selectContent" v-model="getTime" type="datetimerange" range-separator="至"
-            start-placeholder="起始时间" end-placeholder="结束时间" style="margin-right:1vw;width:480px"
-            @change="handleDatePickerChange" :default-time="defaultTime" />
+                          start-placeholder="起始时间" end-placeholder="结束时间" style="margin-right:1vw;width:480px"
+                          @change="handleDatePickerChange" :default-time="defaultTime"/>
           <div v-if="false">
             <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''"> 今</el-button>
             <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨</el-button>
@@ -578,43 +583,44 @@ const getTagText = (state) => {
     </div>
     <div style="overflow-y: auto">
       <el-table :data="tableData" style="width: 82vw" height="56vh" @sort-change="handleSortChange"
-      :row-style="{ height: '50px' }">
+                :row-style="{ height: '50px' }">
         <el-table-column type="index" label="序号" width="80px" fixed="left">
           <template #default="scope">
             <span>{{
-              scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
-            }}</span>
+                scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+              }}</span>
           </template>
         </el-table-column>
         <!-- 固定姓名列 -->
-        <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip />
+        <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip/>
         <!-- 固定精网号列 -->
-        <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
-        <el-table-column prop="dept" label="地区" width="110px" />
+        <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left"/>
+        <el-table-column prop="dept" label="地区" width="110px"/>
         <el-table-column prop="gift" label="礼物" width="140px">
         </el-table-column>
-        <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px" />
+        <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px"/>
         <el-table-column prop="isBackpack" label="背包礼物" width="120px">
           <template #default="scope">
             {{ scope.row.isBackpack == 1 ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px" />
-        <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px" />
-        <el-table-column prop="liveChannel" label="频道" width="120px" show-overflow-tooltip />
-        <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip />
-        <el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px" />
+        <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px"/>
+        <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px"/>
+        <el-table-column prop="liveChannel" label="频道" width="120px" show-overflow-tooltip/>
+        <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip/>
+        <el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px"/>
       </el-table>
     </div>
-    <el-pagination background :current-page="getObj.pageNum" :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]" style="margin-top: 20px;"
-      layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
-      @current-change="handleCurrentChange"></el-pagination>
+    <el-pagination background :current-page="getObj.pageNum" :page-size="getObj.pageSize"
+                   :page-sizes="[5, 10, 20, 50, 100]" style="margin-top: 20px;"
+                   layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
+                   @current-change="handleCurrentChange"></el-pagination>
   </el-card>
 
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
     <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
-      <el-table-column prop="fileName" label="文件名" />
+      <el-table-column prop="fileName" label="文件名"/>
       <el-table-column prop="state" label="状态">
         <template #default="scope">
           <el-tag :type="getTagType(scope.row.state)" :effect="scope.row.state === 3 ? 'light' : 'plain'">
@@ -630,7 +636,7 @@ const getTagText = (state) => {
       <el-table-column label="操作">
         <template #default="scope">
           <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
-            :disabled="scope.row.state !== 2">
+                     :disabled="scope.row.state !== 2">
             下载
           </el-button>
         </template>
@@ -671,7 +677,7 @@ const getTagText = (state) => {
 :deep(.el-table__header-wrapper),
 :deep(.el-table__body-wrapper),
 :deep(.el-table__cell),
-/* 表格 */
+  /* 表格 */
 :deep(.el-table__body td) {
   background-color: #F3FAFE !important;
 }
diff --git a/src/views/workspace/index_.vue b/src/views/workspace/index_.vue
deleted file mode 100644
index 190e23c..0000000
--- a/src/views/workspace/index_.vue
+++ /dev/null
@@ -1,911 +0,0 @@
-<template>
-  <div class="top">
-    <el-card style="width:10vw" class="center-card">数据总览</el-card>
-    <span class="text">
-      最后更新时间：{{
-        workDataUpdateTime && workDataUpdateTime !== '1970-01-01 08:00:00' ? workDataUpdateTime : '该地区暂无数据'
-      }}
-    </span>
-  </div>
-
-  <div class="card">
-    <!-- 第一个卡片 -->
-    <el-card class="card-item">
-      <template #header>
-        <div class="card-title">当前金币余量</div>
-        <div>
-          <span style="font-weight: bold">{{ currentGold / 100
-            }}</span>&nbsp;&nbsp;&nbsp;&nbsp;较前一日
-          {{ dailyChange / 100 }}
-          <template v-if="dailyChange > 0">
-            <el-icon style="color:red">
-              <ArrowUpBold />
-            </el-icon>
-          </template>
-          <template v-else-if="dailyChange < 0">
-            <el-icon style="color:forestgreen">
-              <ArrowDownBold />
-            </el-icon>
-          </template>
-          <template v-else>
-            <el-icon style="color:grey">
-              <SemiSelect />
-            </el-icon>
-          </template>
-        </div>
-      </template>
-      <div>
-        <div class="margin-bottom">永久金币：{{ currentPermanent / 100 }}</div>
-        <div class="margin-bottom">免费金币：{{ currentFree / 100 }}</div>
-        <div class="margin-bottom">[六月到期|{{ currentFreeJune / 100 }}]&nbsp;&nbsp;
-          [十二月到期|{{ currentFreeDecember / 100 }}]
-        </div>
-        <div>任务金币：{{ currentTask / 100 }}</div>
-      </div>
-    </el-card>
-
-    <!-- 第二个卡片 -->
-    <el-card class="card-item">
-      <div class="card-title">全年累计充值金币数</div>
-      <div class="card-title">{{ yearlyRecharge / 100 }}</div>
-      <div>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</div>
-      <div class="center-card">折合新币累计金额:{{ yearlyMoney / 100 }}</div>
-      <template #footer>
-        <el-col class="margin-bottom center-card">昨日新增金币：{{ recharge / 100 }}</el-col>
-        <el-col class="margin-bottom center-card">其中永久金币：{{ money / 100 }}</el-col>
-      </template>
-    </el-card>
-
-    <!-- 第三个卡片 -->
-    <el-card class="card-item">
-      <div class="card-title">全年累计消费金币数</div>
-      <div class="card-title">{{ yearlyReduce / 100 }}</div>
-      <div style="padding-left: 30%;">消耗：{{ yearlyConsume / 100 }}</div>
-      <div style="padding-left: 30%;">退款：{{ yearlyRefund / 100 }}</div>
-      <template #footer>
-        <div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增消费：{{ dailyConsume / 100 }}</div>
-        <div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增消耗：{{ dailyReduce / 100 }}</div>
-        <div style="margin-bottom:0.5%;padding-left: 30%;">昨日新增退款：{{ dailyRefund / 100 }}</div>
-      </template>
-    </el-card>
-
-    <!-- 第四个卡片 -->
-    <el-card class="card-item">
-      <el-col class="card-title">全年累计充值人头数</el-col>
-      <el-col class="card-title">{{ yearlyRechargeNum }}</el-col>
-      <el-col style="padding-left: 35%;">周同比:{{ sumWow }}%&nbsp;&nbsp;&nbsp;&nbsp;
-        <template v-if="sumWow > 0">
-          <el-icon style="color:red">
-            <ArrowUpBold />
-          </el-icon>
-        </template>
-        <template v-else-if="sumWow < 0">
-          <el-icon style="color:forestgreen">
-            <ArrowDownBold />
-          </el-icon>
-        </template>
-        <template v-else>
-          <el-icon style="color:grey">
-            <SemiSelect />
-          </el-icon>
-        </template>
-      </el-col>
-      <el-col style="padding-left: 35%;">日环比:{{ sumDaily }}%&nbsp;&nbsp;&nbsp;&nbsp;
-        <template v-if="sumDaily > 0">
-          <el-icon style="color:red">
-            <ArrowUpBold />
-          </el-icon>
-        </template>
-        <template v-else-if="sumDaily < 0">
-          <el-icon style="color:forestgreen">
-            <ArrowDownBold />
-          </el-icon>
-        </template>
-        <template v-else>
-          <el-icon style="color:grey">
-            <SemiSelect />
-          </el-icon>
-        </template>
-      </el-col>
-      <template #footer>
-        <el-col style="padding-left: 35%;margin-bottom:0.5%">昨日充值人数：{{ ydayRechargeNum }}</el-col>
-        <el-col style="padding-left: 35%;">其中首充：{{ firstRecharge }}</el-col>
-      </template>
-    </el-card>
-  </div>
-
-  <div class="graph">
-    <el-card style="width:84vw;">
-      <div>
-        <el-tabs v-model="activeTab" @tab-change="handleTabChange">
-          <el-tab-pane label="金币充值" name="recharge"></el-tab-pane>
-          <el-tab-pane label="金币消费" name="consume"></el-tab-pane>
-        </el-tabs>
-      </div>
-      <div class="condition">
-        <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>
-        <div>
-          <el-button @click="getYes()" size="small" :type="activeTimeRange === 'yes' ? 'primary' : ''">昨天
-          </el-button>
-          <el-button @click="getToday()" size="small" :type="activeTimeRange === 'today' ? 'primary' : ''">今天
-          </el-button>
-          <el-button @click="getWeek()" size="small" :type="activeTimeRange === 'week' ? 'primary' : ''">本周
-          </el-button>
-          <el-button @click="getMonth()" size="small" :type="activeTimeRange === 'month' ? 'primary' : ''">本月
-          </el-button>
-          <el-button @click="getYear()" size="small" :type="activeTimeRange === 'year' ? 'primary' : ''">本年
-          </el-button>
-        </div>
-        <div>
-          <el-date-picker size="small" v-model="dateRange" type="datetimerange" range-separator="→"
-                          start-placeholder="开始时间" end-placeholder="结束时间" format="YYYY-MM-DD HH:mm:ss"
-                          style="width:20vw;margin-left:0.5vw;" value-format="YYYY-MM-DD HH:mm:ss" :default-time="defaultTime"
-                          :disabled-date="disabledDate" @change="handleDatePickerChange" />
-          <el-button type="primary" size="small" style="margin-left: 0.5vw" @click="getChartData">查询</el-button>
-        </div>
-      </div>
-
-      <div class="graph-content">
-        <div ref="chartRef" class="left"></div>
-        <div class="right">
-          <el-card>
-            <div class="card-large">金币{{ activeTab === 'recharge' ? '充值' : '消费' }}排名</div>
-            <el-select v-model="selectedType" style="width: 100%; margin-bottom: 15px">
-              <el-option label="全部类型" value="all"></el-option>
-              <el-option label="永久金币" value="permanent"></el-option>
-              <el-option label="免费金币" value="free"></el-option>
-              <el-option label="任务金币" value="task"></el-option>
-            </el-select>
-            <el-table :data="tableData" height="320px">
-              <el-table-column prop="rank" label="排名" width="60" align="center"></el-table-column>
-              <el-table-column prop="market" label="地区" align="center">
-                <template #default="scope">
-                  <span>{{ marketMapping[scope.row.market] || scope.row.market }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="coinAmount" label="金币数量" align="center">
-                <template #default="{ row }">
-                  {{ row.coinAmount.toLocaleString() }}
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-card>
-        </div>
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script setup>
-import * as echarts from 'echarts'
-import { ref, onMounted, nextTick, watch, onUnmounted } from 'vue'
-import API from '@/util/http'
-import { ElMessage } from 'element-plus'
-import dayjs from 'dayjs';
-import utc from 'dayjs-plugin-utc'
-import weekday from 'dayjs/plugin/weekday'
-dayjs.extend(utc)
-import { ArrowUpBold, ArrowDownBold, SemiSelect } from '@element-plus/icons-vue'
-import { marketMapping } from "@/utils/marketMap.js";
-
-const defaultTime = [
-  new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1, 23, 59, 59),
-]
-
-// 地区数据
-const markets = ref([])
-// 图表相关
-const dateRange = ref([])
-const activeTab = ref('recharge')
-const selectedType = ref('all')
-const tableData = ref([])
-const chartRef = ref(null)
-let chartInstance = null
-// 图表合计数
-const sumRechargePermanent = ref(0)
-const sumRechargeFree = ref(0)
-const sumRechargeTask = ref(0)
-const sumConsumePermanent = ref(0)
-const sumConsumeFree = ref(0)
-const sumConsumeTask = ref(0)
-const sumConsume = ref(0)
-// 用户信息
-const adminData = ref({})
-// 卡片数据相关
-const currentGold = ref(0)
-const dailyChange = ref(0)
-const currentPermanent = ref(0)
-const currentFree = ref(0)
-const currentFreeJune = ref(0)
-const currentFreeDecember = ref(0)
-const currentTask = ref(0)
-const yearlyRecharge = ref(0)
-const yearlyMoney = ref(0)
-const recharge = ref(0)
-const money = ref(0)
-const yearlyReduce = ref(0)
-const yearlyConsume = ref(0)
-const yearlyRefund = ref(0)
-const dailyReduce = ref(0)
-const dailyConsume = ref(0)
-const dailyRefund = ref(0)
-const yearlyRechargeNum = ref(0)
-const sumWow = ref(0)
-const sumDaily = ref(0)
-const rechargeNum = ref(0)
-const ydayRechargeNum = ref(0)
-const firstRecharge = ref(0)
-const length = ref(0)
-//  加载状态
-const chartLoading = ref(true)
-
-const handleResize = () => {
-  if (chartInstance.value) {
-    try {
-      chartInstance.value.resize()
-      console.log('resize一下')
-    } catch (error) {
-      console.error('图表resize失败:', error)
-    }
-  }
-}
-// 初始化图表
-const initChart = () => {
-  if (!chartInstance && chartRef.value) {
-    chartInstance = echarts.init(chartRef.value)
-    window.addEventListener('resize', handleResize)
-  }
-}
-// 销毁图表
-const destroyChart = () => {
-  if (chartInstance.value) {
-    try {
-      chartInstance.value.dispose()
-    } catch (error) {
-      console.error('图表销毁失败:', error)
-    }
-    chartInstance.value = null
-  }
-  window.removeEventListener('resize', handleResize)
-}
-const formatDate = function (date) {
-  const year = date.getFullYear();
-  const month = String(date.getMonth() + 1).padStart(2, '0');
-  const day = String(date.getDate()).padStart(2, '0');
-  const hours = String(date.getHours()).padStart(2, '0');
-  const minutes = String(date.getMinutes()).padStart(2, '0');
-  const seconds = String(date.getSeconds()).padStart(2, '0');
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-}
-// 昨天
-const getYes = function () {
-  const yesterday = dayjs().subtract(1, 'day')
-  const startTime = yesterday.startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = yesterday.endOf('day').format('YYYY-MM-DD HH:mm:ss')
-  dateRange.value = [startTime, endTime]
-  console.log('看看dateRange', dateRange.value)
-  activeTimeRange.value = 'yes' // 标记当前激活状态
-
-  getChartData()
-}
-// 今天
-const getToday = function () {
-  const today = dayjs()
-  const startTime = today.startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.endOf('day').format('YYYY-MM-DD HH:mm:ss')
-  // const endTime = today.add(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
-  dateRange.value = [startTime, endTime]
-  console.log('看看dateRange', dateRange.value)
-  activeTimeRange.value = 'today' // 标记当前激活状态
-
-  getChartData()
-}
-// 本周
-const getWeek = function () {
-  const today = dayjs();
-  // 获取今天是星期几（0是周日，1是周一，...，6是周六）
-  const day = today.day();
-
-  // 计算本周一（如果今天是周一，就取今天；如果是周日，就减6天）
-  let monday = today.subtract(day === 0 ? 6 : day - 1, 'day');
-  // 计算本周日（如果今天是周日，就取今天；否则就加(7 - day)天）
-  let sunday = today.add(day === 0 ? 0 : 7 - day, 'day');
-
-  // 设置时间为起始和结束
-  const startTime = monday.startOf('day').format('YYYY-MM-DD HH:mm:ss');
-  const endTime = sunday.endOf('day').format('YYYY-MM-DD HH:mm:ss');
-
-  dateRange.value = [startTime, endTime];
-  console.log('本周时间范围（周一到周日）：', dateRange.value);
-  activeTimeRange.value = 'week';
-
-  getChartData();
-};
-// 本月
-const getMonth = function () {
-  const today = dayjs()
-  const startTime = today.startOf('month').format('YYYY-MM-DD HH:mm:ss')
-  // const endTime = today.add(1, 'month').startOf('month').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.endOf('month').format('YYYY-MM-DD HH:mm:ss')
-  dateRange.value = [startTime, endTime]
-  console.log('看看dateRange', dateRange.value)
-  activeTimeRange.value = 'month' // 标记当前激活状态
-
-  getChartData()
-}
-// 本年
-const getYear = function () {
-  const today = dayjs()
-  const startTime = today.startOf('year').format('YYYY-MM-DD HH:mm:ss')
-  const endTime = today.endOf('year').format('YYYY-MM-DD HH:mm:ss')
-  // const endTime = today.add(1, 'year').startOf('year').format('YYYY-MM-DD HH:mm:ss')
-  dateRange.value = [startTime, endTime]
-  console.log('看看dateRange', dateRange.value)
-  activeTimeRange.value = 'year' // 标记当前激活状态
-
-  getChartData()
-}
-
-// 要加上所有市场的，还有额外计算的(总数 = 永久 + 6月 + 12月 + 免费 + 任务)
-const processData = (data) => {
-  const summary = {
-    currentGold: 0,
-    dailyChange: 0,
-    currentPermanent: 0,
-    currentFreeJune: 0,
-    currentFreeDecember: 0,
-    currentTask: 0,
-    currentFree: 0,
-    recharge: 0,
-    money: 0,
-    yearlyRecharge: 0,
-    yearlyMoney: 0,
-    consumePermanent: 0,
-    consumeFreeJune: 0,
-    consumeFreeDecember: 0,
-    consumeTask: 0,
-    refundPermanent: 0,
-    refundFreeJune: 0,
-    refundFreeDecember: 0,
-    refundTask: 0,
-    dailyReduce: 0,
-    yearlyConsume: 0,
-    yearlyRefund: 0,
-    yearlyReduce: 0,
-    rechargeNum: 0,
-    ydayRechargeNum: 0,
-    firstRecharge: 0,
-    sumWow: 0,
-    sumDaily: 0,
-    yearlyRechargeNum: 0
-  }
-
-  // 遍历市场
-  data.marketCards.forEach(market => {
-    for (const i in summary) {
-      if (market[i] !== undefined && market[i] !== null) { // 其实还应该卡一个number
-        summary[i] += market[i]
-      }
-    }
-  })
-
-  // wow和daily除一下
-  length.value = data.markets.length
-  console.log(length.value)
-
-  // 计算昨日新增消费和退款
-  const yesterdayConsume = summary.consumePermanent + summary.consumeFreeJune + summary.consumeFreeDecember + summary.consumeTask
-  const yesterdayRefund = summary.refundPermanent + summary.refundFreeJune + summary.refundFreeDecember + summary.refundTask
-
-  // 更新卡片数据
-  currentGold.value = summary.currentGold.toFixed(2)
-  dailyChange.value = summary.dailyChange.toFixed(2)
-  currentPermanent.value = summary.currentPermanent.toFixed(2)
-  currentFree.value = summary.currentFree.toFixed(2)
-  currentFreeJune.value = summary.currentFreeJune.toFixed(2)
-  currentFreeDecember.value = summary.currentFreeDecember.toFixed(2)
-  currentTask.value = summary.currentTask.toFixed(2)
-
-  yearlyRecharge.value = summary.yearlyRecharge.toFixed(2)
-  yearlyMoney.value = summary.yearlyMoney.toFixed(2)
-  recharge.value = summary.recharge.toFixed(2)
-  money.value = summary.money.toFixed(2)
-
-  yearlyReduce.value = summary.yearlyReduce.toFixed(2)
-  yearlyConsume.value = summary.yearlyConsume.toFixed(2)
-  yearlyRefund.value = summary.yearlyRefund.toFixed(2)
-  dailyReduce.value = summary.dailyReduce.toFixed(2)
-  dailyConsume.value = yesterdayConsume.toFixed(2)
-  dailyRefund.value = yesterdayRefund.toFixed(2)
-
-  yearlyRechargeNum.value = summary.yearlyRechargeNum
-
-  // // 周同比
-  // sumWow.value = (marketCards.sumWow / length.value).toFixed(2)
-  // // 日环比
-  // sumDaily.value = (marketCards.sumDaily / length.value).toFixed(2)
-
-  // rechargeNum.value = summary.rechargeNum
-  ydayRechargeNum.value = summary.ydayRechargeNum
-  firstRecharge.value = summary.firstRecharge
-}
-
-//无法选择的时间
-const disabledDate = (time) => {
-  const limitDate = new Date(2025, 0, 1);
-  return time.getTime() < limitDate.getTime();
-}
-
-// 获取市场列表
-const getMarkets = async () => {
-  console.log("adminData", adminData.value.account)
-  try {
-    const response = await API({
-      url: '/general/adminMarkets',
-      data: {
-        account: adminData.value.account
-      }
-    })
-    if (Array.isArray(response.data)) {
-      // markets.value = response.data.filter(data => data !== "1")
-      markets.value = response.data
-      console.log('市场列表获取成功:', markets.value)
-    } else {
-      console.error('获取市场列表失败', response)
-      ElMessage.error('获取市场列表失败')
-    }
-  } catch (error) {
-    console.error('获取市场列表失败:', error)
-    ElMessage.error('获取市场列表失败')
-  }
-}
-
-// 获取图表数据
-const getChartData = async () => {
-  try {
-    // 校验市场数据到底有没有
-    if (!markets.value || markets.value.length === 0) {
-      await getMarkets()
-    }
-    // 本年
-    if (!dateRange.value || dateRange.value.length === 0) {
-      getYear()
-    }
-    const params = {
-      markets: markets.value,
-      startDate: dateRange.value[0],
-      endDate: dateRange.value[1]
-    };
-
-
-    const response = await API({
-      url: '/workbench/getGraph',
-      data: params
-    })
-    console.log('看看params', params)
-    if (Array.isArray(response.marketGraphs)) {
-      // const filteredGraphs = response.marketGraphs.filter(data => data.market !== "1");
-      // 处理图表数据
-      processChartData(response.marketGraphs)
-      // 处理排名数据
-      processRankingData(response.marketGraphs)
-    } else {
-      console.error('获取图表数据失败:', response)
-      ElMessage.error('获取图表数据失败')
-    }
-  } catch (error) {
-    console.error('获取图表数据失败:', error)
-    ElMessage.error('获取图表数据失败')
-  }
-}
-// 处理图表数据
-const processChartData = (marketCards) => {
-  const chartData = {
-    rechargePermanent: [],
-    rechargeFree: [],
-    rechargeTask: [],
-    consumePermanent: [],
-    consumeFree: [],
-    consumeTask: [],
-    sumConsume: []
-  }
-  // 这是图表的合计数，怎样遍历？？？？？
-  const sumRechargePermanent1 = ref(0)
-  const sumRechargeFree1 = ref(0)
-  const sumRechargeTask1 = ref(0)
-  const sumConsumePermanent1 = ref(0)
-  const sumConsumeFree1 = ref(0)
-  const sumConsumeTask1 = ref(0)
-  const sumConsume1 = ref(0)
-
-
-  marketCards.forEach(market => {
-    chartData.rechargePermanent.push(market.sumRechargePermanent / 100 || 0)
-    chartData.rechargeFree.push(market.sumRechargeFree / 100 || 0)
-    chartData.rechargeTask.push(market.sumRechargeTask / 100 || 0)
-    chartData.consumePermanent.push(market.sumConsumePermanent / 100 || 0)
-    chartData.consumeFree.push(market.sumConsumeFree / 100 || 0)
-    chartData.consumeTask.push(market.sumConsumeTask / 100 || 0)
-    chartData.sumConsume.push(market.sumConsume / 100 || 0)
-
-    // 合计数合计数合计数咋算
-    sumRechargePermanent1.value += (market.sumRechargePermanent || 0)
-    sumRechargeFree1.value += (market.sumRechargeFree || 0)
-    //sumRechargeTask1.value += (market.sumRechargeTask || 0)
-    sumConsumePermanent1.value += (market.sumConsumePermanent || 0)
-    sumConsumeFree1.value += (market.sumConsumeFree || 0)
-    sumConsumeTask1.value += (market.sumConsumeTask || 0)
-    sumConsume1.value += (market.sumConsume || 0)
-  })
-  sumRechargePermanent.value = sumRechargePermanent1.value
-  sumRechargeFree.value = sumRechargeFree1.value
-  sumRechargeTask.value = 0
-  sumConsumePermanent.value = sumConsumePermanent1.value
-  sumConsumeFree.value = sumConsumeFree1.value
-  sumConsumeTask.value = sumConsumeTask1.value
-  sumConsume.value = sumConsume1.value
-
-  updateChart(chartData)
-}
-
-const processRankingData = (marketCards) => {
-  // 每个市场的总金币数
-  const rankingData = marketCards.map(market => {
-    let coinAmount = 0;
-    if (activeTab.value === 'recharge') {
-      // 充值排名
-      switch (selectedType.value) {
-        case 'all':
-          coinAmount = (market.sumRechargePermanent / 100 || 0) + (market.sumRechargeFree / 100 || 0) + (market.sumRechargeTask / 100 || 0);
-          break;
-        case 'permanent':
-          coinAmount = market.sumRechargePermanent / 100 || 0;
-          break;
-        case 'free':
-          coinAmount = market.sumRechargeFree / 100 || 0;
-          break;
-        case 'task':
-          coinAmount = market.sumRechargeTask / 100 || 0;
-          break;
-      }
-    } else {
-      // 消费排名
-      switch (selectedType.value) {
-        case 'all':
-          coinAmount = (market.sumConsumePermanent / 100 || 0) + (market.sumConsumeFree / 100 || 0) + (market.sumConsumeTask / 100 || 0);
-          break;
-        case 'permanent':
-          coinAmount = market.sumConsumePermanent / 100 || 0;
-          break;
-        case 'free':
-          coinAmount = market.sumConsumeFree / 100 || 0;
-          break;
-        case 'task':
-          coinAmount = market.sumConsumeTask / 100 || 0;
-          break;
-      }
-    }
-    return {
-      market: market.market,
-      coinAmount: coinAmount
-    };
-  });
-
-  // 按金币数量排序
-  rankingData.sort((a, b) => b.coinAmount - a.coinAmount);
-
-  // 排名序号
-  tableData.value = rankingData.map((item, index) => ({
-    rank: index + 1,
-    ...item
-  }));
-}
-
-watch(selectedType, () => {
-  getChartData();
-});
-// 更新图表
-const updateChart = (chartData) => {
-  if (!chartInstance) {
-    initChart()
-  }
-  chartLoading.value = true
-  try {
-    let series = []
-    let legend = []
-
-    if (activeTab.value === 'recharge') {
-      series = [
-        {
-          name: '永久金币',
-          type: 'bar',
-          stack: 'recharge',
-          data: chartData.rechargePermanent,
-          itemStyle: { color: '#5470c6' },
-          barWidth: 30
-        },
-        {
-          name: '免费金币',
-          type: 'bar',
-          stack: 'recharge',
-          data: chartData.rechargeFree,
-          itemStyle: { color: '#91cc75' },
-          barWidth: 30
-        },
-        {
-          name: '任务金币',
-          type: 'bar',
-          stack: 'recharge',
-          data: chartData.rechargeTask,
-          itemStyle: { color: '#fac858' },
-          barWidth: 30
-        }
-      ]
-      legend = ['永久金币', '免费金币', '任务金币']
-    } else {
-      series = [
-        {
-          name: '永久金币',
-          type: 'bar',
-          stack: 'consume',
-          data: chartData.consumePermanent,
-          itemStyle: { color: '#5470c6' },
-          barWidth: 30
-        },
-        {
-          name: '免费金币',
-          type: 'bar',
-          stack: 'consume',
-          data: chartData.consumeFree,
-          itemStyle: { color: '#91cc75' },
-          barWidth: 30
-        },
-        {
-          name: '任务金币',
-          type: 'bar',
-          stack: 'consume',
-          data: chartData.consumeTask,
-          itemStyle: { color: '#fac858' },
-          barWidth: 30
-        }
-      ]
-      legend = ['永久金币', '免费金币', '任务金币']
-    }
-
-    const option = {
-      tooltip: {
-        trigger: 'axis',
-        axisPointer: {
-          type: 'shadow'
-        },
-        formatter: function (params) {
-          let result = params[0].name + '<br/>'
-          let total = 0;
-          params.forEach(param => {
-            result += `${param.seriesName}: ${param.value.toLocaleString()}<br/>`;
-            total += param.value;
-          })
-          result += `总${activeTab.value === 'recharge' ? '充值' : '消费'}: ${total.toLocaleString()}`;
-          return result
-        }
-      },
-      legend: {
-        data: legend,
-        bottom: 10
-      },
-      grid: {
-        left: '3%',
-        right: '4%',
-        bottom: '10%',
-        containLabel: true
-      },
-      xAxis: {
-        type: 'category',
-        data: markets.value,
-        axisLabel: {
-          interval: 0,
-          rotate: 30
-        }
-      },
-      yAxis: {
-        type: 'value',
-        axisLabel: {
-          formatter: function (value) {
-            return value.toLocaleString()
-          }
-        }
-      },
-      series: series,
-      // dataZoom: [
-      //   {
-      //     type: 'slider',
-      //     show: true,
-      //     start: 0,
-      //     end: 100,
-      //     maxSpan: 100,
-      //     minSpan: 100,
-      //
-      //     height: 2,
-      //   },
-      // ]
-    }
-
-    chartInstance.setOption(option)
-  } catch (error) {
-    console.error('图表更新失败:', error)
-    ElMessage.error('图表渲染失败')
-  } finally {
-    setTimeout(() => {
-      chartLoading.value = false
-    }, 300)
-  }
-}
-
-// 处理标签切换
-const handleTabChange = () => {
-  getChartData()
-  console.log('标签切换调用图表')
-}
-
-const getAdminData = async function () {
-  try {
-    const result = await API({ url: '/admin/userinfo', data: {} })
-    adminData.value = result
-    console.log('用户信息', adminData.value)
-  } catch (error) {
-    console.log('请求失败', error)
-  }
-}
-// 获取卡片数据
-const getCardData = async () => {
-  try {
-    const response = await API({ url: '/workbench/getCard', data: {} })
-    workDataUpdateTime.value = response.updateTime
-    // 周同比
-    sumWow.value = response.sumWow.toFixed(2)
-    // 日环比
-    sumDaily.value = response.sumDaily.toFixed(2)
-
-    if (response && response.data) {
-      processData(response.data)
-    } else if (Array.isArray(response?.marketCards)) {
-      processData(response)
-    } else {
-      console.error('无效的API响应结构:', response)
-    }
-  } catch (error) {
-    console.error('获取卡片数据失败:', error)
-  }
-}
-const workDataUpdateTime = ref(null)
-
-// 标记当前激活的时间范围按钮
-const activeTimeRange = ref('')
-// 日期选择器变化时清除按钮激活状态
-const handleDatePickerChange = () => {
-  activeTimeRange.value = ''
-}
-
-onMounted(async () => {
-  await getAdminData()
-  await getCardData()
-  await getMarkets()
-  getYear()
-  window.addEventListener('resize', () => {
-    chartInstance.resize()
-  })
-})
-onUnmounted(() => {
-  destroyChart()
-})
-</script>
-
-<style scoped>
-.top {
-  height: 5.5vh;
-  width: 80vw;
-  display: flex;
-  margin-bottom: 0.5vh;
-
-  .text {
-    margin-left: 2vw;
-    width: 20vw;
-    display: flex;
-    align-items: center;
-    font-size: 18px;
-  }
-}
-
-.card {
-  height: 28vh;
-  margin-bottom: 0.5vh;
-  display: flex;
-  justify-content: center;
-}
-
-.graph {
-  width: 100%;
-  display: flex;
-  height: 64%;
-
-  .condition {
-    width: 100%;
-    height: 1%;
-    display: flex;
-    align-items: center;
-
-    .stats {
-      display: flex;
-      align-items: center;
-      width: 35vw;
-      font-size: 15px;
-    }
-  }
-
-  .graph-content {
-    flex: 1;
-    height: auto;
-    display: flex;
-
-    .left {
-      width: 70%;
-      height: auto;
-    }
-
-    .right {
-      flex: 1;
-      padding: 0.5vw 2vh;
-    }
-  }
-}
-
-.center-card {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.margin-bottom {
-  margin-bottom: 0.5vh;
-}
-
-.card-item {
-  width: 25%;
-  height: 28vh;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  margin-right: 0.25vw;
-}
-
-.card-title {
-  font-weight: bold;
-  margin-bottom: 1vh;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-
-.card-large {
-  font-weight: bold;
-  font-size: 16px;
-  text-align: center;
-  margin-bottom: 15px;
-}
-
-@keyframes spin {
-  0% {
-    transform: rotate(0deg);
-  }
-
-  100% {
-    transform: rotate(360deg);
-  }
-}
-</style>
\ No newline at end of file

From 52dd3354ff1f50184ac3d0c76ae9483d869e4eba Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 27 Nov 2025 13:28:59 +0800
Subject: [PATCH 5/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20=E9=A2=91?=
 =?UTF-8?q?=E9=81=93=E7=AE=A1=E7=90=86=E7=9A=84=E9=93=81=E7=B2=89=E5=92=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E6=B2=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/channelManage/cart/cart.vue     | 3 +++
 src/views/channelManage/fans/fans.vue     | 2 ++
 src/views/channelManage/reward/reward.vue | 4 +++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/channelManage/cart/cart.vue b/src/views/channelManage/cart/cart.vue
index 67c097e..c5f02a4 100644
--- a/src/views/channelManage/cart/cart.vue
+++ b/src/views/channelManage/cart/cart.vue
@@ -156,6 +156,7 @@ const searchCart = async function () {
           ...beanCart.value,
           sortField: sortField.value,
           sortOrder: sortOrder.value,
+          roleId: adminData.value.roleId
         }
       }
     })
@@ -282,6 +283,8 @@ const exportExcel = async function () {
       ...beanCart.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      roleId: adminData.value.roleId
+
     },
   }
   const res = await API({ url: '/export/exportArticle', data: params })
diff --git a/src/views/channelManage/fans/fans.vue b/src/views/channelManage/fans/fans.vue
index 7d66e1d..7d57c14 100644
--- a/src/views/channelManage/fans/fans.vue
+++ b/src/views/channelManage/fans/fans.vue
@@ -399,6 +399,8 @@ const exportExcel = async function () {
       ...beanConsumeFan.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      roleId: adminData.value.roleId
+
     },
   }
   const res = await API({ url: '/export/exportFan', data: params })
diff --git a/src/views/channelManage/reward/reward.vue b/src/views/channelManage/reward/reward.vue
index 697e9c9..c954418 100644
--- a/src/views/channelManage/reward/reward.vue
+++ b/src/views/channelManage/reward/reward.vue
@@ -419,7 +419,9 @@ const exportExcel = async function () {
       startTime: beanConsumeLive.value.startTime || '',
       endTime: beanConsumeLive.value.endTime || '',
       sortField: sortField.value || 'consumeTime',
-      sortOrder: sortOrder.value || 'desc'
+      sortOrder: sortOrder.value || 'desc',
+      roleId: adminData.value.roleId
+
     }
   }
   // 打印请求参数，方便调试

From eee0b0f6d2d19b33acf32218139a5dd7c3fb2e51 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Thu, 27 Nov 2025 15:18:01 +0800
Subject: [PATCH 6/7] aa

---
 src/views/activityManage/activity.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue
index 13c5c28..d3dd5d3 100644
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@@ -193,7 +193,7 @@ const editForm = ref({
 })
 const marketOptions = ref([])
 const getActivity = async function () {
-    if (!hasMenuPermission(permissionMapping.view_activity)) {
+    if (!hasMenuPermission(menuTree.value,permissionMapping.view_activity)) {
         ElMessage.error('无此权限')
         return
     }
@@ -223,7 +223,7 @@ const getActivity = async function () {
     }
 }
 const handleAdd = async function () {
-    if (!hasMenuPermission(permissionMapping.add_activity)) {
+    if (!hasMenuPermission(menuTree.value,permissionMapping.add_activity)) {
         ElMessage.error('无此权限')
         return
     }
@@ -282,7 +282,7 @@ const handleAdd = async function () {
 // 新增节流
 const throttleGetActivity = _.throttle(handleAdd, 5000, { trailing: false });
 const handleEdit = async function () {
-    if (!hasMenuPermission(permissionMapping.edit_activity)) {
+    if (!hasMenuPermission(menuTree.value,permissionMapping.edit_activity)) {
         ElMessage.error('无此权限')
         return
     }
@@ -335,7 +335,7 @@ const handleEdit = async function () {
     }
 }
 const handleDel = async function (row) {
-    if (!hasMenuPermission(permissionMapping.delete_activity)) {
+    if (!hasMenuPermission(menuTree.value,permissionMapping.delete_activity)) {
         ElMessage.error('无此权限')
         return
     }

From 98db0f7bb4be85d3257054de0f3865502ac40914 Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Thu, 27 Nov 2025 15:21:48 +0800
Subject: [PATCH 7/7] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=20=E5=91=98?=
 =?UTF-8?q?=E5=B7=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/channelManage/fans/fans.vue     | 1 +
 src/views/channelManage/reward/reward.vue | 3 ++-
 src/views/consume/bean/articleVideo.vue   | 3 ++-
 src/views/consume/bean/dieHardFan.vue     | 3 ++-
 src/views/consume/bean/liveStream.vue     | 4 +++-
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/channelManage/fans/fans.vue b/src/views/channelManage/fans/fans.vue
index 7d57c14..41f4887 100644
--- a/src/views/channelManage/fans/fans.vue
+++ b/src/views/channelManage/fans/fans.vue
@@ -399,6 +399,7 @@ const exportExcel = async function () {
       ...beanConsumeFan.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
+      flag: flag.value,
       roleId: adminData.value.roleId
 
     },
diff --git a/src/views/channelManage/reward/reward.vue b/src/views/channelManage/reward/reward.vue
index c954418..43b0d48 100644
--- a/src/views/channelManage/reward/reward.vue
+++ b/src/views/channelManage/reward/reward.vue
@@ -420,7 +420,8 @@ const exportExcel = async function () {
       endTime: beanConsumeLive.value.endTime || '',
       sortField: sortField.value || 'consumeTime',
       sortOrder: sortOrder.value || 'desc',
-      roleId: adminData.value.roleId
+      roleId: adminData.value.roleId,
+      flag: flag.value,
 
     }
   }
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 5ea2851..a52c598 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -396,7 +396,8 @@ const exportExcel = async function () {
       ...beanConsumeArticle.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
-      roleId: adminData.value.roleId
+      roleId: adminData.value.roleId,
+      flag: flag.value,
 
     },
   }
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 8e6fbf9..aba8f1f 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -399,7 +399,8 @@ const exportExcel = async function () {
       ...beanConsumeFan.value,
       sortField: sortField.value,
       sortOrder: sortOrder.value,
-      roleId: adminData.value.roleId
+      roleId: adminData.value.roleId,
+      flag: flag.value,
 
     },
   }
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index 9dd6326..fc237ce 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -421,7 +421,9 @@ const exportExcel = async function () {
       endTime: beanConsumeLive.value.endTime || '',
       sortField: sortField.value || 'consumeTime',
       sortOrder: sortOrder.value || 'desc',
-      roleId: adminData.value.roleId
+      roleId: adminData.value.roleId,
+      flag: flag.value,
+
 
     }
   }