Commit a8ad500c79896b9b26e523b2f0575f7f3f56265d
Merge branch 'dev' into 'test'
Dev See merge request !422
Showing
2 changed files
with
48 additions
and
25 deletions
pages/cart/cart/cart.js
... | ... | @@ -404,6 +404,7 @@ Page({ |
404 | 404 | iarr = item; |
405 | 405 | if (!sele && item.length > 0) { |
406 | 406 | for (var i = 0; i < iarr.length; i++) { |
407 | + if(iarr[i].is_gift==1) continue; | |
407 | 408 | if (iarr[i].distr_type != 0) { |
408 | 409 | if (fir == 0) { |
409 | 410 | fir = iarr[i].distr_type; |
... | ... | @@ -452,6 +453,8 @@ Page({ |
452 | 453 | //当数量大于1,且是选择的时候 |
453 | 454 | if (iarr.length > 1 && !a.selected) { |
454 | 455 | for (var i = 0; i < iarr.length; i++) { |
456 | + if(iarr[i].is_gift==1) continue; | |
457 | + | |
455 | 458 | //---当不是本身选择项目---- |
456 | 459 | var sel = iarr[i].selected; |
457 | 460 | if (iarr[i].distr_type != 0 && (sel || iarr[i].id == a.id)) { | ... | ... |
pages/cart/cart2/cart2.js
... | ... | @@ -445,6 +445,8 @@ Page({ |
445 | 445 | if(num>data['gift_storecount']) num=0; |
446 | 446 | if(num>0){ |
447 | 447 | var ob={}; |
448 | + ob.is_gift=1; | |
449 | + ob.prom_id=data.prom_id; | |
448 | 450 | ob.goods_id=data.gift_goods_id; |
449 | 451 | ob.goods_name=data.gift_goods_name; |
450 | 452 | ob.goods_color=data.gift_goods_color; |
... | ... | @@ -623,6 +625,7 @@ Page({ |
623 | 625 | }else{ |
624 | 626 | c_arr[i].exp_type = th.data.bn_exp_type; //配送方式 |
625 | 627 | c_arr[i].wind = th.data.index; //立即购买选择的物流 |
628 | + //c_arr[i].=th.data. //立即购买的使用余额 | |
626 | 629 | if(th.data.cartlist) c_arr[i].check_quan_price_list= th.data.cartlist[i].check_quan_price_list; //优惠券优惠什么商品价格 |
627 | 630 | if(th.data.cartlist) c_arr[i].check_quan_ware_list= th.data.cartlist[i].check_quan_ware_list; //优惠券优惠什么商品 |
628 | 631 | } |
... | ... | @@ -640,6 +643,10 @@ Page({ |
640 | 643 | } |
641 | 644 | var f_o_price=o_price; |
642 | 645 | var prom_g=th.data.prom_goods_map[pickid]; |
646 | + | |
647 | + //判断包邮券的钱 | |
648 | + var q_conditin=0; | |
649 | + q_conditin=o_price; | |
643 | 650 | //---如果该门店的相关活动,就要算一下减价-- |
644 | 651 | if(th.data.prom_goods_map[pickid]){ |
645 | 652 | var ob=th.data.prom_goods_map[pickid]; |
... | ... | @@ -687,11 +694,8 @@ Page({ |
687 | 694 | item[j].is_past= item_map.is_past; |
688 | 695 | } |
689 | 696 | } |
690 | - | |
691 | - var q_conditin=0; | |
692 | - //判断包邮券的钱 | |
693 | - q_conditin=o_price; | |
694 | - if(!item_map.is_xz_yh) q_conditin=o_price-item_map.price; | |
697 | + //有活动,且优惠活动并没有限制使用优惠券,且有减价 | |
698 | + //if(item_map && !item_map.is_xz_yh && item_map.price) q_conditin=o_price-item_map.price; | |
695 | 699 | //--看有没有减价-- |
696 | 700 | if(item_map.prom_price && item_map.price-item_map.prom_price){ |
697 | 701 | if(cart_item.prom_pt_json){ |
... | ... | @@ -738,7 +742,7 @@ Page({ |
738 | 742 | } |
739 | 743 | } |
740 | 744 | |
741 | - cart_item.goods_price = o_price.toFixed(2); //商品总费用 | |
745 | + cart_item.goods_price = f_o_price.toFixed(2); //商品总费用,用f_o_price来计算 | |
742 | 746 | //计算物流费用 |
743 | 747 | cart_item.shipping_price = 0; |
744 | 748 | |
... | ... | @@ -959,18 +963,33 @@ Page({ |
959 | 963 | cart_item.total_amount= cart_item.total_amount.toFixed(2); |
960 | 964 | cart_item.order_amount=cart_item.order_amount.toFixed(2); |
961 | 965 | |
962 | - //--------------如果使用余额--------------------- | |
963 | - if (th.data.js_use_money == 1) { | |
964 | - if (umoney > cart_item.order_amount) { | |
965 | - cart_item.user_money = cart_item.order_amount; | |
966 | - umoney = umoney - cart_item.order_amount; | |
967 | - }else { | |
968 | - cart_item.user_money = umoney; | |
969 | - umoney=0; | |
970 | - } | |
966 | + //搭配购在使用余额 | |
967 | + if(th.data.bn_use_money==1 && th.data.is_b_now==1){ | |
968 | + | |
969 | + if (umoney > cart_item.order_amount) { | |
970 | + cart_item.user_money = cart_item.order_amount; | |
971 | + umoney = umoney - cart_item.order_amount; | |
972 | + }else { | |
973 | + cart_item.user_money = umoney; | |
974 | + umoney=0; | |
975 | + } | |
976 | + | |
971 | 977 | }else{ |
972 | - cart_item.user_money=0; | |
973 | - } | |
978 | + //--------------如果使用余额,购物车购买--------------------- | |
979 | + if (th.data.js_use_money == 1) { | |
980 | + if (umoney > cart_item.order_amount) { | |
981 | + cart_item.user_money = cart_item.order_amount; | |
982 | + umoney = umoney - cart_item.order_amount; | |
983 | + }else { | |
984 | + cart_item.user_money = umoney; | |
985 | + umoney=0; | |
986 | + } | |
987 | + }else{ | |
988 | + cart_item.user_money=0; | |
989 | + } | |
990 | + } | |
991 | + | |
992 | + | |
974 | 993 | |
975 | 994 | cart_item.user_money = parseFloat(cart_item.user_money).toFixed(2); |
976 | 995 | |
... | ... | @@ -978,9 +997,9 @@ Page({ |
978 | 997 | else cart_item.coupon_price = coupon_price |
979 | 998 | if(quan_no) cart_item.quan_no = quan_no; |
980 | 999 | |
981 | - | |
982 | - cart_item.goods_price = o_price.toFixed(2); | |
983 | - cart_item.order_amount= cart_item.order_amount- cart_item.user_money; //会员使用余额 | |
1000 | + | |
1001 | + //cart_item.goods_price = o_price.toFixed(2); | |
1002 | + cart_item.order_amount= cart_item.order_amount- cart_item.user_money; //会员使用余额 | |
984 | 1003 | |
985 | 1004 | |
986 | 1005 | all_price += parseFloat(f_o_price); |
... | ... | @@ -1050,9 +1069,9 @@ Page({ |
1050 | 1069 | |
1051 | 1070 | var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; |
1052 | 1071 | //-----------当地址不为空,且是物流时,计算物流费用,并同时商品不是优惠活动的包邮---------- |
1053 | - 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){ | |
1072 | + if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past!=1 ){ | |
1054 | 1073 | //看是不是有调用过包邮券 |
1055 | - if(!th.data.isget_by_quan[th.data.bn_pick]){ | |
1074 | + if(!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh!=1){ | |
1056 | 1075 | var condition=allpice-cut_price; |
1057 | 1076 | //--判断要不要显示包邮券,链式调用接口,调取包邮券,已经是减了优惠的金额--- |
1058 | 1077 | getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea",{ |
... | ... | @@ -1440,6 +1459,7 @@ Page({ |
1440 | 1459 | 'store_id': oo.stoid, |
1441 | 1460 | 'is_gift':1, |
1442 | 1461 | 'gift_id':gift_gg.gift_id, |
1462 | + 'prom_id':gift_gg.prom_id, | |
1443 | 1463 | }; |
1444 | 1464 | item.order_goods.push(g_goods); |
1445 | 1465 | } |
... | ... | @@ -1600,7 +1620,7 @@ Page({ |
1600 | 1620 | |
1601 | 1621 | if (pdata.length==0) return; |
1602 | 1622 | var str = JSON.stringify(pdata); |
1603 | - | |
1623 | + | |
1604 | 1624 | wx.showLoading({title: "加载中"}); |
1605 | 1625 | wx.request({ |
1606 | 1626 | url: oo.url + '/api/weshop/order/createWxdOrder', |
... | ... | @@ -2242,7 +2262,6 @@ Page({ |
2242 | 2262 | } |
2243 | 2263 | } |
2244 | 2264 | if(!is_find) arr.push(item); |
2245 | - | |
2246 | 2265 | } |
2247 | 2266 | return arr; |
2248 | 2267 | }, |
... | ... | @@ -2388,9 +2407,9 @@ Page({ |
2388 | 2407 | //如果有限制使用优惠券,就要返回 |
2389 | 2408 | if(gd.prom_type==3){ |
2390 | 2409 | if(th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; |
2391 | - is_xz_yh=0; | |
2392 | 2410 | th.data.prom_goods_map[pickup_id][gd.prom_id].coupon_sele=1; |
2393 | 2411 | } |
2412 | + is_xz_yh=0; | |
2394 | 2413 | var item_price=gd.goods_price*gd.goods_num; |
2395 | 2414 | ckeck_quan_price+=item_price; |
2396 | 2415 | //--组装价格list-- |
... | ... | @@ -2560,6 +2579,7 @@ Page({ |
2560 | 2579 | } |
2561 | 2580 | arr.s_libao=get_data.libao; |
2562 | 2581 | arr.s_lb_num=get_data.lb_num; |
2582 | + arr.prom_id=prom_id; | |
2563 | 2583 | } |
2564 | 2584 | func(arr); |
2565 | 2585 | }) | ... | ... |