Commit 2b78667afd1c86adea0876f3576c31b138b0cc88
1 parent
251a46db
包邮价格大于等于
Showing
5 changed files
with
6 additions
and
6 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| @@ -1042,7 +1042,7 @@ Page({ | @@ -1042,7 +1042,7 @@ Page({ | ||
| 1042 | th = this; | 1042 | th = this; |
| 1043 | price += parseFloat(o_shipping_price); | 1043 | price += parseFloat(o_shipping_price); |
| 1044 | //如果是包邮 | 1044 | //如果是包邮 |
| 1045 | - if (freight_free > 0 && o_price > freight_free) { | 1045 | + if (freight_free > 0 && o_price >= freight_free) { |
| 1046 | return 0; | 1046 | return 0; |
| 1047 | } | 1047 | } |
| 1048 | if (user_addr == null) { | 1048 | if (user_addr == null) { |
packageC/pages/presell/cart/cart2_pre.js
| @@ -706,7 +706,7 @@ Page({ | @@ -706,7 +706,7 @@ Page({ | ||
| 706 | var price =0,th=this; | 706 | var price =0,th=this; |
| 707 | price +=parseFloat(o_shipping_price); | 707 | price +=parseFloat(o_shipping_price); |
| 708 | //如果是包邮 | 708 | //如果是包邮 |
| 709 | - if (freight_free > 0 && o_price > freight_free){ return 0;} | 709 | + if (freight_free > 0 && o_price >= freight_free){ return 0;} |
| 710 | if (user_addr==null) { return 0; } | 710 | if (user_addr==null) { return 0; } |
| 711 | //计算物流的config item; | 711 | //计算物流的config item; |
| 712 | var item=null; | 712 | var item=null; |
pages/cart/cart2/cart2.js
| @@ -884,8 +884,8 @@ Page({ | @@ -884,8 +884,8 @@ Page({ | ||
| 884 | } | 884 | } |
| 885 | 885 | ||
| 886 | 886 | ||
| 887 | - gd.prom_type=gg.prom_type; | ||
| 888 | - gd.prom_id=gg.prom_id; | 887 | + gd.prom_type=gg.prom_type?gg.prom_type:0; |
| 888 | + gd.prom_id=gg.prom_id?gg.prom_id:0; | ||
| 889 | 889 | ||
| 890 | switch (gd.prom_type) { | 890 | switch (gd.prom_type) { |
| 891 | case 0: | 891 | case 0: |
pages/cart/cart2_pt/cart2_pt.js
| @@ -779,7 +779,7 @@ Page({ | @@ -779,7 +779,7 @@ Page({ | ||
| 779 | var price =0,th=this; | 779 | var price =0,th=this; |
| 780 | price +=parseFloat(o_shipping_price); | 780 | price +=parseFloat(o_shipping_price); |
| 781 | //如果是包邮 | 781 | //如果是包邮 |
| 782 | - if (freight_free > 0 && o_price > freight_free){ return 0;} | 782 | + if (freight_free > 0 && o_price >= freight_free){ return 0;} |
| 783 | if (user_addr==null) { return 0; } | 783 | if (user_addr==null) { return 0; } |
| 784 | //计算物流的config item; | 784 | //计算物流的config item; |
| 785 | var item=null; | 785 | var item=null; |
pages/cart/cart_wk/cart_wk.js
| @@ -470,7 +470,7 @@ Page({ | @@ -470,7 +470,7 @@ Page({ | ||
| 470 | var price = 0, th = this; | 470 | var price = 0, th = this; |
| 471 | price += parseFloat(o_shipping_price); | 471 | price += parseFloat(o_shipping_price); |
| 472 | //如果是包邮 | 472 | //如果是包邮 |
| 473 | - if (freight_free > 0 && o_price > freight_free) { return 0; } | 473 | + if (freight_free > 0 && o_price >= freight_free) { return 0; } |
| 474 | if (user_addr == null) { return 0; } | 474 | if (user_addr == null) { return 0; } |
| 475 | //计算物流的config item; | 475 | //计算物流的config item; |
| 476 | var item = null; | 476 | var item = null; |