Authored by hf

fixes bug refs YW-917

@@ -61,7 +61,7 @@ cHammer.on('tap', function() { @@ -61,7 +61,7 @@ cHammer.on('tap', function() {
61 continue; 61 continue;
62 } 62 }
63 63
64 - html += '<li><a href="http://search.m.yohobuy.com/?query=' + history + '">' + history + '</li>'; 64 + html += '<li><a href="/?query=' + history + '">' + history + '</li>';
65 } 65 }
66 66
67 $history.html(html); 67 $history.html(html);
@@ -14,8 +14,10 @@ class IndexController extends AbstractAction @@ -14,8 +14,10 @@ class IndexController extends AbstractAction
14 */ 14 */
15 public function indexAction() 15 public function indexAction()
16 { 16 {
17 - // 先检查COOKIE是否有访问过, 有则跳转到相应的频道页  
18 - // Index\HomeModel::goSwitchChannel(); 17 + if (null !== $this->get('go')) {
  18 + // 先检查COOKIE是否有访问过, 有则跳转到相应的频道页
  19 + Index\HomeModel::goSwitchChannel();
  20 + }
19 21
20 // 渲染模板 22 // 渲染模板
21 $this->_view->display('index', array( 23 $this->_view->display('index', array(
@@ -29,14 +29,13 @@ class IndexController extends AbstractAction @@ -29,14 +29,13 @@ class IndexController extends AbstractAction
29 if (is_string($gender)) { 29 if (is_string($gender)) {
30 $gender = rawurldecode($gender); 30 $gender = rawurldecode($gender);
31 } 31 }
32 -  
33 // // 设置侧边栏逛的默认选中状态 32 // // 设置侧边栏逛的默认选中状态
34 // if ($gender === '1,3') { 33 // if ($gender === '1,3') {
35 // $this->setNavSide('boys'); 34 // $this->setNavSide('boys');
36 // } elseif ($gender === '2,3') { 35 // } elseif ($gender === '2,3') {
37 // $this->setNavSide('girls'); 36 // $this->setNavSide('girls');
38 // } else { 37 // } else {
39 -// $this->setNavSide('all'); 38 +// $this->setNavSide();
40 // } 39 // }
41 40
42 $this->_view->display('index', Guang\IndexModel::getArticle($gender, $type, $uid, $udid)); 41 $this->_view->display('index', Guang\IndexModel::getArticle($gender, $type, $uid, $udid));
@@ -123,7 +123,10 @@ class PlusstarController extends AbstractAction @@ -123,7 +123,10 @@ class PlusstarController extends AbstractAction
123 $data['ps']['infos'][] = Helpers::formatArticle($value, false, false, false); 123 $data['ps']['infos'][] = Helpers::formatArticle($value, false, false, false);
124 } 124 }
125 125
  126 + $this->setNavHeader($brandInfo['getBrandInfo']['data']['brand_name'], true, SITE_MAIN);
  127 +
126 $brandInfo = array(); 128 $brandInfo = array();
  129 +
127 } while (false); 130 } while (false);
128 131
129 if (array() === $data) { 132 if (array() === $data) {
@@ -131,6 +134,7 @@ class PlusstarController extends AbstractAction @@ -131,6 +134,7 @@ class PlusstarController extends AbstractAction
131 } else { 134 } else {
132 $this->_view->display('detail', $data); 135 $this->_view->display('detail', $data);
133 } 136 }
  137 +
134 } 138 }
135 139
136 } 140 }