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

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

@@ -31,8 +31,11 @@
     let locationQuery = qs(decodeURIComponent(location.search.replace(/^\?/, '')));
     let hasSort = !!locationQuery.sort;
 
+    // filter 字段 对应 的 查询 字段
     const aliasMap = {
-        groupSort: 'sort'
+        groupSort: 'sort',
+        priceRange: 'price',
+        discount: 'p_d'
     };
 
     module.exports = {
@@ -97,15 +100,12 @@
 
                 let filter = {};
                 $.each(this.selected, (type, item) => {
-                    if (item.id) {
-                        filter[type] = item.id;
-                    }
+                    filter[type] = item.id;
                 });
 
                 let query;
                 query = $.extend({}, locationQuery, filter);
                 query = $.param(query);
-
                 if (history.replaceState) {
                     history.replaceState({}, '', location.pathname + '?'+ query);
                 }
@@ -218,6 +218,7 @@
     .filter-cate-label {
         font-size: 36px;
         font-weight: bold;
+        font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "\9ED1\4F53", Arial;
     }
 
     .filter-cate-val {

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

@@ -79,7 +79,7 @@
                 return $.get(this.url, Object.assign({
                     order: this.order,
                     page: nextPage
-                }, this.filter, locationQuery))
+                }, locationQuery, this.filter))
                     .done(res => {
                         if (res.data) {
                             self.page = res.data.page;

@@ -72,7 +72,7 @@
                 this.inSearching = true;
                 return $.get(this.url, Object.assign({
                     page: nextPage
-                }, this.filter, locationQuery))
+                }, locationQuery, this.filter))
                     .done(res => {
                         if (res.code === 200) {
                             self.page = res.data.page;

@@ -123,7 +123,7 @@
                 this.inSearching = true;
                 $.get(this.url, Object.assign({
                     page: nextPage
-                }, this.filter, locationQuery)).done(result => {
+                }, locationQuery, this.filter)).done(result => {
                     if (result.code === 200) {
                         self.page = result.data.page;
                         self.totalPage = result.data.pageTotal;