Merge branch 'refs/heads/milestone-20251104-现金二期' into lihui/feature-20251104165712-现金二期

.env.development

@@ -1,4 +1,4 @@
-# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
+VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
 #  VITE_API_BASE='http://54.255.212.181:10704/'
 # 正式环境
@@ -13,7 +13,7 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 # 本地
 # VITE_API_BASE='http://localhost:8081/'
 # 孙加倍
-VITE_API_BASE='http://192.168.40.12:8081'
+# VITE_API_BASE='http://192.168.40.12:8081'
 
 # Lijianlin
 # VITE_API_BASE='http://192.168.9.41:8081/'

src/router/index.js

@@ -319,7 +319,7 @@ const routes = [
                             {
                                 path: 'receiveManager',
                                 name: "receiveManager",
-                                component: () => import("../views/moneyManage/receiveDetail/receiveManage.vue"),
+                                component: () => import("../views/moneyManage/receiveDetail/receiveFinance.vue"),
                                 meta: { permissionId: [67, 79] }
                             },
                             {//地区财务
@@ -385,7 +385,7 @@ const routes = [
             },
             // 频道管理
             {
-                path: '/channelManage',
+                path: 'channelManage',
                 name: 'channelManage',
                 meta: { permissionId: 124 },
                 children: [

src/utils/menuTreePermission.js

@@ -187,7 +187,7 @@ export const findMenuById = (menuList, targetId) => {
 // 递归判断某个 menuId 是否存在
 export const hasMenuPermission = (tree, targetId) => {
     for (const node of tree) {
-        console.log(node.id)
+        // console.log(node.id)
         if (node.id === targetId) return true;
         if (node.children && hasMenuPermission(node.children, targetId)) return true;
     }

src/utils/menuUtils.js

@@ -91,8 +91,13 @@ export const getRoutePath = (menu) => {
         '退款-总部财务':'/moneyManage/refundDetail/refundHeader',
 
         '执行明细': '/moneyManage/executor',
-    };
 
+        '频道管理': '/channelManage',
+        '打赏管理': '/channelManage/reward',
+        '铁粉管理': '/channelManage/fans',
+        '小黄车管理': '/channelManage/cart',
+    };
+    // console.log('1111',menu.menuName)
     // 未匹配的菜单默认使用id作为路由（可根据实际需求调整）
     return routeMap[menu.menuName] || '/noPermission'
 

src/views/audit/bean/beanAudit.vue

@@ -173,6 +173,9 @@ const reason = ref('')
 const rejectRow = ref({
   id: null
 })// 驳回行数据
+const passRow = ref({
+  id: null
+})// 通过行数据
 const popconfirmRef = ref(null)
 
 // 操作权限（金豆审核相关，与充值权限格式对齐）
@@ -337,13 +340,14 @@ const showApproveDialog = (row) => {
     ElMessage.error('暂无权限')
     return
   }
+  passRow.value.id = row.id
   approveDialogVisible.value = true
 }
 
 // 处理通过操作
 // 为什么使用handleApproveConfirm页面就加载不出来，使用handleApprove就可以，
 // （发现问题：加了防抖，名称为handleApprove，修改名称一致即可）
-const handleApproveConfirm = async (row) => {
+const handleApproveConfirm = async function() {// 不要再传row了！哪有row！！！
   if (!hasbeanWaitThough) {
     ElMessage.error('暂无权限')
     return
@@ -351,7 +355,7 @@ const handleApproveConfirm = async (row) => {
   clicked.value = true
   try {
     const params = {
-      id: row.id,
+      id: passRow.value.id,
       auditName: adminData.value.adminName
     }
     await API({ url: '/beanAudit/status1', data: params })

src/views/channelManage/cart/cart.vue

@@ -0,0 +1,676 @@
+<script setup>
+import { computed, onMounted, ref } from 'vue'
+import { dayjs, ElMessage } from 'element-plus'
+import request from '@/util/http.js'
+import API from '@/util/http.js'
+import moment from 'moment'
+import { 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),
+]
+/*
+====================工具方法==============================
+*/
+
+// 时间格式化
+const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
+
+/*
+====================数据=================================
+*/
+//这是获取用户信息的接口
+const adminData = ref({})
+// 充值明细表格
+const tableData = ref([])
+
+// 搜索articleVideo 表单
+const beanConsumeArticle = ref({
+  jwcode: null,
+  dept: "",
+  type: "",
+  payMode: "",
+  articleId: "",
+  articleName: "",
+  author: "",
+  startTime: '',
+  endTime: '',
+
+})
+// 频道列表
+const channels = ref([])
+
+// 抽离类型选项到响应式数组
+const consumeTypes = ref([
+  { label: '打赏', value: 9 },
+  { label: '打赏', value: 10 },
+  { label: '付费购买', value: 11 },
+])
+
+// 处理 payMode 选择变化
+const handlePayModeChange = (value) => {
+  beanConsumeArticle.value.payMode = value;
+  // 触发搜索
+  ConsumeSelectBy();
+}
+
+//------------------------
+
+// 标记当前激活的时间范围按钮
+const activeTimeRange = ref('')
+// 日期选择器变化时清除按钮激活状态
+const handleDatePickerChange = () => {
+  activeTimeRange.value = ''
+}
+// 搜索对象
+const getObj = ref({
+  pageNum: 1,
+  pageSize: 50
+})
+
+//分页总条目
+const total = ref(100)
+
+// 搜索对象时间
+const getTime = ref({
+  startTime: '',
+  endTime: ''
+})
+
+// 搜索地区列表
+const dept = ref([])
+// 获取地区列表的方法
+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 filterChannel = (query) => {
+//   if (query) {
+//     return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
+//   }
+//   return channels.value;
+// };
+
+// 新增排序字段和排序方式
+const sortField = ref('')
+const sortOrder = ref('')
+
+// 合计数
+const permanentBean = ref(0)
+const freeBean = ref(0)
+const totalNum = ref(0)
+
+
+/*
+====================方法=================================
+*/
+// 获取登录用户信息
+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)
+  }
+}
+
+
+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 != '') {
+        beanConsumeArticle.value.startTime = formatTime(getTime.value[0])
+        beanConsumeArticle.value.endTime = formatTime(getTime.value[1])
+      }
+    } else {
+      beanConsumeArticle.value.startTime = ''
+      beanConsumeArticle.value.endTime = ''
+    }
+    beanConsumeArticle.value.sortField = sortField.value
+    beanConsumeArticle.value.sortOrder = sortOrder.value
+
+    console.log('搜索参数_时间', beanConsumeArticle.value.startTime)
+    console.log('搜索参数1', getObj.value)
+    console.log('搜索参数2', beanConsumeArticle.value)
+
+    // 发送POST请求
+    const result = await request({
+      url: '/beanConsume/selectArticleBy',
+      data: {
+        pageNum: getObj.value.pageNum,
+        pageSize: getObj.value.pageSize,
+        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,
+          startTime: beanConsumeArticle.value.startTime,
+          endTime: beanConsumeArticle.value.endTime,
+          sortField: beanConsumeArticle.value.sortField,
+          sortOrder: beanConsumeArticle.value.sortOrder,
+        }
+      }
+    })
+
+    console.log('请求成功4', sortField)
+    console.log('接口响应结果', result); // 打印接口响应结果
+    if (result.code === 200 && result.data && result.data.list) {
+      // 过滤返回的数据，确保 type 值符合 payMode 规则
+      const filteredList = result.data.list.filter(item => {
+        if (beanConsumeArticle.value.payMode === '0') {
+          return [9, 10].includes(Number(item.type));
+        } else if (beanConsumeArticle.value.payMode === '1') {
+          return Number(item.type) === 11;
+        }
+        return true;
+      });
+      tableData.value = filteredList;
+
+    }
+
+    // 合计数的接口
+    // 复制一份 beanConsumeArticle.value 并设置固定的 payType 值 8是文章的
+    const sumConsumeParams = {
+      payType: 8, // 固定传入 payType 值 8
+      beanConsumeArticle: {
+        ...beanConsumeArticle.value,
+
+      }
+    };
+
+    // 发送 POST 请求获取合计数
+    const resultTotalGold = await request({
+      url: '/beanConsume/sumConsumeGold',
+      data: sumConsumeParams
+    });
+
+    console.log("总计", resultTotalGold);
+
+    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;
+
+    // 存储分页总数
+    total.value = result.data.total
+    console.log('total', total.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
+// 搜索
+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.articleId) {
+    const numRef = /^\d{1,9}$/;
+    if (!numRef.test(beanConsumeArticle.value.articleId)) {
+      ElMessage.error('请检查文章ID格式')
+      return
+    }
+  }
+  ConsumeSelectBy()
+}
+// 重置
+const reset = function () {
+  console.log('文章/视频的重置')
+
+  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 = ''
+
+
+  sortField.value = ''
+  sortOrder.value = ''
+  getTime.value = {}
+  activeTimeRange.value = '' // 清除激活状态
+
+
+  // 点完重置后，重新请求数据
+  ConsumeSelectBy()
+  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')
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'today' // 标记当前激活状态
+
+  ConsumeSelectBy()
+}
+// 昨天
+const getYesterday = function () {
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'yesterday' // 标记当前激活状态
+
+  ConsumeSelectBy()
+}
+// 近7天
+const get7Days = function () {
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('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 = '7days' // 标记当前激活状态
+
+  ConsumeSelectBy()
+}
+
+
+// 处理排序事件
+const handleSortChange = (column) => {
+  console.log('排序字段：', column.prop)
+  console.log('排序方式：', column.order)
+  if (column.prop === 'beanNum') {
+    sortField.value = 'beanNum'
+  } else if (column.prop === 'consumeTime') {
+    sortField.value = 'consumeTime'
+  } else if (column.prop === 'buyBean') {
+    sortField.value = 'buyBean'
+  } else if (column.prop === 'freeBean') {
+    sortField.value = 'freeBean'
+  }
+  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 totalBean = computed(() => permanentBean.value + freeBean.value)
+
+/*
+====================监听=================================
+*/
+
+/*
+====================挂载=================================
+*/
+
+const format3 = (num) => {
+  // 每三位添加逗号
+  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,
+    },
+  }
+  const res = await API({ url: '/export/exportArticle', 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 === 8; //4表示金币消耗列表 // todo 修改对应type 8表示文章/视频
+      });
+      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>
+  <el-card class="card1" style="margin-bottom: 0.5vh">
+    <el-col style="margin-bottom: 1vh; ">
+      <div class="select">
+        <div class="selectRow">
+          <el-text class="text" size="large">精网号：</el-text>
+          <el-input class="selectContent" v-model="beanConsumeArticle.jwcode" placeholder="请输入精网号" clearable />
+        </div>
+        <div class="selectRow">
+          <el-text class="text" size="large">所属地区：</el-text>
+          <el-select class="selectContent" v-model="beanConsumeArticle.dept" placeholder="请选择地区" clearable>
+            <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
+          </el-select>
+        </div>
+        <div class="selectRow">
+          <el-text class="text" size="large">商品名称：</el-text>
+          <el-select class="selectContent" style="width: 20px" v-model="beanConsumeArticle.payMode" placeholder="请选择类型"
+            clearable @change="handlePayModeChange">
+            <el-option label="打赏" value="0" />
+            <el-option label="付费购买" value="1" />
+            <el-option label="其他" value="2" />
+          </el-select>
+        </div>
+        <div class="selectRow">
+          <el-text class="text">频道名称：</el-text>
+          <el-select class="selectContent"  placeholder="请选择频道" clearable filterable>
+            <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
+          </el-select>
+        </div>
+        
+
+      </div>
+    </el-col>
+
+    <el-col>
+      <div class="select">
+        <div class="selectRow" style="width: 33vw;">
+          <el-text class="text" size="large">下单时间：</el-text>
+          <el-date-picker class="selectContent" v-model="getTime" type="datetimerange" range-separator="至"
+            start-placeholder="起始时间" end-placeholder="结束时间" style="width:25vw" @change="handleDatePickerChange"
+            value-format="YYYY-MM-DD HH:mm:ss" :default-time="defaultTime" />
+          <div v-if="false">
+            <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
+            <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
+            <el-button @click="get7Days()" :type="activeTimeRange === '7days' ? 'primary' : ''">近7天</el-button>
+          </div>
+        </div>
+        <div class="selectRow">
+          <el-text class="text" size="large">直播间名称：</el-text>
+          <el-input class="selectContent"  placeholder="请输入直播间" clearable />
+        </div>
+
+      </div>
+    </el-col>
+    <el-col>
+      <div class="selectButton">
+        <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-button type="success" @click="reset()">重置</el-button>
+      </div>
+    </el-col>
+  </el-card>
+  <el-card class="card2">
+    <div class="goldStatistics">
+      金豆总数：{{ format3(Math.abs(permanentBean + freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      付费金豆数：{{ format3(Math.abs(permanentBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      免费金豆数：{{ format3(Math.abs(freeBean)) }}
+    </div>
+    <div style="overflow-y: auto">
+      <el-table :data="tableData" style="width: 82vw" height="65vh" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
+        <el-table-column type="index" label="序号" width="110px" fixed="left">
+          <template #default="scope">
+            <span>{{
+              scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- 固定姓名列 -->
+        <el-table-column prop="name" label="姓名" width="140px" fixed="left" show-overflow-tooltip />
+        <!-- 固定精网号列 -->
+        <el-table-column prop="jwcode" label="精网号" width="140px" fixed="left" />
+        <el-table-column prop="dept" label="地区" width="140px" />
+        <el-table-column prop="type" label="商品名称" width="160px"/>
+        <el-table-column prop="beanNum" label="金币数量" sortable="custom" width="140px" />
+        <el-table-column prop="buyBean" label="频道名称" width="160px" show-overflow-tooltip />
+        <el-table-column prop="freeBean" label="直播间名称" width="160px" show-overflow-tooltip />
+        <el-table-column prop="consumeTime" label="下单时间" sortable="custom" width="180px">
+          <template #default="scope">
+            {{ formatTime(scope.row.consumeTime) }}
+          </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-dialog v-model="exportListVisible" title="导出列表" width="80%">
+    <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
+      <el-table-column prop="fileName" label="文件名" />
+      <el-table-column prop="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 lang="scss">
+// 搜索的卡片样式
+.card1 {
+  background: #F3FAFE;
+}
+
+// 表单的卡片样式
+.card2 {
+  background: #E7F4FD;
+  height: 78vh;
+}
+
+// 新币总数等等
+.goldStatistics {
+  margin-left: 1vw;
+  margin-bottom: 1vh;
+  color: #000000;
+  font-family: "PingFang SC";
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: 20px;
+}
+
+// 表头背景等
+:deep(.el-table__header-wrapper),
+:deep(.el-table__body-wrapper),
+:deep(.el-table__cell),
+/* 表格 */
+:deep(.el-table__body td) {
+  background-color: #F3FAFE !important;
+}
+
+/* 表头 */
+:deep(.el-table__header th) {
+  background-color: #F3FAFE !important;
+}
+
+/* 鼠标悬停 */
+:deep(.el-table__row:hover > .el-table__cell) {
+  background-color: #E5EBFE !important;
+}
+
+.pagination {
+  display: flex;
+  margin-top: 20px;
+}
+
+/** 搜索的样式 */
+.selectButton {
+  margin-left: 1vw;
+  margin-top: 1vh;
+}
+.select {
+  display: flex;
+
+  .selectRow {
+    width: 16vw;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 0.5vw;
+
+    .text {
+      width: 5vw;
+      font-size: 15px;
+    }
+    .textB {
+      width: 7vw;
+      font-size: 15px;
+    }
+
+    .selectContent {
+      flex: 1;
+    }
+  }
+}
+</style>

src/views/channelManage/fans/fans.vue

@@ -0,0 +1,657 @@
+<script setup>
+import { computed, onMounted, ref } from 'vue'
+import { dayjs, ElMessage } from 'element-plus'
+import request from '@/util/http.js'
+import API from '@/util/http.js'
+import moment from 'moment'
+// 之后整理一下
+
+/*
+====================工具方法==============================
+*/
+const format3 = (num) => {
+  // 每三位添加逗号
+  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),
+]
+/*
+====================数据=================================
+*/
+//这是获取用户信息的接口
+const adminData = ref({})
+// 充值明细表格
+const tableData = ref([])
+
+// 搜索beanConsumeFan 表单
+const beanConsumeFan = ref({
+  jwcode: null,
+  dept: "",
+  type: "",
+  gift: "",
+  channel: "",
+  liveRoom: "",
+  startTime: '',
+  endTime: '',
+
+})
+// 频道列表
+const channels = ref([])
+// 获取频道列表的方法
+const getChannel = async function () {
+  try {
+    const result = await request({
+      url: '/beanConsume/getLiveChannel', // todo 换成实际接口地址
+      data: { account: adminData.value.account }
+    })
+    console.log('请求频道列表成功', result)
+    // 存储频道数据
+    channels.value = result.data
+    console.log('频道数据', channels.value)
+  } catch (error) {
+    console.log('请求频道列表失败', error)
+    ElMessage({
+      type: 'error',
+      message: '获取频道列表失败，请稍后重试'
+    })
+  }
+}
+// // 频道模糊查询方法
+// const filterChannel = (query) => {
+//   if (query) {
+//     return channels.value.filter(item => item.toLowerCase().includes(query.toLowerCase()));
+//   }
+//   return channels.value;
+// };
+
+// 抽离类型选项到响应式数组
+const consumeTypes = ref([
+  { label: '发礼物', value: 1 },
+  { label: '发红包', value: 2 },
+  { label: '发福袋', value: 3 },
+  { label: '付费直播', value: 4 },
+  { label: '加入粉丝团', value: 5 },
+  { label: '发弹幕', value: 6 },
+  { label: '单次付费', value: 7 },
+  { label: '连续包月', value: 8 }
+])
+
+// // 处理类型选择变化
+// const handleTypeChange = (value) => {
+//   if (value !==  1) {
+//     beanConsumeFan.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 sortField = ref('')
+const sortOrder = ref('')
+
+// 合计数
+const permanentBean = ref(0)
+const freeBean = ref(0)
+const totalNum = ref(0)
+
+
+/*
+====================方法=================================
+*/
+// 获取登录用户信息
+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)
+  }
+}
+
+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 != '') {
+        beanConsumeFan.value.startTime = formatTime(getTime.value[0])
+        beanConsumeFan.value.endTime = formatTime(getTime.value[1])
+      }
+    } else {
+      beanConsumeFan.value.startTime = ''
+      beanConsumeFan.value.endTime = ''
+    }
+    beanConsumeFan.value.sortField = sortField.value
+    beanConsumeFan.value.sortOrder = sortOrder.value
+
+    console.log('搜索参数_时间', beanConsumeFan.value.startTime)
+    console.log('搜索参数1', getObj.value)
+    console.log('搜索参数2', beanConsumeFan.value)
+
+    // 发送POST请求
+    const result = await request({
+      url: '/beanConsume/selectFanBy',
+      data: {
+        pageNum: getObj.value.pageNum,
+        pageSize: getObj.value.pageSize,
+        beanConsumeFan: {
+          ...beanConsumeFan.value,
+          jwcode: beanConsumeFan.value.jwcode ? String(beanConsumeFan.value.jwcode) : '',
+          dept: beanConsumeFan.value.dept || '',
+          channel: beanConsumeFan.value.channel || '',
+          startTime: beanConsumeFan.value.startTime || '',
+          endTime: beanConsumeFan.value.endTime || '',
+          sortField: beanConsumeFan.value.sortField || 'consumeTime',
+          sortOrder: beanConsumeFan.value.sortOrder || 'desc'
+        }
+      }
+    })
+
+    console.log('请求成功3', sortField)
+    console.log('接口响应结果', result);
+    if (result.code === 200 && result.data && result.data.list) {
+      tableData.value = result.data.list;
+      total.value = result.data.total;
+    }
+
+    // 合计数的接口
+    // 复制一份 beanConsumeFan.value 并设置固定的 payType 值 1是直播 7是铁粉
+    const sumConsumeParams = {
+      payType: 7, // 固定传入 payType 值 7
+      beanConsumeFan: {
+        ...beanConsumeFan.value,
+
+      }
+    };
+    // 发送 POST 请求获取合计数
+    const resultTotalGold = await request({
+      url: '/beanConsume/sumConsumeGold',
+      data: sumConsumeParams
+    });
+
+    console.log("总计2", resultTotalGold);
+
+    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;
+
+    // 存储分页总数
+    total.value = result.data.total
+    console.log('total', total.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
+// 搜索
+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
+    }
+  }
+  ConsumeSelectBy()
+}
+// 重置
+const reset = function () {
+  console.log('兄弟，你点了重置')
+
+  beanConsumeFan.value.jwcode = null
+
+  beanConsumeFan.value.type = ''
+  beanConsumeFan.value.gift = ''
+  beanConsumeFan.value.channel = ''
+  beanConsumeFan.value.liveRoom = ''
+
+  beanConsumeFan.value.dept = ''
+
+  beanConsumeFan.value.startTime = ''
+
+  beanConsumeFan.value.endTime = ''
+
+
+  sortField.value = ''
+  sortOrder.value = ''
+  getTime.value = {}
+  activeTimeRange.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')
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'today' // 标记当前激活状态
+
+  ConsumeSelectBy()
+}
+// 昨天
+const getYesterday = function () {
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'yesterday' // 标记当前激活状态
+  console.log('昨', getTime.value)
+  ConsumeSelectBy()
+}
+// 近7天
+const get7Days = function () {
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('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 = '7days' // 标记当前激活状态
+
+  ConsumeSelectBy()
+}
+
+
+// 获取地区列表的方法
+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 === 'beanNum') {
+    sortField.value = 'beanNum'
+  } else if (column.prop === 'consumeTime') {
+    sortField.value = 'consumeTime'
+  } else if (column.prop === 'buyBean') {
+    sortField.value = 'buyBean'
+  } else if (column.prop === 'freeBean') {
+    sortField.value = 'freeBean'
+  }
+  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 totalBean = computed(() => permanentBean.value + freeBean.value)
+
+/*
+====================监听=================================
+*/
+
+/*
+====================挂载=================================
+*/
+
+
+onMounted(async function () {
+  await getAdminData()
+  await ConsumeSelectBy()
+  await getChannel()
+  await getDept()
+
+})
+
+
+const exportExcel = async function () {
+  const params = { //需要修改
+    ...getObj.value,
+    "beanConsumeFan": {
+      ...beanConsumeFan.value,
+      sortField: sortField.value,
+      sortOrder: sortOrder.value,
+    },
+  }
+  const res = await API({ url: '/export/exportFan', 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 === 7; //4表示金币消耗列表 // todo 修改对应type 7是铁粉
+      });
+      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>
+  <el-card class="card1" style="margin-bottom: 0.5vh;">
+    <el-col style="margin-bottom: 1vh">
+      <div class="select">
+        <div class="selectRow">
+          <el-text class="text">精网号：</el-text>
+          <el-input class="selectContent" v-model="beanConsumeFan.jwcode" placeholder="请输入精网号" clearable />
+        </div>
+        <div class="selectRow">
+          <el-text class="text">地区：</el-text>
+          <el-select class="selectContent" v-model="beanConsumeFan.dept" placeholder="请选择地区" clearable>
+            <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
+          </el-select>
+        </div>
+        <div class="selectRow">
+          <el-text class="text">频道：</el-text>
+          <el-select class="selectContent" v-model="beanConsumeFan.channel" placeholder="请选择频道" clearable filterable>
+            <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
+          </el-select>
+        </div>
+      </div>
+    </el-col>
+    <el-col>
+      <div class="select">
+        <div class="selectRow" style="width: 36vw;">
+          <el-text class="text" size="large">消费时间：</el-text>
+          <el-date-picker class="selectContent" v-model="getTime" type="datetimerange" range-separator="至"
+            start-placeholder="起始时间" end-placeholder="结束时间" style="margin-right:1vw;width:25vw"
+            @change="handleDatePickerChange" value-format="YYYY-MM-DD HH:mm:ss" :default-time="defaultTime" />
+          <div v-if="false">
+            <el-button @click="getToday()" :type="activeTimeRange === 'today' ? 'primary' : ''">今</el-button>
+            <el-button @click="getYesterday()" :type="activeTimeRange === 'yesterday' ? 'primary' : ''">昨</el-button>
+            <el-button @click="get7Days()" :type="activeTimeRange === '7days' ? 'primary' : ''">近7天</el-button>
+          </div>
+        </div>
+        <div class="selectRow" style="justify-content: flex-start;">
+          <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-button type="success" @click="reset()">重置</el-button>
+        </div>
+      </div>
+    </el-col>
+  </el-card>
+  <el-card class="card2">
+    <div class="goldStatistics">
+      金豆总数：{{ format3(Math.abs(permanentBean + freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      付费金豆数：{{ format3(Math.abs(permanentBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      免费金豆数：{{ format3(Math.abs(freeBean)) }}
+    </div>
+    <div style="overflow-y: auto">
+      <el-table :data="tableData" style="width: 82vw" height="68vh" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
+        <el-table-column type="index" label="序号" width="80px" fixed="left">
+          <template #default="scope">
+            <span>{{
+              scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- 固定姓名列 -->
+        <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip />
+        <!-- 固定精网号列 -->
+        <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
+        <el-table-column prop="dept" label="地区" width="110px" />
+        <el-table-column prop="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" show-overflow-tooltip />
+        <el-table-column prop="type" label="会员类型" width="120px">
+          <template #default="scope">
+            {{consumeTypes.find(item => item.value === Number(scope.row.type))?.label || '未知类型'}}
+          </template>
+        </el-table-column>
+        <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]"
+        layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handlePageSizeChange"
+        @current-change="handleCurrentChange"></el-pagination>
+    </div>
+  </el-card>
+
+  <!-- 导出弹窗 -->
+  <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
+    <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
+      <el-table-column prop="fileName" label="文件名" />
+      <el-table-column prop="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 lang="scss">
+// 搜索的卡片样式
+.card1 {
+  background: #F3FAFE;
+}
+
+// 表单的卡片样式
+.card2 {
+  background: #E7F4FD;
+  height: 81vh;
+}
+
+// 新币总数等等
+.goldStatistics {
+  margin-left: 1vw;
+  margin-bottom: 1vh;
+  color: #000000;
+  font-family: "PingFang SC";
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: 20px;
+}
+
+// 表头背景等
+:deep(.el-table__header-wrapper),
+:deep(.el-table__body-wrapper),
+:deep(.el-table__cell),
+/* 表格 */
+:deep(.el-table__body td) {
+  background-color: #F3FAFE !important;
+}
+
+/* 表头 */
+:deep(.el-table__header th) {
+  background-color: #F3FAFE !important;
+}
+
+/* 鼠标悬停 */
+:deep(.el-table__row:hover > .el-table__cell) {
+  background-color: #E5EBFE !important;
+}
+
+.pagination {
+  display: flex;
+  margin-top: 20px;
+}
+
+
+/** 搜索的样式 */
+.select {
+  display: flex;
+
+  .selectRow {
+    width: 17vw;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 0.5vw;
+
+    .text {
+      width: 5vw;
+      font-size: 15px;
+    }
+
+    .selectContent {
+      flex: 1;
+    }
+  }
+}
+</style>

src/views/channelManage/reward/reward.vue

@@ -0,0 +1,700 @@
+<script setup>
+import { computed, onMounted, ref } from 'vue'
+import { dayjs, ElMessage } from 'element-plus'
+import request from '@/util/http.js'
+import API from '@/util/http.js'
+import moment from 'moment'
+// 之后整理一下
+
+/*
+====================工具方法==============================
+*/
+const defaultTime = [
+  new Date(2000, 1, 1, 0, 0, 0),
+  new Date(2000, 2, 1, 23, 59, 59),
+]
+const format3 = (num) => {
+  // 每三位添加逗号
+  return num.toLocaleString('en-US')
+}
+// 时间格式化
+const formatTime = (val) => val ? dayjs(val).format('YYYY-MM-DD HH:mm:ss') : ''
+
+/*
+====================数据=================================
+*/
+//这是获取用户信息的接口
+const adminData = ref({})
+// 充值明细表格
+const tableData = ref([])
+
+// 搜索beanConsumeLive 表单
+const beanConsumeLive = ref({
+  jwcode: null,
+  dept: "",
+  type: "",
+  gift: "",
+  liveChannel: "",
+  liveName: "",
+  startTime: '',
+  endTime: '',
+  sortField: '',
+  sortOrder: ''
+
+})
+// 礼物列表
+const gifts = ref([])
+// 获取礼物列表的方法
+const getGift = async function () {
+  try {
+    const result = await request({
+      url: '/beanConsume/getLiveGift', // todo 换成实际接口地址
+      data: { account: adminData.value.account }
+    })
+    console.log('请求礼物列表成功', result)
+    // 存储礼物数据
+    gifts.value = result.data
+    console.log('礼物数据', gifts.value)
+  } catch (error) {
+    console.log('请求礼物列表失败', error)
+    ElMessage({
+      type: 'error',
+      message: '获取礼物列表失败，请稍后重试'
+    })
+  }
+}
+
+// 频道列表
+const channels = ref([])
+// 获取频道列表的方法
+const getChannel = async function () {
+  try {
+    const result = await request({
+      url: '/beanConsume/getLiveChannel', // todo 换成实际接口地址
+      data: { account: adminData.value.account }
+    })
+    console.log('请求频道列表成功', result)
+    // 存储频道数据
+    channels.value = result.data
+    console.log('频道数据', channels.value)
+  } catch (error) {
+    console.log('请求频道列表失败', error)
+    ElMessage({
+      type: 'error',
+      message: '获取频道列表失败，请稍后重试'
+    })
+  }
+}
+
+// 抽离类型选项到响应式数组
+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) {
+    beanConsumeLive.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 dept = ref([])
+// 获取地区列表的方法
+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 sortField = ref('')
+const sortOrder = ref('')
+
+// 合计数
+const permanentBean = ref(0)
+const freeBean = ref(0)
+const totalNum = ref(0)
+
+/*
+====================方法=================================
+*/
+// 获取登录用户信息
+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)
+  }
+}
+
+const selectLiveBy = async function (val) {
+  try {
+
+    // 搜索参数页码赋值
+    if (typeof val === 'number') {
+      getObj.value.pageNum = val
+    }
+    // 搜索参数时间赋值
+
+    // 修复时间范围处理
+    if (Array.isArray(getTime.value) && getTime.value.length === 2) {
+      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
+
+    console.log('搜索参数_时间', beanConsumeLive.value.startTime)
+    console.log('搜索参数1', getObj.value)
+    console.log('搜索参数2', beanConsumeLive.value)
+
+    // 发送POST请求
+    const result = await request({
+      url: '/beanConsume/selectLiveBy',
+      data: {
+        pageNum: getObj.value.pageNum,
+        pageSize: getObj.value.pageSize,
+        beanConsumeLive: {
+          ...beanConsumeLive.value,
+          jwcode: beanConsumeLive.value.jwcode ? String(beanConsumeLive.value.jwcode) : '',
+          dept: beanConsumeLive.value.dept || '',
+          type: beanConsumeLive.value.type || '',
+          gift: beanConsumeLive.value.gift || '',
+          beanNum: beanConsumeLive.value.beanNum || '',
+          isBackpack: beanConsumeLive.value.isBackpack || '',
+          liveChannel: beanConsumeLive.value.liveChannel || '',
+          liveName: beanConsumeLive.value.liveName || '',
+          startTime: beanConsumeLive.value.startTime || '',
+          endTime: beanConsumeLive.value.endTime || '',
+          sortField: beanConsumeLive.value.sortField || 'consumeTime',
+          sortOrder: beanConsumeLive.value.sortOrder || 'desc'
+        }
+      }
+    })
+
+    console.log('请求成功2', sortField)
+    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是直播
+    const sumConsumeParams = {
+      payType: 1, // 固定传入 payType 值 1 是直播
+      beanConsumeLive: {
+        ...beanConsumeLive.value,
+
+      }
+    };
+
+    // 发送 POST 请求获取合计数
+    const resultTotalGold = await request({
+      url: '/beanConsume/sumConsumeGold',
+      data: sumConsumeParams
+    });
+
+    console.log("总计", resultTotalGold);
+
+    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;
+
+
+    // 存储分页总数
+    total.value = result.data.total
+    console.log('total', total.value)
+  } catch (error) {
+    console.log('请求失败', error)
+  }
+}
+// 搜索
+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
+    }
+  }
+  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 = ''
+  sortField.value = ''
+  sortOrder.value = ''
+  getTime.value = {}
+  activeTimeRange.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')
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'today' // 标记当前激活状态
+
+  selectLiveBy()
+}
+// 昨天
+const getYesterday = function () {
+  const today = dayjs()
+  const startTime = today.subtract(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss')
+  const endTime = today.subtract(1, 'day').endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  getTime.value = [startTime, endTime]
+  console.log('getTime', getTime.value)
+  activeTimeRange.value = 'yesterday' // 标记当前激活状态
+
+  selectLiveBy()
+}
+// 近7天
+const get7Days = function () {
+  const today = dayjs()
+  const startTime = today.subtract(6, 'day').startOf('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 = '7days' // 标记当前激活状态
+
+  selectLiveBy()
+}
+
+
+// 处理排序事件
+const handleSortChange = (column) => {
+  console.log('排序字段：', column.prop)
+  console.log('排序方式：', column.order)
+  if (column.prop === 'beanNum') {
+    sortField.value = 'beanNum'
+  } else if (column.prop === 'consumeTime') {
+    sortField.value = 'consumeTime'
+  } else if (column.prop === 'buyBean') {
+    sortField.value = 'buyBean'
+  } else if (column.prop === 'freeBean') {
+    sortField.value = 'freeBean'
+  }
+  sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC'
+  selectLiveBy()
+}
+
+const handlePageSizeChange = function (val) {
+  getObj.value.pageSize = val
+  selectLiveBy()
+}
+
+const handleCurrentChange = function (val) {
+  getObj.value.pageNum = val
+  selectLiveBy()
+}
+/*
+====================计算属性=================================
+*/
+
+// 计算总金币数
+// const totalBean = computed(() => permanentBean.value + freeBean.value)
+
+/*
+====================监听=================================
+*/
+
+/*
+====================挂载=================================
+*/
+
+
+onMounted(async function () {
+  await getAdminData()
+  await selectLiveBy()
+  await getDept()
+  await getGift()
+  await getChannel()
+})
+
+
+const exportExcel = async function () {
+  console.log('1')
+  const params = {
+    ...getObj.value,
+    "beanConsumeLive": {
+      ...beanConsumeLive.value,
+      jwcode: beanConsumeLive.value.jwcode ? String(beanConsumeLive.value.jwcode) : '',
+      dept: beanConsumeLive.value.dept || '',
+      type: beanConsumeLive.value.type || '',
+      gift: beanConsumeLive.value.gift || '',
+      liveChannel: beanConsumeLive.value.liveChannel || '',
+      liveName: beanConsumeLive.value.liveName || '',
+      startTime: beanConsumeLive.value.startTime || '',
+      endTime: beanConsumeLive.value.endTime || '',
+      sortField: sortField.value || 'consumeTime',
+      sortOrder: sortOrder.value || 'desc'
+    }
+  }
+  // 打印请求参数，方便调试
+  console.log('导出请求参数:', params);
+
+  try {
+    console.log('2')
+    const res = await API({ url: '/export/exportLive', data: params });
+    console.log('导出请求响应:', res);
+    if (res.code === 200) {
+      ElMessage.success('导出成功');
+    } else {
+      ElMessage.error(res.message || '导出失败，请稍后重试');
+    }
+  } catch (error) {
+    console.error('导出请求出错:', error);
+    ElMessage.error('导出失败，请稍后重试');
+  }
+}
+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 === 6; //4表示金币消耗列表 // todo 修改对应type 6是直播
+      });
+      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>
+  <el-card class="card1" style="margin-bottom: 0.5vh;">
+    <el-col style="margin-bottom: 1vh">
+      <div class="select">
+        <div class="selectRow">
+          <el-text class="text">精网号：</el-text>
+          <el-input class="selectContent" v-model="beanConsumeLive.jwcode" placeholder="请输入精网号" clearable />
+        </div>
+        <div class="selectRow">
+          <el-text class="text">地区：</el-text>
+          <el-select class="selectContent" v-model="beanConsumeLive.dept" placeholder="请选择地区" clearable>
+            <el-option v-for="(item, index) in dept" :key="index" :label="item" :value="item" />
+          </el-select>
+        </div>
+        <div class="selectRow" style="width: 14vw;">
+          <el-text class="text">礼物名称：</el-text>
+          <el-select class="selectContent" v-model="beanConsumeLive.gift" placeholder="请选择礼物名称" clearable filterable
+            allow-create default-first-option>
+            <el-option v-for="(item, index) in gifts" :key="index" :label="item" :value="item" />
+          </el-select>
+        </div>
+        <div class="selectRow" style="width: 12vw;">
+          <el-text class="textB" size="large">频道：</el-text>
+          <el-select class="selectContent" v-model="beanConsumeLive.liveChannel" placeholder="请选择频道" clearable
+            filterable allow-create default-first-option>
+            <el-option v-for="(item, index) in channels" :key="index" :label="item" :value="item" />
+          </el-select>
+        </div>
+        <div class="selectRow" style="width: 12vw;">
+          <el-text class="textB" size="large">直播间：</el-text>
+          <el-input class="selectContent" v-model="beanConsumeLive.liveName" placeholder="请输入直播间" clearable />
+        </div>
+      </div>
+    </el-col>
+    <el-col>
+      <div class="select">
+        <div class="selectRow" style="width: 31.4vw;">
+          <el-text class="text">消费时间：</el-text>
+          <el-date-picker class="selectContent" v-model="getTime" type="datetimerange" range-separator="至"
+            start-placeholder="起始时间" end-placeholder="结束时间" style="margin-right:1vw;width:480px"
+            @change="handleDatePickerChange" :default-time="defaultTime" />
+          <div v-if="false">
+            <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>
+          </div>
+        </div>
+        <div class="selectRow" style="justify-content: flex-start;">
+          <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-button type="success" @click="reset()">重置</el-button>
+        </div>
+      </div>
+    </el-col>
+  </el-card>
+  <el-card class="card2">
+    <div class="goldStatistics">
+      金豆总数：{{ format3(Math.abs(permanentBean + freeBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      付费金豆数：{{ format3(Math.abs(permanentBean)) }}&nbsp;&nbsp;&nbsp;&nbsp;
+      免费金豆数：{{ format3(Math.abs(freeBean)) }}
+    </div>
+    <div style="overflow-y: auto">
+      <el-table :data="tableData" style="width: 82vw" height="68vh" @sort-change="handleSortChange"
+      :row-style="{ height: '50px' }">
+        <el-table-column type="index" label="序号" width="80px" fixed="left">
+          <template #default="scope">
+            <span>{{
+              scope.$index + 1 + (getObj.pageNum - 1) * getObj.pageSize
+            }}</span>
+          </template>
+        </el-table-column>
+        <!-- 固定姓名列 -->
+        <el-table-column prop="name" label="姓名" width="150px" fixed="left" show-overflow-tooltip />
+        <!-- 固定精网号列 -->
+        <el-table-column prop="jwcode" label="精网号" width="110px" fixed="left" />
+        <el-table-column prop="dept" label="地区" width="110px" />
+        <el-table-column prop="gift" label="礼物" width="140px">
+        </el-table-column>
+        <el-table-column prop="beanNum" label="金豆数量" sortable="custom" width="120px" />
+        <el-table-column prop="isBackpack" label="背包礼物" width="120px">
+          <template #default="scope">
+            {{ scope.row.isBackpack == 1 ? '是' : '否' }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="buyBean" label="付费金豆数" sortable="custom" width="120px" />
+        <el-table-column prop="freeBean" label="免费金豆数" sortable="custom" width="120px" />
+        <el-table-column prop="liveChannel" label="频道" width="120px" show-overflow-tooltip />
+        <el-table-column prop="liveName" label="直播间名称" width="160px" show-overflow-tooltip />
+        <el-table-column prop="consumeTime" label="消费时间" sortable="custom" width="180px" />
+      </el-table>
+    </div>
+    <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>
+  </el-card>
+
+  <!-- 导出弹窗 -->
+  <el-dialog v-model="exportListVisible" title="导出列表" width="80%">
+    <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
+      <el-table-column prop="fileName" label="文件名" />
+      <el-table-column prop="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 lang="scss">
+// 搜索的卡片样式
+.card1 {
+  background: #F3FAFE;
+}
+
+// 表单的卡片样式
+.card2 {
+  background: #E7F4FD;
+  height: 81vh;
+}
+
+// 新币总数等等
+.goldStatistics {
+  margin-left: 1vw;
+  margin-bottom: 1vh;
+  color: #000000;
+  font-family: "PingFang SC";
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 700;
+  line-height: 20px;
+}
+
+// 表头背景等
+:deep(.el-table__header-wrapper),
+:deep(.el-table__body-wrapper),
+:deep(.el-table__cell),
+/* 表格 */
+:deep(.el-table__body td) {
+  background-color: #F3FAFE !important;
+}
+
+/* 表头 */
+:deep(.el-table__header th) {
+  background-color: #F3FAFE !important;
+}
+
+/* 鼠标悬停 */
+:deep(.el-table__row:hover > .el-table__cell) {
+  background-color: #E5EBFE !important;
+}
+
+.pagination {
+  display: flex;
+  margin-top: 20px;
+}
+
+/** 搜索的样式 */
+.select {
+  display: flex;
+
+  .selectRow {
+    width: 14.7vw;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 0.5vw;
+
+    .text {
+      width: 5vw;
+      font-size: 15px;
+    }
+
+    .selectContent {
+      flex: 1;
+    }
+  }
+}
+</style>

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -190,8 +190,7 @@
                             </template>
                         </el-table-column>
                         <!-- 地区财务表格操作（待审核→审核，已通过→编辑） -->
-                        <el-table-column fixed="right" label="操作" width="120px"
-                            v-if="activeTab != 'reject' && activeTab != 'done'">
+                        <el-table-column fixed="right" label="操作" width="120px" v-if="activeTab != 'reject'">
                             <template #default=scope>
                                 <el-link v-if="activeTab == 'wait'" style="color: #2741DE;"
                                     @click="openAuditForm(scope.row)">审核
@@ -200,18 +199,37 @@
                                     v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4)"
                                     style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
                                 </el-link>
+                                <el-link
+                                    v-else-if="activeTab == 'done' && scope.row.status == 4 && startsWith(scope.row.orderCode, 'GOLDCOIN')"
+                                    style="color: #2741DE;" @click="openRefundConfirm(scope.row)">退款
+                                </el-link>
                             </template>
                         </el-table-column>
                     </el-table>
                 </div>
                 <div class="pagination">
-                    <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-                        layout="total, sizes, prev, pager, next, jumper" :total="total"
-                        @size-change="handlePagination('size', $event)"
+                    <el-pagination background :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"
+                        :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper"
+                        :total="total" @size-change="handlePagination('size', $event)"
                         @current-change="handlePagination('page', $event)"></el-pagination>
                 </div>
             </el-card>
         </div>
+        <!-- 退款确认弹窗 -->
+        <div class="recallDialog" v-show="refundConfirmDialog">
+            <div class="close">
+                <button @click="closeConfirmRefund" class="Btn">关闭</button>
+            </div>
+            <div class="text">
+                <text class="txt">{{ textContent }}</text>
+            </div>
+            <div class="cancle">
+                <button @click="closeConfirmRefund" class="Btn">取消</button>
+            </div>
+            <div class="confirm">
+                <button @click="openRefundDialog" class="Btn">确定</button>
+            </div>
+        </div>
 
         <!-- 仅保留地区财务相关弹窗：审核弹窗、编辑手续费弹窗 -->
         <!-- 审核弹窗 -->
@@ -406,6 +424,108 @@
                 </div>
             </div>
         </el-dialog>
+
+        <!-- 新增退款 -->
+        <el-dialog v-model="refundDialog" title="退款" class="refundDialog" overflow draggable style="width: 40vw;"
+            :before-close="closeRefundForm">
+            <div style="display: flex;">
+                <div class="left">
+                    <div class="add-item">
+                        <el-text style="width:4vw;">精网号</el-text>
+                        <el-input v-model="refundFormData.jwcode" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">客户姓名</el-text>
+                        <el-input v-model="refundFormData.name" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">所属地区</el-text>
+                        <el-input v-model="refundFormData.marketName" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">活动名称</el-text>
+                        <el-input v-model="refundFormData.activity" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">产品名称</el-text>
+                        <el-input v-model="refundFormData.goodsName" style="width:10vw;" disabled />
+                    </div>
+                    <div v-show="!isRefundGold" class="add-item">
+                        <el-text style="width:4vw;">产品数量</el-text>
+                        <el-input style="padding-right: 10px; width:10.5vw;" v-model="refundFormData.goodNum"
+                            placeholder="请输入产品数量" disabled />
+                    </div>
+                    <div v-show="isRefundGold" style="display: flex; margin-bottom: 10px;">
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span style="color: #999999;  white-space: nowrap;">永久金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.permanentGold" disabled />
+                        </div>
+                        <div style=" display: flex; align-items: center;justify-content: center; ">
+                            <span
+                                style="color: #999999;  white-space: nowrap;">免费金币：</span>
+                            <el-input style="padding-right: 10px;  height: 30px; width: 70px;"
+                                v-model="refundFormData.freeGold" disabled />
+                        </div>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款币种</el-text>
+                        <el-input v-model="refundFormData.paymentCurrency" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款金额</el-text>
+                        <el-input v-model="refundFormData.paymentAmount" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">支付方式</el-text>
+                        <el-input v-model="refundFormData.payType" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">付款时间</el-text>
+                        <el-date-picker v-model="refundFormData.payTime" type="datetime" style="width:10vw;" disabled />
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;" size="small">转账凭证</el-text>
+                        <el-form-item :rules="{ required: true, message: '请上传图片', trigger: 'change' }">
+                            <el-upload ref="uploadRef" :auto-upload="false" list-type="picture-card"
+                                :show-file-list="false">
+                                <template #default>
+                                    <img v-if="refundFormData.voucher" :src="refundFormData.voucher"
+                                        style="width: 100%; height: 100%; object-fit: cover;">
+                                    <el-icon v-else>
+                                        <Plus />
+                                    </el-icon>
+                                </template>
+                            </el-upload>
+                        </el-form-item>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">备注</el-text>
+                        <el-input v-model="refundFormData.remark" style="width:10vw;" :rows="2" type="textarea"
+                            maxLength="100" disabled show-word-limit />
+                    </div>
+                </div>
+                <div class="right">
+                    <div class="add-item">
+                        <el-text style="width:4vw;">退款模式</el-text>
+                        <el-radio-group v-model="refundFormData.refundModel">
+                            <el-radio value="0">全部退款</el-radio>
+                            <el-radio value="1">部分退款</el-radio>
+                        </el-radio-group>
+                    </div>
+                    <div class="add-item">
+                        <el-text style="width:4vw;">退款理由</el-text>
+                        <el-input v-model="refundFormData.refundReason" style="width:10vw;" :rows="5" maxlength="150"
+                            show-word-limit type="textarea" />
+                    </div>
+                    <div>ps:请在退款理由表明用户的退款需求。</div>
+                    <div style="display:flex;justify-content: center;margin-top: 5vh;">
+                        <el-button type="default" @click="">重置</el-button>
+                        <el-button type="primary" @click="throttledsubmitRefund">提交</el-button>
+                    </div>
+                </div>
+            </div>
+        </el-dialog>
     </div>
 </template>
 
@@ -419,6 +539,7 @@ import request from '@/util/http.js';
 import moment from 'moment';
 import _ from 'lodash';
 import { Plus } from '@element-plus/icons-vue';
+import { startsWith } from './utils/util.js'
 
 // 地区财务专属组件
 import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue';
@@ -474,7 +595,38 @@ const tooltipContent = ref('');
 const tooltipLeft = ref(0);
 const tooltipTop = ref(0);
 
-// 基础数据（地区财务专用）
+// 退款确认弹窗
+const refundConfirmDialog = ref(false)
+const textContent = ref('')
+
+
+//退款弹窗
+const refundDialog = ref(false)
+const refundFormData = ref({})
+
+const openRefundDialog = () => {
+    refundDialog.value = true
+    closeConfirmRefund()
+
+}
+const closeRefundForm = () => {
+    refundDialog.value = false
+    refundFormData.value = {}
+}
+
+const isRefundGold = ref(false)
+const ifRefundGold = () => {
+    if (refundFormData.value.goodsName === '金币充值') {
+        isRefundGold.value = true
+        refundFormData.value.goodNum = 0
+    } else {
+        isRefundGold.value = false
+    }
+}
+
+
+
+// 基础数据
 const adminData = ref({});
 const activityList = ref([]);
 const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)']);
@@ -482,6 +634,23 @@ const paytypeList = ["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-
 const paytypeOptions = ref([...paytypeList]);
 
 // ===================== 2. 核心功能函数（仅地区财务） =====================
+
+//确认退款弹窗
+const openRefundConfirm = (row) => {
+    textContent.value = '将要对该订单退款!'
+    refundConfirmDialog.value = true
+    refundFormData.value = { ...row }
+    ifRefundGold()
+    console.log(row);
+
+}
+
+const closeConfirmRefund = () => {
+    refundConfirmDialog.value = false
+    textContent.value = ''
+}
+
+
 // 2.1 数据加载：获取地区财务订单列表
 const getlist = async () => {
     try {
@@ -544,6 +713,54 @@ const getlist = async () => {
     }
 };
 
+//提交退款
+const submitRefund = async () => {
+    try {
+        const result = await request({
+            url: '/Money/add',
+            data: {
+                jwcode: refundFormData.value.jwcode, // 精网号（必填）
+                name: refundFormData.value.name,  // 姓名（必填）
+                market: refundFormData.value.marketName,  // 所属地区（必填）
+                activity: refundFormData.value.activity, // 活动名称（可选）
+                bankCode: refundFormData.value.bankCode,  // 银行流水订单号（必填）
+                goodsName: refundFormData.value.goodsName, // 商品名称（必填）
+                goodNum: refundFormData.value.goodNum,  // 商品数量（必填，默认0）
+                paymentCurrency: refundFormData.value.paymentCurrency,  // 付款币种（必填）
+                paymentAmount: (refundFormData.value.paymentAmount) * 100,  // 付款金额（必填）
+                receivedCurrency: refundFormData.value.receivedCurrency,  // 到账币种（必填）
+                receivedAmount: (refundFormData.value.receivedAmount) * 100,  // 到账金额（必填）
+                handlingCharge: (refundFormData.value.handlingCharge) * 100,  // 手续费（可选）
+                receivedMarket: refundFormData.value.receivedMarket, // 到账地区（可选）
+                payType: refundFormData.value.payType,  // 支付方式（必填）
+                payTime: refundFormData.value.payTime,  // 付款时间，格式：yyyy-MM-dd HH:mm:ss（可选）
+                receivedTime: refundFormData.value.receivedTime,  // 到账时间，格式：yyyy-MM-dd HH:mm:ss（可选）
+                areaServise: adminData.value.adminName,  // 提交人（可选）
+                submitterId: adminData.value.id,
+                voucher: refundFormData.value.voucher,  // 转账凭证URL（可选）
+                remark: refundFormData.value.remark,  // 备注信息（可选）
+                refundReason: refundFormData.value.refundReason,  // 退款备注-客服填写（可选）
+                refundModel: refundFormData.value.refundModel,  // 退款方式：0-全额，1-部分（可选）
+                id: refundFormData.value.id,                      //订单id
+                orderCode: refundFormData.value.orderCode,
+                permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
+                freeGold: (refundFormData.value.freeGold) * 100 || 0
+            }
+        })
+        if (result.code == 200) {
+            ElMessage.success('新增退款成功')
+            getlist()
+            closeRefundForm()
+        } else {
+            ElMessage.error(result.msg)
+            getlist()
+        }
+        console.log('返回参数：', result);
+    } catch (error) {
+        console.log(error);
+    }
+}
+
 // 2.2 搜索与重置
 const search = () => {
     getlist();
@@ -823,6 +1040,9 @@ onMounted(async () => {
             window.history.back();
         });
     }
+    //背景预加载
+    const bgImg = new Image();
+    bgImg.src = '/src/assets/收款明细撤回背景.png';
 });
 
 // 2.10 未使用函数占位（避免报错）
@@ -1102,6 +1322,37 @@ const handlePagination = (type, val) => {
         font-weight: 800;
         padding-bottom: 15px;
     }
+
+    .refundDialog {
+        .left {
+            width: 50%;
+            height: 70vh;
+            min-height: 700px;
+            padding: 0 2vw;
+
+            .add-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 1vh;
+            }
+
+            .image {
+                width: 4vw !important;
+                height: 4vw !important;
+            }
+        }
+
+        .right {
+            width: 50%;
+            height: 50vh;
+
+            .add-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 1vh;
+            }
+        }
+    }
 }
 
 // 表格样式统一
@@ -1130,4 +1381,80 @@ const handlePagination = (type, val) => {
     overflow-y: auto;
     white-space: pre-wrap;
 }
+
+.recallDialog {
+    //撤回弹窗提示
+    height: 392px;
+    width: 700px;
+    background-image: url('/src/assets/收款明细撤回背景.png');
+    position: fixed; // 固定定位，相对于浏览器窗口
+    top: 50%; // 距离顶部50%
+    left: 50%; // 距离左侧50%
+    transform: translate(-50%, -50%); // 向左、向上平移自身宽高的50%，实现居中
+    z-index: 1000; // 确保在其他元素上层显示
+
+    .close {
+        position: absolute;
+        left: 625px;
+        top: 20px;
+        height: 38px;
+        width: 38px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 10px;
+        }
+    }
+
+    .text {
+        position: absolute;
+        left: 185px;
+        top: 190px;
+        height: 67px;
+        width: 500px;
+
+        .txt {
+            height: 100%;
+            width: 100%;
+            color: #001a42;
+            font-family: "PingFang SC";
+            font-size: 48px;
+            font-style: normal;
+            font-weight: 900;
+            line-height: normal;
+        }
+    }
+
+    .cancle {
+        position: absolute;
+        left: 185px;
+        top: 304px;
+        height: 55px;
+        width: 150px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 20px;
+        }
+    }
+
+    .confirm {
+        position: absolute;
+        left: 375px;
+        top: 304px;
+        height: 55px;
+        width: 150px;
+        opacity: 0;
+
+        .Btn {
+            height: 100%;
+            width: 100%;
+            border-radius: 20px;
+        }
+    }
+}
 </style>

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -363,6 +363,14 @@
                             <el-radio value="1">部分退款</el-radio>
                         </el-radio-group>
                     </div>
+                    <div class="add-item" v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
+                        <el-text style="width:4vw;">永久金币</el-text>
+                        <el-input v-model="refundFormData.aaa" style="width:5vw;" />&nbsp;&nbsp;个
+                    </div>
+                    <div class="add-item" v-show="refundFormData.goodsName === '金币充值' && refundFormData.refundModel === '1'">
+                        <el-text style="width:4vw;">免费金币</el-text>
+                        <el-input v-model="refundFormData.bbb" style="width:5vw;" />&nbsp;&nbsp;个
+                    </div>
                     <div class="add-item">
                         <el-text style="width:4vw;">退款理由</el-text>
                         <el-input v-model="refundFormData.refundReason" style="width:10vw;" :rows="5" maxlength="150"

src/views/moneyManage/receiveDetail/utils/util.js

@@ -0,0 +1,13 @@
+//判断是否为线上订单
+export const startsWith = (mainStr, prefix) => {
+    // 处理前缀为空字符串的情况（空字符串是所有字符串的前缀）
+    if (prefix === '') {
+        return true;
+    }
+    // 处理主字符串长度小于前缀长度的情况
+    if (mainStr.length < prefix.length) {
+        return false;
+    }
+    // 比较主字符串开头与前缀相同长度的部分
+    return mainStr.substring(0, prefix.length) === prefix;
+}

src/views/permissions/rolePermission.vue

@@ -9,6 +9,7 @@ import { storeToRefs } from "pinia"
 const adminStore = useAdminStore();
 const { adminData, menuTree } = storeToRefs(adminStore);
 import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
+import { tr } from 'element-plus/es/locales.mjs'
 
 // 表单验证ref
 const Ref = ref(null)
@@ -35,7 +36,7 @@ const addRole = ref({
   market: ''
 })
 const addRoleMarket = ref([])
-
+const channelList = ref(['美股', '港股', 'hc第一频道'])
 const getRoleList = async function (val) {
   if (!findMenuById(menuTree.value, permissionMapping.view_role_information)) {
     ElMessage.error('无此权限')
@@ -196,7 +197,8 @@ const handleAddRole = async function () {
         "roleName": addRole.value.roleName,
         "menuIds": finalCheckedKeys,
         "fatherId": addRole.value.parentId,
-        "market": addRole.value.market
+        "market": addRole.value.market,
+        channel: addRole.value.channel
       }
     })
     if (res.code === 200) {
@@ -317,6 +319,7 @@ const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
   // 判断是否有选中的节点
   if (allCheckedNodes.length === 0) {
     permissionEditRoleObj.value.checkedKeys = []
+    ifHasChannel.value = false
     return
   }
 
@@ -326,13 +329,22 @@ const handleEditRolePermissionCheck = (checkedNodes, checkedInfo) => {
 
   console.log('编辑角色选中的权限ID:', checkedKeys)
   console.log('选中的节点数量:', allCheckedNodes.length)
+  if (checkedKeys.includes(124) || checkedKeys.includes(125) || checkedKeys.includes(126) || checkedKeys.includes(127)) {
+    ifHasChannel.value = true
+  } else {
+    ifHasChannel.value = false
+  }
 };
+
+//用于标记是否勾选频道管理
+const ifHasChannel = ref(false)
 const handleCheckChange = async (checkedNodes, checkedInfo) => {
   const { checkedKeys, checkedNodes: allCheckedNodes } = checkedInfo
 
   // 判断是否有选中的节点
   if (allCheckedNodes.length === 0) {
     addRole.value.checkedKeys = []
+    ifHasChannel.value = false
     return
   }
 
@@ -348,6 +360,12 @@ const handleCheckChange = async (checkedNodes, checkedInfo) => {
   // 将Set转换为数组并更新
   addRole.value.checkedKeys = Array.from(allKeys)
   console.log('新增角色包含所有父级的选中项:', addRole.value.checkedKeys)
+  if (addRole.value.checkedKeys.includes(124)) {
+    ifHasChannel.value = true
+    console.log('勾选了频道');
+  } else {
+    ifHasChannel.value = false
+  }
 }
 const selectParentNodes = (treeData, nodeId, checkedKeys) => {
   if (!Array.isArray(treeData)) return false
@@ -413,18 +431,38 @@ const collectIds2 = (tree) => {
   return ids
 }
 
+const collectIdsAll = (tree) => {
+  let ids = []
+  tree.forEach((node) => {
+    ids.push(node.id)
+    // 如果当前节点没有 children 或 children 为空，说明是叶子节点
+    if (node.children || node.children.length === 0) {
+      ids = ids.concat(collectIdsAll(node.children))
+    }
+  })
+  return ids
+}
+
 
 // 编辑角色初始化
 const permissionEditRoleInit = async function (row) {
   console.log('row', row)
   console.log('row.tree', row.tree)
+  let EditIds = collectIdsAll(row.tree)
+  console.log(EditIds);
+
   permissionEditRoleObj.value = {}
   permissionEditRoleObj.value.id = row.id
   permissionEditRoleObj.value.roleName = row.roleName
   permissionEditRoleObj.value.market = row.market
   permissionEditRoleObj.value.parentId = row.fatherId
   permissionEditRoleObj.value.parentName = row.fatherName
-
+  permissionEditRoleObj.value.channel = row.channel
+  if (EditIds.includes(124)) {
+    ifHasChannel.value = true
+  } else {
+    ifHasChannel.value = false
+  }
   try {
     let roleId = permissionEditRoleObj.value.parentId;
     // 如果没有上级角色，设置为管理员的id
@@ -636,9 +674,9 @@ onMounted(async function () {
       </div>
 
       <div style="margin-top: 20px;display: flex;">
-        <el-pagination background  :current-page="getRoleObj.pageNum" :page-size="getRoleObj.pageSize" :page-sizes="[5, 10, 20, 50, 100]"
-          layout="total, sizes, prev, pager, next, jumper" :total="roleTotal" @size-change="handleRolePageSizeChange"
-          @current-change="handleRoleCurrentChange"></el-pagination>
+        <el-pagination background :current-page="getRoleObj.pageNum" :page-size="getRoleObj.pageSize"
+          :page-sizes="[5, 10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper" :total="roleTotal"
+          @size-change="handleRolePageSizeChange" @current-change="handleRoleCurrentChange"></el-pagination>
       </div>
     </el-card>
   </div>
@@ -686,6 +724,11 @@ onMounted(async function () {
             <span style="color: #999;">暂无数据</span>
           </div>
         </el-form-item>
+        <el-form-item v-show="ifHasChannel" prop="channel" label="频道名称:" required>
+          <el-select v-model="addRole.channel" placeholder="请选择频道" style="width: 220px" clearable>
+            <el-option v-for="item in channelList" :key="item" :label="item" :value="item" />
+          </el-select>
+        </el-form-item>
       </el-form>
 
       <div>
@@ -729,6 +772,12 @@ onMounted(async function () {
             <span style="color: #999;">暂无数据</span>
           </div>
         </el-form-item>
+
+        <el-form-item v-show="ifHasChannel" prop="channel" label="频道名称:" required>
+          <el-select v-model="permissionEditRoleObj.channel" placeholder="请选择频道" style="width: 220px" clearable>
+            <el-option v-for="item in channelList" :key="item" :label="item" :value="item" />
+          </el-select>
+        </el-form-item>
       </el-form>
 
       <div>