结算页

@@ -13,6 +13,4 @@
         </p>
         </p>
         <span class="chose">选择</span>
         <span class="chose">选择</span>
     </div>
     </div>
-
-
 </div>
 </div>

@@ -28,6 +28,12 @@
         <p class="limit">不支持7天无理由退换货</p>
         <p class="limit">不支持7天无理由退换货</p>
         {{/if}}
         {{/if}}
         <p class="row price-wrap">
         <p class="row price-wrap">
+            {{#if isVipPrice}}
+            <span class="fill-text">VIP</span>
+            {{/if}}
+            {{#if isStudebt}}
+            <span class="fill-text">学</span>
+            {{/if}}
             <span class="price">
             <span class="price">
                 ¥{{round price 2}}
                 ¥{{round price 2}}
             </span>
             </span>

@@ -429,7 +429,7 @@
 
 
         .name {
         .name {
             font-size: 32px;
             font-size: 32px;
-            max-width: 70%;
+            max-width: 65%;
             overflow: hidden;
             overflow: hidden;
             text-overflow: ellipsis;
             text-overflow: ellipsis;
             display: -webkit-box;
             display: -webkit-box;
@@ -458,6 +458,16 @@
             text-align: right;
             text-align: right;
         }
         }
 
 
+        .fill-text {
+            padding: 0.05rem 0.3rem;
+            color: #fff;
+            font-size: 0.625rem;
+            line-height: 0.75rem;
+            border-radius: 0.75rem;
+            display: inline-block;
+            background-color: #e01;
+        }
+
         .price {
         .price {
             color: #e01;
             color: #e01;
         }
         }

@@ -96,6 +96,7 @@ const formatCartGoods = (goodData, isAdvanceCart, isValid, inValidLow) => {
     if (typeof inValidLow === 'undefined') {
     if (typeof inValidLow === 'undefined') {
         inValidLow = false;
         inValidLow = false;
     }
     }
+
     let result = {
     let result = {
         id: goodData.product_sku,
         id: goodData.product_sku,
         skn: goodData.product_skn,
         skn: goodData.product_skn,

@@ -171,8 +171,10 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
             obj.color = good.color_name;
             obj.color = good.color_name;
             obj.size = good.size_name;
             obj.size = good.size_name;
             obj.count = good.buy_number;
             obj.count = good.buy_number;
-            obj.price = good.last_price;
+            obj.price = good.sales_price;
             obj.isLimitSkn = good.is_limit_skn === 'Y';
             obj.isLimitSkn = good.is_limit_skn === 'Y';
+            obj.isVipPrice = good.sales_price !== good.last_vip_price && good.discount_tag === 'V';
+            obj.isStudebt = good.sales_price !== good.last_vip_price && good.discount_tag === 'S';
 
 
             if (good.good_type === 'gift' && good.is_advance === 'Y') {
             if (good.good_type === 'gift' && good.is_advance === 'Y') {
                 obj.gift = true;
                 obj.gift = true;
@@ -182,6 +184,10 @@ function tranformPayment(data, orderInfo, cartType, skuList, orderComputeData) {
                 obj.price = good.sale_price;
                 obj.price = good.sale_price;
             }
             }
 
 
+            if (good.goods_type === 'gift' || good.goods_type === 'price_gift') {
+                obj.price = good.last_price;
+            }
+
             // Total Price
             // Total Price
             goodsPrice += obj.count * obj.price;
             goodsPrice += obj.count * obj.price;