Merge branch 'feature/orderApportion' into 'release/5.8'

订单列表加价购赠品价格



See merge request !647

@@ -50,12 +50,14 @@ const _formatOrderGoods = (orderGoods, count, haveLink, tickets) => {
         if (value.goods_type === 'gift') {
             Object.assign(goods, {
                 gift: true,
-                salePrice: transPrice(value.sales_price)
+                salePrice: transPrice(value.sales_price),
+                payPrice: value.goods_price
             });
         } else if (value.goods_type === 'price_gift') {
             Object.assign(goods, {
                 advanceBuy: true,
-                salePrice: transPrice(value.sales_price)
+                salePrice: transPrice(value.sales_price),
+                payPrice: value.goods_price
             });
         }
 

@@ -198,12 +198,14 @@ const orderDetailData = (uid, orderCode) => {
                 if (data.goodsType === 'gift') {
                     obj = _.assign(obj, {
                         gift: true,
-                        salePrice: parseFloat(data.salesPrice).toFixed(2)
+                        salePrice: parseFloat(data.salesPrice).toFixed(2),
+                        payPrice: data.goodsPrice
                     });
                 } else if (data.goodsType === 'priceGift') {
                     obj = _.assign(obj, {
                         advanceBuy: true,
-                        salePrice: parseFloat(data.salesPrice).toFixed(2)
+                        salePrice: parseFloat(data.salesPrice).toFixed(2),
+                        payPrice: data.goodsPrice
                     });
                 }