From 8755d646837de2cd1a6de1fb430cfa7733e6de79 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 1 Dec 2023 21:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6=E3=80=90?=
 =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E3=80=91=EF=BC=88=E5=BE=85=E9=87=8D=E5=86=99?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sheep/api/promotion/combination.js            | 67 +++++++++++++++++++
 .../components/s-block-item/s-block-item.vue  |  2 +-
 .../s-groupon-block/s-groupon-block.vue       | 56 ++++++++--------
 .../s-seckill-block/s-seckill-block.vue       |  4 +-
 4 files changed, 98 insertions(+), 31 deletions(-)
 create mode 100644 sheep/api/promotion/combination.js

diff --git a/sheep/api/promotion/combination.js b/sheep/api/promotion/combination.js
new file mode 100644
index 0000000..eeeb9a0
--- /dev/null
+++ b/sheep/api/promotion/combination.js
@@ -0,0 +1,67 @@
+import request2 from "@/sheep/request2";
+
+// 拼团 API
+const CombinationApi = {
+    // 获得拼团活动列表
+    getCombinationActivityList: (count) => {
+        return request2({
+            url: "promotion/combination-activity/list",
+            method: 'GET',
+            params: {count}
+        });
+    },
+
+    // 获得拼团活动分页
+    getCombinationActivityPage: (params) => {
+        return request2({
+            url: "promotion/combination-activity/page",
+            method: 'GET',
+            params
+        });
+    },
+
+    // 获得拼团活动明细
+    getCombinationActivity: (id) => {
+        return request2({
+            url: "promotion/combination-activity/get-detail",
+            method: 'GET',
+            params: {
+                id
+            }
+        });
+    },
+
+    // 获得最近 n 条拼团记录（团长发起的）
+    getHeadCombinationRecordList: (activityId, status, count) => {
+        return request2({
+            url: "promotion/combination-record/get-head-list",
+            method: 'GET',
+            params: {
+                activityId,
+                status,
+                count
+            }
+        });
+    },
+
+    // 获得拼团记录明细
+    getCombinationRecordDetail: (id) => {
+        return request2({
+            url: "promotion/combination-record/get-detail",
+            method: 'GET',
+            params: {
+                id
+            }
+        });
+    },
+
+    // 获得拼团记录的概要信息
+    getCombinationRecordSummary: () => {
+        return request2({
+            url: "promotion/combination-record/get-summary",
+            method: 'GET',
+        });
+    }
+}
+
+export default CombinationApi
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index b39337b..eec343c 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -32,7 +32,7 @@
     <s-goods-shelves v-if="type === 'ProductList'" :data="data" :styles="styles" />
 
     <!-- 营销组件：拼团 -->
-    <s-groupon-block v-if="type === 'groupon'" :data="data" :styles="styles" />
+    <s-groupon-block v-if="type === 'PromotionCombination'" :data="data" :styles="styles" />
     <!-- 营销组件：秒杀 -->
     <s-seckill-block v-if="type === 'PromotionSeckill'" :data="data" :styles="styles" />
     <!-- 营销组件：积分商城（模式不一样，无法适配） -->
diff --git a/sheep/components/s-groupon-block/s-groupon-block.vue b/sheep/components/s-groupon-block/s-groupon-block.vue
index 3aea89c..7ea1c8f 100644
--- a/sheep/components/s-groupon-block/s-groupon-block.vue
+++ b/sheep/components/s-groupon-block/s-groupon-block.vue
@@ -2,13 +2,13 @@
 <template>
   <view>
     <view
-      v-if="mode === 1"
+      v-if="layoutType === 'threeCol'"
       class="goods-sm-box ss-flex ss-flex-wrap"
       :style="[{ margin: '-' + data.space + 'rpx' }]"
     >
       <view
-        v-for="item in goodsList"
-        :key="item.id"
+        v-for="product in productList"
+        :key="product.id"
         class="goods-card-box"
         :style="[
           {
@@ -19,15 +19,15 @@
         <s-goods-column
           class="goods-card"
           size="sm"
-          :goodsFields="goodsFields"
+          :goodsFields="data.fields"
           :tagStyle="tagStyle"
-          :data="item"
-          :titleColor="goodsFields.title?.color"
+          :data="product"
+          :titleColor="data.fields.name?.color"
           :topRadius="data.borderRadiusTop"
           :bottomRadius="data.borderRadiusBottom"
           @click="
             sheep.$router.go('/pages/goods/groupon', {
-              id: item.id,
+              id: product.id,
               activity_id: props.data.activityId,
             })
           "
@@ -35,33 +35,33 @@
       </view>
     </view>
     <!-- 样式2 一行一个 图片左 文案右 -->
-    <view class="goods-box" v-if="mode == 2">
+    <view class="goods-box" v-if="layoutType === 'oneCol'">
       <view
         class="goods-list"
-        v-for="(item, index) in goodsList"
+        v-for="(product, index) in productList"
         :key="index"
         :style="[{ marginBottom: space + 'px' }]"
       >
         <s-goods-column
           class="goods-card"
           size="lg"
-          :includes="goodsFields"
+          :goodsFields="data.fields"
           :tagStyle="tagStyle"
-          :data="item"
-          :titleColor="goodsFields.title?.color"
-          :subTitleColor="goodsFields.subtitle.color"
+          :data="product"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction?.color"
           :topRadius="data.borderRadiusTop"
           :bottomRadius="data.borderRadiusBottom"
           @click="
             sheep.$router.go('/pages/goods/groupon', {
-              id: item.id,
+              id: product.id,
               activity_id: props.data.activityId,
             })
           "
         >
           <template v-slot:cart>
             <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ buyNowStyle.mode === 1 ? buyNowStyle.text : '' }}
+              {{ btnBuy?.type === 'text' ? btnBuy.text : '' }}
             </button>
           </template>
         </s-goods-column>
@@ -73,13 +73,11 @@
 <script setup>
   /**
    * 拼团
-   *
-   * @property {Array} list 											- 商品列表
-   *
-   *
    */
   import { computed, onMounted, ref } from 'vue';
   import sheep from '@/sheep';
+  import SpuApi from "@/sheep/api/product/spu";
+  import CombinationApi from "@/sheep/api/promotion/combination";
 
   // 接收参数
   const props = defineProps({
@@ -93,32 +91,34 @@
     },
   });
 
-  let { mode, tagStyle, buyNowStyle, goodsFields, space } = props.data;
+  let { layoutType, tagStyle, btnBuy, space } = props.data;
   let { marginLeft, marginRight } = props.styles;
 
   // 购买按钮样式
   const buyStyle = computed(() => {
-    let buyNowStyle = props.data.buyNowStyle;
-    if (buyNowStyle.mode == 1) {
+    let btnBuy = props.data.btnBuy;
+    if (btnBuy?.type === 'text') {
       return {
-        background: `linear-gradient(to right, ${buyNowStyle.color1}, ${buyNowStyle.color2})`,
+        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
       };
     }
 
-    if (buyNowStyle.mode == 2) {
+    if (btnBuy?.type === 'img') {
       return {
         width: '54rpx',
         height: '54rpx',
-        background: `url(${sheep.$url.cdn(buyNowStyle.src)}) no-repeat`,
+        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
         backgroundSize: '100% 100%',
       };
     }
   });
 
-  const goodsList = ref([]);
+  const productList = ref([]);
   onMounted(async () => {
-    let { data } = await sheep.$api.goods.activity({ activity_id: props.data.activityId });
-    goodsList.value = data;
+    // todo：@owen 与Yudao结构不一致，待重构
+    const { data: activity } = await CombinationApi.getCombinationActivity(props.data.activityId);
+    const { data: spu } = await SpuApi.getSpuDetail(activity.spuId)
+    productList.value = [spu];
   });
 </script>
 
diff --git a/sheep/components/s-seckill-block/s-seckill-block.vue b/sheep/components/s-seckill-block/s-seckill-block.vue
index 1eda0e7..5b31725 100644
--- a/sheep/components/s-seckill-block/s-seckill-block.vue
+++ b/sheep/components/s-seckill-block/s-seckill-block.vue
@@ -100,12 +100,12 @@
   // 购买按钮样式
   const buyStyle = computed(() => {
     let btnBuy = props.data.btnBuy;
-    if (btnBuy.type === 'text') {
+    if (btnBuy?.type === 'text') {
       return {
         background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
       };
     }
-    if (btnBuy.type === 'img') {
+    if (btnBuy?.type === 'img') {
       return {
         width: '54rpx',
         height: '54rpx',