diff --git a/.env.development b/.env.development index 3b5ebee..f289417 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,5 @@ -VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' +# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin' VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload +# VITE_API_BASE='http://192.168.9.21:8081/' +VITE_API_BASE='http://18.143.76.3:10704/' diff --git a/.env.production b/.env.production index eff9201..332ab80 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ -VITE_API_BASE='https://hwjb.homilychart.com/prod' -# VITE_API_BASE='http://192.168.8.232:8080/' +# VITE_API_BASE='https://hwjb.homilychart.com/prod' +VITE_API_BASE='http://192.168.8.246:8081/' VITE_UPLOAD_URL=https://api.homilychart.com/hljw/api/aws/upload diff --git a/.env.test b/.env.test index 995e851..3ecc103 100644 --- a/.env.test +++ b/.env.test @@ -1,4 +1,5 @@ # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' -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.8.246:8081/' VITE_UPLOAD_URL=https://api.homilychart.com/hljw/api/aws/upload \ No newline at end of file diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue index ec3456d..c2cf0a6 100644 --- a/src/views/consume/coinConsumeDetail.vue +++ b/src/views/consume/coinConsumeDetail.vue @@ -3,6 +3,7 @@ import {computed, onMounted, ref} from 'vue' import {dayjs, ElMessage} from 'element-plus' import request from '@/util/http' import API from '@/util/http' +import moment from 'moment' // 之后整理一下 /* @@ -393,24 +394,7 @@ const handleSortChange = (column) => { sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC' ConsumeSelectBy() } -const exportExcel = async function () { - const params = { - consumUser: { - jwcode: consumeUser.value.jwcode || '', - payPlatform: consumeUser.value.payPlatform || '', - market: consumeUser.value.market || '', - startTime: consumeUser.value.startTime || '', - endTime: consumeUser.value.endTime || '', - goodsName: consumeUser.value.goodsName || '' - }, - page: getObj.pageNum, - size: getObj.pageSize - } - const res = await API({url: '/export/exportConsume', data: params}) - if (res.code === 200) { - ElMessage.success('导出成功') - } -} + const handlePageSizeChange = function (val) { getObj.value.pageSize = val ConsumeSelectBy() @@ -445,6 +429,97 @@ onMounted(async function () { }) +const exportExcel = async function () { + const params = { + consumUser: { + jwcode: consumeUser.value.jwcode || '', + payPlatform: consumeUser.value.payPlatform || '', + market: consumeUser.value.market || '', + startTime: consumeUser.value.startTime || '', + endTime: consumeUser.value.endTime || '', + goodsName: consumeUser.value.goodsName || '' + }, + page: getObj.value.pageNum, + size: total.value + } + const res = await API({url: '/export/exportConsume', data: params}) + if (res.code === 200) { + ElMessage.success('导出成功') + } +} +const exportListVisible = ref(false) + +// 打开导出列表弹窗 +const openExportList = () => { + getExportList() + exportListVisible.value = true +} + +// 导出列表数据 +const exportList = ref([]) +// 导出列表加载状态 +const exportListLoading = ref(false) +// 获取导出列表 +const getExportList = async () => { + exportListLoading.value = true + try { + const result = await API({ url: '/export/export' }) + if (result.code === 200) { + const filteredData = result.data.filter(item => { + return item.type === 4; //4表示金币消耗列表 + }); + 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 '未知状态'; + } +} + \ No newline at end of file diff --git a/src/views/recharge/coinRechargeDetail.vue b/src/views/recharge/coinRechargeDetail.vue index ba4bd16..49d6284 100644 --- a/src/views/recharge/coinRechargeDetail.vue +++ b/src/views/recharge/coinRechargeDetail.vue @@ -327,31 +327,7 @@ const get7Days = function () { get() } -const exportExcel = async function () { - const params = { - rechargeUser: { - jwcode: rechargeUser.value.jwcode || '', - market: rechargeUser.value.market || '', - payPlatform: rechargeUser.value.payPlatform || '', - activity: rechargeUser.value.activity || '', - startTime: rechargeUser.value.startTime || '', - endTime: rechargeUser.value.endTime || '' - }, - page: getObj.value.pageNum, - size: getObj.value.pageSize - } - try { - const res = await API({ url: '/export/exportRecharge', data: params }) - if (res.code === 200) { - ElMessage.success('导出成功') - } else { - ElMessage.error(res.message || '导出失败,请稍后重试') - } - } catch (error) { - console.log('请求失败', error) - ElMessage.error('导出失败,请稍后重试') - } -} + // 挂载 onMounted(async function () { @@ -384,6 +360,106 @@ const handleSortChange = (column) => { console.log('传递给后端的排序方式:', sortOrder.value) get() } + +const exportExcel = async function () { + const params = { + rechargeUser: { + jwcode: rechargeUser.value.jwcode || '', + market: rechargeUser.value.market || '', + payPlatform: rechargeUser.value.payPlatform || '', + activity: rechargeUser.value.activity || '', + startTime: rechargeUser.value.startTime || '', + endTime: rechargeUser.value.endTime || '' + }, + page: getObj.value.pageNum, + size: total.value + } + try { + const res = await API({ url: '/export/exportRecharge', data: params }) + if (res.code === 200) { + ElMessage.success('导出成功') + } else { + ElMessage.error(res.message || '导出失败,请稍后重试') + } + } catch (error) { + console.log('请求失败', 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 === 2; //2表示金币充值列表 + }); + 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 '未知状态'; + } +}