From 394cda3efd0aad645658685abc950d2cefbef6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Thu, 10 Nov 2022 09:28:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20:lipstick:=20=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=96=B0=E5=A2=9E=E7=A0=8D=E4=BB=B7=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/product/promotion/-promotion-details.vue | 10 +++++++++-
 pages/product/product/promotion/-promotion.vue       | 12 ++++++++++++
 pages/product/product/promotion/promotion_type.js    |  4 ++++
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/pages/product/product/promotion/-promotion-details.vue b/pages/product/product/promotion/-promotion-details.vue
index 8de6432..e1ed292 100644
--- a/pages/product/product/promotion/-promotion-details.vue
+++ b/pages/product/product/promotion/-promotion-details.vue
@@ -49,6 +49,13 @@
             <span class="pro-text">当前商品参与积分活动。<span @click="handClickToJoinPromotion(prom)" class="href">点击此处参与活动</span></span>
           </div>
         </view>
+
+         <view v-if="prom.split('-')[0] == 'KANJIA'">
+          <div class="res_prom_item">
+            <u-tag text="砍价活动" type="error"></u-tag>
+            <span class="pro-text">当前商品参与砍价活动。<span @click="handClickToJoinPromotion(prom)" class="href">点击此处参与活动</span></span>
+          </div>
+        </view>
       </view>
     </view>
     <view v-if="!res">暂无促销活动</view>
@@ -89,7 +96,8 @@ export default {
     handClickToJoinPromotion(val){
     
       const promotion = {
-        "POINTS_GOODS": `/pages/promotion/point/detail?id=${this.res[val].id}`
+        "POINTS_GOODS": `/pages/promotion/point/detail?id=${this.res[val].id}`,
+        "KANJIA": `/pages/promotion/bargain/detail?id=${this.res[val].id}`,
       }
 
       uni.navigateTo({
diff --git a/pages/product/product/promotion/-promotion.vue b/pages/product/product/promotion/-promotion.vue
index 0a1fe77..c061f7d 100644
--- a/pages/product/product/promotion/-promotion.vue
+++ b/pages/product/product/promotion/-promotion.vue
@@ -44,6 +44,18 @@
             <div class="text proText">{{ res[item].promotionName }}</div>
           </div>
         </div>
+        <div
+          class="promotion_col"
+          v-if="
+            item.split('-')[0] == promotionItem.value && item.split('-')[0] == 'KANJIA'
+          "
+        >
+          <!-- 砍价活动 -->
+          <div class="flex">
+            <view class="deg_tag">{{ promotionItem.title }}</view>
+            <div class="text proText"></div>
+          </div>
+        </div>
         <div
           class="promotion_col"
           v-if="
diff --git a/pages/product/product/promotion/promotion_type.js b/pages/product/product/promotion/promotion_type.js
index e6cd74a..6b0d8c6 100644
--- a/pages/product/product/promotion/promotion_type.js
+++ b/pages/product/product/promotion/promotion_type.js
@@ -3,6 +3,10 @@ const promotion = [
     title: "积分活动",
     value: "POINTS_GOODS",
   },
+  {
+    title: "砍价活动",
+    value: "KANJIA",
+  },
   {
     title: "单品立减",
     value: "MINUS",