Merge branch 'release/4.0' into gray

@@ -15,8 +15,11 @@
     <div class="top-filter clearfix">
         <div class="filter-content">
             <ul class="filter-type">
-                <li class="type-item">新品<i class="icon down icon-sort-down"></i></li>
-                <li class="type-item">筛选<i class="icon down icon-sort-down"></i></li>
+                <li
+                    class="type-item"><span class="sort-label">新品<i class="icon down icon-sort-down"></i></span></li>
+                <li
+                    class="type-item"><span class="sort-label">筛选
+                    <i class="icon down icon-sort-down"></i></span></li>
             </ul>
         </div>
     </div>

@@ -39,7 +39,6 @@
 <style>
 .cate-page {
     font-size: 36px;
-    font-family: helvetica, Arial, "黑体";
 
     .cate-container {
     }

@@ -3,8 +3,12 @@
         <div class="filter-overlay" v-show="layFlag" @click="close"></div>
         <div class="filter-content">
             <ul class="filter-type">
-                <li class="type-item" @click="toggleRec">{{activeSort.text}}<i class="icon" :class="recClass"></i></li>
-                <li class="type-item" @click="toggleFilter">筛选<i class="icon" :class="filterClass"></i></li>
+                <li class="type-item" @click="toggleRec">
+                    <span class="sort-label">{{activeSort.text}}<i class="icon" :class="recClass"></i></span>
+                </li>
+                <li class="type-item" @click="toggleFilter">
+                    <span class="sort-label">筛选<i class="icon" :class="filterClass"></i></span>
+                </li>
             </ul>
             <div class="rec-detail" v-show="!recDown">
                 <ul class="re-items">
@@ -144,6 +148,16 @@ export default {
                         text: '推荐',
                         val: '',
                         type: 0
+                    },
+                    s_p_desc: {
+                        text: '价格从高到低',
+                        val: 's_p_desc',
+                        type: 3
+                    },
+                    s_p_asc: {
+                        text: '价格从低到高',
+                        val: 's_p_asc',
+                        type: 3
                     }
                 };
 
@@ -385,10 +399,14 @@ export default {
             }
         }
 
-        .icon {
+        .sort-label {
             position: relative;
+        }
+
+        .icon {
+            position: absolute;
             top: 14px;
-            left: 20px;
+            right: -46px;
             font-size: 40px;
             font-weight: bold;