Merge branch 'zhangrenyuan/feature-20250728113353-金币前端三期' into milestone-20250728-金币前端三期

2 weeks ago · 7ef0a2cc0e
4 changed files with 26 additions and 46 deletions
--- a/.env.development
+++ b/.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://18.143.76.3:10704/'
 #  VITE_API_BASE='http://192.168.9.52:10705/'
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@ -355,23 +355,14 @@ onMounted(async function () {

 const exportExcel = async function () {
  const params = { //需要修改
-     beanConsumeArticle: {
-      ...beanConsumeArticle.value,
-    jwcode: beanConsumeArticle.value.jwcode ? String(beanConsumeArticle.value.jwcode) : '',
-    dept: beanConsumeArticle.value.dept || '',
-    type: beanConsumeArticle.value.type || '',
-    articleId: beanConsumeArticle.value.articleId || '',
-    articleName: beanConsumeArticle.value.articleName || '',
-    author: beanConsumeArticle.value.author || '',
-    beanNum: beanConsumeArticle.value.beanNum || '',
-    buyBean: beanConsumeArticle.value.buyBean || '',
-    freeBean: beanConsumeArticle.value.freeBean || '',
-    consumeTime: beanConsumeArticle.value.consumeTime || '',
-    sortField: sortField.value || 'consumeTime',
-    sortOrder: sortOrder.value || 'desc'
-    }
+     ...getObj.value,
+        "beanConsumeArticle": {
+            ...beanConsumeArticle.value,
+            sortField: sortField.value,
+            sortOrder: sortOrder.value,
+        },
  }
-  const res = await API({ url: '/export/exportConsume', data: params })
+  const res = await API({ url: '/export/exportArticle', data: params })
  if (res.code === 200) {
    ElMessage.success('导出成功')
  }
@ -395,7 +386,7 @@ const getExportList = async () => {
    const result = await API({ url: '/export/export' })
    if (result.code === 200) {
      const filteredData = result.data.filter(item => {
-        // return item.type === 4; //4表示金币消耗列表 // todo 修改对应type
+        return item.type === 8; //4表示金币消耗列表 // todo 修改对应type 8表示文章/视频
      });
      exportList.value = filteredData
    } else {
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@ -363,18 +363,14 @@ onMounted(async function () {

 const exportExcel = async function () {
  const params = { //需要修改
-     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'
-        }
+     ...getObj.value,
+        "beanConsumeFan": {
+            ...beanConsumeFan.value,
+            sortField: sortField.value,
+            sortOrder: sortOrder.value,
+        },
  }
-  const res = await API({ url: '/export/exportConsume', data: params })
+  const res = await API({ url: '/export/exportFan', data: params })
  if (res.code === 200) {
    ElMessage.success('导出成功')
  }
@ -398,7 +394,7 @@ const getExportList = async () => {
    const result = await API({ url: '/export/export' })
    if (result.code === 200) {
      const filteredData = result.data.filter(item => {
-        return item.type === 4; //4表示金币消耗列表 // todo 修改对应type
+        return item.type === 7; //4表示金币消耗列表 // todo 修改对应type 7是铁粉
      });
      exportList.value = filteredData
    } else {
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@ -373,22 +373,14 @@ onMounted(async function () {

 const exportExcel = async function () {
  const params = {
-  beanConsumeLive: {
+  ...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 || '',
-    beanNum: beanConsumeLive.value.beanNum || '',
-    liveChannel: beanConsumeLive.value.liveChannel || '',
-    liveName: beanConsumeLive.value.liveName || '',
-    startTime: beanConsumeLive.value.startTime || '',
-    endTime: beanConsumeLive.value.endTime || '',
    sortField: sortField.value || 'consumeTime',
    sortOrder: sortOrder.value || 'desc'
  }
 }
-  const res = await API({ url: '/export/exportConsume', data: params })
+  const res = await API({ url: '/export/exportLive', data: params })
  if (res.code === 200) {
    ElMessage.success('导出成功')
  }
@ -405,6 +397,7 @@ const openExportList = () => {
 const exportList = ref([])
 // 导出列表加载状态
 const exportListLoading = ref(false)
+
 // 获取导出列表
 const getExportList = async () => {
  exportListLoading.value = true
@ -412,7 +405,7 @@ const getExportList = async () => {
    const result = await API({ url: '/export/export' })
    if (result.code === 200) {
      const filteredData = result.data.filter(item => {
-        return item.type === 4; //4表示金币消耗列表 // todo 修改对应type
+        return item.type === 6; //4表示金币消耗列表 // todo 修改对应type 6是直播
      });
      exportList.value = filteredData
    } else {
@ -564,13 +557,13 @@ const getTagText = (state) => {
        <!-- 设置表格容器的高度和滚动样式 -->
        <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">
+            <!-- <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> -->
            <!-- 固定姓名列 -->
            <el-table-column prop="name" label="姓名" width="150px" fixed="left" />
            <!-- 固定精网号列 -->
@ -608,9 +601,9 @@ const getTagText = (state) => {
          </el-tag>
        </template>
      </el-table-column>
-      <el-table-column prop="consumeTime" label="创建时间">
+      <el-table-column prop="createTime" label="创建时间">
        <template #default="scope">
-          {{ moment(scope.row.consumeTime).format('YYYY-MM-DD HH:mm:ss') }}
+          {{ moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') }}
        </template>
      </el-table-column>
      <el-table-column label="操作">