Merge branch 'develop' into 'develop'

Develop

1：加价购商品添加原价

See merge request !60

@@ -5,15 +5,6 @@
         margin-left: 34rem / $pxConvertRem;
         height: 160rem / $pxConvertRem;
         border-bottom: 1px solid #e0e0e0;
-
-        &:last-child {
-            border-bottom: none;
-        }
-    }
-
-
-    .advance-block .gift-advance-good:last-child {
-        border-bottom: none;
     }
 
     .advance-block:last-child .gift-advance-good:last-child {

@@ -111,6 +111,11 @@
     .price {
         font-size: 0.6rem;
         color: $cartRed;
+        display: inline;
+        .sale-price{
+            color: #b0b0b0;
+            text-decoration: line-through;
+        }
     }
 
     .count {

@@ -140,10 +140,11 @@
 
         > li {
             box-sizing: border-box;
-            height: 90rem / $pxConvertRem;
-            line-height: 90rem / $pxConvertRem;
+            height: 80rem / $pxConvertRem;
+            line-height: 80rem / $pxConvertRem;
             margin-bottom: 10rem / $pxConvertRem;
             padding: 0 20rem / $pxConvertRem;
+            background: #f1f1f1;
 
             &:last-child {
                 margin-bottom: 0;

@@ -41,10 +41,12 @@
                 </p>
             </div>
             <p class="row">
-                <span class="price">
-                    ¥{{price}}
-                </span>
-
+                    <p class="price">
+                        <span class="market-price">¥{{price}}</span>
+                        {{#if isAdvanceBuy}}
+                        <span class="sale-price">¥{{salesPrice}}</span>
+                        {{/if}}
+                    </p>
                 {{#if isVipPrice}}
                     <span class="vip">
                         VIP