From cc37efffe87d24b91ce498a04d4b60b1de6a86fb Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Sat, 15 Aug 2020 10:21:15 +0800
Subject: [PATCH] 如果是赠品，就不算优惠

---
 pages/cart/cart2/cart2.js | 1 +
 1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 566da66..df130da 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -738,6 +738,7 @@ Page({
 
                   //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表-----------
                   for(var j=0;j<item.length;j++){
+					  if(item[j].is_gift) continue;
                       if(item[j].prom_type==3 && item[j].prom_id==item_map.prom_id){
                           item[j].is_xz_yh= item_map.is_xz_yh;
                           item[j].is_past= item_map.is_past;
--
libgit2 0.21.4