From 0aa9831a6294a8858615707e61b548eb52acd794 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: Wed, 9 Nov 2022 17:00:57 +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=E4=B8=AD=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96=20=20=EF=BC=8C=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E8=AF=A6=E6=83=85=E4=B8=AD=E5=B0=86=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E7=A7=AF=E5=88=86=E5=95=86=E5=93=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/goods.vue                       | 13 +++-------
 .../product/promotion/-promotion-details.vue  | 25 ++++++++++++++++++-
 .../product/product/promotion/-promotion.vue  | 12 +++++++++
 .../product/promotion/promotion_type.js       |  2 +-
 pages/promotion/point/detail.vue              |  2 +-
 5 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 3647eb3..3447387 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -144,12 +144,8 @@
                 <view class="-goods-flex">
                   <!-- 如果有积分显示积分 -->
                   <view class="-goods-price" v-if="goodsDetail.price != undefined">
-                    <span v-if="pointDetail.points">
-                      <span class="price">{{ pointDetail.points }}</span>
-                      <span>积分</span>
-                    </span>
-
-                    <span v-else>
+                   
+                    <span >
 													<span v-if="wholesaleList.length">
 														<span>¥</span><span class="price">{{ $options.filters.goodsFormatPrice(wholesaleList[wholesaleList.length-1].price)[0] }}</span>.{{ $options.filters.goodsFormatPrice(wholesaleList[wholesaleList.length-1].price)[1] }}
 														~
@@ -668,10 +664,7 @@ export default {
           if (item.indexOf("PINTUAN") == 0) {
             this.isGroup = true;
           }
-          // 积分
-          if (item.indexOf("POINTS_GOODS") == 0) {
-            this.pointDetail = this.PromotionList[item];
-          }
+         
           // 秒杀
           if (item.indexOf("SECKILL") == 0) {
             this.isSeckill = true
diff --git a/pages/product/product/promotion/-promotion-details.vue b/pages/product/product/promotion/-promotion-details.vue
index d9a52e1..69acdb7 100644
--- a/pages/product/product/promotion/-promotion-details.vue
+++ b/pages/product/product/promotion/-promotion-details.vue
@@ -42,6 +42,13 @@
             <span class="pro-text">限时抢购</span>
           </div>
         </view>
+
+        <view v-if="prom.split('-')[0] == 'POINTS_GOODS'">
+          <div class="res_prom_item">
+            <u-tag text="积分活动" type="error"></u-tag>
+            <span class="pro-text">当前商品参与积分活动。<span @click="handClickToJoinPromotion(prom,prom.split('-')[0])" class="href">点击此处参与活动</span></span>
+          </div>
+        </view>
       </view>
     </view>
     <view v-if="!res">暂无促销活动</view>
@@ -77,7 +84,20 @@ export default {
     },
   },
   mounted() {},
-  methods: {},
+  methods: {
+    // 跳转到参与商品活动的详情列表中
+    handClickToJoinPromotion(val,type){
+    
+      const promotion = {
+        "POINTS_GOODS": `/pages/promotion/point/detail?id=${this.res[val].id}`
+      }
+
+      uni.navigateTo({
+        url:promotion[type]
+      })
+
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>
@@ -108,4 +128,7 @@ export default {
 .price_image {
   display: block;
 }
+.href{
+  color: $main-color;
+}
 </style>
diff --git a/pages/product/product/promotion/-promotion.vue b/pages/product/product/promotion/-promotion.vue
index 6444563..0a1fe77 100644
--- a/pages/product/product/promotion/-promotion.vue
+++ b/pages/product/product/promotion/-promotion.vue
@@ -32,6 +32,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] == 'POINTS_GOODS'
+          "
+        >
+          <!-- 积分活动 -->
+          <div class="flex">
+            <view class="deg_tag">{{ promotionItem.title }}</view>
+            <div class="text proText">{{ res[item].promotionName }}</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 1607e00..e6cd74a 100644
--- a/pages/product/product/promotion/promotion_type.js
+++ b/pages/product/product/promotion/promotion_type.js
@@ -1,7 +1,7 @@
 const promotion = [
   {
     title: "积分活动",
-    value: "POINT",
+    value: "POINTS_GOODS",
   },
   {
     title: "单品立减",
diff --git a/pages/promotion/point/detail.vue b/pages/promotion/point/detail.vue
index a7f0cec..4706b46 100644
--- a/pages/promotion/point/detail.vue
+++ b/pages/promotion/point/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="page">
-    <u-navbar :border-bottom="false" title=""></u-navbar>
+    <u-navbar :border-bottom="false" title="积分商品"></u-navbar>
 
     <div class="wrapper">
       <!-- 积分商品列表 -->