diff --git a/src/api/mall/promotion/combination/combinationActivity.ts b/src/api/mall/promotion/combination/combinationActivity.ts index b3e70154..87053085 100644 --- a/src/api/mall/promotion/combination/combinationActivity.ts +++ b/src/api/mall/promotion/combination/combinationActivity.ts @@ -17,9 +17,6 @@ export interface CombinationActivityVO { status?: number limitDuration?: number products: CombinationProductVO[] - spuName?: string - picUrl?: string - marketPrice?: number } // 拼团活动所需属性 @@ -39,7 +36,7 @@ export interface SpuExtension extends Spu { } // 查询拼团活动列表 -export const getCombinationActivityPage = async (params) => { +export const getCombinationActivityPage = async (params: any) => { return await request.get({ url: '/promotion/combination-activity/page', params }) } @@ -48,8 +45,8 @@ export const getCombinationActivity = async (id: number) => { return await request.get({ url: '/promotion/combination-activity/get?id=' + id }) } -// 查询拼团活动详情列表 -export const getCombinationActivityDetailList = (ids: number[]) => { +// 获得拼团活动列表,基于活动编号数组 +export const getCombinationActivityListByIds = (ids: number[]) => { return request.get({ url: `/promotion/combination-activity/list-by-ids?ids=${ids}` }) } diff --git a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue index 1bd182ec..efe18902 100644 --- a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue +++ b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue @@ -136,30 +136,20 @@ watch( // 新添加的拼团组件,是没有活动ID的 const activityIds = props.property.activityIds // 检查活动ID的有效性 - if ( - Array.isArray(activityIds) && - activityIds.length > 0 && - activityIds.every((item) => item != null) - ) { + if (Array.isArray(activityIds) && activityIds.length > 0) { // 获取拼团活动详情列表 combinationActivityList.value = - await CombinationActivityApi.getCombinationActivityDetailList(activityIds) + await CombinationActivityApi.getCombinationActivityListByIds(activityIds) - // 清空之前的数据,防止有重复 - spuIdList.value = [] + // 获取拼团活动的 SPU 详情列表 spuList.value = [] - - // 生成有效的 spuId 列表 spuIdList.value = combinationActivityList.value .map((activity) => activity.spuId) .filter((spuId): spuId is number => typeof spuId === 'number') - - // 如果存在有效的 spuId,调用 API 获取详细信息 if (spuIdList.value.length > 0) { spuList.value = await ProductSpuApi.getSpuDetailList(spuIdList.value) - } else { - console.warn('没有用于获取详细信息的有效 spuId。') } + // 更新 SPU 的最低价格 combinationActivityList.value.forEach((activity) => { activity.products.forEach((product) => { diff --git a/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue b/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue index 6c551ad9..ea901a0f 100644 --- a/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue +++ b/src/components/DiyEditor/components/mobile/PromotionCombination/property.vue @@ -158,7 +158,6 @@ onMounted(async () => { status: CommonStatusEnum.ENABLE }) activityList.value = list - console.log('formDa', props) }) diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue index 8504f3e1..700d32bd 100644 --- a/src/components/DiyEditor/index.vue +++ b/src/components/DiyEditor/index.vue @@ -151,13 +151,8 @@ class="m-[calc(0px-var(--el-card-padding))]" view-class="p-[var(--el-card-padding)] p-b-[calc(var(--el-card-padding)+var(--el-card-padding))] property" > - diff --git a/src/views/mall/product/spu/components/SpuShowcase.vue b/src/views/mall/product/spu/components/SpuShowcase.vue index 8bee4004..b8527e05 100644 --- a/src/views/mall/product/spu/components/SpuShowcase.vue +++ b/src/views/mall/product/spu/components/SpuShowcase.vue @@ -85,6 +85,7 @@ const openSpuTableSelect = () => { /** * 选择商品后触发 + * * @param spus 选中的商品列表 */ const handleSpuSelected = (spus: ProductSpuApi.Spu | ProductSpuApi.Spu[]) => { @@ -94,6 +95,7 @@ const handleSpuSelected = (spus: ProductSpuApi.Spu | ProductSpuApi.Spu[]) => { /** * 删除商品 + * * @param index 商品索引 */ const handleRemoveSpu = (index: number) => { diff --git a/src/views/mall/promotion/combination/components/CombinationShowcase.vue b/src/views/mall/promotion/combination/components/CombinationShowcase.vue index 8e8e107f..ba88434b 100644 --- a/src/views/mall/promotion/combination/components/CombinationShowcase.vue +++ b/src/views/mall/promotion/combination/components/CombinationShowcase.vue @@ -81,7 +81,7 @@ watch( Activitys.value.length === 0 || Activitys.value.some((combinationActivity) => !ids.includes(combinationActivity.id!)) ) { - Activitys.value = await CombinationActivityApi.getCombinationActivityDetailList(ids) + Activitys.value = await CombinationActivityApi.getCombinationActivityListByIds(ids) } }, { immediate: true }