Commit a76a80689580c50234a3bbbb495aeb6e672412e8
Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa
Showing
1 changed file
with
13 additions
and
0 deletions
utils/more_cx.js
| @@ -524,6 +524,19 @@ module.exports = { | @@ -524,6 +524,19 @@ module.exports = { | ||
| 524 | var all_pri=0; | 524 | var all_pri=0; |
| 525 | for(var f=0;f<t_goods.length;f++){ | 525 | for(var f=0;f<t_goods.length;f++){ |
| 526 | all_num+=t_goods[f].goods_num; | 526 | all_num+=t_goods[f].goods_num; |
| 527 | + | ||
| 528 | + //-- 优惠促销取价的优化 -- | ||
| 529 | + let f_price=t_goods[f].goods_price; | ||
| 530 | + if(fd.discount_field!=undefined){ | ||
| 531 | + switch (fd.discount_field){ | ||
| 532 | + case 0: f_price=t_goods[f].goods_price;break; | ||
| 533 | + case 1: f_price=t_goods[f].shop_price;break; | ||
| 534 | + case 2: f_price=t_goods[f].goods_market_price;break; | ||
| 535 | + } | ||
| 536 | + } | ||
| 537 | + t_goods[f].goods_price=f_price; | ||
| 538 | + | ||
| 539 | + | ||
| 527 | all_pri+=t_goods[f].goods_num*t_goods[f].goods_price; | 540 | all_pri+=t_goods[f].goods_num*t_goods[f].goods_price; |
| 528 | } | 541 | } |
| 529 | var yh_ok=1; | 542 | var yh_ok=1; |