diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index b548567..64844de 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -963,23 +963,6 @@ Page({
       //如果有购买活动
       item1.promgoodsbuynum = promgoodsbuynum;
 
-      //默认是包邮和优惠的
-      item1.is_order_yh=1;
-      item1.is_post_temp=1;
-
-      //如果是秒杀,团购的时候
-      if([1,2,3,6].indexOf(item1.prom_type)>-1){
-        var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
-            + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
-        await app.request.promiseGet(url,{}).then(res=>{
-          if(res.data.code==0){
-            console.log(res.data.data,"111");
-            item1.is_order_yh=res.data.data.is_order_yh;
-            item1.is_post_temp=res.data.data.is_post_temp;
-          }
-        })
-      }
-
       if(is_change){
         carr[i].collocationList=null;
       }
@@ -1415,6 +1398,23 @@ Page({
           }
         }
 
+        //默认是包邮和优惠的
+        item1.is_order_yh=1;
+        item1.is_post_temp=1;
+        //如果是秒杀,团购的时候,优惠促销和搭配购的时候
+        if([1,2,3,5,6].indexOf(item1.prom_type)>-1){
+          var url= "/api/weshop/activitylist/getSJGoodsPriceNew/" + os.stoid
+              + "/" + item1.goods_id + "/"+item1.prom_type+"/" + item1.prom_id + "/" + app.globalData.user_id;
+          await app.request.promiseGet(url,{}).then(res=>{
+            if(res.data.code==0){
+              console.log(res.data.data,"111");
+              item1.is_order_yh=res.data.data.is_order_yh;
+              item1.is_post_temp=res.data.data.is_post_temp;
+            }
+          })
+        }
+
+
       }
 
 
@@ -2915,7 +2915,7 @@ Page({
         o_price += item[jc].goods_price * item[jc].goods_num;
 
         //--- 秒杀, 团购的时候，判断有没有订单优惠和包邮模板的叠加 ---
-        if( [1,2,3,6].indexOf(item[jc].prom_type)>-1){
+        if( [1,2,3,5,6].indexOf(item[jc].prom_type)>-1){
 
           var gd_price=item[jc].goods_price;
           if(item[jc].account_fir) gd_price=item[jc].account_fir;