From 1ec6002ce0400f2df29f6a6ddb61654c8a4683a8 Mon Sep 17 00:00:00 2001 From: lihui Date: Thu, 17 Jul 2025 14:16:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E6=89=80=E6=9C=89=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=20=E5=BF=AB=E6=8D=B7=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=90=8E=E6=9C=89=E9=AB=98=E4=BA=AE=E6=98=BE?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/audit/rechargeAudit.vue | 18 ++++++++++++++---- src/views/audit/refundAudit.vue | 24 ++++++++++++++++++++---- src/views/consume/coinConsumeDetail.vue | 24 ++++++++++++++++++------ src/views/recharge/coinRechargeDetail.vue | 23 +++++++++++++++++++---- src/views/refund/coinRefundDetail.vue | 31 ++++++++++++++++++------------- src/views/usergold/clientCountDetail.vue | 23 +++++++++++++++++++---- src/views/workspace/index.vue | 24 +++++++++++++++++++----- 7 files changed, 127 insertions(+), 40 deletions(-) diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue index 9783f56..dceb91d 100644 --- a/src/views/audit/rechargeAudit.vue +++ b/src/views/audit/rechargeAudit.vue @@ -35,10 +35,10 @@
充值时间： - 今 - 昨 - 近7天 + end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/> + 今 + 昨 + 近7天 重置 查询
@@ -185,6 +185,12 @@ const formatTime = (val) => val ? moment(val).format('YYYY-MM-DD HH:mm:ss') : '' const adminData = ref({}) // 充值明细表格 const tableData = ref([]) +// 标记当前激活的时间范围按钮 +const activeTimeRange = ref('') +// 日期选择器变化时清除按钮激活状态 +const handleDatePickerChange = () => { + activeTimeRange.value = '' +} // 搜索表单数据 const rechargeAudit = ref({ @@ -352,6 +358,7 @@ const resetSearch = function () { auditStatus: rechargeAudit.value.auditStatus } getTime.value = [] + activeTimeRange.value = '' // 清除激活状态 getRecharge() getStats() } @@ -371,6 +378,7 @@ const getToday = function () { ) getTime.value = [startTime, endTime] console.log('getTime', getTime.value) + activeTimeRange.value = 'today' // 标记当前激活状态 getRecharge() getStats() } @@ -391,6 +399,7 @@ const getYesterday = function () { ) getTime.value = [startTime, endTime] console.log('getTime', getTime.value) + activeTimeRange.value = 'yesterday' // 标记当前激活状态 getRecharge() getStats() } @@ -410,6 +419,7 @@ const get7Days = function () { ) getTime.value = [startTime, endTime] console.log('getTime', getTime.value) + activeTimeRange.value = '7days' // 标记当前激活状态 getRecharge() getStats() } diff --git a/src/views/audit/refundAudit.vue b/src/views/audit/refundAudit.vue index 0ef8b44..4a40478 100644 --- a/src/views/audit/refundAudit.vue +++ b/src/views/audit/refundAudit.vue @@ -34,10 +34,10 @@
提交时间： - 今 - 昨 - 近7天 + end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/> + 今 + 昨 + 近7天 重置 查询
@@ -154,6 +154,13 @@ import { ElMessage } from 'element-plus' import API from '@/util/http' import moment from 'moment' +// 标记当前激活的时间范围按钮 +const activeTimeRange = ref('') +// 日期选择器变化时清除按钮激活状态 +const handleDatePickerChange = () => { + activeTimeRange.value = '' +} + const scopeValue = ref(null) // 当前行 const rejectDialogVisible = ref(false) // 驳回对话框显示状态 const rejectReason = ref('') // 驳回理由 @@ -174,6 +181,7 @@ const searchForm = ref({ auditStatus: '0' }) const checkTab = ref('pending') // 能否不用STATUS常量，0是待审批，1是已通过，2是驳回，参数status需要Integer +// 时间 const dateRange = ref([]) const pagination = ref({ pageNum: 1, @@ -399,6 +407,7 @@ const resetSearch = function () { auditStatus:auditStatus } dateRange.value = [] + activeTimeRange.value = '' // 清除激活状态 } // 今天 @@ -408,8 +417,11 @@ const getToday = function () { const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1) dateRange.value = [startTime, endTime] console.log('dateRange', dateRange.value) + activeTimeRange.value = 'today' // 标记当前激活状态 + get() getStats() + console.log('aaaaaaaaaa这是今天调用') } @@ -421,6 +433,8 @@ const getYesterday = function () { const endTime = new Date(yesterday.getFullYear(), yesterday.getMonth(), yesterday.getDate() + 1) dateRange.value = [startTime, endTime] console.log('dateRange', dateRange.value) + activeTimeRange.value = 'yesterday' // 标记当前激活状态 + get() getStats() console.log('aaaaaaaaaa这是昨天调用') @@ -433,6 +447,8 @@ const get7Days = function () { const endTime = new Date(today.getFullYear(), today.getMonth(), today.getDate() + 1) dateRange.value = [startTime, endTime] console.log('dateRange', dateRange.value) + activeTimeRange.value = '7days' // 标记当前激活状态 + get() getStats() console.log('aaaaaaaaaa这是近七天调用') diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue index af3f8f8..ec3456d 100644 --- a/src/views/consume/coinConsumeDetail.vue +++ b/src/views/consume/coinConsumeDetail.vue @@ -34,7 +34,12 @@ const consumeUser = ref({ }) - +// 标记当前激活的时间范围按钮 +const activeTimeRange = ref('') +// 日期选择器变化时清除按钮激活状态 +const handleDatePickerChange = () => { + activeTimeRange.value = '' +} // 搜索对象 const getObj = ref({ pageNum: 1, @@ -266,6 +271,8 @@ const reset = function () { sortField.value = '' sortOrder.value = '' getTime.value = {} + activeTimeRange.value = '' // 清除激活状态 + // 点完重置后，重新请求数据 ConsumeSelectBy() @@ -286,6 +293,8 @@ const getToday = function () { ) getTime.value = [startTime, endTime] console.log('getTime', getTime.value) + activeTimeRange.value = 'today' // 标记当前激活状态 + ConsumeSelectBy() } // 昨天 @@ -304,6 +313,8 @@ const getYesterday = function () { ) getTime.value = [startTime, endTime] console.log('getTime', getTime.value) + activeTimeRange.value = 'yesterday' // 标记当前激活状态 + ConsumeSelectBy() } // 近7天 @@ -321,6 +332,8 @@ const get7Days = function () { ) getTime.value = [startTime, endTime] console.log('getTime', getTime.value) + activeTimeRange.value = '7days' // 标记当前激活状态 + ConsumeSelectBy() } // 获取商品列表 @@ -482,11 +495,10 @@ onMounted(async function () {
消耗时间： - 今 - - 昨 - 近7天 + end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/> + 今 + 昨 + 近7天 { + activeTimeRange.value = '' +} // 地区数据 const markets = ref([]) // 图表相关 @@ -279,6 +286,8 @@ const getToday = function () { const endTime = today.add(1, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss') dateRange.value = [startTime, endTime] console.log('看看dateRange', dateRange.value) + activeTimeRange.value = 'today' // 标记当前激活状态 + getChartData() } // 本周 @@ -288,6 +297,8 @@ const getWeek = function () { const endTime = today.add(1, 'week').startOf('week').add(1, 'day').format('YYYY-MM-DD HH:mm:ss') dateRange.value = [startTime, endTime] console.log('看看dateRange', dateRange.value) + activeTimeRange.value = 'week' // 标记当前激活状态 + getChartData() } // 本月 @@ -297,6 +308,8 @@ const getMonth = function () { const endTime = today.add(1, 'month').startOf('month').format('YYYY-MM-DD HH:mm:ss') dateRange.value = [startTime, endTime] console.log('看看dateRange', dateRange.value) + activeTimeRange.value = 'month' // 标记当前激活状态 + getChartData() } // 本年 @@ -306,6 +319,7 @@ const getYear = function () { const endTime = today.add(1, 'year').startOf('year').format('YYYY-MM-DD HH:mm:ss') dateRange.value = [startTime, endTime] console.log('看看dateRange', dateRange.value) + activeTimeRange.value = 'year' // 标记当前激活状态 getChartData() } From 906a1e86a662efa7b779901dc0e9418428d5cd98 Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 18 Jul 2025 11:34:09 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(usergold):=20=E4=B8=BA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=87=91=E5=B8=81=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E5=9C=B0=E5=8C=BA=E9=80=89=E6=8B=A9=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=A4=9A=E9=80=89=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BC=A0=E6=95=B0?= =?UTF-8?q?=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/usergold/clientCountBalance.vue | 2 +- src/views/usergold/clientCountDetail.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue index 4c7515b..7ccba7c 100644 --- a/src/views/usergold/clientCountBalance.vue +++ b/src/views/usergold/clientCountBalance.vue @@ -255,7 +255,7 @@ const exportExcel = async function () {
所属地区： - +
diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue index 1a41b62..8a6c16a 100644 --- a/src/views/usergold/clientCountDetail.vue +++ b/src/views/usergold/clientCountDetail.vue @@ -400,8 +400,8 @@ onMounted(async function () {
所属地区： - + From 60e7d43887298644bb5a0298f230324caf17138c Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 18 Jul 2025 12:02:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor(usergold):=20=E5=B0=86=20user.mark?= =?UTF-8?q?et=20=E5=92=8C=20goldDetail.market=20=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=E4=B8=BA=20markets?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/usergold/clientCountBalance.vue | 2 +- src/views/usergold/clientCountDetail.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue index 7ccba7c..16b78b8 100644 --- a/src/views/usergold/clientCountBalance.vue +++ b/src/views/usergold/clientCountBalance.vue @@ -255,7 +255,7 @@ const exportExcel = async function () {
所属地区： - +
diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue index 8a6c16a..195d56e 100644 --- a/src/views/usergold/clientCountDetail.vue +++ b/src/views/usergold/clientCountDetail.vue @@ -44,7 +44,7 @@ const exportExcel = async function () { jwcode: goldDetail.value.jwcode || '', payPlatform: goldDetail.value.payPlatform || '', type: goldDetail.value.type || '', - market: goldDetail.value.market || '', + markets: goldDetail.value.markets || '', startTime: goldDetail.value.startTime || '', endTime: goldDetail.value.endTime || '', }, @@ -254,7 +254,7 @@ const reset = function () { delete goldDetail.value.type delete goldDetail.value.startTime delete goldDetail.value.endTime - delete goldDetail.value.market + delete goldDetail.value.markets delete sortField.value delete sortOrder.value getTime.value = [] @@ -400,7 +400,7 @@ onMounted(async function () {
所属地区： - From 4e283a01d99b7956965c325569a86dfa35311e4f Mon Sep 17 00:00:00 2001 From: lihui Date: Fri, 18 Jul 2025 13:29:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=90=88=E8=AE=A1?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/usergold/clientCountBalance.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/usergold/clientCountBalance.vue b/src/views/usergold/clientCountBalance.vue index 16b78b8..87a64e5 100644 --- a/src/views/usergold/clientCountBalance.vue +++ b/src/views/usergold/clientCountBalance.vue @@ -118,13 +118,13 @@ const get = async function (val) { tableData.value = result.data.list total.value = result.data.total - + console.log('兄弟你是什么 user', user.value) // 获取合计数 const resultGoldTotal = await API({ url: '/goldDetail/goldTotal', data: { - ...getAllObj.value, - user: {...user.value} + jwcode: user.value.jwcode, + markets: user.value.markets } }) // 判断精网号是否存在，假设精网号不存在时 result.data.list 为空数组 @@ -260,6 +260,8 @@ const exportExcel = async function () {
查询 + 重置 + 导出Excel