Commit 4fa642d520581e9dca6394179c564f6517cd7989
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
1 changed file
with
2 additions
and
1 deletions
packageC/pages/presell/cart/cart.js
| @@ -668,8 +668,9 @@ Page({ | @@ -668,8 +668,9 @@ Page({ | ||
| 668 | order_prom_id = ord_prom['id']; | 668 | order_prom_id = ord_prom['id']; |
| 669 | switch (ord_prom['type']) { | 669 | switch (ord_prom['type']) { |
| 670 | case 0: | 670 | case 0: |
| 671 | + var all_1=o_condition; | ||
| 671 | o_condition = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 | 672 | o_condition = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 |
| 672 | - order_prom_amount = (o_condition - order_m).toFixed(2); | 673 | + order_prom_amount = (all_1 - o_condition).toFixed(2); |
| 673 | break; | 674 | break; |
| 674 | case 1: | 675 | case 1: |
| 675 | o_condition = o_condition - ord_prom['expression'];//满额优惠金额 | 676 | o_condition = o_condition - ord_prom['expression'];//满额优惠金额 |