Commit 7485cbc30ae4ab90098e466d9221893e69a52ed7
1 parent
f4e6ae87
拼团和预售的运费问题
Showing
2 changed files
with
4 additions
and
2 deletions
packageC/pages/presell/cart/cart2.js
| @@ -700,7 +700,8 @@ Page({ | @@ -700,7 +700,8 @@ Page({ | ||
| 700 | 700 | ||
| 701 | if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { | 701 | if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { |
| 702 | if (item['exp_sum_type'] == 2) { | 702 | if (item['exp_sum_type'] == 2) { |
| 703 | - cut_good_weight += item['weight'] * item['buynum']; | 703 | + cut_good_weight += item['weight'] * item['buynum']; |
| 704 | + goods_weight += item['weight'] * item['buynum']; | ||
| 704 | } | 705 | } |
| 705 | if (back_data.weight_free > 0) { | 706 | if (back_data.weight_free > 0) { |
| 706 | out_of_weight = (back_data.weight_free * 1000) - cut_good_weight; | 707 | out_of_weight = (back_data.weight_free * 1000) - cut_good_weight; |
pages/cart/cart2_pt/cart2_pt.js
| @@ -431,7 +431,8 @@ Page({ | @@ -431,7 +431,8 @@ Page({ | ||
| 431 | 431 | ||
| 432 | if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { | 432 | if (back_data && back_data['is_by_all'] && (!back_data.no_free_goods || back_data.no_free_goods.indexOf(item.goods_id) == -1)) { |
| 433 | if (item['exp_sum_type'] == 2) { | 433 | if (item['exp_sum_type'] == 2) { |
| 434 | - cut_good_weight += item['weight'] * item['buynum']; | 434 | + cut_good_weight += item['weight'] * item['buynum']; |
| 435 | + goods_weight += item['weight'] * item['buynum']; | ||
| 435 | } | 436 | } |
| 436 | if (back_data.weight_free > 0) { | 437 | if (back_data.weight_free > 0) { |
| 437 | out_of_weight = (back_data.weight_free * 1000) - cut_good_weight; | 438 | out_of_weight = (back_data.weight_free * 1000) - cut_good_weight; |