From 7f27a6c71623190f0a8d9dfbf3b9ec57dcb3e9ad Mon Sep 17 00:00:00 2001 From: hf <fei.hong@yoho.cn> Date: Sat, 31 Oct 2015 14:41:57 +0800 Subject: [PATCH] fixes bug to search page show header --- assets/search.html | 30 ++++++++++-------------------- yohobuy/m.yohobuy.com/application/controllers/Search.php | 2 ++ 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/assets/search.html b/assets/search.html index a87f287..846f3d2 100644 --- a/assets/search.html +++ b/assets/search.html @@ -25,9 +25,14 @@ <link rel="stylesheet" href="http://static.buy.test.yoho.cn/dist/myohobuy/0.0.6/index.css"> </head> <body > - <div class="search-page yoho-page"> + <header class="yoho-header boys"> + <a href="javascript:history.go(-1);" class="nav-back"></a> + <a href="http://buy.test.yoho.cn?go=1" class="nav-home"></a> + <p class="nav-title">搜索</p> +</header> +<div class="search-page yoho-page"> <div id="search-input" class="search-input"> - <form id="search-form" action="http://search.test.yoho.cn" method="get"> + <form id="search-form" action=http://search.dev.yohobuy.com method="get"> <i class="search-icon iconfont"></i> <input type="text" placeholder="搜索商品" name="query"> <i class="clear-input iconfont hide"></i> @@ -72,29 +77,14 @@ 立即下载 </a> </div> - - -<script src="http://static.buy.test.yoho.cn/dist/myohobuy/0.0.6/lib.js"></script> -<script src="http://static.buy.test.yoho.cn/dist/myohobuy/0.0.6/index.js"></script> +<script src="http://static.buy.test.yoho.cn/dist/myohobuy/0.0.1/lib.js"></script> +<script src="http://static.buy.test.yoho.cn/dist/myohobuy/0.0.1/index.js"></script> <script> seajs.use('js/common'); </script> - - - - - - - - - - - - - <script> seajs.use('js/index/search'); + seajs.use('js/index/footer'); </script> - </body> </html> \ No newline at end of file diff --git a/yohobuy/m.yohobuy.com/application/controllers/Search.php b/yohobuy/m.yohobuy.com/application/controllers/Search.php index 5b09cd1..4bbca20 100644 --- a/yohobuy/m.yohobuy.com/application/controllers/Search.php +++ b/yohobuy/m.yohobuy.com/application/controllers/Search.php @@ -16,6 +16,8 @@ class SearchController extends AbstractAction */ public function indexAction() { + $this->setNavHeader('搜索', true, SITE_MAIN); + $this->_view->html('search'); $this->_view->display('index', array( 'search' => array('url' => Helpers::url('', null, 'search')), -- libgit2 0.24.0