Merge remote-tracking branch 'origin/release-201815-wangcz' into release-201815-wangcz

components/product/CategoryNav.vue

@@ -430,7 +430,7 @@
     padding: 20px 0;
     background: #fff;
     border: 1px solid #ddd;
-    max-height: 130px;
+    max-height: 135px;
     overflow-y: auto;
     .inline-block {
       width: 20%;