Merge remote-tracking branch 'remotes/origin/release/4.4'

@@ -8539,7 +8539,10 @@ var $listNav = $('#list-nav'),
     $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
     searching;
 
-var viewType = 1;// 1-首页,2-上新,3-人气
+var viewType = 1,// 1-首页,2-上新,3-人气
+    listCount = $('.category-list li').length,
+    listModValue = 4 - listCount % 4,
+    listIndex;
 
 lazyLoad($('img.lazy'));
 
@@ -8569,6 +8572,23 @@ if ($('.multi-browse').find('li').size() > 1) {
     });
 }
 
+//根据热门品类的个数来改变样式展示
+//
+if ($('.category-list li').length % 4 !== 0) {
+    $('.category-list li:last-child').addClass('category-list-last-li');
+}
+
+if ($('.category-list li').length < 4) {
+    $('.category-list').addClass('category-list-top-board');
+    $('.category-list').find('.buriedpoint').addClass('category-list-only-one-row');
+}
+
+if ($('.category-list li').length >= 5) {
+    for (listIndex = listModValue; listIndex >= 0; listIndex--) {
+        $('.category-list li').eq(listCount - 4 + listIndex - 1).addClass('category-list-last-full-row');
+    }
+}
+
 function getPageGoods(info) {
     var nav,navType;
 
@@ -9308,7 +9328,6 @@ $('#collect').on('touchstart', function(e) {
     }
 });
 
-
 
 });
 define("js/me/entry", ["jquery","hammer","lazyload","handlebars","source-map","swiper","mlellipsis","index"], function(require, exports, module){

@@ -80,7 +80,10 @@ var $listNav = $('#list-nav'),
     $pre = $listNav.find('.active'), //纪录进入筛选前的active项，初始为选中项
     searching;
 
-var viewType = 1;// 1-首页,2-上新,3-人气
+var viewType = 1,// 1-首页,2-上新,3-人气
+    listCount = $('.category-list li').length,
+    listModValue = 4 - listCount % 4,
+    listIndex;
 
 lazyLoad($('img.lazy'));
 
@@ -110,6 +113,23 @@ if ($('.multi-browse').find('li').size() > 1) {
     });
 }
 
+//根据热门品类的个数来改变样式展示
+//
+if ($('.category-list li').length % 4 !== 0) {
+    $('.category-list li:last-child').addClass('category-list-last-li');
+}
+
+if ($('.category-list li').length < 4) {
+    $('.category-list').addClass('category-list-top-board');
+    $('.category-list').find('.buriedpoint').addClass('category-list-only-one-row');
+}
+
+if ($('.category-list li').length >= 5) {
+    for (listIndex = listModValue; listIndex >= 0; listIndex--) {
+        $('.category-list li').eq(listCount - 4 + listIndex - 1).addClass('category-list-last-full-row');
+    }
+}
+
 function getPageGoods(info) {
     var nav,navType;
 
@@ -849,4 +869,3 @@ $('#collect').on('touchstart', function(e) {
     }
 });
 
-

@@ -505,4 +505,20 @@
             transform: rotate(-180deg);
         }
     }
+
+    .category-list-top-board {
+        border-top: 1px solid #e0e0e0;
+    }
+    
+    .category-list-last-li {
+        border-right: 1px solid #e0e0e0;
+    }
+
+    .category-list-only-one-row {
+        border-top: none!important;
+    }
+
+    .category-list-last-full-row {
+        border-bottom: 1px solid #e0e0e0;
+    }
 }
\ No newline at end of file