diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
index af97ed3..a283774 100644
--- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue
+++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue
@@ -66,6 +66,7 @@
/>
-->
+
开始时间:
今
昨
近7天
+
查询
重置
diff --git a/gold-system/src/views/managerecharge/activity.vue b/gold-system/src/views/managerecharge/activity.vue
index 27d504e..5010a3f 100644
--- a/gold-system/src/views/managerecharge/activity.vue
+++ b/gold-system/src/views/managerecharge/activity.vue
@@ -231,7 +231,7 @@ const delConfirm = async (row) => {
delObj.value = row
// 发送删除请求
const result = await request({
- url: '/recharge/activity/delete', // 假设这是删除活动的接口
+ url: '/recharge/activity/edit', // 假设这是删除活动的接口
method: 'post',
data: delObj.value
})
diff --git a/gold-system/src/views/recharge/allRecharge.vue b/gold-system/src/views/recharge/allRecharge.vue
index 574cfce..161d41d 100644
--- a/gold-system/src/views/recharge/allRecharge.vue
+++ b/gold-system/src/views/recharge/allRecharge.vue
@@ -204,15 +204,21 @@ const getToday = function () {
today.getMonth(),
today.getDate()
)
+ // 设置结束时间为当天的 23:59:59
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
- today.getDate() + 1
+ today.getDate(),
+ 23, 59, 59
)
getTime.value = [startDate, endDate]
+ // 格式化时间
+ rechargeVo.value.startDate = moment(startDate).format('YYYY-MM-DD HH:mm:ss')
+ rechargeVo.value.endDate = moment(endDate).format('YYYY-MM-DD HH:mm:ss')
console.log('getTime', getTime.value)
get()
}
+
// 昨天
const getYesterday = function () {
const yesterday = new Date()
@@ -222,15 +228,21 @@ const getYesterday = function () {
yesterday.getMonth(),
yesterday.getDate()
)
+ // 设置结束时间为昨天的 23:59:59
const endDate = new Date(
yesterday.getFullYear(),
yesterday.getMonth(),
- yesterday.getDate() + 1
+ yesterday.getDate(),
+ 23, 59, 59
)
getTime.value = [startDate, endDate]
+ // 格式化时间
+ rechargeVo.value.startDate = moment(startDate).format('YYYY-MM-DD HH:mm:ss')
+ rechargeVo.value.endDate = moment(endDate).format('YYYY-MM-DD HH:mm:ss')
console.log('getTime', getTime.value)
get()
}
+
// 近7天
const get7Days = function () {
const today = new Date()
@@ -239,12 +251,17 @@ const get7Days = function () {
today.getMonth(),
today.getDate() - 6
)
+ // 设置结束时间为当天的 23:59:59
const endDate = new Date(
today.getFullYear(),
today.getMonth(),
- today.getDate() + 1
+ today.getDate(),
+ 23, 59, 59
)
getTime.value = [startDate, endDate]
+ // 格式化时间
+ rechargeVo.value.startDate = moment(startDate).format('YYYY-MM-DD HH:mm:ss')
+ rechargeVo.value.endDate = moment(endDate).format('YYYY-MM-DD HH:mm:ss')
console.log('getTime', getTime.value)
get()
}
diff --git a/gold-system/src/views/refund/allRefund.vue b/gold-system/src/views/refund/allRefund.vue
index de0ecaa..44ed083 100644
--- a/gold-system/src/views/refund/allRefund.vue
+++ b/gold-system/src/views/refund/allRefund.vue
@@ -1,4 +1,5 @@