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 222cee1..c2cf0a6 100644
--- a/src/views/consume/coinConsumeDetail.vue
+++ b/src/views/consume/coinConsumeDetail.vue
@@ -35,7 +35,12 @@ const consumeUser = ref({
})
-
+// 标记当前激活的时间范围按钮
+const activeTimeRange = ref('')
+// 日期选择器变化时清除按钮激活状态
+const handleDatePickerChange = () => {
+ activeTimeRange.value = ''
+}
// 搜索对象
const getObj = ref({
pageNum: 1,
@@ -267,6 +272,8 @@ const reset = function () {
sortField.value = ''
sortOrder.value = ''
getTime.value = {}
+ activeTimeRange.value = '' // 清除激活状态
+
// 点完重置后,重新请求数据
ConsumeSelectBy()
@@ -287,6 +294,8 @@ const getToday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
+ activeTimeRange.value = 'today' // 标记当前激活状态
+
ConsumeSelectBy()
}
// 昨天
@@ -305,6 +314,8 @@ const getYesterday = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
+ activeTimeRange.value = 'yesterday' // 标记当前激活状态
+
ConsumeSelectBy()
}
// 近7天
@@ -322,6 +333,8 @@ const get7Days = function () {
)
getTime.value = [startTime, endTime]
console.log('getTime', getTime.value)
+ activeTimeRange.value = '7days' // 标记当前激活状态
+
ConsumeSelectBy()
}
// 获取商品列表
@@ -560,11 +573,10 @@ const getTagText = (state) => {
消耗时间:
- 今
-
- 昨
- 近7天
+ end-placeholder="结束时间" style="width: 400px" @change="handleDatePickerChange"/>
+ 今
+ 昨
+ 近7天