diff --git a/apps/web-antd/src/api/mall/statistics/common.ts b/apps/web-antd/src/api/mall/statistics/common.ts index bb474b5cc..3b1fad6d7 100644 --- a/apps/web-antd/src/api/mall/statistics/common.ts +++ b/apps/web-antd/src/api/mall/statistics/common.ts @@ -1,5 +1,5 @@ /** 数据对照 Response */ -export interface MallDataComparisonResp { +export interface DataComparisonRespVO { value: T; reference: T; } diff --git a/apps/web-antd/src/api/mall/statistics/member.ts b/apps/web-antd/src/api/mall/statistics/member.ts index ea90af372..1411389d4 100644 --- a/apps/web-antd/src/api/mall/statistics/member.ts +++ b/apps/web-antd/src/api/mall/statistics/member.ts @@ -1,4 +1,4 @@ -import type { MallDataComparisonResp } from './common'; +import type { DataComparisonRespVO } from './common'; import { formatDate } from '@vben/utils'; @@ -23,7 +23,7 @@ export namespace MallMemberStatisticsApi { orderUserCount: number; // 下单用户数 payUserCount: number; // 支付用户数 atv: number; // 平均客单价 - comparison: MallDataComparisonResp; // 对照数据 + comparison: DataComparisonRespVO; // 对照数据 } /** 会员地区统计 Response */ @@ -57,7 +57,7 @@ export namespace MallMemberStatisticsApi { } /** 会员数量统计 Response */ - export interface Count { + export interface MemberCountRespVO { visitUserCount: string; // 用户访问量 registerUserCount: number; // 注册用户数量 } @@ -112,7 +112,7 @@ export function getMemberTerminalStatisticsList() { /** 获得用户数量量对照 */ export function getUserCountComparison() { return requestClient.get< - MallDataComparisonResp + DataComparisonRespVO >('/statistics/member/user-count-comparison'); } diff --git a/apps/web-antd/src/api/mall/statistics/product.ts b/apps/web-antd/src/api/mall/statistics/product.ts index d458d4353..834ae27d1 100644 --- a/apps/web-antd/src/api/mall/statistics/product.ts +++ b/apps/web-antd/src/api/mall/statistics/product.ts @@ -1,6 +1,6 @@ import type { PageParam, PageResult } from '@vben/request'; -import type { MallDataComparisonResp } from './common'; +import type { DataComparisonRespVO } from './common'; import { requestClient } from '#/api/request'; @@ -43,7 +43,7 @@ export namespace MallProductStatisticsApi { /** 获得商品统计分析 */ export function getProductStatisticsAnalyse(params: PageParam) { return requestClient.get< - MallDataComparisonResp + DataComparisonRespVO >('/statistics/product/analyse', { params }); } diff --git a/apps/web-antd/src/api/mall/statistics/trade.ts b/apps/web-antd/src/api/mall/statistics/trade.ts index 1f866c636..aedfccae5 100644 --- a/apps/web-antd/src/api/mall/statistics/trade.ts +++ b/apps/web-antd/src/api/mall/statistics/trade.ts @@ -1,4 +1,4 @@ -import type { MallDataComparisonResp } from './common'; +import type { DataComparisonRespVO } from './common'; import { formatDate } from '@vben/utils'; @@ -43,7 +43,7 @@ export namespace MallTradeStatisticsApi { } /** 交易订单统计 Response */ - export interface TradeOrderSummary { + export interface TradeOrderSummaryRespVO { /** 支付订单商品数 */ orderPayCount?: number; /** 总支付金额,单位:分 */ @@ -71,7 +71,7 @@ const formatDateParam = (params: MallTradeStatisticsApi.TradeTrendReq) => { /** 查询交易统计 */ export function getTradeStatisticsSummary() { return requestClient.get< - MallDataComparisonResp + DataComparisonRespVO >('/statistics/trade/summary'); } @@ -80,7 +80,7 @@ export function getTradeStatisticsAnalyse( params: MallTradeStatisticsApi.TradeTrendReq, ) { return requestClient.get< - MallDataComparisonResp + DataComparisonRespVO >('/statistics/trade/analyse', { params: formatDateParam(params) }); } @@ -113,7 +113,7 @@ export function getOrderCount() { /** 获得交易订单数量对照 */ export function getOrderComparison() { return requestClient.get< - MallDataComparisonResp + DataComparisonRespVO >('/statistics/trade/order-comparison'); } @@ -124,7 +124,7 @@ export function getOrderCountTrendComparison( endTime: Date, ) { return requestClient.get< - MallDataComparisonResp[] + DataComparisonRespVO[] >('/statistics/trade/order-count-trend', { params: { type, diff --git a/apps/web-antd/src/views/mall/home/index.vue b/apps/web-antd/src/views/mall/home/index.vue index e398fd177..873e9cdc7 100644 --- a/apps/web-antd/src/views/mall/home/index.vue +++ b/apps/web-antd/src/views/mall/home/index.vue @@ -1,13 +1,17 @@ @@ -61,7 +67,9 @@ onMounted(async () => { prefix="¥" :decimals="2" :value="fenToYuan(orderComparison?.value?.orderPayPrice || 0)" - :reference="fenToYuan(orderComparison?.reference?.orderPayPrice || 0)" + :reference=" + fenToYuan(orderComparison?.reference?.orderPayPrice || 0) + " /> @@ -89,7 +97,6 @@ onMounted(async () => { /> - @@ -99,7 +106,6 @@ onMounted(async () => { - @@ -109,10 +115,8 @@ onMounted(async () => { - - diff --git a/apps/web-antd/src/views/mall/home/modules/comparison-card.vue b/apps/web-antd/src/views/mall/home/modules/comparison-card.vue index b746dd7af..ebffe3064 100644 --- a/apps/web-antd/src/views/mall/home/modules/comparison-card.vue +++ b/apps/web-antd/src/views/mall/home/modules/comparison-card.vue @@ -1,31 +1,32 @@ - - -