Merge branch 'release/5.4.1' of git.yoho.cn:fe/yohobuywap-node into release/5.4.1

@@ -8,7 +8,6 @@ var $ = require('yoho-jquery');
 var FastClick = require('yoho-fastclick');
 var FastClick = require('yoho-fastclick');
 
 
 var $nav = $('.category-nav'),
 var $nav = $('.category-nav'),
-    $search = $('#search-input'),
     $categoryContainer = $('.category-container'),
     $categoryContainer = $('.category-container'),
     $contents = $categoryContainer.children('.content'),
     $contents = $categoryContainer.children('.content'),
     $subLevelItem = $categoryContainer.find('.sub-level li');
     $subLevelItem = $categoryContainer.find('.sub-level li');
@@ -19,15 +18,12 @@ $(function() {
 });
 });
 
 
 function resetHeight() {
 function resetHeight() {
-    var h = document.body.scrollHeight - $search.outerHeight() - $nav.outerHeight();
+    var h = document.body.scrollHeight - $nav.outerHeight();
 
 
     $contents.height(h);
     $contents.height(h);
 }
 }
 resetHeight();
 resetHeight();
 
 
-$search.focus(function() {
-    $(this).blur();
-});
 $nav.on('contextmenu', function() {
 $nav.on('contextmenu', function() {
     return false;
     return false;
 });
 });

@@ -4,9 +4,7 @@ var $ = require('yoho-jquery'),
 var categoryHeight = $('.tab-box').height(),
 var categoryHeight = $('.tab-box').height(),
     gender;
     gender;
 
 
-var $intercept = $('.no-intercept'),
-    $list = $('.brand-list-box'),
-    $listBox = $('.list-box'),
+var $listBox = $('.list-box'),
     $brandContent = $('.brand-content'),
     $brandContent = $('.brand-content'),
     $tabBox = $('.tab-box'),
     $tabBox = $('.tab-box'),
     $contentIndex = $('.content-index'),
     $contentIndex = $('.content-index'),
@@ -28,6 +26,19 @@ function channels(key) {
     return channel[key];
     return channel[key];
 }
 }
 
 
+// 点击字母，页面滚动到相关区域
+function reference() {
+    $('.no-intercept').click(function() {
+        var name = $(this).attr('href').split('#')[1] === '0_9' ? '0~9' : $(this).attr('href').split('#')[1],
+            targetTop = $('.brand-list-box').find('[name="' + name + '"]').offset().top - categoryHeight;
+
+        $('html,body').animate({
+            scrollTop: targetTop
+        }, 200);
+        return false;
+    });
+}
+
 function initialize() {
 function initialize() {
     $('.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) {
@@ -65,6 +76,8 @@ function loadData(channel) {
                 $tabBox.removeClass('fastening');
                 $tabBox.removeClass('fastening');
                 $contentIndex.removeClass('distance');
                 $contentIndex.removeClass('distance');
             });
             });
+
+            reference();
         }
         }
     });
     });
 }
 }
@@ -77,16 +90,7 @@ $brandCha.find('li').click(function() {
     loadData(channels(gender));
     loadData(channels(gender));
 });
 });
 
 
-// 点击字母，页面滚动到相关区域
-$intercept.click(function() {
-    var name = $(this).attr('href').split('#')[1] === '0_9' ? '0~9' : $(this).attr('href').split('#')[1],
-        targetTop = $list.find('[name="' + name + '"]').offset().top - categoryHeight;
-
-    $('html,body').animate({
-        scrollTop: targetTop
-    }, 200);
-    return false;
-});
+reference();
 
 
 $('.brand-tab').find('li').click(function() {
 $('.brand-tab').find('li').click(function() {
 
 

@@ -20,7 +20,7 @@
         text-align: center;
         text-align: center;
         z-index: 10;
         z-index: 10;
         background-color: #fff;
         background-color: #fff;
-        padding: 0 200px 84px;
+        padding: 0 222px 84px;
         border-bottom: 5px solid #e0e0e0;
         border-bottom: 5px solid #e0e0e0;
         width: 100%;
         width: 100%;
 
 

@@ -55,7 +55,6 @@ $border_color_light: #eee;
         height: 112px;
         height: 112px;
         line-height: 112px;
         line-height: 112px;
         background-color: #fff;
         background-color: #fff;
-        padding-left: 40px;
         font-size: 40px;
         font-size: 40px;
     }
     }
 
 

@@ -42,7 +42,7 @@
 
 
 .address-select-component {
 .address-select-component {
     position: fixed;
     position: fixed;
-    top: 0;
+    bottom: 0;
     left: 0;
     left: 0;
     width: 100%;
     width: 100%;
     background: rgba(0, 0, 0, 0.5);
     background: rgba(0, 0, 0, 0.5);