Merge branch 'release/3.0' of http://git.yoho.cn/fe/yohoblk-wap into release/3.0

@@ -33,11 +33,11 @@
                         <h2 class="card-label">
                             <a class="line-clamp-1">{{product_name}}</a>
                         </h2>
-                        <span class="good-price {{#if market_price}}sale-price{{/if}}">¥ {{toFixed sales_price
+                        <span class="good-price {{#if market_price}}sale-price{{/if}}">¥{{toFixed sales_price
                             2}}</span>
                         {{#if market_price}}
                         <span class="good-price old-price">
-                            ¥ {{toFixed market_price 2}}
+                            ¥{{toFixed market_price 2}}
                         </span>
                         {{/if}}
                     </div>

@@ -206,7 +206,6 @@ export default {
 
         .add-btn {
             background-color: #b0b0b0;
-            border-color: #b0b0b0;
         }
     }
 
@@ -267,7 +266,6 @@ export default {
         text-align: center;
         line-height: 82px;
         background-color: #000;
-        border: 1px solid #7a7a7a;
     }
 }
 </style>

@@ -14,8 +14,8 @@
                     <h2 class="card-label-desc" v-if="item.product_name1">
                         <a v-good-href="item" class="line-clamp-1">{{item.product_name}}</a>
                     </h2>
-                    <span class="good-price" :class="{'sale-price': item.market_price}">¥ {{item.sales_price | toFixed}}</span>
-                    <span class="good-price" :class="{'old-price': item.market_price}" v-if="item.market_price">¥ {{item.market_price | toFixed}}</span>
+                    <span class="good-price" :class="{'sale-price': item.market_price}">¥{{item.sales_price | toFixed}}</span>
+                    <span class="good-price" :class="{'old-price': item.market_price}" v-if="item.market_price">¥{{item.market_price | toFixed}}</span>
                 </div>
             </li>
         </ul>
@@ -106,6 +106,7 @@
             min-height: 180px;
             padding-top: 40px;
             font-size: 0;
+            font-family: "BrownStd", "PingFang SC", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;
         }
 
         .card-label {

@@ -29,6 +29,7 @@
         color: #000;
         text-align: left;
         line-height: 80px;
+        font-family: "BrownStd", "PingFang SC", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;
     }
 
     .list-wrap {

@@ -148,6 +148,9 @@
     };
 </script>
 <style>
+    .top-filter {
+        border-top: none;
+    }
     .list-items {
         background-color: #fff;
         padding-top: 105px;