'结算页显示销售价格,赠品/加价购显示赠品/加价购价格'

@@ -138,8 +138,8 @@ const formatCartGoods = (cartGoods, isAdvanceCart, inValid, isOffShelves, analys
             productNum: Number(it.buy_number),
             storageNum: Number(it.storage_number),
             isSoldOut: parseInt(it.storage_number, 10) === 0 || parseInt(it.off_shelves, 10) === 1, // 已售罄
-            isVipPrice: it.last_vip_price < it.sales_price && it.discount_tag === 'V',
-            isStuPrice: it.last_vip_price < it.sales_price && it.discount_tag === 'S',
+            isVipPrice: it.discount_tag === 'V',
+            isStuPrice: it.discount_tag === 'S',
             yohoIcon: Number(it.get_yoho_coin) || 0,
             productSubtotal: transPrice(it.last_vip_price * it.buy_number),
             promotionId: it.promotion_id || 0,

@@ -95,19 +95,12 @@ const handlePaymentInfo = (d, address) => {
         g.linkToGoods = helper.urlFormat(`/product/pro_${g.product_id}_${g.goods_id}/${g.cn_alphabet}.html`,
             '', 'item');
         g.productPrice = g.sales_price;
-        g.isVipPrice = g.last_vip_price < g.sales_price && g.discount_tag === 'V';
-        g.isStuPrice = g.last_vip_price < g.sales_price && g.discount_tag === 'S';
-
-        // 划线的价格
-        if (g.last_vip_price < g.sales_price) {
-            g.productPrice = g.last_vip_price;
-            g.linePrice = g.sales_price;
-        }
+        g.isVipPrice = g.discount_tag === 'V';
+        g.isStuPrice = g.discount_tag === 'S';
 
         // 赠品、加价购
         if (g.goods_type === 'gift' || g.goods_type === 'price_gift') {
             g.productPrice = g.last_price;
-            g.linePrice = g.sales_price; // 划线的价格
         }
     });
     resData.goodsList = d.goods_list;

@@ -374,8 +374,8 @@ const getOrders = (uid, page, limit, type, isPage)=> {
                 newGood.size = good.size_name;
 
                 newGood.price = good.sales_price;// 默认显示销售价
-                newGood.isVipPrice = good.real_pay_price < good.sales_price && good.discount_tag === 'V';
-                newGood.isStuPrice = good.real_pay_price < good.sales_price && good.discount_tag === 'S';
+                newGood.isVipPrice = good.discount_tag === 'V';
+                newGood.isStuPrice = good.discount_tag === 'S';
 
                 // 划线的价格
                 if (good.real_pay_price < good.sales_price) {
@@ -786,8 +786,8 @@ const _getOrderDetail = co(function * (uid, orderId) {
                     color: good.factory_color_name,
                     size: good.size_name,
                     price: good.sales_price, // 默认显示销售价
-                    isVipPrice: good.real_pay_price < good.sales_price && good.discount_tag === 'V',
-                    isStuPrice: good.real_pay_price < good.sales_price && good.discount_tag === 'S',
+                    isVipPrice: good.discount_tag === 'V',
+                    isStuPrice: good.discount_tag === 'S',
                     coin: good.yoho_give_coin,
                     num: good.buy_number,
                     sum: good.goods_amount,

@@ -149,7 +149,7 @@
                 text-align: left;
                 padding-left: 10px;
                 color: #444;
-                min-height: 19px;
+                min-height: 15px;
                 font-size: 13px;
 
                 .icon-tip-help {

@@ -171,7 +171,7 @@
                 text-align: left;
                 padding-left: 10px;
                 color: #444;
-                min-height: 19px;
+                min-height: 15px;
                 font-size: 13px;
 
                 .icon-tip-help {