From 4130b2fec52b4676eea3a2a54abde1e3564cb577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E8=B6=8A?= <552369664@qq.com>
Date: Fri, 16 Aug 2024 14:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E8=A3=85=E4=BF=AE=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E6=8B=BC=E5=9B=A2=E4=BB=B7=E6=A0=BC=E5=92=8C=E7=A7=92?=
 =?UTF-8?q?=E6=9D=80=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/mobile/PromotionCombination/index.vue      | 7 ++-----
 .../components/mobile/PromotionSeckill/index.vue          | 8 ++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
index ee4061de..7bb7176a 100644
--- a/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
+++ b/src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
@@ -86,11 +86,8 @@ watch(
     // 循环活动信息，赋值拼团价格
     activity.products.forEach((product: CombinationProductVO) => {
       spuList.value.forEach((spu: Spu) => {
-        // 如果商品 SpuId 匹配
-        if (spu.id === product.spuId) {
-          // 商品原售价和拼团价，哪个便宜就赋值哪个
-          spu.combinationPrice = Math.min(spu.price || 0, product.combinationPrice); // 设置 SPU 的最低价格
-        }
+        // 商品原售价和拼团价，哪个便宜就赋值哪个
+        spu.combinationPrice = Math.min(spu.combinationPrice || Infinity, product.combinationPrice); // 设置 SPU 的最低价格
       })
     });
   },
diff --git a/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue b/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue
index 139bf61b..63bee8eb 100644
--- a/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue
+++ b/src/components/DiyEditor/components/mobile/PromotionSeckill/index.vue
@@ -84,14 +84,10 @@ watch(
     if (!activity?.spuId) return
     spuList.value = [await ProductSpuApi.getSpu(activity.spuId)]
     spuList.value = [await ProductSpuApi.getSpu(activity.spuId)]
-    // 循环活动信息，赋值拼团价格
+    // 循环活动信息，赋值秒杀最低价格
     activity.products.forEach((product: SeckillProductVO) => {
       spuList.value.forEach((spu: Spu) => {
-        // 如果商品 SpuId 匹配
-        if (spu.id === product.spuId) {
-          // 商品原售价和拼团价，哪个便宜就赋值哪个
-          spu.seckillPrice = Math.min(spu.price || 0, product.seckillPrice); // 设置 SPU 的最低价格
-        }
+        spu.seckillPrice = Math.min(spu.seckillPrice || Infinity, product.seckillPrice);  // 设置 SPU 的最低价格
       })
     });
   },