【功能修复】秒杀装修重构

sheep/api/promotion/seckill.js

@@ -1,4 +1,4 @@
-import request from "@/sheep/request";
+import request from '@/sheep/request';
 
 const SeckillApi = {
   // 获得秒杀时间段列表
@@ -16,6 +16,17 @@ const SeckillApi = {
     return request({ url: 'promotion/seckill-activity/page', method: 'GET', params });
   },
 
+  // 获得秒杀活动列表，基于活动编号数组
+  getSeckillActivityListByIds: (ids) => {
+    return request({
+      url: '/promotion/seckill-activity/list-by-ids',
+      method: 'GET',
+      params: {
+        ids,
+      },
+    });
+  },
+
   /**
    * 获得秒杀活动明细
    * @param {number} id 秒杀活动编号
@@ -25,9 +36,9 @@ const SeckillApi = {
     return request({
       url: 'promotion/seckill-activity/get-detail',
       method: 'GET',
-      params: { id }
+      params: { id },
     });
-  }
+  },
-}
+};
 
 export default SeckillApi;

sheep/components/s-groupon-block/s-groupon-block.vue

@@ -145,7 +145,6 @@
   import sheep from '@/sheep';
   import CombinationApi from '@/sheep/api/promotion/combination';
   import SpuApi from '@/sheep/api/product/spu';
-  import spu from '@/sheep/api/product/spu';
 
   // 布局类型
   const LayoutTypeEnum = {

sheep/components/s-seckill-block/s-seckill-block.vue

@@ -1,114 +1,190 @@
-<!-- 装修组件 - 秒杀 -->
+<!-- 装修商品组件：【拼团】商品卡片 -->
 <template>
+  <!-- 商品卡片 -->
   <view>
-		<!-- 样式一：三列 - 上图下文 -->
+    <!-- 布局1. 单列大图（上图，下内容）-->
-		<view v-if="layoutType === 'threeCol'" class="goods-sm-box ss-flex ss-flex-wrap" :style="[{ margin: '-' + data.space + 'rpx' }]">
+    <view
-			<view v-for="product in productList" :key="product.id" class="goods-card-box" :style="[{padding: data.space + 'rpx',},]">
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.spuList.length"
+      class="goods-sl-box"
+    >
+      <view
+        class="goods-box"
+        v-for="item in state.spuList"
+        :key="item.id"
+        :style="[{ marginBottom: data.space * 2 + 'rpx' }]"
+      >
         <s-goods-column
-					class="goods-card" size="sm"
+          class=""
-					:goodsFields="goodsFields"
+          size="sl"
-					:tagStyle="badge"
+          :goodsFields="data.fields"
-					:data="product"
+          :tagStyle="data.badge"
+          :data="item"
           :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
           :topRadius="data.borderRadiusTop"
           :bottomRadius="data.borderRadiusBottom"
-					@click="sheep.$router.go('/pages/goods/seckill', { id: props.data.activityId, })">
+          @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
-				</s-goods-column>
+        >
-			</view>
+          <!-- 购买按钮 -->
-		</view>
-		<!-- 样式二：一列 - 左图右文 -->
-		<view class="goods-box" v-if="layoutType === 'oneCol'">
-			<view class="goods-list" v-for="(product, index) in productList" :key="index"
-				:style="[{ marginBottom: space + 'px' }]">
-				<s-goods-column
-					class="goods-card"
-					size="lg"
-					:goodsFields="goodsFields"
-					:seckillTag="true"
-					:tagStyle="badge"
-					:data="product"
-					:titleColor="data.fields.name?.color"
-					:subTitleColor="data.fields.introduction?.color"
-					:topRadius="data.borderRadiusTop"
-					:bottomRadius="data.borderRadiusBottom"
-					@click="sheep.$router.go('/pages/goods/seckill', { id: props.data.activityId, })">
           <template v-slot:cart>
             <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-							{{ btnBuy?.type === 'text' ? btnBuy.text : '立即秒杀' }}
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
             </button>
           </template>
         </s-goods-column>
       </view>
     </view>
+
+    <!-- 布局2. 单列小图（左图，右内容） -->
+    <view
+      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.spuList.length"
+      class="goods-lg-box"
+    >
+      <view
+        class="goods-box"
+        :style="[{ marginBottom: data.space + 'px' }]"
+        v-for="item in state.spuList"
+        :key="item.id"
+      >
+        <s-goods-column
+          class="goods-card"
+          size="lg"
+          :goodsFields="data.fields"
+          :data="item"
+          :tagStyle="data.badge"
+          :titleColor="data.fields.name?.color"
+          :subTitleColor="data.fields.introduction.color"
+          :topRadius="data.borderRadiusTop"
+          :bottomRadius="data.borderRadiusBottom"
+          @tap="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+        >
+          <!-- 购买按钮 -->
+          <template v-slot:cart>
+            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+            </button>
+          </template>
+        </s-goods-column>
+      </view>
+    </view>
+
+    <!-- 布局3. 双列（每一列：上图，下内容）-->
+    <view
+      v-if="layoutType === LayoutTypeEnum.TWO_COL && state.spuList.length"
+      class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
+    >
+      <view class="goods-list-box">
+        <view
+          class="left-list"
+          :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.leftSpuList"
+          :key="item.id"
+        >
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
+            :data="item"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+            @getHeight="calculateGoodsColumn($event, 'left')"
+          >
+            <!-- 购买按钮 -->
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+              </button>
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+      <view class="goods-list-box">
+        <view
+          class="right-list"
+          :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+          v-for="item in state.rightSpuList"
+          :key="item.id"
+        >
+          <s-goods-column
+            class="goods-md-box"
+            size="md"
+            :goodsFields="data.fields"
+            :tagStyle="data.badge"
+            :data="item"
+            :titleColor="data.fields.name?.color"
+            :subTitleColor="data.fields.introduction.color"
+            :topRadius="data.borderRadiusTop"
+            :bottomRadius="data.borderRadiusBottom"
+            :titleWidth="330 - marginLeft - marginRight"
+            @click="sheep.$router.go('/pages/goods/groupon', { id: item.activityId })"
+            @getHeight="calculateGoodsColumn($event, 'right')"
+          >
+            <!-- 购买按钮 -->
+            <template v-slot:cart>
+              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
+                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+              </button>
+            </template>
+          </s-goods-column>
+        </view>
+      </view>
+    </view>
   </view>
 </template>
 
 <script setup>
   /**
-	 * 秒杀商品列表
+   * 商品卡片
-	 *
-	 * @property {Array} list 商品列表
    */
-	import {
+  import { computed, onMounted, reactive, ref } from 'vue';
-		computed,
-		onMounted,
-		reactive,
-		ref
-	} from 'vue';
   import sheep from '@/sheep';
-	import SeckillApi from "@/sheep/api/promotion/seckill";
+  import SeckillApi from '@/sheep/api/promotion/seckill';
-	import SpuApi from "@/sheep/api/product/spu";
+  import SpuApi from '@/sheep/api/product/spu';
 
-	// 接收参数
+  // 布局类型
+  const LayoutTypeEnum = {
+    // 单列大图
+    ONE_COL_BIG_IMG: 'oneColBigImg',
+    // 双列
+    TWO_COL: 'twoCol',
+    // 单列小图
+    ONE_COL_SMALL_IMG: 'oneColSmallImg',
+  };
+
+  const state = reactive({
+    spuList: [],
+    leftSpuList: [],
+    rightSpuList: [],
+  });
   const props = defineProps({
-		// 装修数据
     data: {
       type: Object,
-			default: () => ({}),
+      default() {},
     },
-		// 装修样式
     styles: {
       type: Object,
-			default: () => ({}),
+      default() {},
     },
   });
 
-	// 设置相关信息是否显示
+  const { layoutType, btnBuy, activityIds } = props.data || {};
-	const goodsFields = reactive({
+  const { marginLeft, marginRight } = props.styles || {};
-	  // 商品价格
-	  price: { show: true },
-	  // 库存
-	  stock: { show: true },
-	  // 商品名称
-	  name: { show: true },
-	  // 商品介绍
-	  introduction: { show: true },
-	  // 市场价
-	  marketPrice: { show: true },
-	  // 销量
-	  salesCount: { show: true },
-	});
-	
-	let {
-		layoutType,
-		badge,
-		btnBuy,
-		space,
-	} = props.data;
-	let {
-		marginLeft,
-		marginRight
-	} = props.styles;
 
   // 购买按钮样式
   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',
@@ -118,44 +194,124 @@
     }
   });
 
-	// 商品列表
+  //region 商品瀑布流布局
-	const productList = ref([]);
+  // 下一个要处理的商品索引
-	// 查询秒杀活动商品
+  let count = 0;
+  // 左列的高度
+  let leftHeight = 0;
+  // 右列的高度
+  let rightHeight = 0;
+
+  /**
+   * 计算商品在左列还是右列
+   * @param height 商品的高度
+   * @param where 添加到哪一列
+   */
+  function calculateGoodsColumn(height = 0, where = 'left') {
+    // 处理完
+    if (!state.spuList[count]) return;
+    // 增加列的高度
+    if (where === 'left') leftHeight += height;
+    if (where === 'right') rightHeight += height;
+    // 添加到矮的一列
+    if (leftHeight <= rightHeight) {
+      state.leftSpuList.push(state.spuList[count]);
+    } else {
+      state.rightSpuList.push(state.spuList[count]);
+    }
+    // 计数
+    count++;
+  }
+
+  //endregion
+
+  /**
+   * 根据商品编号列表，获取商品列表
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getSeckillActivityDetailList(ids) {
+    const { data } = await SeckillApi.getSeckillActivityListByIds(ids);
+    return data;
+  }
+
+  /**
+   * 根据商品编号，获取商品详情
+   * @param ids 商品编号列表
+   * @return {Promise<undefined>} 商品列表
+   */
+  async function getSpuDetail(ids) {
+    const { data: spu } = await SpuApi.getSpuDetail(ids);
+    return spu;
+  }
+
+  // 初始化
   onMounted(async () => {
-		// todo：@owen 与Yudao结构不一致，待重构
+    // 加载活动列表
-		const {
+    const activityList = await getSeckillActivityDetailList(activityIds.join(','));
-			data: activity
+    // 循环获取活动商品SPU详情并添加到spuList
-		} = await SeckillApi.getSeckillActivity(props.data.activityId);
+    for (const activity of activityList) {
-		const {
+      state.spuList.push(await getSpuDetail(activity.spuId));
-			data: spu
+    }
-		} = await SpuApi.getSpuDetail(activity.spuId)
+
-		// 循环活动信息，赋值秒杀最低价格
+    // 循环活动列表
-		activity.products.forEach((product) => {
+    activityList.forEach((activity) => {
-			spu.price = Math.min(spu.price, product.seckillPrice); // 设置 SPU 的最低价格
+      // 提取活动价格
+      const seckillPrice = activity.seckillPrice || Infinity;
+      // 查找对应的 spu 并更新价格
+      const spu = state.spuList.find((spu) => activity.spuId === spu.id);
+      if (spu) {
+        // 赋值最低价格
+        spu.price = Math.min(seckillPrice, spu.price);
+        // 赋值活动ID，为了点击跳转详情页
+        spu.activityId = activity.id;
+      }
     });
-    // 将活动库存赋值给商品库存
+
-    spu.stock = activity.stock
+    // 只有双列布局时需要
-    // 活动总库存 - 活动库存 = 销量
+    if (layoutType === LayoutTypeEnum.TWO_COL) {
-    spu.salesCount = activity.totalStock - activity.stock
+      // 分列
-		productList.value = [spu];
+      calculateGoodsColumn();
+    }
   });
 </script>
 
 <style lang="scss" scoped>
-	.header-box {
+  .goods-md-wrap {
-		height: 100rpx;
+    width: 100%;
   }
 
-	.goods-list {
+  .goods-list-box {
-		position: relative;
+    width: 50%;
+    box-sizing: border-box;
 
+    .left-list {
       &:nth-last-child(1) {
         margin-bottom: 0 !important;
       }
+    }
+
+    .right-list {
+      &:nth-last-child(1) {
+        margin-bottom: 0 !important;
+      }
+    }
+  }
+
+  .goods-box {
+    &:nth-last-of-type(1) {
+      margin-bottom: 0 !important;
+    }
+  }
+
+  .goods-md-box,
+  .goods-sl-box,
+  .goods-lg-box {
+    position: relative;
 
     .cart-btn {
       position: absolute;
-			bottom: 10rpx;
+      bottom: 18rpx;
       right: 20rpx;
       z-index: 11;
       height: 50rpx;
@@ -164,19 +320,6 @@
       border-radius: 25rpx;
       font-size: 24rpx;
       color: #fff;
-			background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
-		}
-	}
-
-	.goods-sm-box {
-		margin: 0 auto;
-		box-sizing: border-box;
-
-		.goods-card-box {
-			flex-shrink: 0;
-			overflow: hidden;
-			width: 33.3%;
-			box-sizing: border-box;
     }
   }
 </style>