Commit 04a2dfa6d8d82a9af686d6584221fc0ad7a4ce1c

Authored by yvan.ni
1 parent 09df1ed8

预售的优化

packageC/pages/presell/cart/cart.js
@@ -895,7 +895,7 @@ Page({ @@ -895,7 +895,7 @@ Page({
895 895
896 if (o_condition1 < 0) o_condition1 = 0; 896 if (o_condition1 < 0) o_condition1 = 0;
897 else if(o_condition1>th.data.goods.use_commission && th.data.bn_use_commission){ 897 else if(o_condition1>th.data.goods.use_commission && th.data.bn_use_commission){
898 - o_condition1-=th.data.bn_use_commission; 898 + o_condition1-=th.data.goods.use_commission;
899 } 899 }
900 900
901 th.setData({ exp_price: 0, order_m: o_condition1, show_submit: 1, }) 901 th.setData({ exp_price: 0, order_m: o_condition1, show_submit: 1, })
@@ -905,7 +905,7 @@ Page({ @@ -905,7 +905,7 @@ Page({
905 if (o_condition < 0) o_condition = 0; 905 if (o_condition < 0) o_condition = 0;
906 //if (o_condition1 < 0) o_condition1 = 0; 906 //if (o_condition1 < 0) o_condition1 = 0;
907 else if(o_condition>th.data.goods.use_commission && th.data.bn_use_commission){ 907 else if(o_condition>th.data.goods.use_commission && th.data.bn_use_commission){
908 - o_condition-=th.data.bn_use_commission; 908 + o_condition-=th.data.goods.use_commission;
909 } 909 }
910 910
911 th.setData({ exp_price: 0, order_m: o_condition, show_submit: 1, }) 911 th.setData({ exp_price: 0, order_m: o_condition, show_submit: 1, })
@@ -2315,7 +2315,7 @@ Page({ @@ -2315,7 +2315,7 @@ Page({
2315 } 2315 }
2316 2316
2317 if( th.data.bn_use_commission){ 2317 if( th.data.bn_use_commission){
2318 - the_price-=th.data.bn_use_commission; 2318 + the_price-=th.data.goods.use_commission;
2319 } 2319 }
2320 th.setData({ exp_price: exp_price, order_m: the_price, show_submit: 1, }) 2320 th.setData({ exp_price: exp_price, order_m: the_price, show_submit: 1, })
2321 2321
@@ -2399,7 +2399,7 @@ Page({ @@ -2399,7 +2399,7 @@ Page({
2399 } 2399 }
2400 2400
2401 if(th.data.bn_use_commission){ 2401 if(th.data.bn_use_commission){
2402 - the_price-=th.data.bn_use_commission; 2402 + the_price-=th.data.goods.use_commission;
2403 } 2403 }
2404 2404
2405 th.setData({ exp_price: exp_price, order_m:the_price.toFixed(2), show_submit: 1, }) 2405 th.setData({ exp_price: exp_price, order_m:the_price.toFixed(2), show_submit: 1, })