From 7665305c0ecc2f6cca5404989c549def6a34ada1 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 22 Mar 2023 15:47:56 +0800
Subject: [PATCH] 优化计算，判断真才提交

---
 packageE/pages/cart/cart2/cart2.js |  9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index aaaadf0..f36e122 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -5293,9 +5293,14 @@ Page({
           continue;
         }
 
-        if(gd.prom_type==5 && !th.data.coll_prom[gd.prom_id].is_coupon && th.has_dp(goodlist,gd.prom_id)){
-          continue;
+        //有搭配购的时候才来判断
+        if(gd.prom_type==5 && th.data.coll_prom && th.data.coll_prom[gd.prom_id]){
+            if(!th.data.coll_prom[gd.prom_id].is_coupon && th.has_dp(goodlist,gd.prom_id)){
+              continue;
+            }
         }
+
+
         //--如果是团购，要判断有没有限制使用优惠券
         if (gd.prom_type == 2) {
           var prom1 = null;
--
libgit2 0.21.4