wxd / MShopWeApp

Merged
Merge Request #929 · created by 后端研发-苏明海

包邮价格大于等于

From dev into test

Merged by 后端研发-苏明海

1 participants
Inline Side-by-side
Showing 5 changed files
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  Edit  View file @2b78667
... ... @@ -1042,7 +1042,7 @@ Page({
1042 1042 th = this;
1043 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 1046 return 0;
1047 1047 }
1048 1048 if (user_addr == null) {
... ...
packageC/pages/presell/cart/cart2_pre.js
  Edit  View file @2b78667
... ... @@ -706,7 +706,7 @@ Page({
706 706 var price =0,th=this;
707 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 710 if (user_addr==null) { return 0; }
711 711 //计算物流的config item;
712 712 var item=null;
... ...
pages/cart/cart2/cart2.js
  View file @2b78667
... ... @@ -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 890 switch (gd.prom_type) {
891 891 case 0:
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @2b78667
... ... @@ -779,7 +779,7 @@ Page({
779 779 var price =0,th=this;
780 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 783 if (user_addr==null) { return 0; }
784 784 //计算物流的config item;
785 785 var item=null;
... ...
pages/cart/cart_wk/cart_wk.js
  View file @2b78667
... ... @@ -470,7 +470,7 @@ Page({
470 470 var price = 0, th = this;
471 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 474 if (user_addr == null) { return 0; }
475 475 //计算物流的config item;
476 476 var item = null;
... ...