判断是不是有参与搭配商品，和后台一起判断是不是有参与搭配促销活动

yvan.ni
1 parent ffb8b07c
Showing 1 changed file with 19 additions and 5 deletions
packageE/pages/cart/cart2/cart2.js
@@ -4876,6 +4876,9 @@ Page({
         var zh_map_count={};
         var check_map = {};
         let groupchat_ids=[]
+
+
+
         //-------------让商品添加到商品列表--------------------
         for (var k = 0; k < t_item.goods.length; k++) {
  
@@ -4894,7 +4897,6 @@ Page({
           };
  
  
-
           if (getApp().globalData.skinface_id) {
             goods.skinface_id = getApp().globalData.skinface_id;
           }
@@ -4942,11 +4944,15 @@ Page({
               }
               break;
             case 5:
-              goods.prom_type = 5;
-              goods.prom_id = g_item.prom_id;
-              if (g_item.is_collocation) {
-                goods.is_collocation = g_item.is_collocation;
+              //看一下有没有搭配商品
+              if(th.has_collocation(t_item.goods,g_item.prom_id)){
+                 goods.prom_type = 5;
+                 goods.prom_id = g_item.prom_id;
+                 if (g_item.is_collocation) {
+                   goods.is_collocation = g_item.is_collocation;
+                 }
               }
+
               break
             case 7:
               goods.prom_type = 7;
@@ -5367,6 +5373,14 @@ Page({
     })
  
   },
+  //看一下有没有选择搭配的商品
+  has_collocation(goods,prom_id){
+       var idx=goods.findIndex(function (e){
+           return e.prom_type==5 && e.prom_id==prom_id && e.is_collocation;
+       })
+       return idx>0;
+  },
+
   //---确认线下门店的数量足不足---
   async check_store_num(goods_id, pick, goods_num, func) {
     var lock = 0, pick_no, plist, erpwareid;