Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -120,7 +120,7 @@ const list = (req, res) => {
                     {
                         link: 'http://www.yohoblk.com/editorial',
                         pathTitle: '资讯',
-                        name: '资讯'
+                        name: 'Editorial资讯'
                     },
                     {
                         pathTitle: '资讯',
@@ -185,7 +185,7 @@ const detail = (req, res, next) => {
                     {
                         link: 'http://www.yohoblk.com/editorial',
                         pathTitle: '资讯',
-                        name: '资讯'
+                        name: 'Editorial资讯'
                     },
                     {
                         pathTitle: '资讯',

@@ -38,9 +38,12 @@ const list = {
                 let nav = [DataHelper.getChannelNav(channel)];
 
                 if (data.filter) {
+                    data.filter.standard = data.standard;
                     data.filter.groupSort = DataHelper.sortConvert(allSort.data.sort);
                     retData.filter = DataHelper.filterHandle(data.filter, q);
                     retData.filter.showPrice = data.total > 10;
+                    retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
+                        || (data.standard && data.standard.length > 0);  //eslint-disable-line
                     nav = _.concat(nav, retData.filter.nav);
                 }
 
@@ -96,9 +99,12 @@ const list = {
                     let data = camelCase(listData.data);
 
                     if (data.filter) {
+                        data.filter.standard = data.standard;
                         data.filter.groupSort = DataHelper.sortConvert(sortData.data.sort);
                         retData.filter = DataHelper.filterHandle(data.filter, q);
                         retData.filter.showPrice = data.total > 10;
+                        retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
+                            || (data.standard && data.standard.length > 0);  //eslint-disable-line
                     }
 
                     retData.navPath = {

@@ -29,9 +29,7 @@ const Query = {
             query: query
         };
 
-        Promise.all([Search.queryAllSort({
-            query: query
-        }), Search.queryProduct(q)]).then(allResult => {
+        Promise.all([Search.queryAllSort(q), Search.queryProduct(q)]).then(allResult => {
             let allSort = camelCase(allResult[0]);
             let result = allResult[1];
 
@@ -51,7 +49,6 @@ const Query = {
                     retData.filter.showInfo = (retData.filter.style && retData.filter.style.length > 0)
                         || (data.standard && data.standard.length > 0);  //eslint-disable-line
 
-                    console.log(retData.filter.standard);
                 }
 
                 retData.navPath = {

@@ -134,9 +134,12 @@ const shop = {
                             if (!hasBrand) {
                                 delete q.brand;
                             }
+                            ret.filter.standard = ret.standard;
                             ret.filter.groupSort = DataHelper.sortConvert(allSort.data.sort);
                             data.filter = DataHelper.filterHandle(ret.filter, q);
                             data.filter.showPrice = ret.total > 10;
+                            data.filter.showInfo = (data.filter.style && data.filter.style.length > 0)
+                                || (ret.standard && ret.standard.length > 0);  //eslint-disable-line
                         }
 
                         data.paginationData = {

@@ -91,6 +91,12 @@ const Search = {
         return api.get('', finalParams);
     },
     queryAllSort(params) {
+
+        params = _.clone(params);
+
+        delete params.msort;
+        delete params.misort;
+
         return api.get('', _.assign({
             method: 'web.regular.groupsort'
         }, params), {code: 200});

@@ -115,12 +115,17 @@
             height: 30px;
         }
 
+        .table-body {
+            height: 53px;
+        }
+
         .table-body td {
             padding: 8px 0 8px 10px;
         }
 
         .select-row {
             border: solid 2px black;
+            height: 54px;
         }
 
         .width-name {

@@ -11,7 +11,7 @@
 
         .toggle-chk {
             span {
-                font-weight: bold;
+                font-weight: normal;
             }
             .not-checked {
                 color: #999;
@@ -39,7 +39,7 @@
 
         .iconfont {
             font-size: 16px;
-            line-height: 16px;
+            line-height: 18px;
         }
 
         .item {

@@ -63,9 +63,6 @@ $hoverColor: #379ed6;
             }
 
             .toggle-chk-item {
-                span {
-                    font-weight: bold;
-                }
                 .not-checked {
                     color: #999;
                 }

@@ -6,9 +6,6 @@
         padding: 30px;
         border: 1px solid #eee;
         .toggle-chk {
-            span {
-                font-weight: bold;
-            }
             .not-checked {
                 color: #999;
             }