Merge branch 'refs/heads/milestone-20250728-金币前端三期' into lihui/feature-20250728114233-金币前端三期

.env.development

@@ -1,6 +1,6 @@
 # VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 测试环境
-#  VITE_API_BASE='http://18.143.76.3:10704/'
+ 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/'
@@ -10,4 +10,4 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
 # zhangyong
 #  VITE_API_BASE='http://192.168.3.83:8081/'
 # 李慧琳
-VITE_API_BASE='http://localhost:8081/'
+# VITE_API_BASE='http://localhost:8081/'

src/views/recharge/beanOnlineRecharge.vue

@@ -81,6 +81,7 @@ const getToday = () => {
     )
     getTime.value = [startTime, endTime]
     activeTimeRange.value = 'today'
+    search();
 }
 
 const getYesterday = () => {
@@ -99,6 +100,7 @@ const getYesterday = () => {
     )
     getTime.value = [startTime, endTime]
     activeTimeRange.value = 'yesterday'
+    search();
 
 }
 
@@ -117,6 +119,7 @@ const get7Days = function () {
     )
     getTime.value = [startTime, endTime]
     activeTimeRange.value = '7days'
+    search();
 
 }
 
@@ -129,6 +132,7 @@ const reset = () => {
     }
     getTime.value = []
     activeTimeRange.value = ''
+    search()
 }
 
 //查询
@@ -150,10 +154,10 @@ const get = async () => {
         const data = {
             ...getObj.value,
             beanRechargeInfo: {
-                ...selectData.value
+                ...selectData.value,
+                sortField: sortField.value,
+                sortOrder: sortOrder.value,
             },
-            sortField: sortField.value,
-            sortOrder: sortOrder.value,
         }
         console.log('请求参数：', data);
         const result = await API({
@@ -191,7 +195,7 @@ const handleSortChange = (column) => {
     console.log('排序方式：', column.order)
 
     // 直接使用允许的排序字段列表进行过滤
-    const allowedFields = ['money', 'freeGold', 'payTime', 'createTime', 'permanentGold'];
+    const allowedFields = ['money', 'num'];
     if (allowedFields.includes(column.prop)) {
         sortField.value = column.prop;
     }
@@ -201,7 +205,7 @@ const handleSortChange = (column) => {
     console.log('传递给后端的排序字段：', sortField.value)
     console.log('传递给后端的排序方式：', sortOrder.value)
 
-    // get();
+    get();
 }
 //========================分页===========================
 // 搜索对象
@@ -230,7 +234,7 @@ const exportExcel = async () => {
         },
     }
     try {
-        const res = await API({ url: '/export', data: params })
+        const res = await API({ url: '/export/exportol', data: params })
         if (res.code === 200) {
             ElMessage.success('导出成功')
         } else {
@@ -259,11 +263,10 @@ const getExportList = async () => {
     try {
         const result = await API({ url: '/export/export' })
         if (result.code === 200) {
-            //   const filteredData = result.data.filter(item => {
-            //     return item.type === 2; //2表示金币充值列表
-            //   });
-            //   exportList.value = filteredData
-            exportList.value = result.data
+            const filteredData = result.data.filter(item => {
+                return item.type === 10;
+            });
+            exportList.value = filteredData
         } else {
             ElMessage.error(result.msg || '获取导出列表失败')
         }
@@ -390,9 +393,7 @@ onMounted(async function () {
         <el-col>
             <el-card>
                 <div class="bean-info">
-                    <!-- 汉字用 <strong> 加粗，动态数据用 <span> 包一层单独改色 -->
-                    <strong> 充值金豆数：</strong><span class="data-text">{{ beanNum }}</span>
-                    <strong>, 合计新币数：</strong><span class="data-text">{{ money }}</span>。
+                    充值金豆数：{{ beanNum }}, 合计新币数：{{ money }}。
                 </div>
                 <!-- 设置表格容器的高度和滚动样式 -->
                 <div style="height: 520px; overflow-y: auto;margin-top: 10px;">
@@ -413,9 +414,9 @@ onMounted(async function () {
                                 <span v-else>其他</span>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="rechargeTime" sortable label="充值时间" min-width="200px">
+                        <el-table-column prop="rechargeTime" label="充值时间" min-width="200px">
                             <template #default="scope">
-                                {{ moment(scope.row.payTime).format('YYYY-MM-DD HH:mm:ss') }}
+                                {{ moment(scope.row.rechargeTime).format('YYYY-MM-DD HH:mm:ss') }}
                             </template>
                         </el-table-column>
                     </el-table>
@@ -463,24 +464,5 @@ onMounted(async function () {
     </el-dialog>
 </template>
 <style scoped>
-:deep(.custom-height-dialog .el-dialog__body) {
-  height: 60vh;
-  overflow-y: auto;
-  padding: 15px;
-}
-.bean-info {
-    background-color: #eaf5ff;
-    padding: 12px 16px;
-    border-radius: 6px;
-    font-size: 16px;
-    color: #333;
-}
-
-.bean-info strong {
-    font-weight: 700;
-}
 
-.bean-info .data-text {
-    color: #007bff;
-}
 </style>

src/views/recharge/beanSystemRecharge.vue

@@ -78,6 +78,7 @@ const getToday = () => {
     )
     getTime.value = [startTime, endTime]
     activeTimeRange.value = 'today'
+    search()
 }
 
 const getYesterday = () => {
@@ -96,6 +97,7 @@ const getYesterday = () => {
     )
     getTime.value = [startTime, endTime]
     activeTimeRange.value = 'yesterday'
+    search()
 
 }
 
@@ -114,6 +116,7 @@ const get7Days = function () {
     )
     getTime.value = [startTime, endTime]
     activeTimeRange.value = '7days'
+    search()
 
 }
 
@@ -126,6 +129,7 @@ const reset = () => {
     }
     getTime.value = []
     activeTimeRange.value = ''
+    search()
 }
 
 //查询
@@ -204,7 +208,7 @@ const handleCurrentChange = (value) => {
     get()
 }
 
-//======================导出=======================
+//==========================导出=======================
 const exportExcel = async () => {
     const params = {
         ...getObj.value,
@@ -215,7 +219,9 @@ const exportExcel = async () => {
         },
     }
     try {
-        const res = await API({ url: '/export', data: params })
+        const res = await API({ url: '/export/exportBean', data: params })
+        console.log('系统充值导出的参数为：', params);
+
         if (res.code === 200) {
             ElMessage.success('导出成功')
         } else {
@@ -230,8 +236,8 @@ const exportListVisible = ref(false)
 
 // 打开导出列表弹窗
 const openExportList = () => {
-  getExportList()
-  exportListVisible.value = true
+    getExportList()
+    exportListVisible.value = true
 }
 
 // 导出列表数据
@@ -240,65 +246,64 @@ 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 === 2; //2表示金币充值列表
-    //   });
-    //   exportList.value = filteredData
-    exportList.value = result.data
-    } else {
-      ElMessage.error(result.msg || '获取导出列表失败')
+    exportListLoading.value = true
+    try {
+        const result = await API({ url: '/export/export' })
+        if (result.code === 200) {
+            const filteredData = result.data.filter(item => {
+                return item.type === 9;
+            });
+            exportList.value = filteredData
+        } else {
+            ElMessage.error(result.msg || '获取导出列表失败')
+        }
+    } catch (error) {
+        console.error('获取导出列表出错:', error)
+        ElMessage.error('获取导出列表失败，请稍后重试')
+    } finally {
+        exportListLoading.value = false
     }
-  } 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('文件还在导出中，请稍后再试')
-  }
+    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';
-  }
+    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 '未知状态';
-  }
+    switch (state) {
+        case 0:
+            return '待执行';
+        case 1:
+            return '执行中';
+        case 2:
+            return '执行完成';
+        case 3:
+            return '执行出错';
+        default:
+            return '未知状态';
+    }
 }
 onMounted(async function () {
     await get()
@@ -343,7 +348,7 @@ onMounted(async function () {
                             <el-button type="success" @click="reset()">重置</el-button>
                             <el-button type="primary" @click="search()">查询</el-button>
                             <el-button type="primary" style="width: 80px;" @click="exportExcel()">导出Excel</el-button>
-                            <el-button type="primary"  style="width: 95px;" @click="openExportList">查看导出列表</el-button>
+                            <el-button type="primary" style="width: 95px;" @click="openExportList">查看导出列表</el-button>
                         </div>
                     </el-col>
                 </el-row>
@@ -358,9 +363,9 @@ onMounted(async function () {
             <el-card>
                 <div class="bean-info">
                     <!-- 汉字用 <strong> 加粗，动态数据用 <span> 包一层单独改色 -->
-                    <strong>金豆总数：</strong><span class="data-text">{{ beanNum }}</span>
-                    <strong>, 充值金豆数：</strong><span class="data-text">{{ permanentBeans }}</span>
-                    <strong>, 合计新币数：</strong><span class="data-text">{{ money }}</span>。
+                    金豆总数：{{ beanNum }}
+                    , 充值金豆数：{{ permanentBeans }}
+                    , 合计新币数：{{ money }}。
                 </div>
                 <!-- 设置表格容器的高度和滚动样式 -->
                 <div style="height: 520px; overflow-y: auto;margin-top: 10px;">
@@ -392,50 +397,33 @@ onMounted(async function () {
     <!-- 导出弹窗 -->
     <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') }}
+            <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-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>
+    </el-dialog>
 </template>
-<style scoped>
-.bean-info {
-    background-color: #eaf5ff;
-    padding: 12px 16px;
-    border-radius: 6px;
-    font-size: 16px;
-    color: #333;
-}
-
-.bean-info strong {
-    font-weight: 700;
-}
-
-.bean-info .data-text {
-    color: #007bff;
-}
-</style>
+<style scoped></style>