wxd / MShopWeApp

Commit 0f38a91a929abadd662eb0076be7b75c5a6fd3f6

Authored by yvan.ni
1 parent 4c79002d

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

2、多赠品控制显示，和运费和订单的叠加
Inline Side-by-side
Showing 1 changed file with 17 additions and 1 deletions
packageE/pages/cart/cart2/cart2.js
  View file @0f38a91
... ... @@ -2200,9 +2200,15 @@ Page({
2200 2200 newd.guide_id=fd_gd.guide_id;
2201 2201 newd.guide_type=fd_gd.guide_type;
2202 2202 newd.distr_type=fd_gd.distr_type;
  2203 + newd.is_order_yh = fd_gd.is_order_yh;
  2204 + newd.is_post_temp = fd_gd.is_post_temp;
2203 2205  
2204 2206 ord_goods.splice(pos+1,0,newd);
2205 2207 th.data.old_cartlist[i].goods.splice(pos2+1,0,newd);
  2208 +
  2209 + var txt9 = "cartlist[" + i + "].goods";
  2210 + th.setData({ [txt9]: ord_goods })
  2211 +
2206 2212 }
2207 2213  
2208 2214 }
... ... @@ -7210,6 +7216,11 @@ Page({
7210 7216 });
7211 7217 var pk_list_goods = alllist[index].goods;
7212 7218  
  7219 +
  7220 + var pos=this.find_pro_last(pk_list_goods,3,item_map.prom_id);
  7221 + var fd_gd=ord_goods[pos]
  7222 +
  7223 +
7213 7224 var url = "/api/weshop/cart/delGift?store_id=" + os.stoid + "&user_id="
7214 7225 + getApp().globalData.user_id + "&is_gift=1&pick_id=" + this.data.gift_pkid + "&prom_id=" + this.data.gf_prom_id;
7215 7226 await getApp().request.promiseDelete(url, {});
... ... @@ -7251,7 +7262,6 @@ Page({
7251 7262 uniform_exp_sum: gf_item.goodsinfo.uniform_exp_sum,
7252 7263 goods_spec: gf_item.goodsinfo.goods_spec,
7253 7264 goods_color: gf_item.goodsinfo.goods_color,
7254   - is_post_temp:1 //赠品暂时的是要包邮运算， 后面和主商品是不是包邮一样
7255 7265 };
7256 7266  
7257 7267 var prom_goods_map=th.data.prom_goods_map[gf_pickup_id];
... ... @@ -7262,6 +7272,12 @@ Page({
7262 7272 newd.is_xz_yh=fd.is_xz_yh;
7263 7273 }
7264 7274  
  7275 + //赠品的优惠要和商品的一样
  7276 + if(fd_gd){
  7277 + newd.is_post_temp=fd.is_post_temp;
  7278 + newd.is_order_yh=fd.is_order_yh;
  7279 + }
  7280 +
7265 7281 //-- 如果是代发商品的时候 --
7266 7282 if (gf_item.goodsinfo.whsle_id) {
7267 7283 newd.whsle_id = gf_item.goodsinfo.whsle_id;
... ...