diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 698cb94..a30d88b 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -404,6 +404,7 @@ Page({ iarr = item; if (!sele && item.length > 0) { for (var i = 0; i < iarr.length; i++) { + if(iarr[i].is_gift==1) continue; if (iarr[i].distr_type != 0) { if (fir == 0) { fir = iarr[i].distr_type; @@ -452,6 +453,8 @@ Page({ //当数量大于1，且是选择的时候 if (iarr.length > 1 && !a.selected) { for (var i = 0; i < iarr.length; i++) { + if(iarr[i].is_gift==1) continue; + //---当不是本身选择项目---- var sel = iarr[i].selected; if (iarr[i].distr_type != 0 && (sel || iarr[i].id == a.id)) { diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index b5f4cf1..e673f98 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -445,6 +445,8 @@ Page({ if(num>data['gift_storecount']) num=0; if(num>0){ var ob={}; + ob.is_gift=1; + ob.prom_id=data.prom_id; ob.goods_id=data.gift_goods_id; ob.goods_name=data.gift_goods_name; ob.goods_color=data.gift_goods_color; @@ -623,6 +625,7 @@ Page({ }else{ c_arr[i].exp_type = th.data.bn_exp_type; //配送方式 c_arr[i].wind = th.data.index; //立即购买选择的物流 + //c_arr[i].=th.data. //立即购买的使用余额 if(th.data.cartlist) c_arr[i].check_quan_price_list= th.data.cartlist[i].check_quan_price_list; //优惠券优惠什么商品价格 if(th.data.cartlist) c_arr[i].check_quan_ware_list= th.data.cartlist[i].check_quan_ware_list; //优惠券优惠什么商品 } @@ -640,6 +643,10 @@ Page({ } var f_o_price=o_price; var prom_g=th.data.prom_goods_map[pickid]; + + //判断包邮券的钱 + var q_conditin=0; + q_conditin=o_price; //---如果该门店的相关活动，就要算一下减价-- if(th.data.prom_goods_map[pickid]){ var ob=th.data.prom_goods_map[pickid]; @@ -687,11 +694,8 @@ Page({ item[j].is_past= item_map.is_past; } } - - var q_conditin=0; - //判断包邮券的钱 - q_conditin=o_price; - if(!item_map.is_xz_yh) q_conditin=o_price-item_map.price; + //有活动，且优惠活动并没有限制使用优惠券，且有减价 + //if(item_map && !item_map.is_xz_yh && item_map.price) q_conditin=o_price-item_map.price; //--看有没有减价-- if(item_map.prom_price && item_map.price-item_map.prom_price){ if(cart_item.prom_pt_json){ @@ -738,7 +742,7 @@ Page({ } } - cart_item.goods_price = o_price.toFixed(2); //商品总费用 + cart_item.goods_price = f_o_price.toFixed(2); //商品总费用,用f_o_price来计算 //计算物流费用 cart_item.shipping_price = 0; @@ -959,18 +963,33 @@ Page({ cart_item.total_amount= cart_item.total_amount.toFixed(2); cart_item.order_amount=cart_item.order_amount.toFixed(2); - //--------------如果使用余额--------------------- - if (th.data.js_use_money == 1) { - if (umoney > cart_item.order_amount) { - cart_item.user_money = cart_item.order_amount; - umoney = umoney - cart_item.order_amount; - }else { - cart_item.user_money = umoney; - umoney=0; - } + //搭配购在使用余额 + if(th.data.bn_use_money==1 && th.data.is_b_now==1){ + + if (umoney > cart_item.order_amount) { + cart_item.user_money = cart_item.order_amount; + umoney = umoney - cart_item.order_amount; + }else { + cart_item.user_money = umoney; + umoney=0; + } + }else{ - cart_item.user_money=0; - } + //--------------如果使用余额,购物车购买--------------------- + if (th.data.js_use_money == 1) { + if (umoney > cart_item.order_amount) { + cart_item.user_money = cart_item.order_amount; + umoney = umoney - cart_item.order_amount; + }else { + cart_item.user_money = umoney; + umoney=0; + } + }else{ + cart_item.user_money=0; + } + } + + cart_item.user_money = parseFloat(cart_item.user_money).toFixed(2); @@ -978,9 +997,9 @@ Page({ else cart_item.coupon_price = coupon_price if(quan_no) cart_item.quan_no = quan_no; - - cart_item.goods_price = o_price.toFixed(2); - cart_item.order_amount= cart_item.order_amount- cart_item.user_money; //会员使用余额 + + //cart_item.goods_price = o_price.toFixed(2); + cart_item.order_amount= cart_item.order_amount- cart_item.user_money; //会员使用余额 all_price += parseFloat(f_o_price); @@ -1050,9 +1069,9 @@ Page({ var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮---------- - if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past!=1 && good.is_xz_yh!=1){ + if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past!=1 ){ //看是不是有调用过包邮券 - if(!th.data.isget_by_quan[th.data.bn_pick]){ + if(!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh!=1){ var condition=allpice-cut_price; //--判断要不要显示包邮券,链式调用接口，调取包邮券，已经是减了优惠的金额--- getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea",{ @@ -1440,6 +1459,7 @@ Page({ 'store_id': oo.stoid, 'is_gift':1, 'gift_id':gift_gg.gift_id, + 'prom_id':gift_gg.prom_id, }; item.order_goods.push(g_goods); } @@ -1600,7 +1620,7 @@ Page({ if (pdata.length==0) return; var str = JSON.stringify(pdata); - + wx.showLoading({title: "加载中"}); wx.request({ url: oo.url + '/api/weshop/order/createWxdOrder', @@ -2242,7 +2262,6 @@ Page({ } } if(!is_find) arr.push(item); - } return arr; }, @@ -2388,9 +2407,9 @@ Page({ //如果有限制使用优惠券，就要返回 if(gd.prom_type==3){ if(th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; - is_xz_yh=0; th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele=1; } + is_xz_yh=0; var item_price=gd.goods_price*gd.goods_num; ckeck_quan_price+=item_price; //--组装价格list-- @@ -2560,6 +2579,7 @@ Page({ } arr.s_libao=get_data.libao; arr.s_lb_num=get_data.lb_num; + arr.prom_id=prom_id; } func(arr); })