From 68aecbdd421796b746823c67d07593d1138a43d2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 25 Apr 2024 09:25:56 +0800
Subject: [PATCH] 赠品包邮的优化

---
 packageE/pages/cart/cart2/cart2.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index f60dc29..d9b1d17 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -2526,16 +2526,20 @@ Page({
   },
 
   //寻找活动在列表中的最后一个
-  is_has_gift(ord_goods, prom_id) {
+  is_has_gift(ord_goods, prom_id,get_data) {
     if (!ord_goods || ord_goods.length == 0) return false;
     var len = ord_goods.length;
+    var is_ck=false;
     for (var i = 0; i < len; i++) {
       var e = ord_goods[i];
       if (e.prom_type == 3 && e.prom_id == prom_id && e.is_gift == 1) {
-        return true;
+        if(get_data.zp_by>0){
+          ord_goods[i].is_past=1;
+        }
+        is_ck=true;
       }
     }
-    return false;
+    return is_ck;
   },
 
 
@@ -2550,7 +2554,7 @@ Page({
   cart_add_gift(item_map, pickid, i, ord_goods, get_data) {
 
     var th = this;
-    var is_has_gift = this.is_has_gift(ord_goods, item_map.prom_id)
+    var is_has_gift = this.is_has_gift(ord_goods, item_map.prom_id,get_data)
 
     //-- 没有赠品的时候才添加，避免购物车重复出现 --
     if (!is_has_gift) {
--
libgit2 0.21.4