Commit b70d396ae98857a803e3bbd21142e388dcb981c3

Authored by WXD-SEASON\season
2 parents b5e71fa1 268d0461

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

packageE/pages/cart/cart_wk/cart_wk.js
@@ -554,7 +554,7 @@ Page({ @@ -554,7 +554,7 @@ Page({
554 switch (ord_prom['type']) { 554 switch (ord_prom['type']) {
555 case 0: 555 case 0:
556 allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 556 allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
557 - order_prom_amount = (o_condition - order_m).toFixed(2); 557 + order_prom_amount = (o_condition - allpice).toFixed(2);
558 break; 558 break;
559 case 1: 559 case 1:
560 //-- 如果有优惠促销倍减的时候 -- 560 //-- 如果有优惠促销倍减的时候 --