Merge remote-tracking branch 'origin/feature/brandsTree' into release/5.4.1

 <div class="brand-blk-page yoho-page">
 <div class="brand-blk-page yoho-page">
+
+    <!--//no-download 标签不出现头部下载按钮-->
+    <div id="no-download"></div>
+
     <div class="tab-box">
     <div class="tab-box">
         <ul class="brand-tab">
         <ul class="brand-tab">
             <li class="brand {{#unless categoryTab}}active{{/ unless}}">鍝佺墝</li>
             <li class="brand {{#unless categoryTab}}active{{/ unless}}">鍝佺墝</li>

@@ -46,7 +46,7 @@
 
 
     <ul class="list-box">
     <ul class="list-box">
         {{# indexList}}
         {{# indexList}}
-        <li class="item in items">
+        <li>
             <a class="no-intercept" href="#{{index}}">{{name}}</a>
             <a class="no-intercept" href="#{{index}}">{{name}}</a>
         </li>
         </li>
         {{/ indexList}}
         {{/ indexList}}

@@ -6,15 +6,17 @@ var categoryHeight = $('.tab-box').height(),
     isBrand;
     isBrand;
 
 
 var $intercept = $('.no-intercept'),
 var $intercept = $('.no-intercept'),
-    $list = $('.brand-list-box');
+    $list = $('.brand-list-box'),
+    $listBox = $('.list-box');
 
 
 function channels(key) {
 function channels(key) {
-
-    return {
+    var channel = {
         men: 1,
         men: 1,
         women: 2,
         women: 2,
         lifestyle: 4
         lifestyle: 4
-    }[key];
+    };
+
+    return channel[key];
 }
 }
 
 
 function initialize() {
 function initialize() {
@@ -97,6 +99,10 @@ $('.brand-tab').find('li').click(function() {
     initialize();
     initialize();
 });
 });
 
 
+if ($listBox.find('li').length <= 0) {
+    $listBox.hide();
+}
+
 $(function() {
 $(function() {
     $('.banner-swiper').each(function() {
     $('.banner-swiper').each(function() {
         if (!$(this).parents('.content').hasClass('hide') && $(this).hasClass('swiper-container-horizontal') === false && $(this).find('li').length > 1) {
         if (!$(this).parents('.content').hasClass('hide') && $(this).hasClass('swiper-container-horizontal') === false && $(this).find('li').length > 1) {

@@ -9,7 +9,7 @@
     .brand-tab {
     .brand-tab {
         max-width: inherit;
         max-width: inherit;
         height: 80px;
         height: 80px;
-        font-size: 0.65rem;
+        font-size: 26px;
         text-align: center;
         text-align: center;
         z-index: 10;
         z-index: 10;
         background-color: #fff;
         background-color: #fff;
@@ -38,8 +38,8 @@
     .channel-tab {
     .channel-tab {
         width: 100%;
         width: 100%;
         max-width: inherit;
         max-width: inherit;
-        height: 2rem;
-        font-size: 0.65rem;
+        height: 80px;
+        font-size: 26px;
         text-align: center;
         text-align: center;
         position: relative;
         position: relative;
         z-index: 10;
         z-index: 10;
@@ -49,12 +49,12 @@
         li {
         li {
             width: 50%;
             width: 50%;
             color: #b0b0b0;
             color: #b0b0b0;
-            line-height: 2rem;
+            line-height: 80px;
             float: left;
             float: left;
         }
         }
 
 
         li:first-child {
         li:first-child {
-            margin-left: -0.25rem;
+            margin-left: -10px;
         }
         }
 
 
         .focus {
         .focus {
@@ -121,27 +121,6 @@
             background: #f6f6f6;
             background: #f6f6f6;
             border-top: 1px solid #eee;
             border-top: 1px solid #eee;
 
 
-            .per-brand-box {
-                background: #fff;
-                padding: 0 30px;
-                border-top: 1px solid #eee;
-                border-bottom: 1px solid #eee;
-                overflow: hidden;
-
-                &:not(:first-of-type) {
-                    margin-top: 20px;
-                }
-
-                .index {
-                    height: 60px;
-                    line-height: 60px;
-
-                    a {
-                        font-size: 32px;
-                    }
-                }
-            }
-
             .brand-big-box {
             .brand-big-box {
                 width: 100%;
                 width: 100%;
             }
             }
@@ -154,17 +133,6 @@
                 text-align: center;
                 text-align: center;
                 margin-bottom: 20px;
                 margin-bottom: 20px;
 
 
-                .brand-logo {
-                    margin: 0 auto;
-                    width: 136px;
-                    height: 136px;
-                    overflow: hidden;
-
-                    img {
-                        width: 100%;
-                    }
-                }
-
                 .brand-name {
                 .brand-name {
                     width: 136px;
                     width: 136px;
                     font-size: 18px;
                     font-size: 18px;
@@ -175,6 +143,38 @@
                     display: inline-block;
                     display: inline-block;
                 }
                 }
             }
             }
+
+            .brand-logo {
+                margin: 0 auto;
+                width: 136px;
+                height: 136px;
+                overflow: hidden;
+
+                img {
+                    width: 100%;
+                }
+            }
+        }
+
+        .per-brand-box {
+            background: #fff;
+            padding: 0 30px;
+            border-top: 1px solid #eee;
+            border-bottom: 1px solid #eee;
+            overflow: hidden;
+
+            &:not(:first-of-type) {
+                margin-top: 20px;
+            }
+
+            .index {
+                height: 60px;
+                line-height: 60px;
+
+                a {
+                    font-size: 32px;
+                }
+            }
         }
         }
 
 
         .index-list {
         .index-list {
@@ -209,7 +209,7 @@
 
 
     .pagination-inner {
     .pagination-inner {
         left: auto;
         left: auto;
-        right: 0.75rem;
+        right: 30px;
         -webkit-transform: none;
         -webkit-transform: none;
         transform: none;
         transform: none;
         position: absolute;
         position: absolute;

-.blk-cate-all {
-    font-size: 15PX;
-    /* margin-bottom: 100px;*/
-
-    .category-nav {
-        height: 70px;
-        border-bottom: 1px solid #e6e6e6;
-
-        li {
-            display: block;
-            box-sizing: border-box;
-            float: left;
-            height: 100%;
-            padding: 20px 0;
-            width: 50%;
-            text-align: center;
-            color: #999;
-
-            &:last-child {
-                border-right: none;
-            }
-
-            &.focus {
-                color: #000;
-            }
-
-            &.bytouch {
-                background: #eee;
-            }
-        }
-
-        span {
-            display: block;
-            width: 100%;
-            height: 30px;
-            line-height: 30px;
-            font-size: 15PX;
-            border-right: 1px solid #e6e6e6;
-        }
-
-        li:last-child span {
-            border-right: 0;
-        }
-    }
-
-    .content {
-        /*background: #f8f8f8;*/
-        overflow: hidden;
-        position: relative;
-
-        &.hide {
-            display: none;
-        }
-    }
-
-    .primary-level {
-        float: left;
-        box-sizing: border-box;
-        width: 45%;
-
-        > li {
-            height: 89px;
-            line-height: 89px;
-            padding: 0 32px;
-            white-space: nowrap;
-            overflow: hidden;
-            text-overflow: ellipsis;
-            border-bottom: 1px solid #e6e6e6;
-
-            &.focus {
-                background-color: #fff;
-            }
-
-            &.highlight {
-                background-color: #eee;
-            }
-        }
-    }
-
-    .trilanglefont {
-        font-family: "iconfont" !important;
-        font-size: 0.75rem;
-        font-style: normal;
-        text-decoration: none;
-        -webkit-font-smoothing: antialiased;
-        -webkit-text-stroke-width: 0.2px;
-        -moz-osx-font-smoothing: grayscale;
-        color: #f4f4f4;
-    }
-
-    .primary-level-trilangle {
-        float: right;
-        background-image: url(sprite.index.product.png);
-        background-position: -3.4rem 0px;
-        background-size: 3.9rem 2.7rem;
-        margin-top: 0.55rem;
-        width: 0.5rem;
-        height: 1.15rem;
-        position: relative;
-        right: -32px;
-    }
-
-    .sub-level-container {
-        float: left;
-        overflow-x: auto;
-        box-sizing: border-box;
-        background: #fff;
-        width: 55%;
-        height: 100%;
-        background: #f4f4f4;
-    }
-
-    .sub-level {
-        width: 100%;
-        height: 100%;
-
-        &.hide {
-            display: none;
-        }
-
-        > li {
-            box-sizing: border-box;
-            height: 79px;
-            line-height: 79px;
-            border-bottom: 1px solid #e6e6e6;
-            padding-left: 20px;
-
-            &.highlight {
-                background: #eee;
-            }
-
-            &:last-child {
-                border-bottom: none;
-            }
-        }
-
-        a {
-            display: block;
-            height: 100%;
-            width: 100%;
-            color: #afafaf;
-        }
-    }
+.blk-cate-all {
+    font-size: 15PX;
+
+    .category-nav {
+        height: 70px;
+        border-bottom: 1px solid #e6e6e6;
+
+        li {
+            display: block;
+            box-sizing: border-box;
+            float: left;
+            height: 100%;
+            padding: 20px 0;
+            width: 50%;
+            text-align: center;
+            color: #999;
+
+            &:last-child {
+                border-right: none;
+            }
+
+            &.focus {
+                color: #000;
+            }
+
+            &.bytouch {
+                background: #eee;
+            }
+        }
+
+        span {
+            display: block;
+            width: 100%;
+            height: 30px;
+            line-height: 30px;
+            font-size: 15PX;
+            border-right: 1px solid #e6e6e6;
+        }
+
+        li:last-child span {
+            border-right: 0;
+        }
+    }
+
+    .content {
+        overflow: hidden;
+        position: relative;
+
+        &.hide {
+            display: none;
+        }
+    }
+
+    .primary-level {
+        float: left;
+        box-sizing: border-box;
+        width: 45%;
+
+        > li {
+            height: 89px;
+            line-height: 89px;
+            padding: 0 32px;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            border-bottom: 1px solid #e6e6e6;
+
+            &.focus {
+                background-color: #fff;
+            }
+
+            &.highlight {
+                background-color: #eee;
+            }
+        }
+    }
+
+    .trilanglefont {
+        font-family: "iconfont" !important;
+        font-size: 30px;
+        font-style: normal;
+        text-decoration: none;
+        -webkit-font-smoothing: antialiased;
+        -webkit-text-stroke-width: 0.2px;
+        -moz-osx-font-smoothing: grayscale;
+        color: #f4f4f4;
+    }
+
+    .primary-level-trilangle {
+        float: right;
+        background-image: url(/product/arrow.png) no-repeat;
+        margin-top: 22px;
+        width: 20px;
+        height: 46px;
+        position: relative;
+        right: -32px;
+    }
+
+    .sub-level-container {
+        float: left;
+        overflow-x: auto;
+        box-sizing: border-box;
+        background: #fff;
+        width: 55%;
+        height: 100%;
+        background: #f4f4f4;
+    }
+
+    .sub-level {
+        width: 100%;
+        height: 100%;
+
+        &.hide {
+            display: none;
+        }
+
+        > li {
+            box-sizing: border-box;
+            height: 79px;
+            line-height: 79px;
+            border-bottom: 1px solid #e6e6e6;
+            padding-left: 20px;
+
+            &.highlight {
+                background: #eee;
+            }
+
+            &:last-child {
+                border-bottom: none;
+            }
+        }
+
+        a {
+            display: block;
+            height: 100%;
+            width: 100%;
+            color: #afafaf;
+        }
+    }
 }
 }