diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 6f81160..2aa8069 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1960,11 +1960,11 @@ Page({
 
           //--------循环计算商品是不是包邮，是不是使用优惠券,此时循环是商品从表-----------
           for (var j = 0; j < ord_goods.length; j++) {
-            if (ord_goods[j].is_gift) continue;
             if (ord_goods[j].whsle_id) continue;
             if (ord_goods[j].prom_type == 3 && ord_goods[j].prom_id == item_map.prom_id) {
               ord_goods[j].is_xz_yh = ord_goods[j].is_xz_yh ? ord_goods[j].is_xz_yh : item_map.is_xz_yh;
               ord_goods[j].is_past = item_map.is_past;
+              if (ord_goods[j].is_gift) continue;  //赠品不平摊
               ord_goods[j].account_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_fir;
               ord_goods[j].account_yu_fir = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account_yu_fir;
               ord_goods[j].account = th.item_map_get_goods(ord_goods[j].goods_id, item_map).account;
@@ -6563,6 +6563,14 @@ Page({
           is_post_temp:1 //赠品暂时的是要包邮运算， 后面和主商品是不是包邮一样
         };
 
+        var  prom_goods_map=th.data.prom_goods_map[gf_pickup_id];
+        var fd=prom_goods_map[th.data.gf_prom_id];
+
+        if(fd){
+          newd.is_past=fd.is_past;
+          newd.is_xz_yh=fd.is_xz_yh;
+        }
+
         //-- 如果是代发商品的时候 --
         if (gf_item.goodsinfo.whsle_id) {
           newd.whsle_id = gf_item.goodsinfo.whsle_id;