Merge branch 'release/1.0'

@@ -17,22 +17,26 @@ const index = (req, res, next) => {
     let contentCode = '';
     let name = '';
     let link = '';
+    let gender = '';
 
     if (channel === 'women') {
         contentCode = '527079e6c46d0f125eb46b835968971b';
         name = 'WOMEN首页';
         link = 'http://www.yohoblk.com/women';
         channel = 302;
+        gender = '2,3';
     } else if (channel === 'lifestyle') {
         contentCode = '94b5ed607b6d565ffc29c2c04be121dc';
         name = 'LIFT STYLE首页';
         link = 'http://www.yohoblk.com/lifestyle';
         channel = 303;
+        gender = '1,2,3';
     } else {
         contentCode = '81886aaa5e82e3741bc1ba1e04ec7706';
         name = 'MEN首页';
         link = 'http://www.yohoblk.com';
         channel = 301;
+        gender = '1,3';
     }
 
     let appType = 1;
@@ -55,6 +59,7 @@ const index = (req, res, next) => {
                         name: 'Brand品牌'
                     }
                 ],
+                gender: gender,
                 tabs: result.tabs,
                 category: result.category
             }

@@ -5,7 +5,7 @@
             <ul class="clearfix">
                 {{#each brands}}
                 <li>
-                    <a data-key="{{key}}" href="{{brandDomain}}" target="_blank">
+                    <a data-key="{{key}}" href="{{brandDomain}}?gender={{@root.brand.gender}}" target="_blank">
                         <img class="lazy" data-original="{{image brandIco 270 190}}">
                         <span>{{#if brandName}}{{brandName}}{{else}}{{brandNameEn}}{{/if}}</span>
                     </a>

@@ -17,4 +17,3 @@
 
 {{/ editorialList}}
 </div>
-{{log pathTitle}}
\ No newline at end of file

@@ -141,10 +141,11 @@ const favorite = {
                 retData.brandList = data.brandList;
 
                 if (retData.brandList) {
-                    retData.brandList.forEach(b => {
+                    _.each(retData.brandList, b => {
+
                         if (b.newProduct && b.newProduct.length > 0) {
                             b.newProduct.forEach(p => {
-                                p.url = `${config.siteUrl}/product/pro_${p.productId}_${p.goods[0].id}/${p.cnAlphabet}.html`; // eslint-disable-line
+                                p.url = `${config.siteUrl}/product/pro_${p.productId}_${p.goods[0].id}/${p.cnAlphabet}.html`; // eslint-disable-line
                             });
                             b.newProduct.push({
                                 more: true

@@ -88,6 +88,8 @@ exports.createPagination = function(pagination, options) {
         }
     }
 
+    queryParams = encodeURI(queryParams);
+
     template = '<div class="' + paginationClass + '">';
 
     // ========= Previous Button ===============

@@ -348,7 +348,7 @@
             width: 360px;
             padding: 6px 0 16px;
             font-size: 14px;
-            top: 50px;
+            top: 44px;
             right: 0;
             position: absolute;
             background: #1b1b1b;
@@ -417,7 +417,7 @@
         left: 0;
         display: none;
         z-index: 10;
-        top: 180px;
+        top: 174px;
 
         dl {
             float: left;

@@ -39,16 +39,16 @@
     }
 
     i {
-        font-size: 12px;
+        font-size: 14px;
         position: relative;
-        top:-1px;
+        top: -1px;
     }
 
     .pre-page,
     .next-page {
-        line-height: 24px;
+        line-height: 23px;
         width: 26px;
-        height:26px;
+        height: 26px;
         font-weight: 700;
     }
 }

@@ -53,6 +53,7 @@
             width: 240px;
             height: 160px;
             position: relative;
+            overflow: hidden;
 
             .editorial-cate {
                 position: absolute;

@@ -578,9 +578,11 @@
         font-size: 14px !important;
         line-height: 1.5;
         overflow-x: hidden;
+        width: 870px;
 
         .nano-content {
             padding: 0 4px;
+            right: 17px !important;
         }
     }
 

@@ -38,12 +38,17 @@
                 height: 32px;
 
                 .iconfont {
-                    font-size: 14px;
+                    font-size: 12px;
                 }
             }
 
             .brand-fav.coled .iconfont {
                 color: #fc0d1b;
+                font-size: 12px;
+            }
+
+            #brand-info {
+                font-size: 12px;
             }
         }
     }
@@ -120,8 +125,8 @@
 
             .goods-info {
                 float: left;
-                width: 272px;
-                margin: 26px 10px;
+                width: 274px;
+                margin: 26px 9px;
                 border-width: 1px;
 
                 .desc {
@@ -265,12 +270,6 @@
     }
 }
 
-.yoho-dialog.item-more-intro-dialog{
-    .nano-pane{
-
-    }
-}
-
 .yoho-dialog.brand-info-dialog {
     width: 900px;
     height: 600px;
@@ -285,8 +284,8 @@
             width: 100%;
         }
 
-        .width780{
-            width:780px;
+        .width780 {
+            width: 780px;
         }
 
         .brand-info-title {

@@ -25,7 +25,7 @@
             height: 52px;
         }
 
-        .title{
+        .title {
             font-size: 14px;
         }
     }
@@ -139,7 +139,7 @@
             text-overflow: ellipsis;
         }
 
-        .phone{
+        .phone {
             font-size: 14px;
         }
     }
@@ -147,7 +147,7 @@
     .address-chosed {
         position: absolute;
         bottom: -1px;
-        right: 0;
+        right: -1px;
     }
 
     .address-content {
@@ -216,7 +216,8 @@
                 border-color: #000;
                 font-size: 14px;
             }
-            .tip-text{
+
+            .tip-text {
                 font-size: 14px;
             }
         }