Merge remote-tracking branch 'origin/master' into feature/download_individate

# Conflicts:
#	package.json

@@ -8,7 +8,7 @@
                         {{!--此处不使用 Lazyload 是由于安卓 UC 10 版本加载不出来--}}
                         <img src="{{image2 src w=158 h=174 q=60}}">
                     </div>
-                    <p class="brand-name">{{name}}</p>
+                    {{!--<p class="brand-name">{{name}}</p>--}}
                 </a>
             </li>
         {{/ list}}

 {
   "name": "m-yohobuy-node",
-  "version": "5.3.17",
+  "version": "5.3.18",
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "repository": {

@@ -8,7 +8,7 @@
                         {{!--此处不使用 Lazyload 是由于安卓 UC 10 版本加载不出来--}}
                         <img src="{{image2 src w=158 h=174 q=60}}">
                     </div>
-                    <p class="brand-name">{{name}}</p>
+                    {{!--<p class="brand-name">{{name}}</p>--}}
                 </a>
             </li>
         {{/ list}}

@@ -24,23 +24,25 @@
 
     .brand {
         float: left;
-        width: 158px;
-        height: 174px;
-        border-right: 1px solid #e0e0e0;
-        border-top: 1px solid #e0e0e0;
+        background-color: #e0e0e0;
+        width: 160px;
+        height: 160px;
         overflow: hidden;
+        padding: 1PX 1PX 0 0;
+
+        &:nth-child(4n + 1) {
+            padding: 1PX 0 0 0;
+        }
 
         .brand-logo {
-            display: table-cell;
-            width: 158px;
-            height: 128px;
-            line-height: 128px;
+            width: 100%;
+            height: 100%;
             text-align: center;
             font-size: 0;
             vertical-align: middle;
 
             img {
-                max-width: 100%;
+                width: 100%;
                 height: 100%;
             }
         }
@@ -65,9 +67,8 @@
 
     .more {
         float: left;
-        width: 317px;
-        height: 174px;
-        border-top: 1px solid #e0e0e0;
+        width: 320px;
+        height: 160px;
         overflow: hidden;
 
         a {