diff --git a/.env.development b/.env.development index 2113484..7fb6ca6 100644 --- a/.env.development +++ b/.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/' diff --git a/src/views/recharge/beanOnlineRecharge.vue b/src/views/recharge/beanOnlineRecharge.vue index 82496ff..5fad66a 100644 --- a/src/views/recharge/beanOnlineRecharge.vue +++ b/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 () {
- - 充值金豆数：{{ beanNum }} - , 合计新币数：{{ money }}。 + 充值金豆数：{{ beanNum }}, 合计新币数：{{ money }}。
@@ -413,9 +414,9 @@ onMounted(async function () { 其他 - + @@ -463,24 +464,5 @@ onMounted(async function () { \ No newline at end of file diff --git a/src/views/recharge/beanSystemRecharge.vue b/src/views/recharge/beanSystemRecharge.vue index 924af91..507ac09 100644 --- a/src/views/recharge/beanSystemRecharge.vue +++ b/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 () { 重置 查询 导出Excel - 查看导出列表 + 查看导出列表
@@ -358,9 +363,9 @@ onMounted(async function () {
- 金豆总数：{{ beanNum }} - , 充值金豆数：{{ permanentBeans }} - , 合计新币数：{{ money }}。 + 金豆总数：{{ beanNum }} + , 充值金豆数：{{ permanentBeans }} + , 合计新币数：{{ money }}。
@@ -392,50 +397,33 @@ onMounted(async function () { - - - - - - - \ No newline at end of file + \ No newline at end of file