Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

@@ -99,7 +99,7 @@ function rePosFooter() {
         return;
         return;
     }
     }
 
 
-    if ($('body').height() <= $(window).height()) {
+    if ($('body').height() <= $(window).height() - 122) {
         $footer.addClass('bottom');
         $footer.addClass('bottom');
     } else {
     } else {
         $footer.removeClass('bottom');
         $footer.removeClass('bottom');

@@ -26,6 +26,8 @@ var $action = $('.action'),
 // 清除原有链接
 // 清除原有链接
 $backBtn.attr('href', 'javascript:void(0);');
 $backBtn.attr('href', 'javascript:void(0);');
 
 
+window.rePosFooter();
+
 // 自定义事件
 // 自定义事件
 $backBtn.on('touchend', function(e) {
 $backBtn.on('touchend', function(e) {
     if (currentPage === 'edit') {
     if (currentPage === 'edit') {

@@ -12,7 +12,7 @@ var recommendSwiper,
     $recommendForYou = $('.recommend-for-you');
     $recommendForYou = $('.recommend-for-you');
 
 
 $.get('/home/preference').then(function(html) {
 $.get('/home/preference').then(function(html) {
-    $recommendForYou.html(html);
+    $recommendForYou.html(html).show();
     if ($('#swiper-recommend').length) {
     if ($('#swiper-recommend').length) {
         recommendSwiper = new Swiper('#swiper-recommend', {
         recommendSwiper = new Swiper('#swiper-recommend', {
             slidesPerView: 'auto',
             slidesPerView: 'auto',