商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题

(cherry picked from commit c3cad3f3ee)
This commit is contained in:
owen 2023-11-24 20:54:47 +08:00 committed by shizhong
parent bafc4ca36c
commit 42b78d1411
3 changed files with 13 additions and 6 deletions

View File

@ -74,11 +74,6 @@ const emits = defineEmits<{
}>()
/** 触发时间范围选中事件 */
const emitDateRangePicker = async () => {
// , 线,
if (DateUtil.isSameDay(times.value[0], times.value[1])) {
//
times.value[0] = DateUtil.formatDate(dayjs(times.value[0]).subtract(1, 'd'))
}
emits('change', times.value)
}

View File

@ -382,5 +382,8 @@ export function getDateRange(
beginDate: dayjs.ConfigType,
endDate: dayjs.ConfigType
): [string, string] {
return [dayjs(beginDate).startOf('d').toString(), dayjs(endDate).endOf('d').toString()]
return [
dayjs(beginDate).startOf('d').format('YYYY-MM-DD HH:mm:ss'),
dayjs(endDate).endOf('d').format('YYYY-MM-DD HH:mm:ss')
]
}

View File

@ -219,6 +219,8 @@ import { TradeSummaryRespVO, TradeTrendSummaryRespVO } from '@/api/mall/statisti
import { calculateRelativeRate, fenToYuan } from '@/utils'
import download from '@/utils/download'
import { CardTitle } from '@/components/Card'
import * as DateUtil from '@/utils/formatTime'
import dayjs from 'dayjs'
/** 交易统计 */
defineOptions({ name: 'TradeStatistics' })
@ -289,6 +291,13 @@ const lineChartOptions = reactive<EChartsOption>({
/** 处理交易状况查询 */
const getTradeTrendData = async () => {
trendLoading.value = true
// 1. : , 线,
const times = shortcutDateRangePicker.value.times
if (DateUtil.isSameDay(times[0], times[1])) {
//
times[0] = DateUtil.formatDate(dayjs(times[0]).subtract(1, 'd'))
}
//
await Promise.all([getTradeTrendSummary(), getTradeStatisticsList()])
trendLoading.value = false
}