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

- Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05
+ Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2

@@ -355,25 +355,15 @@ class AbstractAction extends Controller_Abstract
      * 
      * @return void
      */
-    protected function setNavFooter()
+    protected function setNavFooterTab()
     {
-        $footer = array();
-
-        // 已登录 @todo
-        $name = $this->getUname();
-        if (!empty($name)) {
-            $footer['user'] = array();
-            $footer['user']['name'] = $name; // 昵称
-            $footer['user']['url'] = ''; // 个人中心链接
-            $footer['user']['signoutUrl'] = '/passport/login/out'; // 登出链接
-        }
-        // 未登录
-        else {
-            $footer['loginUrl'] = '/signin.html'; // 登录链接
-            $footer['signupUrl'] = '/reg.html'; // 注册链接
-        }
-
-        $this->_view->assign('pageFooter', $footer);
+        $this->_view->assign('showFooterTab', array(
+            'indexUrl' => Helpers::url('/?go=1'), //首页
+            'categoryUrl' => Helpers::url('/cate'), // 分类
+            'guangUrl' => Helpers::url('', null, 'guang'), // 逛首页
+            'shoppingCartUrl' => Helpers::url('/cart/index/index'), // 购物车
+            'mineUrl' => Helpers::url('/home'), // 个人中心
+        ));
     }
 
     /**

@@ -100,6 +100,22 @@ server
         proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
         proxy_set_header   Accept-Encoding "gzip";
     }
+    location = /boys/bottomBanner {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
+    location = /girls/bottomBanner {
+        proxy_redirect off;
+        proxy_pass http://yohobuy;
+        proxy_set_header   Host   $host;
+        proxy_set_header   X-Real-IP  $remote_addr;
+        proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header   Accept-Encoding "gzip";
+    }
     
     # 商品相关
     location = /cate {

@@ -107,7 +107,7 @@ navHammer.on('tap', function(e) {
 });
 
 $(document).scroll(function() {
-    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH) {
+    if ($(window).scrollTop() + winH >= $(document).height() - loadMoreH - 50) {
         loadMore($infos.not('.hide'), state[curType]);
     }
 });
\ No newline at end of file

@@ -26,12 +26,13 @@ class BoysController extends AbstractAction
         $this->setTitle('男生首页');
         // 显示侧边栏
         $this->setNavSide('boys');
+        // 显示底部TAB
+        $this->setNavFooterTab();
 
         // 渲染模板并输出
         $this->_view->display('index', array(
             'boysHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
-            'showFooterTab' => true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getBoysFloor(),
             'pageFooter' => true,

@@ -21,12 +21,13 @@ class GirlsController extends AbstractAction
         $this->setTitle('女生首页');
         // 显示侧边栏
         $this->setNavSide('girls');
+        // 显示底部TAB
+        $this->setNavFooterTab();
 
         // 渲染模板并输出
         $this->_view->display('index', array(
             'grilsHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
-            'showFooterTab' => true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getGirlsFloor(),
             'pageFooter' => true,
@@ -49,9 +50,8 @@ class GirlsController extends AbstractAction
             if (empty($bottomBanner)) {
                 break;
             }
-            
+
             $this->echoJson($bottomBanner);
-            
         } while (false);
 
         echo ' ';

@@ -21,12 +21,13 @@ class KidsController extends AbstractAction
         $this->setTitle('潮童首页');
         // 显示侧边栏
         $this->setNavSide();
+        // 显示底部TAB
+        $this->setNavFooterTab();
 
         // 渲染模板并输出
         $this->_view->display('index', array(
             'kidsHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
-            'showFooterTab' => true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getKidsFloor(),
             'pageFooter' => true,

@@ -21,12 +21,13 @@ class LifestyleController extends AbstractAction
         $this->setTitle('创意生活首页');
         // 显示侧边栏
         $this->setNavSide();
+        // 显示底部TAB
+        $this->setNavFooterTab();
 
         // 渲染模板并输出
         $this->_view->display('index', array(
             'lifestyleHomePage' => true,
             'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
-            'showFooterTab' => true,
             'maybeLike' => true,
             'content' => Index\HomeModel::getLifestyleFloor(),
             'pageFooter' => true,