Merge branch 'master' into develop

@@ -54,13 +54,15 @@ module.exports = {
         infoFile: {
             name: 'info',
             level: 'info',
-            filename: 'logs/info.log'
+            filename: 'logs/info.log',
+            maxFiles: 7
         },
         errorFile: {
             name: 'error',
             level: 'error',
             filename: 'logs/error.log',
-            handleExceptions: true
+            handleExceptions: true,
+            maxFiles: 7
         },
         udp: { // send by udp
             level: 'debug', // logger level
@@ -99,7 +101,7 @@ if (isProduction) {
         useOneapm: true,
         useCache: true,
         interfaceShunt: {
-            useInterfaceShunt: true,
+            useInterfaceShunt: false,
             tencentServers: {
                 api: ['123.206.1.98', '123.206.2.80'],
                 service: ['123.206.1.98', '123.206.2.80']

-/**
- * 内容码配置文件
- * @author: 赵彪<bill.zhao@yoho.cn>
- * @date: 2016/06/23
- */
-
-'use strict';
-
-const channel = {
-    men: '9ee58aadd9559d07207fe4a98843eaac',
-    women: '3ad8826fc89fb0d023a4cd06a6991219',
-    lifestyle: 'aa8d34c85934c2ccc16e2babd3eb5e47'
-};
-
-const brand = {
-    men: '9ee58aadd9559d07207fe4a98843eaac',
-    women: 'aa8d34c85934c2ccc16e2babd3eb5e47',
-    lifestyle: '3ad8826fc89fb0d023a4cd06a6991219'
-};
-
-const cate = {
-    men: '9ee58aadd9559d07207fe4a98843eaac',
-    women: 'aa8d34c85934c2ccc16e2babd3eb5e47',
-    lifestyle: '3ad8826fc89fb0d023a4cd06a6991219'
-};
-
-module.exports = {
-    channel,
-    brand,
-    cate
-};

@@ -6,8 +6,8 @@
 
 const channel = {
     men: '9ee58aadd9559d07207fe4a98843eaac',
-    women: 'aa8d34c85934c2ccc16e2babd3eb5e47',
-    lifestyle: '3ad8826fc89fb0d023a4cd06a6991219'
+    women: '3ad8826fc89fb0d023a4cd06a6991219',
+    lifestyle: 'aa8d34c85934c2ccc16e2babd3eb5e47'
 };
 
 /* 品牌一览资源位 */

@@ -97,7 +97,7 @@ ul {
 }
 
 img[lazy] {
-    transition: all 200ms;
+    transition: all 100ms;
 }
 
 img[lazy=loading] {

@@ -7,7 +7,8 @@
                 </div>
             </template>
             <a class="item ellipsis" href="{{item.sortUrl}}">
-                {{(item.sortNameEn || '').trim()}}{{item.sortName}}
+                <span class="en">{{(item.sortNameEn || '').trim()}}</span>
+                <span class="cn">{{item.sortName}}</span>
             </a>
         </template>
     </div>
@@ -54,6 +55,7 @@
         left: 0;
         overflow-x: hidden;
         overflow-y: auto;
+        background: #f6f6f6;
     }
 
     .sidebar {
@@ -65,11 +67,20 @@
             padding: 0 30px;
             height: 124px;
             line-height: 124px;
-            font-size: 36px;
+            font-size: 30px;
             font-weight: bold;
             font-family: "BrownStd-Bold", "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;
 
+            .en {
+                font-size: 36px;
+            }
+
+            .cn {
+                margin-left: -6px;
+            }
+
             &:first-child {
+                font-size: 36px;
                 height: 142px;
                 line-height: 142px;
                 font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;
@@ -85,10 +96,14 @@
                 border-bottom: 1px solid #eee;
             }
 
-            &:last-child:after {
+            &:last-child {
+                border-bottom: 1px solid #eee;
+
+                &:after {
                     content: none;
                 }
             }
+        }
 
         .sep {
             margin-top: -1px;
@@ -99,6 +114,7 @@
             border-bottom: 1px solid #eee;
 
             & + .item {
+                font-size: 36px;
                 height: 142px;
                 line-height: 142px;
                 font-family: "PingFang SC", Helvetica, Roboto, "Heiti SC", "黑体", Arial;