From 8188a8af7b5c0dfdf4ad89b8d769b8958bf77f78 Mon Sep 17 00:00:00 2001
From: "pikachu1995@126.com" <pikachu1995@126.com>
Date: Thu, 5 Nov 2026 15:20:38 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=B8=85=E7=90=86=E5=81=9C?=
 =?UTF-8?q?=E7=94=A8=E4=BF=83=E9=94=80=E7=9A=84=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/goods.vue                       |  2 +-
 .../-promotion-assemble-promotions.vue        | 24 -------------------
 .../product/promotion/-promotion-details.vue  | 24 +++----------------
 .../product/product/promotion/-promotion.vue  | 12 ----------
 .../product/promotion/promotion_type.js       |  8 -------
 5 files changed, 4 insertions(+), 66 deletions(-)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 7c54536..d38eca3 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -70,7 +70,7 @@
          
           <GoodsSwiper id="main1" :res="imgList" :video="goodsDetail.goodsVideo" />
 
-          <!-- 促销活动条（秒杀/限时直降/拼团等，M-02 含 E_COUPON） -->
+          <!-- 促销活动条（秒杀/拼团等，M-02 含 E_COUPON） -->
           <PromotionAssembleLayout v-if="PromotionList" :detail="goodsDetail" :res="PromotionList" />
 
           <view class="card-box top-radius-0" id="main2">
diff --git a/pages/product/product/promotion/-promotion-assemble-promotions.vue b/pages/product/product/promotion/-promotion-assemble-promotions.vue
index 6d8f69b..6dc1bbc 100644
--- a/pages/product/product/promotion/-promotion-assemble-promotions.vue
+++ b/pages/product/product/promotion/-promotion-assemble-promotions.vue
@@ -5,7 +5,6 @@
         class="showBox"
         v-if="
           promotion.__key == 'SECKILL' ||
-          promotion.__key == 'FLASH_DISCOUNT' ||
           promotion.__key == 'GROUPBUY' ||
           promotion.__key == 'PINTUAN'
         "
@@ -37,29 +36,6 @@
                   </view>
                 </view>
 
-                <!-- 限时直降 -->
-                <view class="u-group-flex-left" v-if="promotion.__key == 'FLASH_DISCOUNT'">
-                  <span
-                    class="u-group-flex-left-span"
-                    v-if="detail.promotionPrice != undefined"
-                  >
-                    ￥
-                    <span class="flex-price">
-                      {{ goodsFormatPrice(detail.promotionPrice)[0] }}.{{
-                        goodsFormatPrice(detail.promotionPrice)[1]
-                      }}</span
-                    >
-                  </span>
-                  <view class="u-group-flex" v-if="detail.price != undefined">
-                    <span class="old-price"
-                      >￥{{ goodsFormatPrice(detail.price)[0] }}.{{
-                        goodsFormatPrice(detail.price)[1]
-                      }}</span
-                    >
-                    <view class="promotion">限时直降</view>
-                  </view>
-                </view>
-
                 <!-- 团购 -->
                 <view class="u-group-flex-left" v-if="promotion.__key == 'GROUPBUY'">
                   <span class="u-group-flex-left-span">
diff --git a/pages/product/product/promotion/-promotion-details.vue b/pages/product/product/promotion/-promotion-details.vue
index 0e1188a..4ec870d 100644
--- a/pages/product/product/promotion/-promotion-details.vue
+++ b/pages/product/product/promotion/-promotion-details.vue
@@ -40,26 +40,6 @@
         </view>
       </view>
 
-      <view v-if="getPromType(prom) == 'FLASH_DISCOUNT'">
-        <view class="res_prom_item">
-          <view class="deg_tag">限时直降</view>
-          <text class="pro-text">{{ props.res[prom].promotionName || props.res[prom].title || '限时直降活动' }}</text>
-        </view>
-      </view>
-
-      <view v-if="getPromType(prom) == 'NTH_ITEM_DISCOUNT'">
-        <view class="res_prom_item">
-          <view class="deg_tag">第N件优惠</view>
-          <text class="pro-text">
-            第{{ props.res[prom].nthNum || 'N' }}件
-            <text v-if="props.res[prom].discountType === 'FREE'">免费</text>
-            <text v-else-if="props.res[prom].discountType === 'HALF'">半价</text>
-            <text v-else-if="props.res[prom].discountValue">享{{ props.res[prom].discountValue }}折</text>
-            <text v-else>优惠</text>
-          </text>
-        </view>
-      </view>
-
       <view v-if="getPromType(prom) == 'POINTS_GOODS'">
         <view class="res_prom_item">
           <view class="deg_tag">积分活动</view>
@@ -93,7 +73,9 @@ const props = defineProps<{
 
 const promotionKeys = computed(() => {
   if (!props.res || typeof props.res !== 'object') return []
-  return Object.keys(props.res).filter((key) => getPromType(key) !== 'COUPON')
+  return Object.keys(props.res).filter((key) =>
+    ['FULL_DISCOUNT', 'PINTUAN', 'SECKILL', 'POINTS_GOODS', 'KANJIA'].includes(getPromType(key))
+  )
 })
 
 function getPromType(key: string) {
diff --git a/pages/product/product/promotion/-promotion.vue b/pages/product/product/promotion/-promotion.vue
index 428b28f..8ff9c85 100644
--- a/pages/product/product/promotion/-promotion.vue
+++ b/pages/product/product/promotion/-promotion.vue
@@ -2,18 +2,6 @@
 	<view>
 		<view v-for="(promotionItem, promotionIndex) in promotion" :key="promotionIndex" class="promotion_row" @click="shutMask(1)">
 			<view v-if="res != null" v-for="(item, index) in Object.keys(res)" :key="index">
-				<div class="promotion_col" v-if="item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'FLASH_DISCOUNT'">
-					<div class="flex">
-						<view class="deg_tag">{{ promotionItem.title }}</view>
-						<div class="text proText">{{ res[item].promotionName || res[item].title || '限时直降' }}</div>
-					</div>
-				</div>
-				<div class="promotion_col" v-if="item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'NTH_ITEM_DISCOUNT'">
-					<div class="flex">
-						<view class="deg_tag">{{ promotionItem.title }}</view>
-						<div class="text proText">{{ res[item].promotionName || res[item].title || '第N件优惠' }}</div>
-					</div>
-				</div>
 				<div class="promotion_col" v-if="item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'FULL_DISCOUNT'">
 					<!-- 满减，折扣 -->
 					<div class="flex">
diff --git a/pages/product/product/promotion/promotion_type.js b/pages/product/product/promotion/promotion_type.js
index a962ed2..f3f1d03 100644
--- a/pages/product/product/promotion/promotion_type.js
+++ b/pages/product/product/promotion/promotion_type.js
@@ -7,14 +7,6 @@ const promotion = [
     title: "砍价活动",
     value: "KANJIA",
   },
-  {
-    title: "限时直降",
-    value: "FLASH_DISCOUNT",
-  },
-  {
-    title: "第N件优惠",
-    value: "NTH_ITEM_DISCOUNT",
-  },
   {
     title: "团购",
     value: "GROUPBUY",