diff --git a/.env.development b/.env.development
index b6264c1..bc3ea14 100644
--- a/.env.development
+++ b/.env.development
@@ -1,9 +1,9 @@
-# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://18.143.76.3:10704/'
 #  VITE_API_BASE='http://192.168.9.52:10705/'
 VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
- VITE_API_BASE='http://192.168.9.28:8081/'
+#  VITE_API_BASE='http://192.168.9.28:8081/'
 #  VITE_API_BASE='http://192.168.9.28:8081/'
 # sunjiabei
 #  VITE_API_BASE='http://192.168.9.28:8081/'
diff --git a/src/views/consume/articleVideo.vue b/src/views/consume/articleVideo.vue
index 2d36320..99a6226 100644
--- a/src/views/consume/articleVideo.vue
+++ b/src/views/consume/articleVideo.vue
@@ -1,11 +1,759 @@
-<script setup lang="ts">
+<script setup>
+import { computed, onMounted, ref } from 'vue'
+import { dayjs, ElMessage } from 'element-plus'
+import request from '@/util/http'
+import API from '@/util/http'
+import moment from 'moment'
+// 之后整理一下
 
+/*
+====================工具方法==============================
+*/
+
+// 时间格式化
+const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
+
+/*
+====================数据=================================
+*/
+//这是获取用户信息的接口
+const adminData = ref({})
+// 充值明细表格
+const tableData = ref([])
+
+// 搜索articleVideo 表单
+const articleVideo = ref({
+  jwcode: null,
+  dept: "",
+  type: "",
+  articleVideoId: "",
+  articleVideoTitle: "",
+  author: "",
+  startTime: '',
+  endTime: '',
+
+})
+// 频道列表
+const channels = ref([])
+
+// 抽离类型选项到响应式数组
+const consumeTypes = ref([
+  { label: '发礼物', value: 1 },
+  { label: '发红包', value: 2 },
+  { label: '发福袋', value: 3 },
+  { label: '付费直播', value: 4 },
+  { label: '加入粉丝团', value: 5 },
+  { label: '发弹幕', value: 6 }
+])
+
+// 处理类型选择变化
+const handleTypeChange = (value) => {
+  if (value !==  1) {
+    articleVideo.value.gift = ''
+  }
+}
+
+//------------------------
+
+// 标记当前激活的时间范围按钮
+const activeTimeRange = ref('')
+// 日期选择器变化时清除按钮激活状态
+const handleDatePickerChange = () => {
+  activeTimeRange.value = ''
+}
+// 搜索对象
+const getObj = ref({
+  pageNum: 1,
+  pageSize: 50
+})
+
+//分页总条目
+const total = ref(100)
+
+// 搜索对象时间
+const getTime = ref({
+  startTime: '',
+  endTime: ''
+})
+// 搜索活动列表
+// const activity = ref([])
+
+// 搜索地区列表
+const dept = ref([])
+
+// 频道模糊查询方法
+const filterChannel = (query) => {
+  if (query) {
+    return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
+  }
+  return channels.value;
+};
+
+// 新增排序字段和排序方式
+const sortField = ref('')
+const sortOrder = ref('')
+
+// // 消费平台选项
+// const consumePlatform = [
+//   {
+//     value: '金币系统',
+//     label: '金币系统'
+//   },
+
+//   {
+//     value: 'HomilyChart',
+//     label: 'HomilyChart'
+//   },
+//   {
+//     value: 'HomilyLink',
+//     label: 'HomilyLink'
+//   },
+//   {
+//     value: 'ERP',
+//     label: 'ERP'
+//   },
+//   {
+//     value: '其他',
+//     label: '其他'
+//   },
+//   {
+//     value: '初始化金币',
+//     label: '初始化金币'
+//   },
+// ]
+
+// // 合计数的显示数据
+// const tableDataTotal = ref({})
+
+// const permanentGold = ref(0)
+// const freeGold = ref(0)
+// const taskGold = ref(0)
+// const totalGold = ref(0)
+// // 定义响应式变量存储金币合计数
+// const permanentGolds = ref(0)
+// const freeGolds = ref(0)
+// const taskGolds = ref(0)
+// // 查询商品的接口的表单
+// const goods = ref([])
+
+// const totalGoldSearch = ref({
+//   jwcode: null,
+//   payPlatform: "",
+//   dept: "",
+//   startTime: "",
+//   endTime: "",
+//   goodsName: ""
+// })
+
+/*
+====================方法=================================
+*/
+// 获取登录用户信息
+const getAdminData = async function () {
+  try {
+    const result = await request({
+      url: '/admin/userinfo',
+      data: {}
+    })
+    adminData.value = result
+    console.log('请求成功', result)
+    console.log('用户信息', adminData.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
+
+// todo
+// const ConsumeSelectBy = async function (val) {
+//   try {
+
+//     // 搜索参数页码赋值
+//     if (typeof val === 'number') {
+//       getObj.value.pageNum = val
+//     }
+//     // 搜索参数时间赋值
+
+//     if (getTime.value != null) {
+//       if (getTime.value.startTime != '' && getTime.value.endTime != '') {
+//          articleVideo.value.startTime = formatTime(getTime.value[0])
+//          articleVideo.value.endTime = formatTime(getTime.value[1])
+//       }
+//     } else {
+//        articleVideo.value.startTime = ''
+//        articleVideo.value.endTime = ''
+//     }
+//      articleVideo.value.sortField = sortField.value
+//      articleVideo.value.sortOrder = sortOrder.value
+
+//     console.log('搜索参数_时间',  articleVideo.value.startTime)
+
+//     console.log('搜索参数1', getObj.value)
+
+//     console.log('搜索参数2',  articleVideo.value)
+
+//     // 发送POST请求
+//     const result = await request({
+//       url: '/consume/selectBy',
+//       data: {
+//         pageNum: getObj.value.pageNum,
+//         pageSize: getObj.value.pageSize,
+//          articleVideo: {
+//           ... articleVideo.value,
+//           sortField: sortField.value,
+//           sortOrder: sortOrder.value
+//         }
+//       }
+//     })
+
+//     console.log('请求成功2', sortField)
+
+//     // 合计数的接口
+//     // 复制一份 detail.value 并移除排序字段和排序方式
+//     const detailWithoutSort = { ... articleVideo.value }
+//     delete detailWithoutSort.sortField
+//     delete detailWithoutSort.sortOrder
+
+
+//     // 赋值
+//     totalGoldSearch.value.startTime =  articleVideo.value.startTime
+//     totalGoldSearch.value.endTime =  articleVideo.value.endTime
+//     totalGoldSearch.value.payPlatform =  articleVideo.value.payPlatform
+//     totalGoldSearch.value.dept =  articleVideo.value.dept
+//     totalGoldSearch.value.goodsName =  articleVideo.value.goodsName
+//     totalGoldSearch.value.jwcode =  articleVideo.value.jwcode
+//     //
+//     const resultTotalGold = await request({
+//       // url: '/consume/statsGold',
+//       url: '/consume/statsGold',
+//       data: totalGoldSearch.value
+
+//     })
+
+//     console.log("总计", resultTotalGold)
+
+//     if (resultTotalGold.code === 200 && resultTotalGold.data) {
+//       const data = resultTotalGold.data
+//       console.log('获取到的金币数据:', data)
+
+//       permanentGolds.value = Number(data.permanentGolds) || 0
+//       freeGolds.value = Number(data.freeGolds) || 0
+//       taskGolds.value = Number(data.taskGolds) || 0
+//     }
+
+//     // 存储表格数据
+//     tableData.value = result.data.list
+//     tableDataTotal.value = resultTotalGold.data
+//     if (resultTotalGold.data == null) {
+//       console.log('请求成功2', resultTotalGold)
+//       // 这是啥东西啊
+//       tableDataTotal.value = resultTotalGold.data
+//     }
+
+//     const sumGoldList = tableData.value.map(item => item.sumGold);
+//     console.log("sumGold", sumGoldList); // 输出包含所有 sumGold 值的数组
+
+//     console.log('@@@@@@@@@@tableDataT', tableDataTotal.value.list)
+
+
+//     // totalGold.value = tableData.value.sum
+
+//     // // 修改为保留两位小数
+//     // permanentGold.value = parseFloat(
+//     //     (tableDataTotal.value.list.sumGold / 100).toFixed(2)
+//     // )
+//     // freeGold.value = parseFloat(
+//     //     (tableDataTotal.value.sumFcion / 100).toFixed(2)
+//     // )
+//     // taskGold.value = parseFloat(
+//     //     (tableDataTotal.value.sumTcion / 100).toFixed(2)
+//     // )
+//     // totalGold.value = parseFloat(
+//     //     (tableDataTotal.value.sumcion / 100).toFixed(2)
+//     // )
+//     console.log('tableData', tableData.value)
+
+//     // 存储分页总数
+//     total.value = result.data.total
+//     console.log('total', total.value)
+//   } catch (error) {
+//     console.log('请求失败', error)
+//     // 在这里可以处理错误逻辑，比如显示错误提示等
+//   }
+// }
+// 搜索
+const search = function () {
+  getObj.value.pageNum = 1
+  // ConsumeSelectBy() todo
+}
+// 重置
+const reset = function () {
+  console.log('兄弟，你点了重置')
+
+  articleVideo.value.jwcode = null
+
+   articleVideo.value.type = ''
+   articleVideo.value.gift = ''
+   articleVideo.value.channel = ''
+   articleVideo.value.liveRoom = ''
+
+   articleVideo.value.dept = ''
+
+   articleVideo.value.startTime = ''
+
+   articleVideo.value.endTime = ''
+
+
+
+  sortField.value = ''
+  sortOrder.value = ''
+  getTime.value = {}
+  activeTimeRange.value = '' // 清除激活状态
+
+
+  // 点完重置后，重新请求数据
+  // ConsumeSelectBy() todo
+  console.log(' articleVideo',  articleVideo.value)
+}
+// 今天
+const getToday = function () {
+  const today = new Date()
+  const startTime = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate()
+  )
+  const endTime = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() + 1
+  )
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'today' // 标记当前激活状态
+
+  // ConsumeSelectBy()
+}
+// 昨天
+const getYesterday = function () {
+  const yesterday = new Date()
+  yesterday.setDate(yesterday.getDate() - 1)
+  const startTime = new Date(
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate()
+  )
+  const endTime = new Date(
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate() + 1
+  )
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'yesterday' // 标记当前激活状态
+
+  // ConsumeSelectBy() //todo
+}
+// 近7天
+const get7Days = function () {
+  const today = new Date()
+  const startTime = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() - 6
+  )
+  const endTime = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() + 1
+  )
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = '7days' // 标记当前激活状态
+
+  // ConsumeSelectBy() todo 
+}
+// 获取商品列表
+// const getGoods = async function () {
+//   try {
+//     // 发送POST请求
+//     const result = await request({
+//       url: '/general/goods',
+//       data: {}
+//     })
+//     // 将响应结果存储到响应式数据中
+//     console.log('请求成功product', result)
+//     // 存储全部数据
+//     goods.value = result.data
+//     console.log('goods 数据', goods.value) // 修改日志输出
+//   } catch (error) {
+//     console.log('请求失败', error)
+//     // 在这里可以处理错误逻辑，比如显示错误提示等
+//   }
+// }
+
+// 获取地区列表的方法
+const getDept = async function () {
+  try {
+    // 发送请求获取地区列表
+    const result = await request({
+      // url: '/general/dept',
+
+      url: '/beanConsume/getDept', // todo 换成实际接口地址
+      data: {account:adminData.value.account}
+    })
+    console.log('请求地区列表成功', result)
+    // 存储地区数据
+    dept.value = result.data
+    console.log('地区数据', dept.value)
+  } catch (error) {
+    console.log('请求地区列表失败', error)
+    ElMessage({
+      type: 'error',
+      message: '获取地区列表失败，请稍后重试'
+    })
+  }
+}
+
+// // 处理排序事件
+// const handleSortChange = (column) => {
+//   console.log('排序字段：', column.prop)
+//   console.log('排序方式：', column.order)
+//   if (column.prop === 'permanentGold') {
+//     sortField.value = 'permanentGold'
+//   } else if (column.prop === 'taskGold') {
+//     sortField.value = 'taskGold'
+//   } else if (column.prop === 'freeGold') {
+//     sortField.value = 'freeGold'
+//   } else if (column.prop === 'createTime') {
+//     sortField.value = 'createTime'
+//   }
+//   sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
+//   ConsumeSelectBy()
+// }
+
+// const handlePageSizeChange = function (val) {
+//   getObj.value.pageSize = val
+//   ConsumeSelectBy()
+// }
+
+// const handleCurrentChange = function (val) {
+//   getObj.value.pageNum = val
+//   ConsumeSelectBy()
+// }
+/*
+====================计算属性=================================
+*/
+
+// 计算总金币数
+// const sumGold = computed(() => permanentGolds.value + freeGolds.value + taskGolds.value)
+
+/*
+====================监听=================================
+*/
+
+/*
+====================挂载=================================
+*/
+
+
+onMounted(async function () {
+  await getAdminData()
+  // await ConsumeSelectBy()
+  // // getActivity();
+  await getDept()
+  // await getGoods()
+})
+
+
+const exportExcel = async function () {
+  // const params = { //需要修改
+  //    articleVideo: {
+  //     jwcode:  articleVideo.value.jwcode || '',
+  //     payPlatform:  articleVideo.value.payPlatform || '',
+  //     dept:  articleVideo.value.dept || '',
+  //     startTime:  articleVideo.value.startTime || '',
+  //     endTime:  articleVideo.value.endTime || '',
+  //     goodsName:  articleVideo.value.goodsName || '',
+  //     sortField: sortField.value || '',
+  //     sortOrder: sortOrder.value || ''
+  //   }
+  // }
+  const res = await API({ url: '/export/exportConsume', data: params })
+  if (res.code === 200) {
+    ElMessage.success('导出成功')
+  }
+}
+const exportListVisible = ref(false)
+
+// 打开导出列表弹窗
+const openExportList = () => {
+  getExportList()
+  exportListVisible.value = true
+}
+
+// 导出列表数据
+const exportList = ref([])
+// 导出列表加载状态
+const exportListLoading = ref(false)
+// 获取导出列表
+const getExportList = async () => {
+  exportListLoading.value = true
+  try {
+    const result = await API({ url: '/export/export' })
+    if (result.code === 200) {
+      const filteredData = result.data.filter(item => {
+        return item.type === 4; //4表示金币消耗列表 // todo 修改对应type
+      });
+      exportList.value = filteredData
+    } else {
+      ElMessage.error(result.msg || '获取导出列表失败')
+    }
+  } catch (error) {
+    console.error('获取导出列表出错:', error)
+    ElMessage.error('获取导出列表失败，请稍后重试')
+  } finally {
+    exportListLoading.value = false
+  }
+}
+// 下载导出文件
+const downloadExportFile = (item) => {
+  if (item.state === 2) {
+    const link = document.createElement('a')
+    link.href = item.url
+    link.download = item.fileName
+    link.click()
+  } else {
+    ElMessage.warning('文件还在导出中，请稍后再试')
+  }
+}
+//根据状态返回对应的标签类型
+const getTagType = (state) => {
+  switch (state) {
+    case 0:
+      return 'info';
+    case 1:
+      return 'primary';
+    case 2:
+      return 'success';
+    case 3:
+      return 'danger';
+    default:
+      return 'info';
+  }
+}
+//根据状态返回对应的标签文案
+const getTagText = (state) => {
+  switch (state) {
+    case 0:
+      return '待执行';
+    case 1:
+      return '执行中';
+    case 2:
+      return '执行完成';
+    case 3:
+      return '执行出错';
+    default:
+      return '未知状态';
+  }
+}
 </script>
 
 <template>
-  <div>article videos</div>
+  <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="articleVideo.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="articleVideo.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="articleVideo.type" placeholder="请选择类型" style="width: 140px" clearable>
+                <el-option label="打赏" value="打赏" />
+                <el-option label="付费" value="付费" />
+              </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="articleVideo.articleVideoId" placeholder="请输入文章/视频ID" style="width: 140px" clearable />
+            </div>
+          </el-col>
+          <el-col :span="4">
+            <div class="head-card-element">
+              <el-text class="mx-1">文章/视频标题：</el-text>
+              <el-input v-model="articleVideo.articleVideoTitle" 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-input v-model="articleVideo.author" placeholder="请输入作者" style="width: 140px" 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"
+                value-format="YYYY-MM-DD HH:mm:ss"
+              />
+              <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-col>
+  </el-row>
+  <el-row>
+    <el-col>
+      <el-card>
+        <div>
+          金豆总数：{{ Math.abs(permanentGolds + freeGolds + taskGolds) / 100 }}，付费金豆数：{{ Math.abs(permanentGolds) / 100 }}，免费金豆数：{{
+            Math.abs(freeGolds) / 100
+          }}
+        </div>
+        <!-- 设置表格容器的高度和滚动样式 -->
+        <div style="height: 576px; overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="576px" @sort-change="handleSortChange">
+            <el-table-column type="index" label="序号" width="80px" fixed="left">
+              <template #default="scope">
+                <span>{{
+                  scope.$index + 1 + (getObj.value.pageNum - 1) * getObj.value.pageSize
+                }}</span>
+              </template>
+            </el-table-column>
+            <!-- 固定姓名列 -->
+            <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
+            <!-- 固定精网号列 -->
+            <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
+            <el-table-column prop="dept" label="地区" width="110px" />
+            <el-table-column prop="type" label="类型" width="120px">
+              <template #default="scope">
+                <!-- 假设 type 是数字，需要转换为对应中文描述 -->
+                {{ consumeTypes.value.find(item => item.value === scope.row.type)?.label || '未知类型' }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="sumGold" label="金豆总数" width="120px">
+              <template #default="scope">
+                {{
+                  (scope.row.taskGold +
+                    scope.row.freeGold +
+                    scope.row.permanentGold) / 100
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="permanentGold" label="付费金豆数" width="120px">
+              <template #default="scope">
+                {{ scope.row.permanentGold / 100 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="freeGold" label="免费金豆数" width="120px">
+              <template #default="scope">
+                {{ scope.row.freeGold / 100 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="articleVideoId" label="文章/视频ID" width="150px" />
+            <el-table-column prop="articleVideoTitle" label="文章/视频标题" width="200px" show-overflow-tooltip />
+            <el-table-column prop="author" label="作者" width="120px" />
+            <el-table-column prop="payTime" label="付费时间" width="180px">
+              <template #default="scope">
+                {{ formatTime(scope.row.payTime) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+
+        <!-- 分页 -->
+        <div class="pagination">
+          <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
+            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%" :loading="exportListLoading">
+      <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'">
+            {{ getTagText(scope.row.state) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间">
+        <template #default="scope">
+          {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
+            :disabled="scope.row.state !== 2">
+            下载
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button text @click="exportListVisible = false">关闭</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <style scoped>
+.status {
+  display: flex;
+}
+
+.head-card {
+  display: flex;
+}
+
+.head-card-element {
+  margin-right: 20px;
+}
+
+.head-card-btn {
+  margin-left: auto;
+}
 
-</style>
\ No newline at end of file
+.pagination {
+  display: flex;
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/consume/dieHardFan.vue b/src/views/consume/dieHardFan.vue
index 78d9704..ac43bd4 100644
--- a/src/views/consume/dieHardFan.vue
+++ b/src/views/consume/dieHardFan.vue
@@ -1,11 +1,730 @@
-<script setup lang="ts">
+<script setup>
+import { computed, onMounted, ref } from 'vue'
+import { dayjs, ElMessage } from 'element-plus'
+import request from '@/util/http'
+import API from '@/util/http'
+import moment from 'moment'
+// 之后整理一下
 
+/*
+====================工具方法==============================
+*/
+
+// 时间格式化
+const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
+
+/*
+====================数据=================================
+*/
+//这是获取用户信息的接口
+const adminData = ref({})
+// 充值明细表格
+const tableData = ref([])
+
+// 搜索liveStream 表单
+const dieHardFan = ref({
+  jwcode: null,
+  dept: "",
+  type: "",
+  gift: "",
+  channel: "",
+  liveRoom: "",
+  startTime: '',
+  endTime: '',
+
+})
+// 频道列表
+const channels = ref([])
+
+// 抽离类型选项到响应式数组
+const consumeTypes = ref([
+  { label: '发礼物', value: 1 },
+  { label: '发红包', value: 2 },
+  { label: '发福袋', value: 3 },
+  { label: '付费直播', value: 4 },
+  { label: '加入粉丝团', value: 5 },
+  { label: '发弹幕', value: 6 }
+])
+
+// 处理类型选择变化
+const handleTypeChange = (value) => {
+  if (value !==  1) {
+    dieHardFan.value.gift = ''
+  }
+}
+
+//------------------------
+
+// 标记当前激活的时间范围按钮
+const activeTimeRange = ref('')
+// 日期选择器变化时清除按钮激活状态
+const handleDatePickerChange = () => {
+  activeTimeRange.value = ''
+}
+// 搜索对象
+const getObj = ref({
+  pageNum: 1,
+  pageSize: 50
+})
+
+//分页总条目
+const total = ref(100)
+
+// 搜索对象时间
+const getTime = ref({
+  startTime: '',
+  endTime: ''
+})
+// 搜索活动列表
+// const activity = ref([])
+
+// 搜索地区列表
+const dept = ref([])
+
+// 频道模糊查询方法
+const filterChannel = (query) => {
+  if (query) {
+    return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
+  }
+  return channels.value;
+};
+
+// 新增排序字段和排序方式
+const sortField = ref('')
+const sortOrder = ref('')
+
+// // 消费平台选项
+// const consumePlatform = [
+//   {
+//     value: '金币系统',
+//     label: '金币系统'
+//   },
+
+//   {
+//     value: 'HomilyChart',
+//     label: 'HomilyChart'
+//   },
+//   {
+//     value: 'HomilyLink',
+//     label: 'HomilyLink'
+//   },
+//   {
+//     value: 'ERP',
+//     label: 'ERP'
+//   },
+//   {
+//     value: '其他',
+//     label: '其他'
+//   },
+//   {
+//     value: '初始化金币',
+//     label: '初始化金币'
+//   },
+// ]
+
+// // 合计数的显示数据
+// const tableDataTotal = ref({})
+
+// const permanentGold = ref(0)
+// const freeGold = ref(0)
+// const taskGold = ref(0)
+// const totalGold = ref(0)
+// // 定义响应式变量存储金币合计数
+// const permanentGolds = ref(0)
+// const freeGolds = ref(0)
+// const taskGolds = ref(0)
+// // 查询商品的接口的表单
+// const goods = ref([])
+
+// const totalGoldSearch = ref({
+//   jwcode: null,
+//   payPlatform: "",
+//   dept: "",
+//   startTime: "",
+//   endTime: "",
+//   goodsName: ""
+// })
+
+/*
+====================方法=================================
+*/
+// 获取登录用户信息
+const getAdminData = async function () {
+  try {
+    const result = await request({
+      url: '/admin/userinfo',
+      data: {}
+    })
+    adminData.value = result
+    console.log('请求成功', result)
+    console.log('用户信息', adminData.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
+
+// todo
+// const ConsumeSelectBy = async function (val) {
+//   try {
+
+//     // 搜索参数页码赋值
+//     if (typeof val === 'number') {
+//       getObj.value.pageNum = val
+//     }
+//     // 搜索参数时间赋值
+
+//     if (getTime.value != null) {
+//       if (getTime.value.startTime != '' && getTime.value.endTime != '') {
+//          dieHardFan.value.startTime = formatTime(getTime.value[0])
+//          dieHardFan.value.endTime = formatTime(getTime.value[1])
+//       }
+//     } else {
+//        dieHardFan.value.startTime = ''
+//        dieHardFan.value.endTime = ''
+//     }
+//      dieHardFan.value.sortField = sortField.value
+//      dieHardFan.value.sortOrder = sortOrder.value
+
+//     console.log('搜索参数_时间',  dieHardFan.value.startTime)
+
+//     console.log('搜索参数1', getObj.value)
+
+//     console.log('搜索参数2',  dieHardFan.value)
+
+//     // 发送POST请求
+//     const result = await request({
+//       url: '/consume/selectBy',
+//       data: {
+//         pageNum: getObj.value.pageNum,
+//         pageSize: getObj.value.pageSize,
+//          dieHardFan: {
+//           ... dieHardFan.value,
+//           sortField: sortField.value,
+//           sortOrder: sortOrder.value
+//         }
+//       }
+//     })
+
+//     console.log('请求成功2', sortField)
+
+//     // 合计数的接口
+//     // 复制一份 detail.value 并移除排序字段和排序方式
+//     const detailWithoutSort = { ... dieHardFan.value }
+//     delete detailWithoutSort.sortField
+//     delete detailWithoutSort.sortOrder
+
+
+//     // 赋值
+//     totalGoldSearch.value.startTime =  dieHardFan.value.startTime
+//     totalGoldSearch.value.endTime =  dieHardFan.value.endTime
+//     totalGoldSearch.value.payPlatform =  dieHardFan.value.payPlatform
+//     totalGoldSearch.value.dept =  dieHardFan.value.dept
+//     totalGoldSearch.value.goodsName =  dieHardFan.value.goodsName
+//     totalGoldSearch.value.jwcode =  dieHardFan.value.jwcode
+//     //
+//     const resultTotalGold = await request({
+//       // url: '/consume/statsGold',
+//       url: '/consume/statsGold',
+//       data: totalGoldSearch.value
+
+//     })
+
+//     console.log("总计", resultTotalGold)
+
+//     if (resultTotalGold.code === 200 && resultTotalGold.data) {
+//       const data = resultTotalGold.data
+//       console.log('获取到的金币数据:', data)
+
+//       permanentGolds.value = Number(data.permanentGolds) || 0
+//       freeGolds.value = Number(data.freeGolds) || 0
+//       taskGolds.value = Number(data.taskGolds) || 0
+//     }
+
+//     // 存储表格数据
+//     tableData.value = result.data.list
+//     tableDataTotal.value = resultTotalGold.data
+//     if (resultTotalGold.data == null) {
+//       console.log('请求成功2', resultTotalGold)
+//       // 这是啥东西啊
+//       tableDataTotal.value = resultTotalGold.data
+//     }
+
+//     const sumGoldList = tableData.value.map(item => item.sumGold);
+//     console.log("sumGold", sumGoldList); // 输出包含所有 sumGold 值的数组
+
+//     console.log('@@@@@@@@@@tableDataT', tableDataTotal.value.list)
+
+
+//     // totalGold.value = tableData.value.sum
+
+//     // // 修改为保留两位小数
+//     // permanentGold.value = parseFloat(
+//     //     (tableDataTotal.value.list.sumGold / 100).toFixed(2)
+//     // )
+//     // freeGold.value = parseFloat(
+//     //     (tableDataTotal.value.sumFcion / 100).toFixed(2)
+//     // )
+//     // taskGold.value = parseFloat(
+//     //     (tableDataTotal.value.sumTcion / 100).toFixed(2)
+//     // )
+//     // totalGold.value = parseFloat(
+//     //     (tableDataTotal.value.sumcion / 100).toFixed(2)
+//     // )
+//     console.log('tableData', tableData.value)
+
+//     // 存储分页总数
+//     total.value = result.data.total
+//     console.log('total', total.value)
+//   } catch (error) {
+//     console.log('请求失败', error)
+//     // 在这里可以处理错误逻辑，比如显示错误提示等
+//   }
+// }
+// 搜索
+const search = function () {
+  getObj.value.pageNum = 1
+  // ConsumeSelectBy() todo
+}
+// 重置
+const reset = function () {
+  console.log('兄弟，你点了重置')
+
+  dieHardFan.value.jwcode = null
+
+   dieHardFan.value.type = ''
+   dieHardFan.value.gift = ''
+   dieHardFan.value.channel = ''
+   dieHardFan.value.liveRoom = ''
+
+   dieHardFan.value.dept = ''
+
+   dieHardFan.value.startTime = ''
+
+   dieHardFan.value.endTime = ''
+
+
+
+  sortField.value = ''
+  sortOrder.value = ''
+  getTime.value = {}
+  activeTimeRange.value = '' // 清除激活状态
+
+
+  // 点完重置后，重新请求数据
+  // ConsumeSelectBy() todo
+  console.log(' dieHardFan',  dieHardFan.value)
+}
+// 今天
+const getToday = function () {
+  const today = new Date()
+  const startTime = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate()
+  )
+  const endTime = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() + 1
+  )
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'today' // 标记当前激活状态
+
+  // ConsumeSelectBy()
+}
+// 昨天
+const getYesterday = function () {
+  const yesterday = new Date()
+  yesterday.setDate(yesterday.getDate() - 1)
+  const startTime = new Date(
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate()
+  )
+  const endTime = new Date(
+    yesterday.getFullYear(),
+    yesterday.getMonth(),
+    yesterday.getDate() + 1
+  )
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'yesterday' // 标记当前激活状态
+
+  // ConsumeSelectBy() //todo
+}
+// 近7天
+const get7Days = function () {
+  const today = new Date()
+  const startTime = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() - 6
+  )
+  const endTime = new Date(
+    today.getFullYear(),
+    today.getMonth(),
+    today.getDate() + 1
+  )
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = '7days' // 标记当前激活状态
+
+  // ConsumeSelectBy() todo 
+}
+// 获取商品列表
+// const getGoods = async function () {
+//   try {
+//     // 发送POST请求
+//     const result = await request({
+//       url: '/general/goods',
+//       data: {}
+//     })
+//     // 将响应结果存储到响应式数据中
+//     console.log('请求成功product', result)
+//     // 存储全部数据
+//     goods.value = result.data
+//     console.log('goods 数据', goods.value) // 修改日志输出
+//   } catch (error) {
+//     console.log('请求失败', error)
+//     // 在这里可以处理错误逻辑，比如显示错误提示等
+//   }
+// }
+
+// 获取地区列表的方法
+const getDept = async function () {
+  try {
+    // 发送请求获取地区列表
+    const result = await request({
+      // url: '/general/dept',
+
+      url: '/beanConsume/getDept', // todo 换成实际接口地址
+      data: {account:adminData.value.account}
+    })
+    console.log('请求地区列表成功', result)
+    // 存储地区数据
+    dept.value = result.data
+    console.log('地区数据', dept.value)
+  } catch (error) {
+    console.log('请求地区列表失败', error)
+    ElMessage({
+      type: 'error',
+      message: '获取地区列表失败，请稍后重试'
+    })
+  }
+}
+
+// // 处理排序事件
+// const handleSortChange = (column) => {
+//   console.log('排序字段：', column.prop)
+//   console.log('排序方式：', column.order)
+//   if (column.prop === 'permanentGold') {
+//     sortField.value = 'permanentGold'
+//   } else if (column.prop === 'taskGold') {
+//     sortField.value = 'taskGold'
+//   } else if (column.prop === 'freeGold') {
+//     sortField.value = 'freeGold'
+//   } else if (column.prop === 'createTime') {
+//     sortField.value = 'createTime'
+//   }
+//   sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
+//   ConsumeSelectBy()
+// }
+
+// const handlePageSizeChange = function (val) {
+//   getObj.value.pageSize = val
+//   ConsumeSelectBy()
+// }
+
+// const handleCurrentChange = function (val) {
+//   getObj.value.pageNum = val
+//   ConsumeSelectBy()
+// }
+/*
+====================计算属性=================================
+*/
+
+// 计算总金币数
+// const sumGold = computed(() => permanentGolds.value + freeGolds.value + taskGolds.value)
+
+/*
+====================监听=================================
+*/
+
+/*
+====================挂载=================================
+*/
+
+
+onMounted(async function () {
+  await getAdminData()
+  // await ConsumeSelectBy()
+  // // getActivity();
+  await getDept()
+  // await getGoods()
+})
+
+
+const exportExcel = async function () {
+  // const params = { //需要修改
+  //    dieHardFan: {
+  //     jwcode:  dieHardFan.value.jwcode || '',
+  //     payPlatform:  dieHardFan.value.payPlatform || '',
+  //     dept:  dieHardFan.value.dept || '',
+  //     startTime:  dieHardFan.value.startTime || '',
+  //     endTime:  dieHardFan.value.endTime || '',
+  //     goodsName:  dieHardFan.value.goodsName || '',
+  //     sortField: sortField.value || '',
+  //     sortOrder: sortOrder.value || ''
+  //   }
+  // }
+  const res = await API({ url: '/export/exportConsume', data: params })
+  if (res.code === 200) {
+    ElMessage.success('导出成功')
+  }
+}
+const exportListVisible = ref(false)
+
+// 打开导出列表弹窗
+const openExportList = () => {
+  getExportList()
+  exportListVisible.value = true
+}
+
+// 导出列表数据
+const exportList = ref([])
+// 导出列表加载状态
+const exportListLoading = ref(false)
+// 获取导出列表
+const getExportList = async () => {
+  exportListLoading.value = true
+  try {
+    const result = await API({ url: '/export/export' })
+    if (result.code === 200) {
+      const filteredData = result.data.filter(item => {
+        return item.type === 4; //4表示金币消耗列表 // todo 修改对应type
+      });
+      exportList.value = filteredData
+    } else {
+      ElMessage.error(result.msg || '获取导出列表失败')
+    }
+  } catch (error) {
+    console.error('获取导出列表出错:', error)
+    ElMessage.error('获取导出列表失败，请稍后重试')
+  } finally {
+    exportListLoading.value = false
+  }
+}
+// 下载导出文件
+const downloadExportFile = (item) => {
+  if (item.state === 2) {
+    const link = document.createElement('a')
+    link.href = item.url
+    link.download = item.fileName
+    link.click()
+  } else {
+    ElMessage.warning('文件还在导出中，请稍后再试')
+  }
+}
+//根据状态返回对应的标签类型
+const getTagType = (state) => {
+  switch (state) {
+    case 0:
+      return 'info';
+    case 1:
+      return 'primary';
+    case 2:
+      return 'success';
+    case 3:
+      return 'danger';
+    default:
+      return 'info';
+  }
+}
+//根据状态返回对应的标签文案
+const getTagText = (state) => {
+  switch (state) {
+    case 0:
+      return '待执行';
+    case 1:
+      return '执行中';
+    case 2:
+      return '执行完成';
+    case 3:
+      return '执行出错';
+    default:
+      return '未知状态';
+  }
+}
 </script>
 
 <template>
-  <div>die-hard fans</div>
+  <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="dieHardFan.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="dieHardFan.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="dieHardFan.channel"
+                placeholder="请选择频道"
+                style="width: 180px"
+                clearable
+                filterable
+                allow-create
+                default-first-option
+                :filter-method="filterChannel"
+              >
+                <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"
+              />
+              <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-col>
+  </el-row>
+  <el-row>
+    <el-col>
+      <el-card>
+        <div>
+          金豆总数：{{ Math.abs(permanentGolds + freeGolds + taskGolds) / 100 }}，付费金豆数：{{ Math.abs(permanentGolds) / 100 }}，免费金豆数：{{
+            Math.abs(freeGolds) / 100
+          }}
+        </div>
+        <!-- 设置表格容器的高度和滚动样式 -->
+        <div style="height: 576px; overflow-y: auto">
+          <el-table :data="tableData" style="width: 100%" height="576px" @sort-change="handleSortChange">
+            <el-table-column type="index" label="序号" width="80px" fixed="left">
+              <template #default="scope">
+                <span>{{
+                  scope.$index + 1 + (getObj.value.pageNum - 1) * getObj.value.pageSize
+                }}</span>
+              </template>
+            </el-table-column>
+            <!-- 固定姓名列 -->
+            <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
+            <!-- 固定精网号列 -->
+            <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
+            <el-table-column prop="dept" label="地区" width="110px" />
+            <el-table-column prop="sumGold" label="金豆数量" width="120px">
+              <template #default="scope">
+                {{
+                  (scope.row.taskGold +
+                    scope.row.freeGold +
+                    scope.row.permanentGold) / 100
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="channel" label="频道" width="120px" />
+            <el-table-column prop="memberType" label="会员类型" width="120px" />
+            <el-table-column prop="joinMethod" label="加入方式" width="120px" />
+            <el-table-column prop="joinTime" label="加入时间" width="180px" />
+            <el-table-column prop="expireTime" label="到期时间" width="180px" />
+          </el-table>
+        </div>
+
+        <!-- 分页 -->
+        <div class="pagination">
+          <el-pagination background :page-size="getObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
+            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%" :loading="exportListLoading">
+      <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'">
+            {{ getTagText(scope.row.state) }}
+          </el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="创建时间">
+        <template #default="scope">
+          {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作">
+        <template #default="scope">
+          <el-button type="primary" size="small" @click="downloadExportFile(scope.row)"
+            :disabled="scope.row.state !== 2">
+            下载
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button text @click="exportListVisible = false">关闭</el-button>
+      </div>
+    </template>
+  </el-dialog>
 </template>
 
 <style scoped>
+.status {
+  display: flex;
+}
+
+.head-card {
+  display: flex;
+}
+
+.head-card-element {
+  margin-right: 20px;
+}
+
+.head-card-btn {
+  margin-left: auto;
+}
 
-</style>
\ No newline at end of file
+.pagination {
+  display: flex;
+  margin-top: 20px;
+}
+</style>
diff --git a/src/views/consume/liveStream.vue b/src/views/consume/liveStream.vue
index ae6aa89..94ca7de 100644
--- a/src/views/consume/liveStream.vue
+++ b/src/views/consume/liveStream.vue
@@ -22,15 +22,17 @@ const adminData = ref({})
 const tableData = ref([])
 
 // 搜索liveStream 表单
-const liveStream = ref({
+const beanConsumeLive = ref({
   jwcode: null,
-  market: "",
+  dept: "",
   type: "",
-  giftName: "",
+  gift: "",
   channel: "",
-  liveRoom: "",
+  liveName: "",
   startTime: '',
   endTime: '',
+  sortField: '',
+  sortOrder: ''
 
 })
 // 频道列表
@@ -38,18 +40,18 @@ const channels = ref([])
 
 // 抽离类型选项到响应式数组
 const consumeTypes = ref([
-  { label: '发礼物', value: '发礼物' },
-  { label: '发红包', value: '发红包' },
-  { label: '发福袋', value: '发福袋' },
-  { label: '付费直播', value: '付费直播' },
-  { label: '加入粉丝团', value: '加入粉丝团' },
-  { label: '发弹幕', value: '发弹幕' }
+  { label: '发礼物', value: 1 },
+  { label: '发红包', value: 2 },
+  { label: '发福袋', value: 3 },
+  { label: '付费直播', value: 4 },
+  { label: '加入粉丝团', value: 5 },
+  { label: '发弹幕', value: 6 }
 ])
 
 // 处理类型选择变化
 const handleTypeChange = (value) => {
-  if (value !== '发礼物') {
-    liveStream.value.giftName = ''
+  if (value !==  1) {
+    beanConsumeLive.value.gift = ''
   }
 }
 
@@ -79,7 +81,7 @@ const getTime = ref({
 // const activity = ref([])
 
 // 搜索地区列表
-const market = ref([])
+const dept = ref([])
 
 // 新增排序字段和排序方式
 const sortField = ref('')
@@ -131,7 +133,7 @@ const sortOrder = ref('')
 // const totalGoldSearch = ref({
 //   jwcode: null,
 //   payPlatform: "",
-//   market: "",
+//   dept: "",
 //   startTime: "",
 //   endTime: "",
 //   goodsName: ""
@@ -155,144 +157,127 @@ const getAdminData = async function () {
   }
 }
 
+const selectLiveBy = async function (val) {
+  try {
 
-// const ConsumeSelectBy = async function (val) {
-//   try {
+    // 搜索参数页码赋值
+    if (typeof val === 'number') {
+      getObj.value.pageNum = val
+    }
+    // 搜索参数时间赋值
 
-//     // 搜索参数页码赋值
-//     if (typeof val === 'number') {
-//       getObj.value.pageNum = val
-//     }
-//     // 搜索参数时间赋值
+    if (getTime.value != null) {
+      if (getTime.value.startTime != '' && getTime.value.endTime != '') {
+         beanConsumeLive.value.startTime = formatTime(getTime.value[0])
+         beanConsumeLive.value.endTime = formatTime(getTime.value[1])
+      }
+    } else {
+       beanConsumeLive.value.startTime = ''
+       beanConsumeLive.value.endTime = ''
+    }
+     beanConsumeLive.value.sortField = sortField.value
+     beanConsumeLive.value.sortOrder = sortOrder.value
 
-//     if (getTime.value != null) {
-//       if (getTime.value.startTime != '' && getTime.value.endTime != '') {
-//          liveStream.value.startTime = formatTime(getTime.value[0])
-//          liveStream.value.endTime = formatTime(getTime.value[1])
-//       }
-//     } else {
-//        liveStream.value.startTime = ''
-//        liveStream.value.endTime = ''
-//     }
-//      liveStream.value.sortField = sortField.value
-//      liveStream.value.sortOrder = sortOrder.value
+    console.log('搜索参数_时间',  beanConsumeLive.value.startTime)
 
-//     console.log('搜索参数_时间',  liveStream.value.startTime)
+    console.log('搜索参数1', getObj.value)
 
-//     console.log('搜索参数1', getObj.value)
+    console.log('搜索参数2',  beanConsumeLive.value)
 
-//     console.log('搜索参数2',  liveStream.value)
+    // 发送POST请求
+    const result = await request({
+      url: '/beanConsume/selectLiveBy',
+      data: {
+        pageNum: getObj.value.pageNum,
+        pageSize: getObj.value.pageSize,
+         beanConsumeLive: {
+          ... beanConsumeLive.value,
+          sortField: sortField.value,
+          sortOrder: sortOrder.value
+        }
+      }
+    })
 
-//     // 发送POST请求
-//     const result = await request({
-//       url: '/consume/selectBy',
-//       data: {
-//         pageNum: getObj.value.pageNum,
-//         pageSize: getObj.value.pageSize,
-//          liveStream: {
-//           ... liveStream.value,
-//           sortField: sortField.value,
-//           sortOrder: sortOrder.value
-//         }
-//       }
-//     })
+    console.log('请求成功2', sortField)
 
-//     console.log('请求成功2', sortField)
+    // // 合计数的接口
+    // // 复制一份 detail.value 并移除排序字段和排序方式
+    // const detailWithoutSort = { ... beanConsumeLive.value }
+    // delete detailWithoutSort.sortField
+    // delete detailWithoutSort.sortOrder
 
-//     // 合计数的接口
-//     // 复制一份 detail.value 并移除排序字段和排序方式
-//     const detailWithoutSort = { ... liveStream.value }
-//     delete detailWithoutSort.sortField
-//     delete detailWithoutSort.sortOrder
 
+    // // 赋值
+    // totalGoldSearch.value.startTime =  beanConsumeLive.value.startTime
+    // totalGoldSearch.value.endTime =  beanConsumeLive.value.endTime
 
-//     // 赋值
-//     totalGoldSearch.value.startTime =  liveStream.value.startTime
-//     totalGoldSearch.value.endTime =  liveStream.value.endTime
-//     totalGoldSearch.value.payPlatform =  liveStream.value.payPlatform
-//     totalGoldSearch.value.market =  liveStream.value.market
-//     totalGoldSearch.value.goodsName =  liveStream.value.goodsName
-//     totalGoldSearch.value.jwcode =  liveStream.value.jwcode
-//     //
-//     const resultTotalGold = await request({
-//       // url: '/consume/statsGold',
-//       url: '/consume/statsGold',
-//       data: totalGoldSearch.value
+    // totalGoldSearch.value.dept =  beanConsumeLive.value.dept
+    // totalGoldSearch.value.goodsName =  beanConsumeLive.value.goodsName
+    // totalGoldSearch.value.jwcode =  beanConsumeLive.value.jwcode
+    // //
+    // const resultTotalGold = await request({
+    //   // url: '/consume/statsGold',
+    //   url: '/consume/statsGold',
+    //   data: totalGoldSearch.value
 
-//     })
+    // })
 
-//     console.log("总计", resultTotalGold)
-
-//     if (resultTotalGold.code === 200 && resultTotalGold.data) {
-//       const data = resultTotalGold.data
-//       console.log('获取到的金币数据:', data)
-
-//       permanentGolds.value = Number(data.permanentGolds) || 0
-//       freeGolds.value = Number(data.freeGolds) || 0
-//       taskGolds.value = Number(data.taskGolds) || 0
-//     }
-
-//     // 存储表格数据
-//     tableData.value = result.data.list
-//     tableDataTotal.value = resultTotalGold.data
-//     if (resultTotalGold.data == null) {
-//       console.log('请求成功2', resultTotalGold)
-//       // 这是啥东西啊
-//       tableDataTotal.value = resultTotalGold.data
-//     }
-
-//     const sumGoldList = tableData.value.map(item => item.sumGold);
-//     console.log("sumGold", sumGoldList); // 输出包含所有 sumGold 值的数组
-
-//     console.log('@@@@@@@@@@tableDataT', tableDataTotal.value.list)
-
-
-//     // totalGold.value = tableData.value.sum
-
-//     // // 修改为保留两位小数
-//     // permanentGold.value = parseFloat(
-//     //     (tableDataTotal.value.list.sumGold / 100).toFixed(2)
-//     // )
-//     // freeGold.value = parseFloat(
-//     //     (tableDataTotal.value.sumFcion / 100).toFixed(2)
-//     // )
-//     // taskGold.value = parseFloat(
-//     //     (tableDataTotal.value.sumTcion / 100).toFixed(2)
-//     // )
-//     // totalGold.value = parseFloat(
-//     //     (tableDataTotal.value.sumcion / 100).toFixed(2)
-//     // )
-//     console.log('tableData', tableData.value)
-
-//     // 存储分页总数
-//     total.value = result.data.total
-//     console.log('total', total.value)
-//   } catch (error) {
-//     console.log('请求失败', error)
-//     // 在这里可以处理错误逻辑，比如显示错误提示等
-//   }
-// }
+    // console.log("总计", resultTotalGold)
+
+    // if (resultTotalGold.code === 200 && resultTotalGold.data) {
+    //   const data = resultTotalGold.data
+    //   console.log('获取到的金币数据:', data)
+
+    //   permanentGolds.value = Number(data.permanentGolds) || 0
+    //   freeGolds.value = Number(data.freeGolds) || 0
+    //   taskGolds.value = Number(data.taskGolds) || 0
+    // }
+
+    // // 存储表格数据
+    // tableData.value = result.data.list
+    // tableDataTotal.value = resultTotalGold.data
+    // if (resultTotalGold.data == null) {
+    //   console.log('请求成功2', resultTotalGold)
+    //   // 这是啥东西啊
+    //   tableDataTotal.value = resultTotalGold.data
+    // }
+
+    // const sumGoldList = tableData.value.map(item => item.sumGold);
+    // console.log("sumGold", sumGoldList); // 输出包含所有 sumGold 值的数组
+
+    // console.log('@@@@@@@@@@tableDataT', tableDataTotal.value.list)
+
+    // console.log('tableData', tableData.value)
+
+    // 存储分页总数
+    total.value = result.data.total
+    console.log('total', total.value)
+  } catch (error) {
+    console.log('请求失败', error)
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+}
 // 搜索
 const search = function () {
   getObj.value.pageNum = 1
-  // ConsumeSelectBy()
+  // selectLiveBy() todo
 }
 // 重置
 const reset = function () {
   console.log('兄弟，你点了重置')
 
-  liveStream.value.jwcode = null
+  beanConsumeLive.value.jwcode = null
 
-   liveStream.value.type = ''
-   liveStream.value.giftName = ''
-   liveStream.value.channel = ''
-   liveStream.value.liveRoom = ''
+   beanConsumeLive.value.type = ''
+   beanConsumeLive.value.gift = ''
+   beanConsumeLive.value.channel = ''
+   beanConsumeLive.value.liveName = ''
 
-   liveStream.value.market = ''
+   beanConsumeLive.value.dept = ''
 
-   liveStream.value.startTime = ''
+   beanConsumeLive.value.startTime = ''
 
-   liveStream.value.endTime = ''
+   beanConsumeLive.value.endTime = ''
 
 
 
@@ -303,8 +288,8 @@ const reset = function () {
 
 
   // 点完重置后，重新请求数据
-  // ConsumeSelectBy()
-  console.log(' liveStream',  liveStream.value)
+  selectLiveBy() 
+  console.log(' beanConsumeLive',  beanConsumeLive.value)
 }
 // 今天
 const getToday = function () {
@@ -323,7 +308,7 @@ const getToday = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'today' // 标记当前激活状态
 
-  // ConsumeSelectBy()
+  // selectLiveBy()
 }
 // 昨天
 const getYesterday = function () {
@@ -343,7 +328,7 @@ const getYesterday = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = 'yesterday' // 标记当前激活状态
 
-  ConsumeSelectBy()
+  // selectLiveBy() //todo
 }
 // 近7天
 const get7Days = function () {
@@ -362,7 +347,7 @@ const get7Days = function () {
   console.log('getTime', getTime.value)
   activeTimeRange.value = '7days' // 标记当前激活状态
 
-  ConsumeSelectBy()
+  // selectLiveBy() todo 
 }
 // 获取商品列表
 // const getGoods = async function () {
@@ -383,28 +368,28 @@ const get7Days = function () {
 //   }
 // }
 
-// // 获取地区列表的方法
-// const getMarket = async function () {
-//   try {
-//     // 发送请求获取地区列表
-//     const result = await request({
-//       // url: '/general/market',
+// 获取地区列表的方法
+const getDept = async function () {
+  try {
+    // 发送请求获取地区列表
+    const result = await request({
+      // url: '/general/dept',
 
-//       url: '/general/adminMarkets', // todo 换成实际接口地址
-//       data: {account:adminData.value.account}
-//     })
-//     console.log('请求地区列表成功', result)
-//     // 存储地区数据
-//     market.value = result.data
-//     console.log('地区数据', market.value)
-//   } catch (error) {
-//     console.log('请求地区列表失败', error)
-//     ElMessage({
-//       type: 'error',
-//       message: '获取地区列表失败，请稍后重试'
-//     })
-//   }
-// }
+      url: '/beanConsume/getDept', // todo 换成实际接口地址
+      data: {account:adminData.value.account}
+    })
+    console.log('请求地区列表成功', result)
+    // 存储地区数据
+    dept.value = result.data
+    console.log('地区数据', dept.value)
+  } catch (error) {
+    console.log('请求地区列表失败', error)
+    ElMessage({
+      type: 'error',
+      message: '获取地区列表失败，请稍后重试'
+    })
+  }
+}
 
 // // 处理排序事件
 // const handleSortChange = (column) => {
@@ -420,17 +405,17 @@ const get7Days = function () {
 //     sortField.value = 'createTime'
 //   }
 //   sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
-//   ConsumeSelectBy()
+//   selectLiveBy()
 // }
 
 // const handlePageSizeChange = function (val) {
 //   getObj.value.pageSize = val
-//   ConsumeSelectBy()
+//   selectLiveBy()
 // }
 
 // const handleCurrentChange = function (val) {
 //   getObj.value.pageNum = val
-//   ConsumeSelectBy()
+//   selectLiveBy()
 // }
 /*
 ====================计算属性=================================
@@ -450,104 +435,104 @@ const get7Days = function () {
 
 onMounted(async function () {
   await getAdminData()
-  // await ConsumeSelectBy()
+  // await selectLiveBy()
   // // getActivity();
-  // await getMarket()
+  await getDept()
   // await getGoods()
 })
 
 
-// const exportExcel = async function () {
-//   const params = {
-//      liveStream: {
-//       jwcode:  liveStream.value.jwcode || '',
-//       payPlatform:  liveStream.value.payPlatform || '',
-//       market:  liveStream.value.market || '',
-//       startTime:  liveStream.value.startTime || '',
-//       endTime:  liveStream.value.endTime || '',
-//       goodsName:  liveStream.value.goodsName || '',
-//       sortField: sortField.value || '',
-//       sortOrder: sortOrder.value || ''
-//     }
-//   }
-//   const res = await API({ url: '/export/exportConsume', data: params })
-//   if (res.code === 200) {
-//     ElMessage.success('导出成功')
-//   }
-// }
-// const exportListVisible = ref(false)
+const exportExcel = async function () {
+  // const params = { //需要修改
+  //    beanConsumeLive: {
+  //     jwcode:  beanConsumeLive.value.jwcode || '',
+  //     payPlatform:  beanConsumeLive.value.payPlatform || '',
+  //     dept:  beanConsumeLive.value.dept || '',
+  //     startTime:  beanConsumeLive.value.startTime || '',
+  //     endTime:  beanConsumeLive.value.endTime || '',
+  //     goodsName:  beanConsumeLive.value.goodsName || '',
+  //     sortField: sortField.value || '',
+  //     sortOrder: sortOrder.value || ''
+  //   }
+  // }
+  const res = await API({ url: '/export/exportConsume', data: params })
+  if (res.code === 200) {
+    ElMessage.success('导出成功')
+  }
+}
+const exportListVisible = ref(false)
 
-// // 打开导出列表弹窗
-// const openExportList = () => {
-//   getExportList()
-//   exportListVisible.value = true
-// }
+// 打开导出列表弹窗
+const openExportList = () => {
+  getExportList()
+  exportListVisible.value = true
+}
 
-// // 导出列表数据
-// const exportList = ref([])
-// // 导出列表加载状态
-// const exportListLoading = ref(false)
-// // 获取导出列表
-// const getExportList = async () => {
-//   exportListLoading.value = true
-//   try {
-//     const result = await API({ url: '/export/export' })
-//     if (result.code === 200) {
-//       const filteredData = result.data.filter(item => {
-//         return item.type === 4; //4表示金币消耗列表
-//       });
-//       exportList.value = filteredData
-//     } else {
-//       ElMessage.error(result.msg || '获取导出列表失败')
-//     }
-//   } catch (error) {
-//     console.error('获取导出列表出错:', error)
-//     ElMessage.error('获取导出列表失败，请稍后重试')
-//   } finally {
-//     exportListLoading.value = false
-//   }
-// }
-// // 下载导出文件
-// const downloadExportFile = (item) => {
-//   if (item.state === 2) {
-//     const link = document.createElement('a')
-//     link.href = item.url
-//     link.download = item.fileName
-//     link.click()
-//   } else {
-//     ElMessage.warning('文件还在导出中，请稍后再试')
-//   }
-// }
-// //根据状态返回对应的标签类型
-// const getTagType = (state) => {
-//   switch (state) {
-//     case 0:
-//       return 'info';
-//     case 1:
-//       return 'primary';
-//     case 2:
-//       return 'success';
-//     case 3:
-//       return 'danger';
-//     default:
-//       return 'info';
-//   }
-// }
-// //根据状态返回对应的标签文案
-// const getTagText = (state) => {
-//   switch (state) {
-//     case 0:
-//       return '待执行';
-//     case 1:
-//       return '执行中';
-//     case 2:
-//       return '执行完成';
-//     case 3:
-//       return '执行出错';
-//     default:
-//       return '未知状态';
-//   }
-// }
+// 导出列表数据
+const exportList = ref([])
+// 导出列表加载状态
+const exportListLoading = ref(false)
+// 获取导出列表
+const getExportList = async () => {
+  exportListLoading.value = true
+  try {
+    const result = await API({ url: '/export/export' })
+    if (result.code === 200) {
+      const filteredData = result.data.filter(item => {
+        return item.type === 4; //4表示金币消耗列表 // todo 修改对应type
+      });
+      exportList.value = filteredData
+    } else {
+      ElMessage.error(result.msg || '获取导出列表失败')
+    }
+  } catch (error) {
+    console.error('获取导出列表出错:', error)
+    ElMessage.error('获取导出列表失败，请稍后重试')
+  } finally {
+    exportListLoading.value = false
+  }
+}
+// 下载导出文件
+const downloadExportFile = (item) => {
+  if (item.state === 2) {
+    const link = document.createElement('a')
+    link.href = item.url
+    link.download = item.fileName
+    link.click()
+  } else {
+    ElMessage.warning('文件还在导出中，请稍后再试')
+  }
+}
+//根据状态返回对应的标签类型
+const getTagType = (state) => {
+  switch (state) {
+    case 0:
+      return 'info';
+    case 1:
+      return 'primary';
+    case 2:
+      return 'success';
+    case 3:
+      return 'danger';
+    default:
+      return 'info';
+  }
+}
+//根据状态返回对应的标签文案
+const getTagText = (state) => {
+  switch (state) {
+    case 0:
+      return '待执行';
+    case 1:
+      return '执行中';
+    case 2:
+      return '执行完成';
+    case 3:
+      return '执行出错';
+    default:
+      return '未知状态';
+  }
+}
 </script>
 
 <template>
@@ -558,29 +543,29 @@ onMounted(async function () {
           <el-col :span="4">
             <div class="head-card-element">
               <el-text class="mx-1">精网号：</el-text>
-              <el-input v-model="liveStream.jwcode" placeholder="请输入精网号" style="width: 150px" clearable />
+              <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="liveStream.market" placeholder="请选择地区" style="width: 150px" clearable>
-                <el-option v-for="(item, index) in market" :key="index" :label="item" :value="item" />
+              <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="liveStream.type" placeholder="请选择类型" style="width: 150px" clearable @change="handleTypeChange">
+              <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" v-if="liveStream.type === '发礼物'">
+          <el-col :span="4" v-if="beanConsumeLive.type === 1">
             <div class="head-card-element">
               <el-text class="mx-1">礼物名称：</el-text>
-              <el-select v-model="liveStream.giftName" placeholder="请选择礼物名称" style="width: 150px" clearable>
+              <el-select v-model="beanConsumeLive.gift" placeholder="请选择礼物名称" style="width: 140px" clearable>
                 <el-option v-for="(item, index) in goods" :key="index" :label="item" :value="item" />
               </el-select>
             </div>
@@ -589,7 +574,7 @@ onMounted(async function () {
             <div class="head-card-element">
               <el-text class="mx-1">频道：</el-text>
               <el-select
-                v-model="liveStream.channel"
+                v-model="beanConsumeLive.channel"
                 placeholder="请选择频道"
                 style="width: 150px"
                 clearable
@@ -604,7 +589,7 @@ onMounted(async function () {
           <el-col :span="4">
             <div class="head-card-element">
               <el-text class="mx-1">直播间：</el-text>
-              <el-input v-model="liveStream.liveRoom" placeholder="请输入直播间" style="width: 150px" clearable />
+              <el-input v-model="beanConsumeLive.liveName" placeholder="请输入直播间" style="width: 150px" clearable />
             </div>
           </el-col>
         </el-row>
@@ -638,9 +623,9 @@ onMounted(async function () {
     <el-col>
       <el-card>
         <div>
-          消耗总金额：{{ Math.abs(permanentGolds) / 100 }}新币，永久金币：{{ Math.abs(permanentGolds) / 100 }}，免费金币：{{
+          金豆总数：{{ Math.abs(permanentGolds + freeGolds + taskGolds) / 100 }}，付费金豆数：{{ Math.abs(permanentGolds) / 100 }}，免费金豆数：{{
             Math.abs(freeGolds) / 100
-          }}，任务金币：{{ Math.abs(taskGolds) / 100 }}
+          }}
         </div>
         <!-- 设置表格容器的高度和滚动样式 -->
         <div style="height: 576px; overflow-y: auto">
@@ -656,22 +641,9 @@ onMounted(async function () {
             <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
             <!-- 固定精网号列 -->
             <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
-            <el-table-column prop="market" label="所属地区" width="110px" />
-            <el-table-column prop="goodsName" label="商品" width="160px" show-overflow-tooltip />
-            <el-table-column prop="payPlatform" label="消耗平台" width="120px">
-              <template #default="scope">
-                <!-- 使用非严格相等比较 -->
-                {{ scope.row.payPlatform }}
-                <!--                <span scope.row.consumePlatform == 1">Homily Chart</span>-->
-
-              </template>
-            </el-table-column>
-            <!-- <el-table-column
-              prop="consumeType"
-              label="消费类型"
-              width="120px"
-            /> -->
-            <el-table-column prop="sumGold" label="消耗金币总数" width="120px">
+            <el-table-column prop="dept" label="地区" width="110px" />
+            <el-table-column prop="type" label="类型" width="120px" />
+            <el-table-column prop="sumGold" label="金豆数量" width="120px">
               <template #default="scope">
                 {{
                   (scope.row.taskGold +
@@ -680,26 +652,9 @@ onMounted(async function () {
                 }}
               </template>
             </el-table-column>
-
-            <el-table-column prop="permanentGold" label="永久金币" sortable="“custom”" width="110px">
-              <template #default="scope">
-                {{ scope.row.permanentGold / 100 }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="freeGold" label="免费金币" sortable="“custom”" width="110px">
-              <template #default="scope">
-                {{ scope.row.freeGold / 100 }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="taskGold" label="任务金币" sortable="“custom”" width="110px">
-              <template #default="scope">
-                {{ scope.row.taskGold / 100 }}
-              </template>
-            </el-table-column>
-
-            <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip />
-            <el-table-column prop="adminName" label="提交人" width="110px" />
-            <el-table-column prop="createTime" label="消耗时间" sortable="custom" width="180px" />
+            <el-table-column prop="channel" label="频道" width="120px" />
+            <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip />
+            <el-table-column prop="createTime" label="消费时间" sortable="custom" width="180px" />
           </el-table>
         </div>