1、单赠品控制显示，和运费和订单的叠加

2、多赠品控制显示，和运费和订单的叠加

1、单赠品控制显示，和运费和订单的叠加
2、多赠品控制显示，和运费和订单的叠加
yvan.ni
1 parent 4c79002d
Showing 1 changed file with 17 additions and 1 deletions
packageE/pages/cart/cart2/cart2.js
@@ -2200,9 +2200,15 @@ Page({
               newd.guide_id=fd_gd.guide_id;
               newd.guide_type=fd_gd.guide_type;
               newd.distr_type=fd_gd.distr_type;
+              newd.is_order_yh = fd_gd.is_order_yh;
+              newd.is_post_temp = fd_gd.is_post_temp;
               ord_goods.splice(pos+1,0,newd);
               th.data.old_cartlist[i].goods.splice(pos2+1,0,newd);
+
+              var txt9 = "cartlist[" + i + "].goods";
+              th.setData({ [txt9]: ord_goods })
+
           }
       }
@@ -7210,6 +7216,11 @@ Page({
       });
       var pk_list_goods = alllist[index].goods;
+
+      var pos=this.find_pro_last(pk_list_goods,3,item_map.prom_id);
+      var fd_gd=ord_goods[pos]
+
+
       var url = "/api/weshop/cart/delGift?store_id=" + os.stoid + "&user_id="
         + getApp().globalData.user_id + "&is_gift=1&pick_id=" + this.data.gift_pkid + "&prom_id=" + this.data.gf_prom_id;
       await getApp().request.promiseDelete(url, {});
@@ -7251,7 +7262,6 @@ Page({
           uniform_exp_sum: gf_item.goodsinfo.uniform_exp_sum,
           goods_spec: gf_item.goodsinfo.goods_spec,
           goods_color: gf_item.goodsinfo.goods_color,
-          is_post_temp:1 //赠品暂时的是要包邮运算， 后面和主商品是不是包邮一样
         };
         var  prom_goods_map=th.data.prom_goods_map[gf_pickup_id];
@@ -7262,6 +7272,12 @@ Page({
           newd.is_xz_yh=fd.is_xz_yh;
         }
+        //赠品的优惠要和商品的一样
+        if(fd_gd){
+          newd.is_post_temp=fd.is_post_temp;
+          newd.is_order_yh=fd.is_order_yh;
+        }
+
         //-- 如果是代发商品的时候 --
         if (gf_item.goodsinfo.whsle_id) {
           newd.whsle_id = gf_item.goodsinfo.whsle_id;