diff --git a/apps/web-antd/src/api/mall/promotion/articleCategory/index.ts b/apps/web-antd/src/api/mall/promotion/article/category/index.ts similarity index 100% rename from apps/web-antd/src/api/mall/promotion/articleCategory/index.ts rename to apps/web-antd/src/api/mall/promotion/article/category/index.ts diff --git a/apps/web-antd/src/api/mall/market/banner/index.ts b/apps/web-antd/src/api/mall/promotion/banner/index.ts similarity index 100% rename from apps/web-antd/src/api/mall/market/banner/index.ts rename to apps/web-antd/src/api/mall/promotion/banner/index.ts diff --git a/apps/web-antd/src/api/mall/promotion/bargain/bargainActivity.ts b/apps/web-antd/src/api/mall/promotion/bargain/bargainActivity.ts index e8501c5cb..97917ec2d 100644 --- a/apps/web-antd/src/api/mall/promotion/bargain/bargainActivity.ts +++ b/apps/web-antd/src/api/mall/promotion/bargain/bargainActivity.ts @@ -33,6 +33,7 @@ export namespace MallBargainActivityApi { stock: number; // 活动库存 } + // TODO @puhui999:要不要删除? /** 扩展 SKU 配置 */ export type SkuExtension = { productConfig: BargainProduct; // 砍价活动配置 diff --git a/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts b/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts index b6da6218d..00471bd65 100644 --- a/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts +++ b/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts @@ -5,12 +5,6 @@ import type { MallSpuApi } from '#/api/mall/product/spu'; import { requestClient } from '#/api/request'; export namespace MallCombinationActivityApi { - /** 拼团活动所需属性 */ - export interface CombinationProduct { - spuId: number; // 商品 SPU 编号 - skuId: number; // 商品 SKU 编号 - combinationPrice: number; // 拼团价格 - } /** 拼团活动 */ export interface CombinationActivity { id?: number; // 活动编号 @@ -31,6 +25,14 @@ export namespace MallCombinationActivityApi { products: CombinationProduct[]; // 商品列表 } + // TODO @puhui999:要不要删除? + /** 拼团活动所需属性 */ + export interface CombinationProduct { + spuId: number; // 商品 SPU 编号 + skuId: number; // 商品 SKU 编号 + combinationPrice: number; // 拼团价格 + } + /** 扩展 SKU 配置 */ export type SkuExtension = { productConfig: CombinationProduct; // 拼团活动配置 diff --git a/apps/web-antd/src/api/mall/promotion/discount/discountActivity.ts b/apps/web-antd/src/api/mall/promotion/discount/discountActivity.ts index 9e469bcbb..3beaa1aef 100644 --- a/apps/web-antd/src/api/mall/promotion/discount/discountActivity.ts +++ b/apps/web-antd/src/api/mall/promotion/discount/discountActivity.ts @@ -26,6 +26,7 @@ export namespace MallDiscountActivityApi { products?: DiscountProduct[]; // 商品列表 } + // TODO @puhui999:要不要删除? /** 扩展 SKU 配置 */ export type SkuExtension = { productConfig: DiscountProduct; // 限时折扣配置 diff --git a/apps/web-antd/src/api/mall/promotion/diy/page.ts b/apps/web-antd/src/api/mall/promotion/diy/page.ts index afdface5a..02726dfd5 100644 --- a/apps/web-antd/src/api/mall/promotion/diy/page.ts +++ b/apps/web-antd/src/api/mall/promotion/diy/page.ts @@ -5,18 +5,12 @@ import { requestClient } from '#/api/request'; export namespace MallDiyPageApi { /** 装修页面 */ export interface DiyPage { - /** 页面编号 */ - id?: number; - /** 模板编号 */ - templateId?: number; - /** 页面名称 */ - name: string; - /** 备注 */ - remark: string; - /** 预览图片地址数组 */ - previewPicUrls: string[]; - /** 页面属性 */ - property: string; + id?: number; // 页面编号 + templateId?: number; // 模板编号 + name: string; // 页面名称 + remark: string; // 备注 + previewPicUrls: string[]; // 预览图片地址数组 + property: string; // 页面属性 } } diff --git a/apps/web-antd/src/api/mall/promotion/diy/template.ts b/apps/web-antd/src/api/mall/promotion/diy/template.ts index f7d82d352..9b7596e85 100644 --- a/apps/web-antd/src/api/mall/promotion/diy/template.ts +++ b/apps/web-antd/src/api/mall/promotion/diy/template.ts @@ -7,26 +7,18 @@ import { requestClient } from '#/api/request'; export namespace MallDiyTemplateApi { /** 装修模板 */ export interface DiyTemplate { - /** 模板编号 */ - id?: number; - /** 模板名称 */ - name: string; - /** 是否使用 */ - used: boolean; - /** 使用时间 */ - usedTime?: Date; - /** 备注 */ - remark: string; - /** 预览图片地址数组 */ - previewPicUrls: string[]; - /** 模板属性 */ - property: string; + id?: number; // 模板编号 + name: string; // 模板名称 + used: boolean; // 是否使用 + usedTime?: Date; // 使用时间 + remark: string; // 备注 + previewPicUrls: string[]; // 预览图片地址数组 + property: string; // 模板属性 } /** 装修模板属性(包含页面列表) */ export interface DiyTemplateProperty extends DiyTemplate { - /** 页面列表 */ - pages: MallDiyPageApi.DiyPage[]; + pages: MallDiyPageApi.DiyPage[]; // 页面列表 } } diff --git a/apps/web-antd/src/api/mall/promotion/kefu/conversation/index.ts b/apps/web-antd/src/api/mall/promotion/kefu/conversation/index.ts index 497bd1a50..2b647a065 100644 --- a/apps/web-antd/src/api/mall/promotion/kefu/conversation/index.ts +++ b/apps/web-antd/src/api/mall/promotion/kefu/conversation/index.ts @@ -18,7 +18,7 @@ export namespace MallKefuConversationApi { } /** 会话置顶请求 */ - export interface ConversationPinnedUpdate { + export interface ConversationPinnedUpdateReqVO { id: number; // 会话编号 pinned: boolean; // 是否置顶 } @@ -40,7 +40,7 @@ export function getConversation(id: number) { /** 客服会话置顶 */ export function updateConversationPinned( - data: MallKefuConversationApi.ConversationPinnedUpdate, + data: MallKefuConversationApi.ConversationPinnedUpdateReqVO, ) { return requestClient.put( '/promotion/kefu-conversation/update-conversation-pinned', diff --git a/apps/web-antd/src/api/mall/promotion/kefu/message/index.ts b/apps/web-antd/src/api/mall/promotion/kefu/message/index.ts index 3fb363267..f70c9f3ff 100644 --- a/apps/web-antd/src/api/mall/promotion/kefu/message/index.ts +++ b/apps/web-antd/src/api/mall/promotion/kefu/message/index.ts @@ -24,11 +24,6 @@ export namespace MallKefuMessageApi { contentType: number; // 消息类型 content: string; // 消息内容 } - - /** 消息列表查询参数 */ - export interface MessageQuery extends PageParam { - conversationId: number; // 会话编号 - } } /** 发送客服消息 */ @@ -44,7 +39,7 @@ export function updateKeFuMessageReadStatus(conversationId: number) { } /** 获得消息列表(流式加载) */ -export function getKeFuMessageList(params: MallKefuMessageApi.MessageQuery) { +export function getKeFuMessageList(params: PageParam) { return requestClient.get>( '/promotion/kefu-message/list', { params }, diff --git a/apps/web-antd/src/api/mall/promotion/point/index.ts b/apps/web-antd/src/api/mall/promotion/point/index.ts index 72441875a..99f39bced 100644 --- a/apps/web-antd/src/api/mall/promotion/point/index.ts +++ b/apps/web-antd/src/api/mall/promotion/point/index.ts @@ -36,6 +36,7 @@ export namespace MallPointActivityApi { price: number; // 兑换金额,单位:分 } + // TODO @puhui999:这些还需要么? /** 扩展 SKU 配置 */ export type SkuExtension = { productConfig: PointProduct; // 积分商城商品配置 diff --git a/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts b/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts index 3abb1fad2..51da7d275 100644 --- a/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts +++ b/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts @@ -35,6 +35,7 @@ export namespace MallSeckillActivityApi { products?: SeckillProduct[]; // 秒杀商品列表 } + // TODO @puhui999:这些还需要么? /** 扩展 SKU 配置 */ export type SkuExtension = { productConfig: SeckillProduct; // 秒杀商品配置 diff --git a/apps/web-antd/src/api/mall/promotion/seckill/seckillConfig.ts b/apps/web-antd/src/api/mall/promotion/seckill/seckillConfig.ts index da76dbdfd..76eb92ba7 100644 --- a/apps/web-antd/src/api/mall/promotion/seckill/seckillConfig.ts +++ b/apps/web-antd/src/api/mall/promotion/seckill/seckillConfig.ts @@ -12,12 +12,6 @@ export namespace MallSeckillConfigApi { sliderPicUrls: string[]; // 秒杀轮播图 status: number; // 活动状态 } - - /** 时段配置状态更新 */ - export interface StatusUpdate { - id: number; // 编号 - status: number; // 状态 - } } /** 查询秒杀时段分页 */ diff --git a/apps/web-antd/src/views/mall/promotion/article/category/index.vue b/apps/web-antd/src/views/mall/promotion/article/category/index.vue index 7464ac168..408158e2e 100644 --- a/apps/web-antd/src/views/mall/promotion/article/category/index.vue +++ b/apps/web-antd/src/views/mall/promotion/article/category/index.vue @@ -1,6 +1,6 @@