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

@@ -56,7 +56,7 @@ $clear.bind('tap', function() {
                     continue;
                 }
 
-                html += '<li><a href="?query=' + history + '">' + history + '</li>';
+                html += '<li><a href="/?query=' + history + '">' + history + '</li>';
             }
 
             $history.html(html);

 {{>layout/header}}
- 
 <div class="index-page yoho-page">
-   
-        <div class="index-container">
-            <div class="index-header clearfix">
-                <div class="iconfont index-logo">&#xe60e;</div>
-                <form action="http://search.m.yohobuy.com" class="index-search">
-                    <a href="javascript:void(0);" class="no-search">取消</a>
-                    <div class="search-box">
-                        <input type="text" name="query" placeholder="搜索">
-                        <span class="iconfont clear-text">&#xe623;</span>
-                        <span class="iconfont search-icon">&#xe60f;</span>
-                    </div>
-                </form>
-            </div>
-            
-             <div class="index-channel">
-                   <img class="img" src="{{background}}" alt="">  
-                   <div class="index-channel-list">
-                        <a href="/boys" class="list-item">男生 <span class="lighter">BOYS</span> <span class="iconfont right-icon">&#xe614;</span></a>
-                        <a href="/girls" class="list-item">女生 <span class="lighter">GIRLS</span> <span class="iconfont right-icon">&#xe614;</span></a>
-                        <a href="/kids" class="list-item">潮童 <span class="lighter">KIDS</span> <span class="iconfont right-icon">&#xe614;</span></a>
-                        <a href="/lifestyle" class="list-item">创意生活 <span class="lighter">LIFESTYLE</span> <span class="iconfont right-icon">&#xe614;</span></a>
-                   </div> 
-                     
-             </div>
-
-        </div> 
+    <div class="index-container">
+        <div class="index-header clearfix">
+            <div class="iconfont index-logo">&#xe60e;</div>
+            <form action="{{searchUrl}}" class="index-search">
+                <a href="javascript:void(0);" class="no-search">取消</a>
+                <div class="search-box">
+                    <input type="text" name="query" placeholder="搜索">
+                    <span class="iconfont clear-text">&#xe623;</span>
+                    <span class="iconfont search-icon">&#xe60f;</span>
+                </div>
+            </form>
+        </div>
+        <div class="index-channel">
+            <img class="img" src="{{background}}" alt="">  
+            <div class="index-channel-list">
+                <a href="/boys" class="list-item">男生 <span class="lighter">BOYS</span> <span class="iconfont right-icon">&#xe614;</span></a>
+                <a href="/girls" class="list-item">女生 <span class="lighter">GIRLS</span> <span class="iconfont right-icon">&#xe614;</span></a>
+                <a href="/kids" class="list-item">潮童 <span class="lighter">KIDS</span> <span class="iconfont right-icon">&#xe614;</span></a>
+                <a href="/lifestyle" class="list-item">创意生活 <span class="lighter">LIFESTYLE</span> <span class="iconfont right-icon">&#xe614;</span></a>
+            </div> 
+        </div>
+    </div>
 </div>
-
 {{>layout/footer}}
 {{> layout/download_app}}
\ No newline at end of file

-{{> layout/header}}
-<div class="good-list-page yoho-page">
-    {{# goodList}}
-        {{# search}}
-            <div id="search-input" class="search-input">
-                <form action="/product/list/index" method="get">
-                    <i class="search-icon iconfont">&#xe60f;</i>
-                    <input type="text" value={{default}} name="query">
-                    <i class="clear-input iconfont hide">&#xe61a;</i>
-                    <button id="search" class="search" type="submit">搜索</button>
-                </form>
-            </div>
-        {{/ search}}
-
-        {{# brandWay}}
-            <div class="brand-way">
-                <a  href={{url}}>
-                    <img class="brand-thumb" src={{thumb}}>
-                    <span>{{name}}</span>
-                    <span class="entry">
-                        进入品牌
-                        <i class="iconfont">&#xe614;</i>
-                    </span>
-                </a>
-            </div>
-        {{/ brandWay}}
-
-        {{# brandHome}}
-            <div id="brand-header" class="brand-header" data-id={{id}}>
-                <img class="lazy" data-original={{banner}}>
-                <a class="btn-intro" href="javascript:void(0);">
-                    品牌介绍
-                </a>
-                <a class="btn-col" href="javascript:void(0);">
-                    <span class="iconfont">&#xe622;</span>
-                    收藏
-                </a>
-            </div>
-            <div id="intro-box" class="brand-intro-box hide">
-                <div id="brand-intro" class="brand-intro">
-                    <h2>品牌介绍</h2>
-                    <div class="con">
-                        {{{intro}}}
-                    </div>
-                    <p class="fo">
-                        <span></span>
-                        100%品牌授权正品
-                    </p>
-                    <span class="iconfont close-intro">&#xe623;</span>
-                </div>
-            </div>
-        {{/ brandHome}}
-
-        <ul id="list-nav" class="list-nav clearfix">
-            <li class="new active">
-                <a href="javascript:void(0);">
-                    最新
-                    <span class="iconfont cur">&#xe616;</span>
-                </a>
-            </li>
-            <li class="price">
-                <a href="javascript:void(0);">
-                    价格
-                    <span class="icon">
-                        <i class="iconfont up">&#xe615;</i>
-                        <i class="iconfont down cur">&#xe616;</i>
-                    </span>
-                </a>
-            </li>
-            <li class="discount">
-                <a href="javascript:void(0);">
-                    折扣
-                    <span class="icon">
-                        <i class="iconfont up">&#xe615;</i>
-                        <i class="iconfont down cur">&#xe616;</i>
-                    </span>
-                </a>
-            </li>
-            <li class="filter">
-                <a href="javascript:void(0);">
-                    筛选
-                    <span class="iconfont">&#xe613;</span>
-                </a>
-            </li>
-        </ul>
-        <div id="goods-container" class="goods-container">
-            <div class="new-goods container">
-                {{# new}}
-                    {{> good}}
-                {{/ new}}
-            </div>
-            <div class="price-goods container hide"></div>
-            <div class="discount-goods container hide"></div>
-
-            {{> filter}}
-        </div>
-
-        {{#if brand}}
-            <input id="brand" type="hidden" value={{brand}}>
-        {{/if}}
-
-        {{#if gender}}
-            <input id="gender" type="hidden" value={{gender}}>
-        {{/if}}
-
-        {{#if sort}}
-            <input id="sort" type="hidden" value={{sort}}>
-        {{/if}}
-
-        {{#if color}}
-            <input id="color" type="hidden" value={{color}}>
-        {{/if}}
-
-        {{#if size}}
-            <input id="size" type="hidden" value={{size}}>
-        {{/if}}
-
-        {{#if price}}
-            <input id="price" type="hidden" value={{price}}>
-        {{/if}}
-
-        {{#if discount}}
-            <input id="discount" type="hidden" value={{discount}}>
-        {{/if}}
-    {{/ goodList}}
-</div>
-{{> layout/footer}}
\ No newline at end of file

-{{# new}}
-    {{> good}}
-{{/ new}}
\ No newline at end of file

 {{> layout/page_footer}}
+{{> layout/download_app}}
 {{#if rlsEnv}}
 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
 <script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>

@@ -2,7 +2,7 @@
 <html>
 <head>
 <meta charset="utf-8">
-<title>{{title}}YOHO!有货</title>
+<title>{{title}}Yoho!Buy有货</title>
 <meta name="keywords" content="{{keywords}}Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
 <meta name="description" content="{{description}}YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">

 <?php
 
 use Action\AbstractAction;
+use Plugin\Helpers;
 
 /**
  * 频道选择
@@ -20,7 +21,8 @@ class IndexController extends AbstractAction
         $this->_view->display('index', array(
             'background' => Index\HomeModel::getBgImage(),
             'channelPage' => true,
-            'showDownloadApp'=>true
+            'showDownloadApp'=>true,
+            'searchUrl' => Helpers::url('', null, 'search'),
         ));
     }
 

@@ -16,46 +16,10 @@ class SearchController extends AbstractAction
      */
     public function indexAction()
     {
-        $data = array(
-            array(
-                /*'hot' => array(
-                    array(
-                        'name' => '夹克',
-                        'url' => 'm.yohobuy.com'
-                    ),
-                    array(
-                        'name' => '休闲运动鞋',
-                        'url' => 'm.yohobuy.com'
-                    ),
-                    array(
-                        'name' => 'Into the Rainbow',
-                        'url' => 'm.yohobuy.com'
-                    )
-                ),
-                'history' => array(
-                    array(
-                        'name' => 'what',
-                        'url' => 'm.yohobuy.com'
-                    ),
-                    array(
-                        'name' => 'the',
-                        'url' => 'm.yohobuy.com'
-                    ),
-                    array(
-                        'name' => 'fuck',
-                        'url' => 'm.yohobuy.com'
-                    )
-                )*/
-            )
-        );
+        $this->_view->html('search');
         $this->_view->display('index', array(
-            'search' => $data,
+            'search' => array('url' => Helpers::url('', null, 'search')),
             'showDownloadApp' => true,
-            'pageHeader' => array (
-                'navBack' => true,
-                'navHome' =>  '/',
-                'navTitle' => '搜索'
-            ),
             'searchPage' => true,
             'pageFooter' => true
         ));
@@ -79,7 +43,7 @@ class SearchController extends AbstractAction
             'discount' => FILTER_DEFAULT,
             'gender' => FILTER_DEFAULT,
             'p_d' => FILTER_DEFAULT,), false);
-        
+
         $query = isset($condition['query']) ? strtolower(trim($condition['query'])) : null;
         if (isset($condition['discount'])) {
             $condition['p_d'] = rawurldecode($condition['discount']);

@@ -38,14 +38,8 @@ class ClassModel
         }
 
         do {
-            $num = 1;
             $data = ClassData::getClassesData();
-
-            if (!isset($data['code']) || $data['code'] !== 200) {
-                break;
-            }
-
-            if (!isset($data['data'])) {
+            if (empty($data['data'])) {
                 break;
             }
 
@@ -53,10 +47,7 @@ class ClassModel
             $item = array();
             foreach ($data['data'] as $k => $v) {
                 $oneClass = array('name' => $k, 'ca' => array());
-                if ($num === 1) {
-                    $oneClass['focus'] = true;
-                }
-
+                
                 foreach ($v as $val) {
                     $item = array();
                     $item['name'] = $val['category_name'];
@@ -69,14 +60,12 @@ class ClassModel
                                     'sort' => $value['relation_parameter']['sort'],
                                     'sort_name' => $value['category_name']
                                         ), 'list');
-
                         $item['sub'][] = $subitem;
                     }
 
                     $oneClass['ca'][] = $item;
                 }
 
-                $num++;
                 $result[] = $oneClass;
             }
 

@@ -10,22 +10,24 @@ class ClassController extends AbstractAction
 {
     public function indexAction()
     {
+        $channel = Helpers::getChannelByCookie();
         $classes =  ClassModel::getClassData();
+        // 根据频道设置默认的焦点
+        if (!empty($classes)) {
+            $classes[$channel - 1]['focus'] = true;
+        }
+        
+        $this->setTitle('商品分类');
+        $this->setNavHeader('商品分类');
 
         $data = array(
             'categoryPage' => true,
             'showDownloadApp' => true,
-            'pageHeader' => array (
-                'navBack' => true,
-                'navHome' =>  '/',
-                'navTitle' => '商品分类'
-            ),
             'category' => array(
-                'class' => $classes
+                'class' => $classes,
+                'searchUrl' => Helpers::url('/search.html', null, 'search'),
             )
         );
-
-        $this->setTitle('商品分类');
         
         $this->_view->display('index', $data);
     }

@@ -51,14 +51,14 @@ class IndexController extends AbstractAction
         $this->setTitle($name);
         $this->setNavHeader($name, true, SITE_MAIN);
 
-        $goodList = Product\ListModel::getClassData($condition);
-        if (!empty($condition) && !empty($goodList)) {
-            $goodList = array_merge($goodList, $condition);
-        }
+//        $goodList = Product\ListModel::getClassData($condition);
+//        if (!empty($condition) && !empty($goodList)) {
+//            $goodList = array_merge($goodList, $condition);
+//        }
         $this->_view->display('index', array(
             'goodListPage' => true,
             'showDownloadApp' => true,
-            'goodList' => $goodList,
+            'goodList' => $condition,
         ));
     }
 

@@ -13,11 +13,11 @@ routes.error.route.controller = Error
 routes.error.route.action = Index
 
 ; 搜索页
-routes.reg.type = "rewrite"
-routes.reg.match = "/search.html"
-routes.reg.route.module = Index
-routes.reg.route.controller = Search
-routes.reg.route.action = Index
+routes.search.type = "rewrite"
+routes.search.match = "/search.html"
+routes.search.route.module = Index
+routes.search.route.controller = Search
+routes.search.route.action = Index
 
 ; 注册页
 routes.reg.type = "rewrite"