From 1e28905359ce39bac954da7d547ac6366f3d6c6e Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Sun, 10 Aug 2025 10:11:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E7=BD=AE=E8=B0=83=E6=96=B9=E6=B3=95+?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/beanAudit.vue           |   5 +-
 src/views/consume/bean/articleVideo.vue | 270 +++++++++++++-------------------
 src/views/consume/bean/dieHardFan.vue   | 231 +++++++++++----------------
 src/views/consume/bean/liveStream.vue   | 254 +++++++++++-------------------
 src/views/usergold/userbean.vue         |   1 +
 5 files changed, 295 insertions(+), 466 deletions(-)

diff --git a/src/views/audit/beanAudit.vue b/src/views/audit/beanAudit.vue
index 389f8cd..a2c8360 100644
--- a/src/views/audit/beanAudit.vue
+++ b/src/views/audit/beanAudit.vue
@@ -395,7 +395,10 @@ const resetSearch = function () {
   }
   selectedMarketPath.value = []
   dateRange.value = []
-  activeTimeRange.value = '' // 清除激活状态
+  activeTimeRange.value = '' // 清除时间的激活状态
+  get()
+  getStats()
+
 }
 
 const handleClick = function (tab) {
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index 3a2d432..6eec541 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -8,7 +8,7 @@ import { ar } from 'element-plus/es/locales.mjs'
 // 之后整理一下
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1,23 , 59, 59),
+  new Date(2000, 2, 1, 23, 59, 59),
 ]
 /*
 ====================工具方法==============================
@@ -52,7 +52,7 @@ const consumeTypes = ref([
 const handlePayModeChange = (value) => {
   beanConsumeArticle.value.payMode = value;
   // 触发搜索
-  ConsumeSelectBy(); 
+  ConsumeSelectBy();
 }
 
 //------------------------
@@ -88,7 +88,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)
     // 存储地区数据
@@ -151,19 +151,19 @@ const ConsumeSelectBy = async function (val) {
 
     if (getTime.value != null) {
       if (getTime.value.startTime != '' && getTime.value.endTime != '') {
-         beanConsumeArticle.value.startTime = formatTime(getTime.value[0])
-         beanConsumeArticle.value.endTime = formatTime(getTime.value[1])
+        beanConsumeArticle.value.startTime = formatTime(getTime.value[0])
+        beanConsumeArticle.value.endTime = formatTime(getTime.value[1])
       }
     } else {
-       beanConsumeArticle.value.startTime = ''
-       beanConsumeArticle.value.endTime = ''
+      beanConsumeArticle.value.startTime = ''
+      beanConsumeArticle.value.endTime = ''
     }
-     beanConsumeArticle.value.sortField = sortField.value
-     beanConsumeArticle.value.sortOrder = sortOrder.value
+    beanConsumeArticle.value.sortField = sortField.value
+    beanConsumeArticle.value.sortOrder = sortOrder.value
 
-    console.log('搜索参数_时间',  beanConsumeArticle.value.startTime)
+    console.log('搜索参数_时间', beanConsumeArticle.value.startTime)
     console.log('搜索参数1', getObj.value)
-    console.log('搜索参数2',  beanConsumeArticle.value)
+    console.log('搜索参数2', beanConsumeArticle.value)
 
     // 发送POST请求
     const result = await request({
@@ -171,14 +171,14 @@ const ConsumeSelectBy = async function (val) {
       data: {
         pageNum: getObj.value.pageNum,
         pageSize: getObj.value.pageSize,
-         beanConsumeArticle: {
-          ... beanConsumeArticle.value,
+        beanConsumeArticle: {
+          ...beanConsumeArticle.value,
           jwcode: beanConsumeArticle.value.jwcode,
           dept: beanConsumeArticle.value.dept,
           payMode: beanConsumeArticle.value.payMode,
           articleId: beanConsumeArticle.value.articleId,
           articleName: beanConsumeArticle.value.articleName,
-          author: beanConsumeArticle.value.author,          
+          author: beanConsumeArticle.value.author,
           startTime: beanConsumeArticle.value.startTime,
           endTime: beanConsumeArticle.value.endTime,
           sortField: beanConsumeArticle.value.sortField,
@@ -200,7 +200,7 @@ const ConsumeSelectBy = async function (val) {
         return true;
       });
       tableData.value = filteredList;
-      
+
     }
 
     // 合计数的接口
@@ -209,7 +209,7 @@ const ConsumeSelectBy = async function (val) {
       payType: 8, // 固定传入 payType 值 8
       beanConsumeArticle: {
         ...beanConsumeArticle.value,
-        
+
       }
     };
 
@@ -223,11 +223,11 @@ const ConsumeSelectBy = async function (val) {
 
     const data = resultTotalGold.data || resultTotalGold;
     console.log('请求成功3', resultTotalGold.data)
-    console.log('permanentBean3',data.permanentBean)
-      // 返回字段为 permanentBean、freeBean、totalNum
-      permanentBean.value = Number(data.permanentBean) || 0;
-      freeBean.value = Number(data.freeBean) || 0;
-      totalNum.value = Number(data.totalNum) || 0;
+    console.log('permanentBean3', data.permanentBean)
+    // 返回字段为 permanentBean、freeBean、totalNum
+    permanentBean.value = Number(data.permanentBean) || 0;
+    freeBean.value = Number(data.freeBean) || 0;
+    totalNum.value = Number(data.totalNum) || 0;
 
     // 存储分页总数
     total.value = result.data.total
@@ -239,20 +239,20 @@ const ConsumeSelectBy = async function (val) {
 // 搜索
 const search = function () {
   getObj.value.pageNum = 1
-    if(beanConsumeArticle.value.jwcode){
-        const numRef = /^\d{1,9}$/;
-        if(!numRef.test(beanConsumeArticle.value.jwcode)){
-            ElMessage.error('请检查精网号格式')
-            return 
-        }
+  if (beanConsumeArticle.value.jwcode) {
+    const numRef = /^\d{1,9}$/;
+    if (!numRef.test(beanConsumeArticle.value.jwcode)) {
+      ElMessage.error('请检查精网号格式')
+      return
     }
-    if(beanConsumeArticle.value.articleId){
-        const numRef = /^\d{1,9}$/;
-        if(!numRef.test(beanConsumeArticle.value.articleId)){
-            ElMessage.error('请检查文章ID格式')
-            return 
-        }
+  }
+  if (beanConsumeArticle.value.articleId) {
+    const numRef = /^\d{1,9}$/;
+    if (!numRef.test(beanConsumeArticle.value.articleId)) {
+      ElMessage.error('请检查文章ID格式')
+      return
     }
+  }
   ConsumeSelectBy()
 }
 // 重置
@@ -261,14 +261,14 @@ const reset = function () {
 
   beanConsumeArticle.value.jwcode = null
   beanConsumeArticle.value.dept = ''
-   beanConsumeArticle.value.type = ''
-   beanConsumeArticle.value.payMode = ''
-   beanConsumeArticle.value.articleId = ''
-   beanConsumeArticle.value.articleName = ''
-   beanConsumeArticle.value.author = ''
-   
-   beanConsumeArticle.value.startTime = ''
-   beanConsumeArticle.value.endTime = ''
+  beanConsumeArticle.value.type = ''
+  beanConsumeArticle.value.payMode = ''
+  beanConsumeArticle.value.articleId = ''
+  beanConsumeArticle.value.articleName = ''
+  beanConsumeArticle.value.author = ''
+
+  beanConsumeArticle.value.startTime = ''
+  beanConsumeArticle.value.endTime = ''
 
 
 
@@ -280,18 +280,18 @@ const reset = function () {
 
   // 点完重置后，重新请求数据
   ConsumeSelectBy()
-  console.log(' beanConsumeArticle',  beanConsumeArticle.value)
+  console.log(' beanConsumeArticle', beanConsumeArticle.value)
 }
 // 今天
 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.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
 
-   ConsumeSelectBy()
+  ConsumeSelectBy()
 }
 // 昨天
 const getYesterday = function () {
@@ -331,7 +331,7 @@ const handleSortChange = (column) => {
     sortField.value = 'buyBean'
   } else if (column.prop === 'freeBean') {
     sortField.value = 'freeBean'
-  } 
+  }
   sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
   ConsumeSelectBy()
 }
@@ -361,26 +361,26 @@ const handleCurrentChange = function (val) {
 */
 
 const format3 = (num) => {
-    // 每三位添加逗号
-    return num.toLocaleString('en-US')
+  // 每三位添加逗号
+  return num.toLocaleString('en-US')
 }
 onMounted(async function () {
   await getAdminData()
   await ConsumeSelectBy()
-  
+
   await getDept()
-  
+
 })
 
 
 const exportExcel = async function () {
   const params = { //需要修改
-     ...getObj.value,
-        "beanConsumeArticle": {
-            ...beanConsumeArticle.value,
-            sortField: sortField.value,
-            sortOrder: sortOrder.value,
-        },
+    ...getObj.value,
+    "beanConsumeArticle": {
+      ...beanConsumeArticle.value,
+      sortField: sortField.value,
+      sortOrder: sortOrder.value,
+    },
   }
   const res = await API({ url: '/export/exportArticle', data: params })
   if (res.code === 200) {
@@ -463,93 +463,57 @@ const getTagText = (state) => {
 </script>
 
 <template>
-  <el-row>
-    <el-col>
-            <el-card style="margin-bottom: 20px;margin-top:10px">
-        <el-row style="margin-bottom: 10px">
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">精网号：</el-text>
-              <el-input v-model="beanConsumeArticle.jwcode" placeholder="请输入精网号" style="width: 140px" clearable />
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">地区：</el-text>
-              <el-select v-model="beanConsumeArticle.dept" placeholder="请选择地区" style="width: 140px" clearable>
-                <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
-              </el-select>
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">类型：</el-text>
-              <el-select v-model="beanConsumeArticle.payMode" placeholder="请选择类型" style="width: 140px" clearable @change="handlePayModeChange">
-                <el-option label="打赏" value="0" />
-                <el-option label="付费购买" value="1" />
-                <el-option label="其他" value="2" />
-              </el-select>
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">文章/视频ID：</el-text>
-              <el-input v-model="beanConsumeArticle.articleId" placeholder="请输入文章/视频ID" style="width: 140px" clearable />
-            </div>
-          </el-col>
-          <el-col :span="5">
-            <div class="head-card-element">
-              <el-text class="mx-1">文章/视频标题：</el-text>
-              <el-input v-model="beanConsumeArticle.articleName" placeholder="请输入文章/视频标题" style="width: 160px" clearable />
-            </div>
-          </el-col>
+      <el-card style="margin-bottom: 10px;margin-top:10px">
+        <el-col style="margin-bottom: 10px">
+          <el-text>精网号：</el-text>
+          <el-input v-model="beanConsumeArticle.jwcode" placeholder="请输入精网号" style="width: 200px;margin-right: 20px" clearable />
           
-        </el-row>
-        <el-row>
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1" >作者：</el-text>
-              <el-input v-model="beanConsumeArticle.author" placeholder="请输入作者" style="width: 155px" clearable />
-            </div>
-          </el-col>
-          <el-col :span="20">
-            <div class="head-card-element">
-              <el-text class="mx-1">付费时间：</el-text>
-              <el-date-picker
-                v-model="getTime"
-                type="datetimerange"
-                range-separator="至"
-                start-placeholder="起始时间"
-                end-placeholder="结束时间"
-                style="width: 400px"
-                @change="handleDatePickerChange"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                :default-time="defaultTime"
-              />
-              <el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
-              <el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
-              <el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''">近7天</el-button>
-              <el-button type="success" @click="reset()">重置</el-button>
-              <el-button type="primary" @click="search()">查询</el-button>
-              <el-button type="primary" @click="exportExcel()">导出Excel</el-button>
-              <el-button type="primary" @click="openExportList">查看导出列表</el-button>
-            </div>
-          </el-col>
-        </el-row>
+          <el-text>地区：</el-text>
+          <el-select v-model="beanConsumeArticle.dept" placeholder="请选择地区" style="width: 200px;margin-right: 20px" clearable>
+            <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
+          </el-select>
+
+          <el-text>类型：</el-text>
+          <el-select v-model="beanConsumeArticle.payMode" placeholder="请选择类型" style="width: 200px;margin-right: 20px" clearable
+            @change="handlePayModeChange">
+            <el-option label="打赏" value="0" />
+            <el-option label="付费购买" value="1" />
+            <el-option label="其他" value="2" />
+          </el-select>
+
+          <el-text>文章/视频ID：</el-text>
+          <el-input v-model="beanConsumeArticle.articleId" placeholder="请输入文章/视频ID" style="width: 200px;margin-right: 20px" clearable />
+
+          <el-text>文章/视频标题：</el-text>
+          <el-input v-model="beanConsumeArticle.articleName" placeholder="请输入文章/视频标题" style="width: 200px" clearable />
+        </el-col>
+        <el-col>
+            <el-text>作者：</el-text>
+            <el-input v-model="beanConsumeArticle.author" placeholder="请输入作者" style="width: 200px;margin-right: 20px" clearable />
+
+            <el-text>付费时间：</el-text>
+            <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
+              end-placeholder="结束时间" style="width: 400px;margin-right: 10px" @change="handleDatePickerChange"
+              value-format="YYYY-MM-DD HH:mm:ss" :default-time="defaultTime" />
+
+            <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
+            <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
+            <el-button @click="get7Days()" :type="activeTimeRange === '7days' ? 'primary' : ''">近7天</el-button>
+
+            <el-button type="success" @click="reset()">重置</el-button>
+            <el-button type="primary" @click="search()">查询</el-button>
+            <el-button type="primary" @click="exportExcel()">导出Excel</el-button>
+            <el-button type="primary" @click="openExportList">查看导出列表</el-button>
+        </el-col>
       </el-card>
-    </el-col>
-  </el-row>
-  <el-row>
-    <el-col>
       <el-card>
         <div>
-          金豆总数：{{ format3(Math.abs(permanentBean+freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+          金豆总数：{{ format3(Math.abs(permanentBean + freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
           付费金豆数：{{ format3(Math.abs(permanentBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
           免费金豆数：{{ format3(Math.abs(freeBean)) }}
         </div>
-        <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 576px; overflow-y: auto">
-          <el-table :data="tableData" style="width: 100%" height="576px" @sort-change="handleSortChange">
+        <div style="overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="550px" @sort-change="handleSortChange">
             <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
                 <span>{{
@@ -564,18 +528,18 @@ const getTagText = (state) => {
             <el-table-column prop="dept" label="地区" width="110px" />
             <el-table-column prop="type" label="类型" width="120px">
               <template #default="scope">
-                {{ 
-                  Array.isArray(consumeTypes) 
-                    ? consumeTypes.find(item => item.value === Number(scope.row.type))?.label || '未知类型' 
-                    : '未知类型' 
+                {{
+                  Array.isArray(consumeTypes)
+                    ? consumeTypes.find(item => item.value === Number(scope.row.type))?.label || '未知类型'
+                    : '未知类型'
                 }}
               </template>
             </el-table-column>
-            <el-table-column prop="beanNum" label="金豆总数" sortable="custom" width="120px"/>
-            <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px"/>
-            <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px"/>
+            <el-table-column prop="beanNum" label="金豆总数" sortable="custom" width="120px" />
+            <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px" />
+            <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px" />
             <el-table-column prop="articleId" label="文章/视频ID" width="150px" />
-            <el-table-column prop="articleName" label="文章/视频标题" width="200px" show-overflow-tooltip />
+            <el-table-column prop="articleName" label="文章/视频标题" width="150px" show-overflow-tooltip />
             <el-table-column prop="author" label="作者" width="120px" />
             <el-table-column prop="consumeTime" label="付费时间" sortable="custom" width="180px">
               <template #default="scope">
@@ -592,12 +556,10 @@ const getTagText = (state) => {
             @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-card>
-    </el-col>
-  </el-row>
 
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
-        <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
+    <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
       <el-table-column prop="fileName" label="文件名" />
       <el-table-column prop="state" label="状态">
         <template #default="scope">
@@ -629,22 +591,6 @@ const getTagText = (state) => {
 </template>
 
 <style scoped>
-.status {
-  display: flex;
-}
-
-.head-card {
-  display: flex;
-}
-
-.head-card-element {
-  margin-right: 20px;
-}
-
-.head-card-btn {
-  margin-left: auto;
-}
-
 .pagination {
   display: flex;
   margin-top: 20px;
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index d77eda3..175bf57 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -10,14 +10,14 @@ import moment from 'moment'
 ====================工具方法==============================
 */
 const format3 = (num) => {
-    // 每三位添加逗号
-    return num.toLocaleString('en-US')
+  // 每三位添加逗号
+  return num.toLocaleString('en-US')
 }
 // 时间格式化
 const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1,23 , 59, 59),
+  new Date(2000, 2, 1, 23, 59, 59),
 ]
 /*
 ====================数据=================================
@@ -46,7 +46,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)
     // 存储频道数据
@@ -156,19 +156,19 @@ const ConsumeSelectBy = async function (val) {
 
     if (getTime.value != null) {
       if (getTime.value.startTime != '' && getTime.value.endTime != '') {
-         beanConsumeFan.value.startTime = formatTime(getTime.value[0])
-         beanConsumeFan.value.endTime = formatTime(getTime.value[1])
+        beanConsumeFan.value.startTime = formatTime(getTime.value[0])
+        beanConsumeFan.value.endTime = formatTime(getTime.value[1])
       }
     } else {
-       beanConsumeFan.value.startTime = ''
-       beanConsumeFan.value.endTime = ''
+      beanConsumeFan.value.startTime = ''
+      beanConsumeFan.value.endTime = ''
     }
-     beanConsumeFan.value.sortField = sortField.value
-     beanConsumeFan.value.sortOrder = sortOrder.value
+    beanConsumeFan.value.sortField = sortField.value
+    beanConsumeFan.value.sortOrder = sortOrder.value
 
-    console.log('搜索参数_时间',  beanConsumeFan.value.startTime)
+    console.log('搜索参数_时间', beanConsumeFan.value.startTime)
     console.log('搜索参数1', getObj.value)
-    console.log('搜索参数2',  beanConsumeFan.value)
+    console.log('搜索参数2', beanConsumeFan.value)
 
     // 发送POST请求
     const result = await request({
@@ -176,8 +176,8 @@ const ConsumeSelectBy = async function (val) {
       data: {
         pageNum: getObj.value.pageNum,
         pageSize: getObj.value.pageSize,
-         beanConsumeFan: {
-          ... beanConsumeFan.value,
+        beanConsumeFan: {
+          ...beanConsumeFan.value,
           jwcode: beanConsumeFan.value.jwcode ? String(beanConsumeFan.value.jwcode) : '',
           dept: beanConsumeFan.value.dept || '',
           channel: beanConsumeFan.value.channel || '',
@@ -190,7 +190,7 @@ const ConsumeSelectBy = async function (val) {
     })
 
     console.log('请求成功3', sortField)
-    console.log('接口响应结果',result);
+    console.log('接口响应结果', result);
     if (result.code === 200 && result.data && result.data.list) {
       tableData.value = result.data.list;
       total.value = result.data.total;
@@ -201,8 +201,8 @@ const ConsumeSelectBy = async function (val) {
     const sumConsumeParams = {
       payType: 7, // 固定传入 payType 值 7
       beanConsumeFan: {
-        ... beanConsumeFan.value,
-        
+        ...beanConsumeFan.value,
+
       }
     };
     // 发送 POST 请求获取合计数
@@ -215,11 +215,11 @@ const ConsumeSelectBy = async function (val) {
 
     const data = resultTotalGold.data || resultTotalGold;
     console.log('请求成功2', resultTotalGold.data)
-    console.log('permanentBean2',data.permanentBean)
-      // 返回字段为 permanentBean、freeBean、totalNum
-      permanentBean.value = Number(data.permanentBean) || 0;
-      freeBean.value = Number(data.freeBean) || 0;
-      totalNum.value = Number(data.totalNum) || 0;
+    console.log('permanentBean2', data.permanentBean)
+    // 返回字段为 permanentBean、freeBean、totalNum
+    permanentBean.value = Number(data.permanentBean) || 0;
+    freeBean.value = Number(data.freeBean) || 0;
+    totalNum.value = Number(data.totalNum) || 0;
 
     // 存储分页总数
     total.value = result.data.total
@@ -231,14 +231,14 @@ const ConsumeSelectBy = async function (val) {
 // 搜索
 const search = function () {
   getObj.value.pageNum = 1
-   if(beanConsumeFan.value.jwcode){
-        const numRef = /^\d{1,9}$/;
-        if(!numRef.test(beanConsumeFan.value.jwcode)){
-            ElMessage.error('请检查精网号格式')
-            return 
-        }
+  if (beanConsumeFan.value.jwcode) {
+    const numRef = /^\d{1,9}$/;
+    if (!numRef.test(beanConsumeFan.value.jwcode)) {
+      ElMessage.error('请检查精网号格式')
+      return
     }
-   ConsumeSelectBy() 
+  }
+  ConsumeSelectBy()
 }
 // 重置
 const reset = function () {
@@ -246,16 +246,16 @@ const reset = function () {
 
   beanConsumeFan.value.jwcode = null
 
-   beanConsumeFan.value.type = ''
-   beanConsumeFan.value.gift = ''
-   beanConsumeFan.value.channel = ''
-   beanConsumeFan.value.liveRoom = ''
+  beanConsumeFan.value.type = ''
+  beanConsumeFan.value.gift = ''
+  beanConsumeFan.value.channel = ''
+  beanConsumeFan.value.liveRoom = ''
 
-   beanConsumeFan.value.dept = ''
+  beanConsumeFan.value.dept = ''
 
-   beanConsumeFan.value.startTime = ''
+  beanConsumeFan.value.startTime = ''
 
-   beanConsumeFan.value.endTime = ''
+  beanConsumeFan.value.endTime = ''
 
 
 
@@ -266,14 +266,14 @@ const reset = function () {
 
 
   // 点完重置后，重新请求数据
-   ConsumeSelectBy() 
-  console.log(' beanConsumeFan',  beanConsumeFan.value)
+  ConsumeSelectBy()
+  console.log(' beanConsumeFan', beanConsumeFan.value)
 }
 // 今天
 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.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
@@ -289,7 +289,7 @@ const getYesterday = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
   console.log('昨', getTime.value)
-  ConsumeSelectBy() 
+  ConsumeSelectBy()
 }
 // 近7天
 const get7Days = function () {
@@ -300,7 +300,7 @@ const get7Days = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态
 
-  ConsumeSelectBy() 
+  ConsumeSelectBy()
 }
 
 
@@ -312,7 +312,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)
     // 存储地区数据
@@ -335,9 +335,9 @@ const handleSortChange = (column) => {
     sortField.value = 'beanNum'
   } else if (column.prop === 'consumeTime') {
     sortField.value = 'consumeTime'
-  } else if(column.prop === 'buyBean') {
+  } else if (column.prop === 'buyBean') {
     sortField.value = 'buyBean'
-  } else if(column.prop === 'freeBean') {
+  } else if (column.prop === 'freeBean') {
     sortField.value = 'freeBean'
   }
   sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
@@ -380,12 +380,12 @@ onMounted(async function () {
 
 const exportExcel = async function () {
   const params = { //需要修改
-     ...getObj.value,
-        "beanConsumeFan": {
-            ...beanConsumeFan.value,
-            sortField: sortField.value,
-            sortOrder: sortOrder.value,
-        },
+    ...getObj.value,
+    "beanConsumeFan": {
+      ...beanConsumeFan.value,
+      sortField: sortField.value,
+      sortOrder: sortOrder.value,
+    },
   }
   const res = await API({ url: '/export/exportFan', data: params })
   if (res.code === 200) {
@@ -468,80 +468,45 @@ const getTagText = (state) => {
 </script>
 
 <template>
-  <el-row>
-    <el-col>
-      <el-card style="margin-bottom: 20px;margin-top:10px">
-        <el-row style="margin-bottom: 10px">
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">精网号：</el-text>
-              <el-input v-model="beanConsumeFan.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">地区：</el-text>
-              <el-select v-model="beanConsumeFan.dept" placeholder="请选择地区" style="width: 150px" clearable>
-                <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
-              </el-select>
-            </div>
-          </el-col>
-          <el-col :span="5">
-            <div class="head-card-element">
-              <el-text class="mx-1">频道：</el-text>
-              <el-select
-                v-model="beanConsumeFan.channel"
-                placeholder="请选择频道"
-                style="width: 180px"
-                clearable
-                filterable
-                allow-create
-                default-first-option
-              >
-                <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
-              </el-select>
-            </div>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="head-card-element">
-              <el-text class="mx-1">消费时间：</el-text>
-              <el-date-picker
-                v-model="getTime"
-                type="datetimerange"
-                range-separator="至"
-                start-placeholder="起始时间"
-                end-placeholder="结束时间"
-                style="width: 400px"
-                @change="handleDatePickerChange"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                :default-time="defaultTime"
-              />
-              <el-button @click="getToday()" style="margin-left: 10px" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
-              <el-button @click="getYesterday()" style="margin-left: 10px" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
-              <el-button @click="get7Days()" style="margin-left: 10px" :type="activeTimeRange === '7days' ? 'primary' : ''">近7天</el-button>
-              <el-button type="success" @click="reset()">重置</el-button>
-              <el-button type="primary" @click="search()">查询</el-button>
-              <el-button type="primary" @click="exportExcel()">导出Excel</el-button>
-              <el-button type="primary" @click="openExportList">查看导出列表</el-button>
-            </div>
-          </el-col>
-        </el-row>
-      </el-card>
+  <el-card style="margin-bottom: 20px;margin-top:10px">
+    <el-col style="margin-bottom: 10px">
+      <el-text>精网号：</el-text>
+      <el-input v-model="beanConsumeFan.jwcode" placeholder="请输入精网号" style="width: 200px;margin-right: 20px"
+        clearable />
+
+      <el-text>地区：</el-text>
+      <el-select v-model="beanConsumeFan.dept" placeholder="请选择地区" style="width: 200px;margin-right: 20px" clearable>
+        <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
+      </el-select>
+
+      <el-text>频道：</el-text>
+      <el-select v-model="beanConsumeFan.channel" placeholder="请选择频道" style="width: 200px" clearable filterable allow-create>
+        <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
+      </el-select>
     </el-col>
-  </el-row>
-  <el-row>
     <el-col>
+      <el-text>消费时间：</el-text>
+      <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
+        end-placeholder="结束时间" style="width: 400px;margin-right:20px" @change="handleDatePickerChange"
+        value-format="YYYY-MM-DD HH:mm:ss" :default-time="defaultTime" />
+      <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
+      <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
+      <el-button @click="get7Days()" :type="activeTimeRange === '7days' ? 'primary' : ''">近7天</el-button>
+
+      <el-button type="success" @click="reset()">重置</el-button>
+      <el-button type="primary" @click="search()">查询</el-button>
+      <el-button type="primary" @click="exportExcel()">导出Excel</el-button>
+      <el-button type="primary" @click="openExportList">查看导出列表</el-button>
+    </el-col>
+  </el-card>
       <el-card>
         <div>
-          金豆总数：{{ format3(Math.abs(permanentBean+freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+          金豆总数：{{ format3(Math.abs(permanentBean + freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
           付费金豆数：{{ format3(Math.abs(permanentBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
           免费金豆数：{{ format3(Math.abs(freeBean)) }}
         </div>
-        <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 576px; overflow-y: auto">
-          <el-table :data="tableData" style="width: 100%" height="576px" @sort-change="handleSortChange">
+        <div style="overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="550px" @sort-change="handleSortChange">
             <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
                 <span>{{
@@ -554,18 +519,16 @@ const getTagText = (state) => {
             <!-- 固定精网号列 -->
             <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
             <el-table-column prop="dept" label="地区" width="110px" />
-            <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px"/>
-            <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px"/>
-            <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px"/>
+            <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px" />
+            <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px" />
+            <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px" />
             <el-table-column prop="channel" label="频道" width="190px" />
-            <el-table-column prop="type" label="会员类型" width="120px" >
+            <el-table-column prop="type" label="会员类型" width="120px">
               <template #default="scope">
-                {{ consumeTypes.find(item => item.value === Number(scope.row.type))?.label || '未知类型' }}
+                {{consumeTypes.find(item => item.value === Number(scope.row.type))?.label || '未知类型'}}
               </template>
             </el-table-column>
-            <!-- <el-table-column prop="joinMethod" label="加入方式" width="120px" /> -->
             <el-table-column prop="consumeTime" label="加入时间" sortable="custom" width="180px" />
-            <!-- <el-table-column prop="consumeTime" label="到期时间" width="180px" /> -->
           </el-table>
         </div>
 
@@ -576,12 +539,10 @@ const getTagText = (state) => {
             @current-change="handleCurrentChange"></el-pagination>
         </div>
       </el-card>
-    </el-col>
-  </el-row>
 
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
-        <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
+    <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
       <el-table-column prop="fileName" label="文件名" />
       <el-table-column prop="state" label="状态">
         <template #default="scope">
@@ -613,22 +574,6 @@ const getTagText = (state) => {
 </template>
 
 <style scoped>
-.status {
-  display: flex;
-}
-
-.head-card {
-  display: flex;
-}
-
-.head-card-element {
-  margin-right: 20px;
-}
-
-.head-card-btn {
-  margin-left: auto;
-}
-
 .pagination {
   display: flex;
   margin-top: 20px;
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index d8411d2..71be640 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -11,11 +11,11 @@ import moment from 'moment'
 */
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
-  new Date(2000, 2, 1,23 , 59, 59),
+  new Date(2000, 2, 1, 23, 59, 59),
 ]
 const format3 = (num) => {
-    // 每三位添加逗号
-    return num.toLocaleString('en-US')
+  // 每三位添加逗号
+  return num.toLocaleString('en-US')
 }
 // 时间格式化
 const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
@@ -49,7 +49,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)
     // 存储礼物数据
@@ -71,7 +71,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)
     // 存储频道数据
@@ -97,7 +97,7 @@ const consumeTypes = ref([
 ])
 // 处理类型选择变化
 const handleTypeChange = (value) => {
-  if (value !==  1) {
+  if (value !== 1) {
     beanConsumeLive.value.gift = ''
   }
 }
@@ -136,7 +136,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)
     // 存储地区数据
@@ -195,14 +195,14 @@ const selectLiveBy = async function (val) {
       beanConsumeLive.value.startTime = ''
       beanConsumeLive.value.endTime = ''
     }
-    
+
     // 设置排序参数
     beanConsumeLive.value.sortField = sortField.value
     beanConsumeLive.value.sortOrder = sortOrder.value
 
-    console.log('搜索参数_时间',  beanConsumeLive.value.startTime)
+    console.log('搜索参数_时间', beanConsumeLive.value.startTime)
     console.log('搜索参数1', getObj.value)
-    console.log('搜索参数2',  beanConsumeLive.value)
+    console.log('搜索参数2', beanConsumeLive.value)
 
     // 发送POST请求
     const result = await request({
@@ -229,17 +229,17 @@ const selectLiveBy = async function (val) {
     })
 
     console.log('请求成功2', sortField)
-     console.log('接口响应结果', result); // 打印接口响应结果
-     if (result.code === 200 && result.data && result.data.list) {
+    console.log('接口响应结果', result); // 打印接口响应结果
+    if (result.code === 200 && result.data && result.data.list) {
       tableData.value = result.data.list;
       total.value = result.data.total;
     }
-     // 复制一份 beanConsumeLive.value 并设置固定的 payType 值 1是直播
+    // 复制一份 beanConsumeLive.value 并设置固定的 payType 值 1是直播
     const sumConsumeParams = {
       payType: 1, // 固定传入 payType 值 1 是直播
       beanConsumeLive: {
         ...beanConsumeLive.value,
-        
+
       }
     };
 
@@ -253,12 +253,12 @@ const selectLiveBy = async function (val) {
 
     const data = resultTotalGold.data || resultTotalGold;
     console.log('请求成功1', resultTotalGold.data) //undifined
-    console.log('permanentBean1',data.permanentBean)
-      // 返回字段为 permanentBean、freeBean、totalNum
-      permanentBean.value = Number(data.permanentBean) || 0;
-      freeBean.value = Number(data.freeBean) || 0;
-      totalNum.value = Number(data.totalNum) || 0;
-    
+    console.log('permanentBean1', data.permanentBean)
+    // 返回字段为 permanentBean、freeBean、totalNum
+    permanentBean.value = Number(data.permanentBean) || 0;
+    freeBean.value = Number(data.freeBean) || 0;
+    totalNum.value = Number(data.totalNum) || 0;
+
 
 
     // 存储分页总数
@@ -271,27 +271,27 @@ const selectLiveBy = async function (val) {
 // 搜索
 const search = function () {
   getObj.value.pageNum = 1
-  if(beanConsumeLive.value.jwcode){
-        const numRef = /^\d{1,9}$/;
-        if(!numRef.test(beanConsumeLive.value.jwcode)){
-            ElMessage.error('请检查精网号格式')
-            return 
-        }
+  if (beanConsumeLive.value.jwcode) {
+    const numRef = /^\d{1,9}$/;
+    if (!numRef.test(beanConsumeLive.value.jwcode)) {
+      ElMessage.error('请检查精网号格式')
+      return
     }
-   selectLiveBy() 
+  }
+  selectLiveBy()
 }
 // 重置
 const reset = function () {
   console.log('直播的重置')
 
   beanConsumeLive.value.jwcode = null
-   beanConsumeLive.value.type = ''
-   beanConsumeLive.value.gift = ''
-   beanConsumeLive.value.liveChannel = ''
-   beanConsumeLive.value.liveName = ''
-   beanConsumeLive.value.dept = ''
-   beanConsumeLive.value.startTime = ''
-   beanConsumeLive.value.endTime = ''
+  beanConsumeLive.value.type = ''
+  beanConsumeLive.value.gift = ''
+  beanConsumeLive.value.liveChannel = ''
+  beanConsumeLive.value.liveName = ''
+  beanConsumeLive.value.dept = ''
+  beanConsumeLive.value.startTime = ''
+  beanConsumeLive.value.endTime = ''
   sortField.value = ''
   sortOrder.value = ''
   getTime.value = {}
@@ -299,19 +299,19 @@ const reset = function () {
 
 
   // 点完重置后，重新请求数据
-  selectLiveBy() 
-  console.log(' beanConsumeLive',  beanConsumeLive.value)
+  selectLiveBy()
+  console.log(' beanConsumeLive', beanConsumeLive.value)
 }
 // 今天
 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.endOf('day').format('YYYY-MM-DD HH:mm:ss')
   getTime.value = [startTime, endTime]
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
 
-   selectLiveBy()
+  selectLiveBy()
 }
 // 昨天
 const getYesterday = function () {
@@ -322,7 +322,7 @@ const getYesterday = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
 
-   selectLiveBy() 
+  selectLiveBy()
 }
 // 近7天
 const get7Days = function () {
@@ -333,7 +333,7 @@ const get7Days = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态
 
-  selectLiveBy() 
+  selectLiveBy()
 }
 
 
@@ -347,9 +347,9 @@ const handleSortChange = (column) => {
     sortField.value = 'beanNum'
   } else if (column.prop === 'consumeTime') {
     sortField.value = 'consumeTime'
-  } else if(column.prop === 'buyBean') {
+  } else if (column.prop === 'buyBean') {
     sortField.value = 'buyBean'
-  } else if(column.prop === 'freeBean') {
+  } else if (column.prop === 'freeBean') {
     sortField.value = 'freeBean'
   }
   sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
@@ -502,101 +502,58 @@ const getTagText = (state) => {
 </script>
 
 <template>
-  <el-row>
-    <el-col>
-      <el-card style="margin-bottom: 20px;margin-top:10px">
-        <el-row style="margin-bottom: 10px">
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">精网号：</el-text>
-              <el-input v-model="beanConsumeLive.jwcode" placeholder="请输入精网号" style="width: 140px" clearable />
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">地区：</el-text>
-              <el-select v-model="beanConsumeLive.dept" placeholder="请选择地区" style="width: 140px" clearable>
-                <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
-              </el-select>
-            </div>
-          </el-col>
-          <!-- <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">类型：</el-text>
-              <el-select v-model="beanConsumeLive.type" placeholder="请选择类型" style="width: 140px" clearable @change="handleTypeChange">
-                <el-option v-for="(item, index) in consumeTypes" :key="index" :label="item.label" :value="item.value" />
-              </el-select>
-            </div>
-          </el-col> -->
-          <el-col :span="4" >
-            <div class="head-card-element">
-              <el-text class="mx-1">礼物名称：</el-text>
-              <el-select v-model="beanConsumeLive.gift" placeholder="请选择礼物名称" style="width: 140px" clearable
-                filterable
-                allow-create
-                default-first-option
-              >
-                <el-option v-for="(item, index) in gifts" :key="index" :label="item" :value="item" />
-              </el-select>
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">频道：</el-text>
-              <el-select
-                v-model="beanConsumeLive.liveChannel"
-                placeholder="请选择频道"
-                style="width: 150px"
-                clearable
-                filterable
-                allow-create
-                default-first-option
-              >
-                <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
-              </el-select>
-            </div>
-          </el-col>
-          <el-col :span="4">
-            <div class="head-card-element">
-              <el-text class="mx-1">直播间：</el-text>
-              <el-input v-model="beanConsumeLive.liveName" placeholder="请输入直播间" style="width: 150px" clearable />
-            </div>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <div class="head-card-element">
-              <el-text class="mx-1"  >消费时间：</el-text>
-              <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-                end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange" :default-time="defaultTime"/>
-              <el-button @click="getToday()" style="margin-left: 10px"
-                :type="activeTimeRange === 'today' ? 'primary' : ''"> 今</el-button>
-              <el-button @click="getYesterday()" style="margin-left: 10px"
-                :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨</el-button>
-              <el-button @click="get7Days()" style="margin-left: 10px"
-                :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
-
-              <el-button type="success" @click="reset()">重置</el-button>
-              <el-button type="primary" @click="search()">查询</el-button>
-              <el-button type="primary" @click="exportExcel()">导出excel</el-button>
-              <el-button type="primary" @click="openExportList">查看导出列表</el-button>
-            </div>
-          </el-col>
-        </el-row>
-      </el-card>
+  <el-card style="margin-bottom: 20px;margin-top:10px">
+    <el-col style="margin-bottom: 10px">
+      <el-text>精网号：</el-text>
+      <el-input v-model="beanConsumeLive.jwcode" placeholder="请输入精网号" style="width: 200px;margin-right: 20px"
+        clearable />
+
+      <el-text>地区：</el-text>
+      <el-select v-model="beanConsumeLive.dept" placeholder="请选择地区" style="width: 200px;margin-right: 20px" clearable>
+        <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
+      </el-select>
+
+      <el-text>礼物名称：</el-text>
+      <el-select v-model="beanConsumeLive.gift" placeholder="请选择礼物名称" style="width: 200px;margin-right: 20px" clearable
+        filterable allow-create default-first-option>
+        <el-option v-for="(item, index) in gifts" :key="index" :label="item" :value="item" />
+      </el-select>
+
+      <el-text>频道：</el-text>
+      <el-select v-model="beanConsumeLive.liveChannel" placeholder="请选择频道" style="width: 200px;margin-right: 20px"
+        clearable filterable allow-create default-first-option>
+        <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
+      </el-select>
+
+      <el-text>直播间：</el-text>
+      <el-input v-model="beanConsumeLive.liveName" placeholder="请输入直播间" style="width: 200px;margin-right: 20px"
+        clearable />
     </el-col>
-  </el-row>
-  <el-row>
     <el-col>
+      <el-text>消费时间：</el-text>
+      <el-date-picker v-model="getTime" type="datetimerange" range-separator="至" start-placeholder="起始时间"
+        end-placeholder="结束时间" style="width: 400px;margin-right: 20px;" @change="handleDatePickerChange"
+        :default-time="defaultTime" />
+
+      <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''"> 今</el-button>
+      <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''"> 昨</el-button>
+      <el-button @click="get7Days()" :type="activeTimeRange === '7days' ? 'primary' : ''"> 近7天</el-button>
+
+      <el-button type="success" @click="reset()">重置</el-button>
+      <el-button type="primary" @click="search()">查询</el-button>
+      <el-button type="primary" @click="exportExcel()">导出excel</el-button>
+      <el-button type="primary" @click="openExportList">查看导出列表</el-button>
+    </el-col>
+  </el-card>
       <el-card>
         <div>
-          金豆总数：{{ format3(Math.abs(permanentBean+freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+          金豆总数：{{ format3(Math.abs(permanentBean + freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
           付费金豆数：{{ format3(Math.abs(permanentBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
           免费金豆数：{{ format3(Math.abs(freeBean)) }}
         </div>
         <!-- 设置表格容器的高度和滚动样式 -->
-        <div style="height: 576px; overflow-y: auto">
-          <el-table :data="tableData" style="width: 100%" height="576px" @sort-change="handleSortChange">
+        <div style="overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="550px" @sort-change="handleSortChange">
             <el-table-column type="index" label="序号" width="80px" fixed="left">
               <template #default="scope">
                 <span>{{
@@ -609,36 +566,29 @@ const getTagText = (state) => {
             <!-- 固定精网号列 -->
             <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 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"> 
+              <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="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" />
             <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip />
             <el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px" />
           </el-table>
         </div>
-
-        <!-- 分页 -->
-        <div class="pagination">
-          <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
+          <el-pagination background :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>
-        </div>
       </el-card>
-    </el-col>
-  </el-row>
 
   <!-- 导出弹窗 -->
   <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
-        <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
+    <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
       <el-table-column prop="fileName" label="文件名" />
       <el-table-column prop="state" label="状态">
         <template #default="scope">
@@ -670,22 +620,6 @@ const getTagText = (state) => {
 </template>
 
 <style scoped>
-.status {
-  display: flex;
-}
-
-.head-card {
-  display: flex;
-}
-
-.head-card-element {
-  margin-right: 20px;
-}
-
-.head-card-btn {
-  margin-left: auto;
-}
-
 .pagination {
   display: flex;
   margin-top: 20px;
diff --git a/src/views/usergold/userbean.vue b/src/views/usergold/userbean.vue
index 5e0a184..4bef023 100644
--- a/src/views/usergold/userbean.vue
+++ b/src/views/usergold/userbean.vue
@@ -168,6 +168,7 @@ const trim = () => {
 const reset = function () {
     searchObj.value.jwcode = ''
     searchObj.value.dept = ''
+    get()
 }
 const handlePageSizeChange = function (val) {
     pagination.value.pageSize = val