Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -81,7 +81,6 @@
             list-style: none;
             list-style: none;
             border: none;
             border: none;
             margin-left: 18px;
             margin-left: 18px;
-            margin-top: 30px;
             margin-bottom: 0;
             margin-bottom: 0;
             padding: 0;
             padding: 0;
             max-width: 600px;
             max-width: 600px;
@@ -92,11 +91,13 @@
         }
         }
 
 
         section {
         section {
+            margin-top: 30px;
 
 
             h4 {
             h4 {
-                margin: 0;
+                float: left;
+                margin-top: 20px;
                 font-size: 25px;
                 font-size: 25px;
-                line-height: 80px;
+                line-height: 88px;
                 display: inline-block;
                 display: inline-block;
             }
             }
 
 

@@ -218,6 +218,7 @@
     .filter-cate-label {
     .filter-cate-label {
         font-size: 36px;
         font-size: 36px;
         font-weight: bold;
         font-weight: bold;
+        font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;
     }
     }
 
 
     .filter-cate-val {
     .filter-cate-val {

@@ -15,7 +15,7 @@
                             <span class="title line-clamp-2">{{item.title}}</span>
                             <span class="title line-clamp-2">{{item.title}}</span>
                             <div class="fav-price">
                             <div class="fav-price">
                                 <span class="new-price" v-if="item.discountPrice">{{item.discountPrice}}</span>
                                 <span class="new-price" v-if="item.discountPrice">{{item.discountPrice}}</span>
-                                <!--<span class="{{ item.discountPrice ? 'price-underline' : ''}}">{{item.price}}</span>-->
+                                <span class="{{ item.discountPrice ? 'price-underline' : ''}}">{{item.price}}</span>
                             </div>
                             </div>
                             <br/>
                             <br/>
                             <div class="save-price">
                             <div class="save-price">

@@ -266,7 +266,6 @@
         i.price {
         i.price {
             color: #b0b0b0;
             color: #b0b0b0;
             font-size: 32px;
             font-size: 32px;
-            font-weight: lighter;
             font-style: normal;
             font-style: normal;
 
 
             &.strike-through {
             &.strike-through {
@@ -288,7 +287,7 @@
         .control-button {
         .control-button {
             min-width: 100px;
             min-width: 100px;
             border: none;
             border: none;
-            border-top: 1px solid #ccc;
+            border-top: 1px solid #eee;
             width: 187.5px;
             width: 187.5px;
             float: left;
             float: left;
             display: block;
             display: block;
@@ -299,7 +298,7 @@
         }
         }
 
 
         .control-button:first-child {
         .control-button:first-child {
-            border-right: 1px solid #ccc;
+            border-right: 1px solid #eee;
         }
         }
 
 
         .button-solid {
         .button-solid {