Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

WXD-SEASON\season
2 parents 31c4f4d1 4194739c
Showing 1 changed file with 2 additions and 1 deletions
packageC/pages/presell/cart/cart.js
@@ -668,8 +668,9 @@ Page({
                         order_prom_id = ord_prom['id'];
                         switch (ord_prom['type']) {
                             case 0:
+							    var all_1=o_condition;
                                 o_condition = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                order_prom_amount = (o_condition - order_m).toFixed(2);
+                                order_prom_amount = (all_1 - o_condition).toFixed(2);
                                 break;
                             case 1:
                                 o_condition = o_condition - ord_prom['expression'];//满额优惠金额