fe / YOHOBUYPC · Commits

Go to a project

Authored by xuqi
Commit b3d0d4fda124c0918393f397f50f1c584089e631 2 parents 7fc7c33a 95450983

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

Inline Side-by-side
Showing 9 changed files with 36 additions and 25 deletions
framework @ 75bbc3b0
1 -Subproject commit 119c247f5cf929aa1e059e40609bb16dd6b58f05 1 +Subproject commit 75bbc3b075de19f239532f60c5995d06c5f814e2
@@ -355,25 +355,15 @@ class AbstractAction extends Controller_Abstract @@ -355,25 +355,15 @@ class AbstractAction extends Controller_Abstract
355 * 355 *
356 * @return void 356 * @return void
357 */ 357 */
358 - protected function setNavFooter() 358 + protected function setNavFooterTab()
359 { 359 {
360 - $footer = array();  
361 -  
362 - // 已登录 @todo  
363 - $name = $this->getUname();  
364 - if (!empty($name)) {  
365 - $footer['user'] = array();  
366 - $footer['user']['name'] = $name; // 昵称  
367 - $footer['user']['url'] = ''; // 个人中心链接  
368 - $footer['user']['signoutUrl'] = '/passport/login/out'; // 登出链接  
369 - }  
370 - // 未登录  
371 - else {  
372 - $footer['loginUrl'] = '/signin.html'; // 登录链接  
373 - $footer['signupUrl'] = '/reg.html'; // 注册链接  
374 - }  
375 -  
376 - $this->_view->assign('pageFooter', $footer); 360 + $this->_view->assign('showFooterTab', array(
  361 + 'indexUrl' => Helpers::url('/?go=1'), //首页
  362 + 'categoryUrl' => Helpers::url('/cate'), // 分类
  363 + 'guangUrl' => Helpers::url('', null, 'guang'), // 逛首页
  364 + 'shoppingCartUrl' => Helpers::url('/cart/index/index'), // 购物车
  365 + 'mineUrl' => Helpers::url('/home'), // 个人中心
  366 + ));
377 } 367 }
378 368
379 /** 369 /**
@@ -100,6 +100,22 @@ server @@ -100,6 +100,22 @@ server
100 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; 100 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
101 proxy_set_header Accept-Encoding "gzip"; 101 proxy_set_header Accept-Encoding "gzip";
102 } 102 }
  103 + location = /boys/bottomBanner {
  104 + proxy_redirect off;
  105 + proxy_pass http://yohobuy;
  106 + proxy_set_header Host $host;
  107 + proxy_set_header X-Real-IP $remote_addr;
  108 + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
  109 + proxy_set_header Accept-Encoding "gzip";
  110 + }
  111 + location = /girls/bottomBanner {
  112 + proxy_redirect off;
  113 + proxy_pass http://yohobuy;
  114 + proxy_set_header Host $host;
  115 + proxy_set_header X-Real-IP $remote_addr;
  116 + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
  117 + proxy_set_header Accept-Encoding "gzip";
  118 + }
103 119
104 # 商品相关 120 # 商品相关
105 location = /cate { 121 location = /cate {
@@ -38,3 +38,4 @@ $searchBox.find('.search-icon').click(function() { @@ -38,3 +38,4 @@ $searchBox.find('.search-icon').click(function() {
38 $indexSearch.submit(); 38 $indexSearch.submit();
39 }); 39 });
40 40
  41 +window.rePosFooter();
@@ -93,6 +93,7 @@ @@ -93,6 +93,7 @@
93 text-align: center; 93 text-align: center;
94 position:relative; 94 position:relative;
95 background-color: #000000; 95 background-color: #000000;
  96 + min-height: 800rem / $pxConvertRem;
96 97
97 .index-channel-list { 98 .index-channel-list {
98 padding-top: 50%; 99 padding-top: 50%;
@@ -26,12 +26,13 @@ class BoysController extends AbstractAction @@ -26,12 +26,13 @@ class BoysController extends AbstractAction
26 $this->setTitle('男生首页'); 26 $this->setTitle('男生首页');
27 // 显示侧边栏 27 // 显示侧边栏
28 $this->setNavSide('boys'); 28 $this->setNavSide('boys');
  29 + // 显示底部TAB
  30 + $this->setNavFooterTab();
29 31
30 // 渲染模板并输出 32 // 渲染模板并输出
31 $this->_view->display('index', array( 33 $this->_view->display('index', array(
32 'boysHomePage' => true, 34 'boysHomePage' => true,
33 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 35 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
34 - 'showFooterTab' => true,  
35 'maybeLike' => true, 36 'maybeLike' => true,
36 'content' => Index\HomeModel::getBoysFloor(), 37 'content' => Index\HomeModel::getBoysFloor(),
37 'pageFooter' => true, 38 'pageFooter' => true,
@@ -21,12 +21,13 @@ class GirlsController extends AbstractAction @@ -21,12 +21,13 @@ class GirlsController extends AbstractAction
21 $this->setTitle('女生首页'); 21 $this->setTitle('女生首页');
22 // 显示侧边栏 22 // 显示侧边栏
23 $this->setNavSide('girls'); 23 $this->setNavSide('girls');
  24 + // 显示底部TAB
  25 + $this->setNavFooterTab();
24 26
25 // 渲染模板并输出 27 // 渲染模板并输出
26 $this->_view->display('index', array( 28 $this->_view->display('index', array(
27 'grilsHomePage' => true, 29 'grilsHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 30 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => true,  
30 'maybeLike' => true, 31 'maybeLike' => true,
31 'content' => Index\HomeModel::getGirlsFloor(), 32 'content' => Index\HomeModel::getGirlsFloor(),
32 'pageFooter' => true, 33 'pageFooter' => true,
@@ -49,9 +50,8 @@ class GirlsController extends AbstractAction @@ -49,9 +50,8 @@ class GirlsController extends AbstractAction
49 if (empty($bottomBanner)) { 50 if (empty($bottomBanner)) {
50 break; 51 break;
51 } 52 }
52 - 53 +
53 $this->echoJson($bottomBanner); 54 $this->echoJson($bottomBanner);
54 -  
55 } while (false); 55 } while (false);
56 56
57 echo ' '; 57 echo ' ';
@@ -21,12 +21,13 @@ class KidsController extends AbstractAction @@ -21,12 +21,13 @@ class KidsController extends AbstractAction
21 $this->setTitle('潮童首页'); 21 $this->setTitle('潮童首页');
22 // 显示侧边栏 22 // 显示侧边栏
23 $this->setNavSide(); 23 $this->setNavSide();
  24 + // 显示底部TAB
  25 + $this->setNavFooterTab();
24 26
25 // 渲染模板并输出 27 // 渲染模板并输出
26 $this->_view->display('index', array( 28 $this->_view->display('index', array(
27 'kidsHomePage' => true, 29 'kidsHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 30 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => true,  
30 'maybeLike' => true, 31 'maybeLike' => true,
31 'content' => Index\HomeModel::getKidsFloor(), 32 'content' => Index\HomeModel::getKidsFloor(),
32 'pageFooter' => true, 33 'pageFooter' => true,
@@ -21,12 +21,13 @@ class LifestyleController extends AbstractAction @@ -21,12 +21,13 @@ class LifestyleController extends AbstractAction
21 $this->setTitle('创意生活首页'); 21 $this->setTitle('创意生活首页');
22 // 显示侧边栏 22 // 显示侧边栏
23 $this->setNavSide(); 23 $this->setNavSide();
  24 + // 显示底部TAB
  25 + $this->setNavFooterTab();
24 26
25 // 渲染模板并输出 27 // 渲染模板并输出
26 $this->_view->display('index', array( 28 $this->_view->display('index', array(
27 'lifestyleHomePage' => true, 29 'lifestyleHomePage' => true,
28 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')), 30 'homeHeader' => array('searchUrl' => Helpers::url('/search', null, 'search')),
29 - 'showFooterTab' => true,  
30 'maybeLike' => true, 31 'maybeLike' => true,
31 'content' => Index\HomeModel::getLifestyleFloor(), 32 'content' => Index\HomeModel::getLifestyleFloor(),
32 'pageFooter' => true, 33 'pageFooter' => true,