【功能优化】重构拼团装修（仍需优化）

src/api/mall/promotion/combination/combinationActivity.ts

@@ -1,66 +1,74 @@
 import request from '@/config/axios'
-import { Sku, Spu } from '@/api/mall/product/spu'
+import {Sku, Spu} from '@/api/mall/product/spu'
 
 export interface CombinationActivityVO {
-  id?: number
-  name?: string
-  spuId?: number
-  totalLimitCount?: number
-  singleLimitCount?: number
-  startTime?: Date
-  endTime?: Date
-  userSize?: number
-  totalCount?: number
-  successCount?: number
-  orderUserCount?: number
-  virtualGroup?: number
-  status?: number
-  limitDuration?: number
-  products: CombinationProductVO[]
+    id?: number
+    name?: string
+    spuId?: number
+    totalLimitCount?: number
+    singleLimitCount?: number
+    startTime?: Date
+    endTime?: Date
+    userSize?: number
+    totalCount?: number
+    successCount?: number
+    orderUserCount?: number
+    virtualGroup?: number
+    status?: number
+    limitDuration?: number
+    products: CombinationProductVO[]
+    spuName?: string
+    picUrl?: string
+    marketPrice?: number
 }
 
 // 拼团活动所需属性
 export interface CombinationProductVO {
-  spuId: number
-  skuId: number
-  combinationPrice: number // 拼团价格
+    spuId: number
+    skuId: number
+    combinationPrice: number // 拼团价格
 }
 
 // 扩展 Sku 配置
 export type SkuExtension = Sku & {
-  productConfig: CombinationProductVO
+    productConfig: CombinationProductVO
 }
 
 export interface SpuExtension extends Spu {
-  skus: SkuExtension[] // 重写类型
+    skus: SkuExtension[] // 重写类型
 }
 
 // 查询拼团活动列表
 export const getCombinationActivityPage = async (params) => {
-  return await request.get({ url: '/promotion/combination-activity/page', params })
+    return await request.get({url: '/promotion/combination-activity/page', params})
 }
 
 // 查询拼团活动详情
 export const getCombinationActivity = async (id: number) => {
-  return await request.get({ url: '/promotion/combination-activity/get?id=' + id })
+    return await request.get({url: '/promotion/combination-activity/get?id=' + id})
+}
+
+// 查询拼团活动详情列表
+export const getCombinationActivityDetailList = (ids: number[]) => {
+    return request.get({url: `/promotion/combination-activity/list?combinationActivityIds=${ids}`})
 }
 
 // 新增拼团活动
 export const createCombinationActivity = async (data: CombinationActivityVO) => {
-  return await request.post({ url: '/promotion/combination-activity/create', data })
+    return await request.post({url: '/promotion/combination-activity/create', data})
 }
 
 // 修改拼团活动
 export const updateCombinationActivity = async (data: CombinationActivityVO) => {
-  return await request.put({ url: '/promotion/combination-activity/update', data })
+    return await request.put({url: '/promotion/combination-activity/update', data})
 }
 
 // 关闭拼团活动
 export const closeCombinationActivity = async (id: number) => {
-  return await request.put({ url: '/promotion/combination-activity/close?id=' + id })
+    return await request.put({url: '/promotion/combination-activity/close?id=' + id})
 }
 
 // 删除拼团活动
 export const deleteCombinationActivity = async (id: number) => {
-  return await request.delete({ url: '/promotion/combination-activity/delete?id=' + id })
+    return await request.delete({url: '/promotion/combination-activity/delete?id=' + id})
 }

src/components/DiyEditor/components/ComponentContainer.vue

@@ -5,7 +5,7 @@
         ...style
       }"
     >
-      <component :is="component.id" :property="component.property" />
+      <component :is="component.id" :property="component.property" :component="component" />
     </div>
     <div class="component-wrap">
       <!-- 左侧：组件名（悬浮的小贴条） -->

src/components/DiyEditor/components/mobile/PromotionCombination/config.ts

@@ -1,64 +1,96 @@
-import { ComponentStyle, DiyComponent } from '@/components/DiyEditor/util'
+import {ComponentStyle, DiyComponent} from '@/components/DiyEditor/util'
 
 /** 拼团属性 */
 export interface PromotionCombinationProperty {
-  // 布局类型：单列 | 三列
-  layoutType: 'oneCol' | 'threeCol'
-  // 商品字段
-  fields: {
-    // 商品名称
-    name: PromotionCombinationFieldProperty
-    // 商品价格
-    price: PromotionCombinationFieldProperty
-  }
-  // 角标
-  badge: {
-    // 是否显示
-    show: boolean
-    // 角标图片
-    imgUrl: string
-  }
-  // 上圆角
-  borderRadiusTop: number
-  // 下圆角
-  borderRadiusBottom: number
-  // 间距
-  space: number
-  // 拼团活动编号
-  activityId: number
-  // 组件样式
-  style: ComponentStyle
+    // 布局类型：单列 | 三列
+    layoutType: 'oneColBigImg' | 'oneColSmallImg' | 'twoCol';
+    // 商品字段
+    fields: {
+        // 商品名称
+        name: PromotionCombinationFieldProperty
+        // 商品简介
+        introduction: PromotionCombinationFieldProperty
+        // 商品价格
+        price: PromotionCombinationFieldProperty
+        // 市场价
+        marketPrice: PromotionCombinationFieldProperty
+        // 商品销量
+        salesCount: PromotionCombinationFieldProperty
+        // 商品库存
+        stock: PromotionCombinationFieldProperty
+    }
+    // 角标
+    badge: {
+        // 是否显示
+        show: boolean
+        // 角标图片
+        imgUrl: string
+    }
+    // 按钮
+    btnBuy: {
+        // 类型：文字 | 图片
+        type: 'text' | 'img'
+        // 文字
+        text: string
+        // 文字按钮：背景渐变起始颜色
+        bgBeginColor: string
+        // 文字按钮：背景渐变结束颜色
+        bgEndColor: string
+        // 图片按钮：图片地址
+        imgUrl: string
+    }
+    // 上圆角
+    borderRadiusTop: number
+    // 下圆角
+    borderRadiusBottom: number
+    // 间距
+    space: number
+    // 拼团活动编号
+    activityIds: number[]
+    // 组件样式
+    style: ComponentStyle
 }
 
 // 商品字段
 export interface PromotionCombinationFieldProperty {
-  // 是否显示
-  show: boolean
-  // 颜色
-  color: string
+    // 是否显示
+    show: boolean
+    // 颜色
+    color: string
 }
 
 // 定义组件
 export const component = {
-  id: 'PromotionCombination',
-  name: '拼团',
-  icon: 'mdi:account-group',
-  property: {
-    layoutType: 'oneCol',
-    fields: {
-      name: { show: true, color: '#000' },
-      price: { show: true, color: '#ff3000' }
-    },
-    badge: { show: false, imgUrl: '' },
-    borderRadiusTop: 8,
-    borderRadiusBottom: 8,
-    space: 8,
-    style: {
-      bgType: 'color',
-      bgColor: '',
-      marginLeft: 8,
-      marginRight: 8,
-      marginBottom: 8
-    } as ComponentStyle
-  }
+    id: 'PromotionCombination',
+    name: '拼团',
+    icon: 'mdi:account-group',
+    property: {
+        layoutType: 'oneColSmallImg',
+        fields: {
+            name: {show: true, color: '#000'},
+            introduction: {show: true, color: '#999'},
+            price: {show: true, color: '#ff3000'},
+            marketPrice: {show: true, color: '#c4c4c4'},
+            salesCount: {show: true, color: '#c4c4c4'},
+            stock: {show: false, color: '#c4c4c4'}
+        },
+        badge: {show: false, imgUrl: ''},
+        btnBuy: {
+            type: 'text',
+            text: '去拼团',
+            bgBeginColor: '#FF6000',
+            bgEndColor: '#FE832A',
+            imgUrl: ''
+        },
+        borderRadiusTop: 8,
+        borderRadiusBottom: 8,
+        space: 8,
+        style: {
+            bgType: 'color',
+            bgColor: '',
+            marginLeft: 8,
+            marginRight: 8,
+            marginBottom: 8
+        } as ComponentStyle
+    }
 } as DiyComponent<PromotionCombinationProperty>

src/components/DiyEditor/components/mobile/PromotionCombination/index.vue

@@ -1,135 +1,210 @@
 <template>
-  <el-scrollbar class="z-1 min-h-30px" wrap-class="w-full" ref="containerRef">
-    <!-- 商品网格 -->
+  <div :class="`box-content min-h-30px w-full flex flex-row flex-wrap`" ref="containerRef">
     <div
-      class="grid overflow-x-auto"
-      :style="{
-        gridGap: `${property.space}px`,
-        gridTemplateColumns,
-        width: scrollbarWidth
-      }"
-    >
-      <!-- 商品 -->
-      <div
         class="relative box-content flex flex-row flex-wrap overflow-hidden bg-white"
         :style="{
-          borderTopLeftRadius: `${property.borderRadiusTop}px`,
-          borderTopRightRadius: `${property.borderRadiusTop}px`,
-          borderBottomLeftRadius: `${property.borderRadiusBottom}px`,
-          borderBottomRightRadius: `${property.borderRadiusBottom}px`
-        }"
+        ...calculateSpace(index),
+        ...calculateWidth(),
+        borderTopLeftRadius: `${property.borderRadiusTop}px`,
+        borderTopRightRadius: `${property.borderRadiusTop}px`,
+        borderBottomLeftRadius: `${property.borderRadiusBottom}px`,
+        borderBottomRightRadius: `${property.borderRadiusBottom}px`
+      }"
         v-for="(spu, index) in spuList"
         :key="index"
+    >
+      <!-- 角标 -->
+      <div v-if="property.badge.show" class="absolute left-0 top-0 z-1 items-center justify-center">
+        <el-image fit="cover" :src="property.badge.imgUrl" class="h-26px w-38px"/>
+      </div>
+      <!-- 商品封面图 -->
+      <div
+          :class="[
+          'h-140px',
+          {
+            'w-full': property.layoutType !== 'oneColSmallImg',
+            'w-140px': property.layoutType === 'oneColSmallImg'
+          }
+        ]"
       >
-        <!-- 角标 -->
-        <div
-          v-if="property.badge.show"
-          class="absolute left-0 top-0 z-1 items-center justify-center"
-        >
-          <el-image fit="cover" :src="property.badge.imgUrl" class="h-26px w-38px" />
-        </div>
-        <!-- 商品封面图 -->
-        <el-image fit="cover" :src="spu.picUrl" :style="{ width: imageSize, height: imageSize }" />
-        <div
+        <el-image fit="cover" class="h-full w-full" :src="spu.picUrl"/>
+      </div>
+      <div
           :class="[
-            'flex flex-col gap-8px p-8px box-border',
+          ' flex flex-col gap-8px p-8px box-border',
+          {
+            'w-full': property.layoutType !== 'oneColSmallImg',
+            'w-[calc(100%-140px-16px)]': property.layoutType === 'oneColSmallImg'
+          }
+        ]"
+      >
+        <!-- 商品名称 -->
+        <div
+            v-if="property.fields.name.show"
+            :class="[
+            'text-14px ',
             {
-              'w-[calc(100%-64px)]': columns === 2,
-              'w-full': columns === 3
+              truncate: property.layoutType !== 'oneColSmallImg',
+              'overflow-ellipsis line-clamp-2': property.layoutType === 'oneColSmallImg'
             }
           ]"
+            :style="{ color: property.fields.name.color }"
         >
-          <!-- 商品名称 -->
-          <div
-            v-if="property.fields.name.show"
+          {{ spu.name }}
+        </div>
+        <!-- 商品简介 -->
+        <div
+            v-if="property.fields.introduction.show"
             class="truncate text-12px"
-            :style="{ color: property.fields.name.color }"
-          >
-            {{ spu.name }}
-          </div>
-          <div>
-            <!-- 商品价格 -->
-            <span
+            :style="{ color: property.fields.introduction.color }"
+        >
+          {{ spu.introduction }}
+        </div>
+        <div>
+          <!-- 价格 -->
+          <span
               v-if="property.fields.price.show"
-              class="text-12px"
+              class="text-16px"
               :style="{ color: property.fields.price.color }"
-            >
-              ￥{{ fenToYuan(spu.combinationPrice || spu.price || 0) }}
-            </span>
-          </div>
+          >
+            ￥{{ fenToYuan(spu.price || Infinity) }}
+          </span>
+          <!-- 市场价 -->
+          <span
+              v-if="property.fields.marketPrice.show && spu.marketPrice"
+              class="ml-4px text-10px line-through"
+              :style="{ color: property.fields.marketPrice.color }"
+          >￥{{ fenToYuan(spu.marketPrice) }}</span
+          >
+        </div>
+        <div class="text-12px">
+          <!-- 销量 -->
+          <span
+              v-if="property.fields.salesCount.show"
+              :style="{ color: property.fields.salesCount.color }"
+          >
+            已售{{ (spu.salesCount || 0) + (spu.virtualSalesCount || 0) }}件
+          </span>
+          <!-- 库存 -->
+          <span v-if="property.fields.stock.show" :style="{ color: property.fields.stock.color }">
+            库存{{ spu.stock || 0 }}
+          </span>
         </div>
       </div>
+      <!-- 购买按钮 -->
+      <div class="absolute bottom-8px right-8px">
+        <!-- 文字按钮 -->
+        <span
+            v-if="property.btnBuy.type === 'text'"
+            class="rounded-full p-x-12px p-y-4px text-12px text-white"
+            :style="{
+            background: `linear-gradient(to right, ${property.btnBuy.bgBeginColor}, ${property.btnBuy.bgEndColor}`
+          }"
+        >
+          {{ property.btnBuy.text }}
+        </span>
+        <!-- 图片按钮 -->
+        <el-image
+            v-else
+            class="h-28px w-28px rounded-full"
+            fit="cover"
+            :src="property.btnBuy.imgUrl"
+        />
+      </div>
     </div>
-  </el-scrollbar>
+  </div>
 </template>
 <script setup lang="ts">
-import { PromotionCombinationProperty } from './config'
+import {PromotionCombinationProperty} from './config'
 import * as ProductSpuApi from '@/api/mall/product/spu'
 import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity'
-import { Spu } from '@/api/mall/product/spu'
-import { CombinationProductVO } from '@/api/mall/promotion/combination/combinationActivity'
-import { fenToYuan } from '@/utils'
+import {fenToYuan} from "@/utils";
 
-/** 拼团 */
-defineOptions({ name: 'PromotionCombination' })
+/** 商品卡片 */
+defineOptions({name: 'ProductCard'})
+// 定义属性
 // 定义属性
-const props = defineProps<{ property: PromotionCombinationProperty }>()
+const props = defineProps<{ property: PromotionCombinationProperty }>();
 // 商品列表
-const spuList = ref<ProductSpuApi.Spu[]>([])
+const spuList = ref<ProductSpuApi.Spu[]>([]);
+const spuIdList = ref<number[]>([]);
+const combinationActivityList = ref<CombinationActivityApi.CombinationActivityVO[]>([]);
+
 watch(
-  () => props.property.activityId,
-  async () => {
-    if (!props.property.activityId) return
-    const activity = await CombinationActivityApi.getCombinationActivity(props.property.activityId)
-    if (!activity?.spuId) return
-    spuList.value = [await ProductSpuApi.getSpu(activity.spuId)]
-    // 循环活动信息，赋值拼团价格
-    activity.products.forEach((product: CombinationProductVO) => {
-      spuList.value.forEach((spu: Spu) => {
-        // 商品原售价和拼团价，哪个便宜就赋值哪个
-        spu.combinationPrice = Math.min(spu.combinationPrice || Infinity, product.combinationPrice) // 设置 SPU 的最低价格
-      })
-    })
-  },
-  {
-    immediate: true,
-    deep: true
-  }
-)
-// 手机宽度
-const phoneWidth = ref(375)
+    () => props.property.activityIds,
+    async () => {
+      try {
+        // 新添加的拼团组件，是没有活动ID的
+        const activityIds = props.property.activityIds;
+        // 检查活动ID的有效性
+        if (Array.isArray(activityIds) && activityIds.length > 0 && activityIds.every(item => item != null)) {
+          // 获取拼团活动详情列表
+          combinationActivityList.value = await CombinationActivityApi.getCombinationActivityDetailList(activityIds);
+
+          // 清空之前的数据，防止有重复
+          spuIdList.value = [];
+          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 => {
+              const spu = spuList.value.find(spu => spu.id === product.spuId);
+              if (spu) {
+                spu.price = Math.min(product.combinationPrice || Infinity, spu.price || Infinity);
+              }
+            });
+          });
+        }
+      } catch (error) {
+        console.error('获取拼团活动细节或 SPU 细节时出错:', error);
+      }
+    },
+    {
+      immediate: true,
+      deep: true
+    }
+);
+
+
+
+/**
+ * 计算商品的间距
+ * @param index 商品索引
+ */
+const calculateSpace = (index: number) => {
+  // 商品的列数
+  const columns = props.property.layoutType === 'twoCol' ? 2 : 1
+  // 第一列没有左边距
+  const marginLeft = index % columns === 0 ? '0' : props.property.space + 'px'
+  // 第一行没有上边距
+  const marginTop = index < columns ? '0' : props.property.space + 'px'
+
+  return {marginLeft, marginTop}
+}
+
 // 容器
 const containerRef = ref()
-// 商品的列数
-const columns = ref(2)
-// 滚动条宽度
-const scrollbarWidth = ref('100%')
-// 商品图大小
-const imageSize = ref('0')
-// 商品网络列数
-const gridTemplateColumns = ref('')
-// 计算布局参数
-watch(
-  () => [props.property, phoneWidth, spuList.value.length],
-  () => {
-    // 计算列数
-    columns.value = props.property.layoutType === 'oneCol' ? 1 : 3
-    // 每列的宽度为：（总宽度 - 间距 * (列数 - 1)）/ 列数
-    const productWidth =
-      (phoneWidth.value - props.property.space * (columns.value - 1)) / columns.value
-    // 商品图布局：2列时，左右布局 3列时，上下布局
-    imageSize.value = columns.value === 2 ? '64px' : `${productWidth}px`
-    // 指定列数
-    gridTemplateColumns.value = `repeat(${columns.value}, auto)`
-    // 不滚动
-    scrollbarWidth.value = '100%'
-  },
-  { immediate: true, deep: true }
-)
-onMounted(() => {
-  // 提取手机宽度
-  phoneWidth.value = containerRef.value?.wrapRef?.offsetWidth || 375
-})
+// 计算商品的宽度
+const calculateWidth = () => {
+  let width = '100%'
+  // 双列时每列的宽度为：（总宽度 - 间距）/ 2
+  if (props.property.layoutType === 'twoCol') {
+    width = `${(containerRef.value.offsetWidth - props.property.space) / 2}px`
+  }
+  return {width}
+}
 </script>
 
 <style scoped lang="scss"></style>

src/components/DiyEditor/components/mobile/PromotionCombination/property.vue

@@ -2,84 +2,135 @@
   <ComponentContainerProperty v-model="formData.style">
     <el-form label-width="80px" :model="formData">
       <el-card header="拼团活动" class="property-group" shadow="never">
-        <el-form-item label="拼团活动" prop="activityId">
-          <el-select v-model="formData.activityId">
-            <el-option
-              v-for="activity in activityList"
-              :key="activity.id"
-              :label="activity.name"
-              :value="activity.id"
-            />
-          </el-select>
-        </el-form-item>
+        <CombinationShowcase v-model="formData.activityIds"/>
       </el-card>
       <el-card header="商品样式" class="property-group" shadow="never">
         <el-form-item label="布局" prop="type">
           <el-radio-group v-model="formData.layoutType">
-            <el-tooltip class="item" content="单列" placement="bottom">
-              <el-radio-button value="oneCol">
-                <Icon icon="fluent:text-column-one-24-filled" />
+            <el-tooltip class="item" content="单列大图" placement="bottom">
+              <el-radio-button value="oneColBigImg">
+                <Icon icon="fluent:text-column-one-24-filled"/>
+              </el-radio-button>
+            </el-tooltip>
+            <el-tooltip class="item" content="单列小图" placement="bottom">
+              <el-radio-button value="oneColSmallImg">
+                <Icon icon="fluent:text-column-two-left-24-filled"/>
               </el-radio-button>
             </el-tooltip>
-            <el-tooltip class="item" content="三列" placement="bottom">
+            <el-tooltip class="item" content="双列" placement="bottom">
+              <el-radio-button value="twoCol">
+                <Icon icon="fluent:text-column-two-24-filled"/>
+              </el-radio-button>
+            </el-tooltip>
+            <!--<el-tooltip class="item" content="三列" placement="bottom">
               <el-radio-button value="threeCol">
                 <Icon icon="fluent:text-column-three-24-filled" />
               </el-radio-button>
-            </el-tooltip>
+            </el-tooltip>-->
           </el-radio-group>
         </el-form-item>
         <el-form-item label="商品名称" prop="fields.name.show">
           <div class="flex gap-8px">
-            <ColorInput v-model="formData.fields.name.color" />
-            <el-checkbox v-model="formData.fields.name.show" />
+            <ColorInput v-model="formData.fields.name.color"/>
+            <el-checkbox v-model="formData.fields.name.show"/>
+          </div>
+        </el-form-item>
+        <el-form-item label="商品简介" prop="fields.introduction.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.introduction.color"/>
+            <el-checkbox v-model="formData.fields.introduction.show"/>
           </div>
         </el-form-item>
         <el-form-item label="商品价格" prop="fields.price.show">
           <div class="flex gap-8px">
-            <ColorInput v-model="formData.fields.price.color" />
-            <el-checkbox v-model="formData.fields.price.show" />
+            <ColorInput v-model="formData.fields.price.color"/>
+            <el-checkbox v-model="formData.fields.price.show"/>
+          </div>
+        </el-form-item>
+        <el-form-item label="市场价" prop="fields.marketPrice.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.marketPrice.color"/>
+            <el-checkbox v-model="formData.fields.marketPrice.show"/>
+          </div>
+        </el-form-item>
+        <el-form-item label="商品销量" prop="fields.salesCount.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.salesCount.color"/>
+            <el-checkbox v-model="formData.fields.salesCount.show"/>
+          </div>
+        </el-form-item>
+        <el-form-item label="商品库存" prop="fields.stock.show">
+          <div class="flex gap-8px">
+            <ColorInput v-model="formData.fields.stock.color"/>
+            <el-checkbox v-model="formData.fields.stock.show"/>
           </div>
         </el-form-item>
       </el-card>
       <el-card header="角标" class="property-group" shadow="never">
         <el-form-item label="角标" prop="badge.show">
-          <el-switch v-model="formData.badge.show" />
+          <el-switch v-model="formData.badge.show"/>
         </el-form-item>
         <el-form-item label="角标" prop="badge.imgUrl" v-if="formData.badge.show">
           <UploadImg v-model="formData.badge.imgUrl" height="44px" width="72px">
-            <template #tip> 建议尺寸：36 * 22 </template>
+            <template #tip> 建议尺寸：36 * 22</template>
           </UploadImg>
         </el-form-item>
       </el-card>
+      <el-card header="按钮" class="property-group" shadow="never">
+        <el-form-item label="按钮类型" prop="btnBuy.type">
+          <el-radio-group v-model="formData.btnBuy.type">
+            <el-radio-button value="text">文字</el-radio-button>
+            <el-radio-button value="img">图片</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <template v-if="formData.btnBuy.type === 'text'">
+          <el-form-item label="按钮文字" prop="btnBuy.text">
+            <el-input v-model="formData.btnBuy.text"/>
+          </el-form-item>
+          <el-form-item label="左侧背景" prop="btnBuy.bgBeginColor">
+            <ColorInput v-model="formData.btnBuy.bgBeginColor"/>
+          </el-form-item>
+          <el-form-item label="右侧背景" prop="btnBuy.bgEndColor">
+            <ColorInput v-model="formData.btnBuy.bgEndColor"/>
+          </el-form-item>
+        </template>
+        <template v-else>
+          <el-form-item label="图片" prop="btnBuy.imgUrl">
+            <UploadImg v-model="formData.btnBuy.imgUrl" height="56px" width="56px">
+              <template #tip> 建议尺寸：56 * 56</template>
+            </UploadImg>
+          </el-form-item>
+        </template>
+      </el-card>
       <el-card header="商品样式" class="property-group" shadow="never">
         <el-form-item label="上圆角" prop="borderRadiusTop">
           <el-slider
-            v-model="formData.borderRadiusTop"
-            :max="100"
-            :min="0"
-            show-input
-            input-size="small"
-            :show-input-controls="false"
+              v-model="formData.borderRadiusTop"
+              :max="100"
+              :min="0"
+              show-input
+              input-size="small"
+              :show-input-controls="false"
           />
         </el-form-item>
         <el-form-item label="下圆角" prop="borderRadiusBottom">
           <el-slider
-            v-model="formData.borderRadiusBottom"
-            :max="100"
-            :min="0"
-            show-input
-            input-size="small"
-            :show-input-controls="false"
+              v-model="formData.borderRadiusBottom"
+              :max="100"
+              :min="0"
+              show-input
+              input-size="small"
+              :show-input-controls="false"
           />
         </el-form-item>
         <el-form-item label="间隔" prop="space">
           <el-slider
-            v-model="formData.space"
-            :max="100"
-            :min="0"
-            show-input
-            input-size="small"
-            :show-input-controls="false"
+              v-model="formData.space"
+              :max="100"
+              :min="0"
+              show-input
+              input-size="small"
+              :show-input-controls="false"
           />
         </el-form-item>
       </el-card>
@@ -88,24 +139,26 @@
 </template>
 
 <script setup lang="ts">
-import { PromotionCombinationProperty } from './config'
-import { usePropertyForm } from '@/components/DiyEditor/util'
+import {PromotionCombinationProperty} from './config'
+import {usePropertyForm} from '@/components/DiyEditor/util'
 import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity'
-import { CommonStatusEnum } from '@/utils/constants'
+import {CommonStatusEnum} from '@/utils/constants'
+import CombinationShowcase from "@/views/mall/promotion/combination/components/CombinationShowcase.vue";
 
 // 拼团属性面板
-defineOptions({ name: 'PromotionCombinationProperty' })
+defineOptions({name: 'PromotionCombinationProperty'})
 
 const props = defineProps<{ modelValue: PromotionCombinationProperty }>()
 const emit = defineEmits(['update:modelValue'])
-const { formData } = usePropertyForm(props.modelValue, emit)
+const {formData} = usePropertyForm(props.modelValue, emit)
 // 活动列表
-const activityList = ref<CombinationActivityApi.CombinationActivityVO>([])
+const activityList = ref<CombinationActivityApi.CombinationActivityVO[]>([])
 onMounted(async () => {
-  const { list } = await CombinationActivityApi.getCombinationActivityPage({
+  const {list} = await CombinationActivityApi.getCombinationActivityPage({
     status: CommonStatusEnum.ENABLE
   })
   activityList.value = list
+  console.log("formDa", props);
 })
 </script>
 

src/views/mall/promotion/combination/components/CombinationShowcase.vue

@@ -0,0 +1,147 @@
+<template>
+  <div class="flex flex-wrap items-center gap-8px">
+    <div
+        v-for="(combinationActivity, index) in Activitys"
+        :key="combinationActivity.id"
+        class="select-box spu-pic">
+      <el-tooltip :content="combinationActivity.name">
+        <div class="relative h-full w-full">
+          <el-image :src="combinationActivity.picUrl" class="h-full w-full"/>
+          <Icon
+              v-show="!disabled"
+              class="del-icon"
+              icon="ep:circle-close-filled"
+              @click="handleRemoveActivity(index)"
+          />
+        </div>
+      </el-tooltip>
+    </div>
+    <el-tooltip content="选择活动" v-if="canAdd">
+      <div class="select-box" @click="openCombinationActivityTableSelect">
+        <Icon icon="ep:plus"/>
+      </div>
+    </el-tooltip>
+  </div>
+  <!-- 拼团活动选择对话框（表格形式） -->
+  <CombinationTableSelect ref="combinationActivityTableSelectRef" :multiple="limit != 1"
+                          @change="handleActivitySelected"/>
+</template>
+<script lang="ts" setup>
+import * as CombinationActivityApi from '@/api/mall/promotion/combination/combinationActivity'
+import {propTypes} from '@/utils/propTypes'
+import {oneOfType} from 'vue-types'
+import {isArray} from '@/utils/is'
+import CombinationTableSelect from "@/views/mall/promotion/combination/components/CombinationTableSelect.vue";
+
+// 活动橱窗，一般用于装修时使用
+// 提供功能：展示活动列表、添加活动、删除活动
+defineOptions({name: 'CombinationShowcase'})
+
+const props = defineProps({
+  modelValue: oneOfType<number | Array<number>>([Number, Array]).isRequired,
+  // 限制数量：默认不限制
+  limit: propTypes.number.def(Number.MAX_VALUE),
+  disabled: propTypes.bool.def(false)
+})
+
+// 计算是否可以添加
+const canAdd = computed(() => {
+  // 情况一：禁用时不可以添加
+  if (props.disabled) return false
+  // 情况二：未指定限制数量时，可以添加
+  if (!props.limit) return true
+  // 情况三：检查已添加数量是否小于限制数量
+  return Activitys.value.length < props.limit
+})
+
+// 拼团活动列表
+const Activitys = ref<CombinationActivityApi.CombinationActivityVO[]>([])
+
+watch(
+    () => props.modelValue,
+    async () => {
+      const ids = isArray(props.modelValue)
+          ? // 情况一：多选
+          props.modelValue
+          : // 情况二：单选
+          props.modelValue
+              ? [props.modelValue]
+              : []
+      // 不需要返显
+      if (ids.length === 0) {
+        Activitys.value = []
+        return
+      }
+      // 只有活动发生变化之后，才会查询活动
+      if (Activitys.value.length === 0 || Activitys.value.some((combinationActivity) => !ids.includes(combinationActivity.id!))) {
+        Activitys.value = await CombinationActivityApi.getCombinationActivityDetailList(ids)
+      }
+    },
+    {immediate: true}
+)
+
+/** 活动表格选择对话框 */
+const combinationActivityTableSelectRef = ref()
+// 打开对话框
+const openCombinationActivityTableSelect = () => {
+  combinationActivityTableSelectRef.value.open(Activitys.value)
+}
+
+/**
+ * 选择活动后触发
+ * @param activityVOs 选中的活动列表
+ */
+const handleActivitySelected = (activityVOs: CombinationActivityApi.CombinationActivityVO | CombinationActivityApi.CombinationActivityVO[]) => {
+  Activitys.value = isArray(activityVOs) ? activityVOs : [activityVOs]
+  emitActivityChange()
+}
+
+/**
+ * 删除活动
+ * @param index 活动索引
+ */
+const handleRemoveActivity = (index: number) => {
+  Activitys.value.splice(index, 1)
+  emitActivityChange()
+}
+const emit = defineEmits(['update:modelValue', 'change'])
+const emitActivityChange = () => {
+  if (props.limit === 1) {
+    const combinationActivity = Activitys.value.length > 0 ? Activitys.value[0] : null
+    emit('update:modelValue', combinationActivity?.id || 0)
+    emit('change', combinationActivity)
+  } else {
+    emit(
+        'update:modelValue',
+        Activitys.value.map((combinationActivity) => combinationActivity.id)
+    )
+    emit('change', Activitys.value)
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.select-box {
+  display: flex;
+  width: 60px;
+  height: 60px;
+  border: 1px dashed var(--el-border-color-darker);
+  border-radius: 8px;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.spu-pic {
+  position: relative;
+}
+
+.del-icon {
+  position: absolute;
+  top: -10px;
+  right: -10px;
+  z-index: 1;
+  width: 20px !important;
+  height: 20px !important;
+}
+</style>

src/views/mall/promotion/combination/components/CombinationTableSelect.vue

@@ -0,0 +1,332 @@
+<template>
+  <Dialog v-model="dialogVisible" :appendToBody="true" title="选择活动" width="70%">
+    <ContentWrap>
+      <!-- 搜索工作栏 -->
+      <el-form
+          ref="queryFormRef"
+          :inline="true"
+          :model="queryParams"
+          class="-mb-15px"
+          label-width="68px"
+      >
+        <el-form-item label="活动名称" prop="name">
+          <el-input
+              v-model="queryParams.name"
+              placeholder="请输入活动名称"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-240px"
+          />
+        </el-form-item>
+        <el-form-item label="活动状态" prop="status">
+          <el-select
+              v-model="queryParams.status"
+              placeholder="请选择活动状态"
+              clearable
+              class="!w-240px"
+          >
+            <el-option
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="handleQuery">
+            <Icon class="mr-5px" icon="ep:search"/>
+            搜索
+          </el-button>
+          <el-button @click="resetQuery">
+            <Icon class="mr-5px" icon="ep:refresh"/>
+            重置
+          </el-button>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="loading" :data="list" show-overflow-tooltip>
+        <!-- 1. 多选模式（不能使用type="selection"，Element会忽略Header插槽） -->
+        <el-table-column width="55" v-if="multiple">
+          <template #header>
+            <el-checkbox
+                v-model="isCheckAll"
+                :indeterminate="isIndeterminate"
+                @change="handleCheckAll"
+            />
+          </template>
+          <template #default="{ row }">
+            <el-checkbox
+                v-model="checkedStatus[row.id]"
+                @change="(checked: boolean) => handleCheckOne(checked, row, true)"
+            />
+          </template>
+        </el-table-column>
+        <!-- 2. 单选模式 -->
+        <el-table-column label="#" width="55" v-else>
+          <template #default="{ row }">
+            <el-radio :value="row.id" v-model="selectedActivityId" @change="handleSingleSelected(row)">
+              <!-- 空格不能省略，是为了让单选框不显示label，如果不指定label不会有选中的效果 -->
+              &nbsp;
+            </el-radio>
+          </template>
+        </el-table-column>
+        <el-table-column label="活动编号" prop="id" min-width="80"/>
+        <el-table-column label="活动名称" prop="name" min-width="140"/>
+        <el-table-column label="活动时间" min-width="210">
+          <template #default="scope">
+            {{ formatDate(scope.row.startTime, 'YYYY-MM-DD') }}
+            ~ {{ formatDate(scope.row.endTime, 'YYYY-MM-DD') }}
+          </template>
+        </el-table-column>
+        <el-table-column label="商品图片" prop="spuName" min-width="80">
+          <template #default="scope">
+            <el-image
+                :src="scope.row.picUrl"
+                class="h-40px w-40px"
+                :preview-src-list="[scope.row.picUrl]"
+                preview-teleported
+            />
+          </template>
+        </el-table-column>
+        <el-table-column label="商品标题" prop="spuName" min-width="300"/>
+        <el-table-column
+            label="原价"
+            prop="marketPrice"
+            min-width="100"
+            :formatter="fenToYuanFormat"
+        />
+        <el-table-column label="拼团价" prop="seckillPrice" min-width="100">
+          <template #default="scope">
+            {{ formatCombinationPrice(scope.row.products) }}
+          </template>
+        </el-table-column>
+        <el-table-column label="开团组数" prop="groupCount" min-width="100"/>
+        <el-table-column label="成团组数" prop="groupSuccessCount" min-width="100"/>
+        <el-table-column label="购买次数" prop="recordCount" min-width="100"/>
+        <el-table-column label="活动状态" align="center" prop="status" min-width="100">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+          </template>
+        </el-table-column>
+        <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            :formatter="dateFormatter"
+            width="180px"
+        />
+      </el-table>
+      <!-- 分页 -->
+      <Pagination
+          v-model:limit="queryParams.pageSize"
+          v-model:page="queryParams.pageNo"
+          :total="total"
+          @pagination="getList"
+      />
+    </ContentWrap>
+    <template #footer v-if="multiple">
+      <el-button type="primary" @click="handleEmitChange">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import {handleTree} from '@/utils/tree'
+
+import * as ProductCategoryApi from '@/api/mall/product/category'
+import {propTypes} from '@/utils/propTypes'
+import {CHANGE_EVENT} from 'element-plus'
+import * as CombinationActivityApi from "@/api/mall/promotion/combination/combinationActivity";
+import {fenToYuanFormat} from "@/utils/formatter";
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
+import {dateFormatter, formatDate} from "@/utils/formatTime";
+import {fenToYuan} from "@/utils";
+
+type CombinationActivityVO = Required<CombinationActivityApi.CombinationActivityVO>
+
+/**
+ * 活动表格选择对话框
+ * 1. 单选模式：
+ *    1.1 点击表格左侧的单选框时，结束选择，并关闭对话框
+ *    1.2 再次打开时，保持选中状态
+ * 2. 多选模式：
+ *    2.1 点击表格左侧的多选框时，记录选中的活动
+ *    2.2 切换分页时，保持活动的选中状态
+ *    2.3 点击右下角的确定按钮时，结束选择，关闭对话框
+ *    2.4 再次打开时，保持选中状态
+ */
+defineOptions({name: 'CombinationTableSelect'})
+
+defineProps({
+  // 多选模式
+  multiple: propTypes.bool.def(false)
+})
+
+// 列表的总页数
+const total = ref(0)
+// 列表的数据
+const list = ref<CombinationActivityVO[]>([])
+// 列表的加载中
+const loading = ref(false)
+// 弹窗的是否展示
+const dialogVisible = ref(false)
+// 查询参数
+const queryParams = ref({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  status: undefined
+})
+
+/** 打开弹窗 */
+const open = (CombinationList?: CombinationActivityVO[]) => {
+  // 重置
+  checkedActivitys.value = []
+  checkedStatus.value = {}
+  isCheckAll.value = false
+  isIndeterminate.value = false
+
+  // 处理已选中
+  if (CombinationList && CombinationList.length > 0) {
+    checkedActivitys.value = [...CombinationList]
+    checkedStatus.value = Object.fromEntries(CombinationList.map((activityVO) => [activityVO.id, true]))
+  }
+
+  dialogVisible.value = true
+  resetQuery()
+}
+// 提供 open 方法，用于打开弹窗
+defineExpose({open})
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await CombinationActivityApi.getCombinationActivityPage(queryParams.value)
+    list.value = data.list
+    total.value = data.total
+    // checkbox绑定undefined会有问题，需要给一个bool值
+    list.value.forEach(
+        (activityVO) => (checkedStatus.value[activityVO.id] = checkedStatus.value[activityVO.id] || false)
+    )
+    // 计算全选框状态
+    calculateIsCheckAll()
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryParams.value = {
+    pageNo: 1,
+    pageSize: 10,
+    name: '',
+    createTime: []
+  }
+  getList()
+}
+
+/**
+ * 格式化拼团价格
+ * @param products
+ */
+const formatCombinationPrice = (products) => {
+  const combinationPrice = Math.min(...products.map((item) => item.combinationPrice))
+  return `￥${fenToYuan(combinationPrice)}`
+}
+
+// 是否全选
+const isCheckAll = ref(false)
+// 全选框是否处于中间状态：不是全部选中 && 任意一个选中
+const isIndeterminate = ref(false)
+// 选中的活动
+const checkedActivitys = ref<CombinationActivityVO[]>([])
+// 选中状态：key为活动ID，value为是否选中
+const checkedStatus = ref<Record<string, boolean>>({})
+
+// 选中的活动 activityId
+const selectedActivityId = ref()
+/** 单选中时触发 */
+const handleSingleSelected = (combinationActivityVO: CombinationActivityVO) => {
+  emits(CHANGE_EVENT, combinationActivityVO)
+  // 关闭弹窗
+  dialogVisible.value = false
+  // 记住上次选择的ID
+  selectedActivityId.value = combinationActivityVO.id
+}
+
+/** 多选完成 */
+const handleEmitChange = () => {
+  // 关闭弹窗
+  dialogVisible.value = false
+  emits(CHANGE_EVENT, [...checkedActivitys.value])
+}
+
+/** 确认选择时的触发事件 */
+const emits = defineEmits<{
+  change: [CombinationActivityApi: CombinationActivityVO | CombinationActivityVO[] | any]
+}>()
+
+/** 全选/全不选 */
+const handleCheckAll = (checked: boolean) => {
+  isCheckAll.value = checked
+  isIndeterminate.value = false
+
+  list.value.forEach((combinationActivity) => handleCheckOne(checked, combinationActivity, false))
+}
+
+/**
+ * 选中一行
+ * @param checked 是否选中
+ * @param combinationActivity 活动
+ * @param isCalcCheckAll 是否计算全选
+ */
+const handleCheckOne = (checked: boolean, combinationActivity: CombinationActivityVO, isCalcCheckAll: boolean) => {
+  if (checked) {
+    checkedActivitys.value.push(combinationActivity)
+    checkedStatus.value[combinationActivity.id] = true
+  } else {
+    const index = findCheckedIndex(combinationActivity)
+    if (index > -1) {
+      checkedActivitys.value.splice(index, 1)
+      checkedStatus.value[combinationActivity.id] = false
+      isCheckAll.value = false
+    }
+  }
+
+  // 计算全选框状态
+  if (isCalcCheckAll) {
+    calculateIsCheckAll()
+  }
+}
+
+// 查找活动在已选中活动列表中的索引
+const findCheckedIndex = (activityVO: CombinationActivityVO) => checkedActivitys.value.findIndex((item) => item.id === activityVO.id)
+
+// 计算全选框状态
+const calculateIsCheckAll = () => {
+  isCheckAll.value = list.value.every((activityVO) => checkedStatus.value[activityVO.id])
+  // 计算中间状态：不是全部选中 && 任意一个选中
+  isIndeterminate.value = !isCheckAll.value && list.value.some((activityVO) => checkedStatus.value[activityVO.id])
+}
+
+// 分类列表
+const categoryList = ref()
+// 分类树
+const categoryTreeList = ref()
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  // 获得分类树
+  categoryList.value = await ProductCategoryApi.getCategoryList({})
+  categoryTreeList.value = handleTree(categoryList.value, 'id', 'parentId')
+})
+</script>