From d6859088f6142c9a075f5fbd398122d5626f56cd Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 29 Jan 2024 09:19:14 +0800
Subject: [PATCH] ~~ 多规格的优化，优惠券的显示 ~~

---
 pages/goods/goodsInfo/goodsInfo.js   | 5 +++++
 pages/goods/goodsInfo/goodsInfo.wxml | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index ca38ff2..5a9da7d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -149,6 +149,7 @@ Page({
 
         //商品的活动类型 0普通  1秒杀 2团购 3优惠  4 积分购  6拼单
         prom_type: 0,
+        f_prom_type: 0,  //前端判断要不要显示券
         prom_time_text: "",
         prom_price: null,
         f_prom_price: null,  //秒杀使用
@@ -4767,6 +4768,7 @@ Page({
                               ee.setData({
                                 prom_price: t.data.data.price,
                                 prom_type: 2,
+                                f_prom_type: 2,
                                 prom_id: prom_id,
                                 prom_buy_limit: t.data.data.buy_limit,
                                 prom_act: t.data.data,
@@ -4865,7 +4867,9 @@ Page({
                                 prom_price: t.data.data.user_price,
                                 f_prom_price: t.data.data.user_price,
                                 prom_type: 1,
+                                f_prom_type: 1,
                                 prom_id: prom_id,
+                                f_prom_id: prom_id,
                                 prom_buy_limit: t.data.data.buy_limit,
                                 prom_act: t.data.data,
                                 f_prom_act: t.data.data,
@@ -5002,6 +5006,7 @@ Page({
                             prom_price: parseFloat(inte_data.addmoney),
                             prom_integral: parseFloat(inte_data.integral),
                             prom_type: 4,
+                            f_prom_type: 4,
                             prom_id: inte_data.id,
                             prom_buy_limit: inte_data.limitvipqty,
                             prom_act: inte_data,
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 4c53f0f..a258d5f 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -675,8 +675,8 @@
         </view>
 
 
-        <!-- 许程 7.24暂时注释 -->
-        <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && front_g.is_xz_yh !=1 && fir_quan.length>0 }}">
+        <!-- 许程 7.24暂时注释，秒杀，团购，积分，拼团的详情页面不显示券的领取 -->
+        <view class="bdt16" wx:if="{{ f_prom_type!=1 &&  f_prom_type!=2 &&  f_prom_type!=4 &&  f_prom_type!=6 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && front_g.is_xz_yh !=1 && fir_quan.length>0 }}">
           <view data-coupon="1" bindtap="switchCoupon" class="cx-frame flex" style="position: relative">
             <view class="cx-sizs fs30">领券</view>
             <view class="flex ai_c f1 pdh20">
--
libgit2 0.21.4