diff --git a/apps/web-antd/src/api/mall/statistics/member.ts b/apps/web-antd/src/api/mall/statistics/member.ts index 8e6f91360..71423b131 100644 --- a/apps/web-antd/src/api/mall/statistics/member.ts +++ b/apps/web-antd/src/api/mall/statistics/member.ts @@ -2,7 +2,7 @@ import type { Dayjs } from 'dayjs'; import type { DataComparisonRespVO } from './common'; -import { formatDate, formatDateTime } from '@vben/utils'; +import { formatDateTime } from '@vben/utils'; import { requestClient } from '#/api/request'; @@ -79,7 +79,9 @@ export function getMemberSummary() { } /** 查询会员分析数据 */ -export function getMemberAnalyse(params: MallMemberStatisticsApi.MemberAnalyseReqVO) { +export function getMemberAnalyse( + params: MallMemberStatisticsApi.MemberAnalyseReqVO, +) { return requestClient.get( '/statistics/member/analyse', { @@ -127,7 +129,7 @@ export function getMemberRegisterCountList(beginTime: Date, endTime: Date) { '/statistics/member/register-count-list', { params: { - times: [formatDate(beginTime), formatDate(endTime)], + times: [formatDateTime(beginTime), formatDateTime(endTime)], }, }, ); diff --git a/apps/web-antd/src/api/mall/statistics/trade.ts b/apps/web-antd/src/api/mall/statistics/trade.ts index aedfccae5..3f8d1cb82 100644 --- a/apps/web-antd/src/api/mall/statistics/trade.ts +++ b/apps/web-antd/src/api/mall/statistics/trade.ts @@ -1,6 +1,6 @@ import type { DataComparisonRespVO } from './common'; -import { formatDate } from '@vben/utils'; +import { formatDate, formatDateTime } from '@vben/utils'; import { requestClient } from '#/api/request'; @@ -128,8 +128,8 @@ export function getOrderCountTrendComparison( >('/statistics/trade/order-count-trend', { params: { type, - beginTime: formatDate(beginTime), - endTime: formatDate(endTime), + beginTime: formatDateTime(beginTime), + endTime: formatDateTime(endTime), }, }); } diff --git a/apps/web-antd/src/views/mall/home/modules/member-statistics-card.vue b/apps/web-antd/src/views/mall/home/modules/member-statistics-card.vue index 1cc40dac2..cc11ded12 100644 --- a/apps/web-antd/src/views/mall/home/modules/member-statistics-card.vue +++ b/apps/web-antd/src/views/mall/home/modules/member-statistics-card.vue @@ -1,16 +1,21 @@ - diff --git a/apps/web-antd/src/views/mall/home/modules/member-statistics-chart-options.ts b/apps/web-antd/src/views/mall/home/modules/member-statistics-chart-options.ts index 0d45d5e9c..d1e8bf08c 100644 --- a/apps/web-antd/src/views/mall/home/modules/member-statistics-chart-options.ts +++ b/apps/web-antd/src/views/mall/home/modules/member-statistics-chart-options.ts @@ -1,8 +1,14 @@ import dayjs from 'dayjs'; -/** - * 会员统计图表配置 - */ +/** 时间范围类型枚举 */ +export enum TimeRangeTypeEnum { + DAY30 = 1, + MONTH = 30, + WEEK = 7, + YEAR = 365, +} + +/** 会员统计图表配置 */ export function getMemberStatisticsChartOptions(list: any[]): any { return { dataset: { @@ -56,4 +62,3 @@ export function getMemberStatisticsChartOptions(list: any[]): any { }, }; } -