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

@@ -23,7 +23,7 @@ module.exports = {
     },
     },
     cookieDomain: 'yohoblk.com',
     cookieDomain: 'yohoblk.com',
     domains: {
     domains: {
-        singleApi: 'http://192.168.102.31:8092/brower',
+        singleApi: 'http://192.168.102.31:8092/',
         api: 'http://api-test1.yohops.com:9999/',
         api: 'http://api-test1.yohops.com:9999/',
         service: 'http://service-test1.yohops.com:9999/',
         service: 'http://service-test1.yohops.com:9999/',
         search: 'http://192.168.102.216:8080/yohosearch/'
         search: 'http://192.168.102.216:8080/yohosearch/'
@@ -111,7 +111,7 @@ if (isProduction) {
     Object.assign(module.exports, {
     Object.assign(module.exports, {
         appName: 'www.yohoblk.com for test',
         appName: 'www.yohoblk.com for test',
         domains: {
         domains: {
-            singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/brower',
+            singleApi: process.env.TEST_SINGLEAPI || 'http://192.168.102.31:8092/',
             api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
             api: process.env.TEST_API || 'http://testapi.yoho.cn:28078/',
             service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
             service: process.env.TEST_SERVICE || 'http://testservice.yoho.cn:28077/',
             search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'
             search: process.env.TEST_SEARCH || 'http://192.168.102.216:8080/yohosearch/'

@@ -78,15 +78,16 @@
             text-align: center;
             text-align: center;
             color: #222;
             color: #222;
             cursor: pointer;
             cursor: pointer;
+            font-size: 14px;
         }
         }
     }
     }
 
 
     .brands-list {
     .brands-list {
         dt {
         dt {
-            height: 70px;
-            line-height: 70px;
+            height: 58px;
+            line-height: 58px;
             font-weight: bold;
             font-weight: bold;
-            font-size: 24px;
+            font-size: 16px;
         }
         }
 
 
         dd {
         dd {
@@ -102,10 +103,6 @@
                 margin-top: 20px;
                 margin-top: 20px;
             }
             }
 
 
-           /* li:nth-child(4n) {
-                margin-right: 0;
-            }*/
-
             li:nth-child(-n+4) {
             li:nth-child(-n+4) {
                 margin-top: 0;
                 margin-top: 0;
             }
             }

@@ -231,7 +231,7 @@
     }
     }
 
 
     .brands {
     .brands {
-        width: 960px;
+        width: 975px;
         padding: 30px 0 0 30px;
         padding: 30px 0 0 30px;
         overflow: hidden;
         overflow: hidden;
     }
     }

@@ -13,6 +13,7 @@
             text-align: center;
             text-align: center;
             background: #fff;
             background: #fff;
         }
         }
+
         .nav {
         .nav {
             li {
             li {
                 cursor: pointer;
                 cursor: pointer;
@@ -26,8 +27,10 @@
                     height: 14px;
                     height: 14px;
                     width: 14px;
                     width: 14px;
                     background-repeat: no-repeat;
                     background-repeat: no-repeat;
-                    background-image: resolve('help/plus.png');
+                    background-image: resolve("help/plus.png");
                     background-size: 14px 14px;
                     background-size: 14px 14px;
+                    position: relative;
+                    top: 3px;
                 }
                 }
 
 
                 .mult {
                 .mult {
@@ -51,6 +54,7 @@
         width: 990px;
         width: 990px;
         padding: 35px 30px;
         padding: 35px 30px;
         background-color: #fff;
         background-color: #fff;
+        font-size: 14px;
 
 
         .normal-data,
         .normal-data,
         .step-data {
         .step-data {
@@ -61,13 +65,14 @@
         .big-title {
         .big-title {
             font-size: 20px;
             font-size: 20px;
         }
         }
+
         .step-title {
         .step-title {
             font-weight: bolder;
             font-weight: bolder;
             padding-bottom: 5px;
             padding-bottom: 5px;
         }
         }
+
         .step {
         .step {
             list-style: disc;
             list-style: disc;
         }
         }
     }
     }
-
 }
 }