Merge branch 'feature/new-goods' into release/5.4

 let Handlebars = require('handlebars/dist/handlebars.js');
 let Handlebars = require('handlebars/dist/handlebars.js');
 
 
 module.exports = guangType => {
 module.exports = guangType => {
-    let html = '';
+    let html = '<div class="cate  fashion-good">潮品</div>';
 
 
-    switch(guangType) {
-        case '1':
-            html = '<div class="cate  topic">话题</div>';
-            break;
-        case '2':
-            html = '<div class="cate  collocation">搭配</div>';
-            break;
-        case '3':
-            html = '<div class="cate  fashion-man">潮人</div>';
-            break;
-        case '4':
-            html = '<div class="cate  fashion-good">潮品</div>';
-            break;
-        case '5':
-            html = '<div class="cate  tip">小贴士</div>';
-            break;
-        case '19':
-            html = '<div class="cate  tip">专题</div>';
-            break;
-    }
+    // switch(guangType) {
+    //     case '1':
+    //         html = '<div class="cate  topic">话题</div>';
+    //         break;
+    //     case '2':
+    //         html = '<div class="cate  collocation">搭配</div>';
+    //         break;
+    //     case '3':
+    //         html = '<div class="cate  fashion-man">潮人</div>';
+    //         break;
+    //     case '4':
+    //         html = '<div class="cate  fashion-good">潮品</div>';
+    //         break;
+    //     case '5':
+    //         html = '<div class="cate  tip">小贴士</div>';
+    //         break;
+    //     case '19':
+    //         html = '<div class="cate  tip">专题</div>';
+    //         break;
+    // }
 
 
     return new Handlebars.SafeString(html);
     return new Handlebars.SafeString(html);
-};
+};

@@ -7,9 +7,11 @@
 
 
 .recommend-brands {
 .recommend-brands {
     .panel-header {
     .panel-header {
+        border-top: none;
         border-bottom: none;
         border-bottom: none;
     }
     }
     .panel-body {
     .panel-body {
+        padding-top: 0;
         padding-left: 20px;
         padding-left: 20px;
         padding-right: 20px;
         padding-right: 20px;
         flex-wrap: wrap;
         flex-wrap: wrap;
@@ -21,7 +23,7 @@
     }
     }
 
 
     .brand-news-count {
     .brand-news-count {
-        margin-top: 20px;
+        margin: 20px 0;
         width: 32%;
         width: 32%;
 
 
         img {
         img {

@@ -66,7 +66,7 @@
     }
     }
 
 
     .meta {
     .meta {
-        margin-top: 20px;
+        margin-top: 16px;
         font-size: 12px;
         font-size: 12px;
 
 
         .iconfont {
         .iconfont {

@@ -36,7 +36,7 @@
         height: 50px;
         height: 50px;
         padding-left: 19px;
         padding-left: 19px;
         padding-right: 19px;
         padding-right: 19px;
-        line-height: 46px;
+        line-height: 50px;
         color: #444;
         color: #444;
         border: 2px solid #444;
         border: 2px solid #444;
         border-radius: 5px;
         border-radius: 5px;

@@ -12,7 +12,7 @@
     &.search-tags {
     &.search-tags {
         background-image: url('/product/new/hot-search.jpg');
         background-image: url('/product/new/hot-search.jpg');
         background-position-y: 28px;
         background-position-y: 28px;
-        background-position-x: -14px;
+        background-position-x: -18px;
     }
     }
 
 
     &.brand-tags {
     &.brand-tags {