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

season
2 parents f4721899 62073970
Showing 1 changed file with 13 additions and 0 deletions
utils/more_cx.js
@@ -524,6 +524,19 @@ module.exports = {
                     var all_pri=0;
                     for(var f=0;f<t_goods.length;f++){
                         all_num+=t_goods[f].goods_num;
+
+                        //-- 优惠促销取价的优化 --
+                        let f_price=t_goods[f].goods_price;
+                        if(fd.discount_field!=undefined){
+                            switch (fd.discount_field){
+                                case 0: f_price=t_goods[f].goods_price;break;
+                                case 1: f_price=t_goods[f].shop_price;break;
+                                case 2: f_price=t_goods[f].goods_market_price;break;
+                            }
+                        }
+                        t_goods[f].goods_price=f_price;
+
+
                         all_pri+=t_goods[f].goods_num*t_goods[f].goods_price;
                     }
                     var yh_ok=1;