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

-{{> layout/header}}
-<div class="product-list-page product-page yoho-page">
-    {{# list}}
-    {{# brandBanner}}
-    <div class="brand-banner">
-        <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})"></div>
-        <div class="opt-wrap">
-            <p class="opt center-content">
-                <a href="{{brandHome}}">
-                    <i class="iconfont">&#xe617;</i>
-                    品牌首页
-                </a>
-                <a href="{{brandIntro}}">
-                    <i class="iconfont">&#xe618;</i>
-                    品牌介绍
-                </a>
-                        <span id="brand-favor" class="brand-favor">
-                            <i class="iconfont{{#if coled}} coled{{/if}}">&#xe616;</i>
-                        </span>
-            </p>
-        </div>
-    </div>
-    {{/ brandBanner}}
-
-    <div class="center-content clearfix">
-        {{> layout/path-nav}}
-
-        {{# brandAbout}}
-        <div class="brand-about">
-            {{{brandIntro}}}
-        </div>
-        {{^}}
-        <div class="list-left pull-left">
-            {{> product/left-content}}
-        </div>
-        <div class="list-right pull-right">
-            {{# shopEntry}}
-            <div class="shop-entry clearfix">
-                <a class="pull-left" href="{{home}}">
-                    <img class="logo" src="{{logo}}">
-                </a>
-
-                <div class="name pull-left">
-                    <a class="shop-name" href="{{home}}">{{shopName}}</a>
-                    <p class="sorts">
-                        {{#each sort}}
-                        <a href="{{href}}">{{name}}</a>
-
-                        {{#unless @last}}
-                        /
-                        {{/unless}}
-                        {{/each}}
-                    </p>
-                </div>
-
-                <a class="entry-btn pull-right" href="{{home}}">
-                    进入品牌店铺
-                    <span class="iconfont">&#xe601;</span>
-                </a>
-            </div>
-            {{/ shopEntry}}
-
-            {{> product/standard-content}}
-
-            {{> product/latest-walk}}
-        </div>
-        {{/ brandAbout}}
-    </div>
-    {{/ list}}
-</div>
-{{> layout/footer}}
\ No newline at end of file
+{{> product/list}}
\ No newline at end of file

-{{> layout/header}}
-<div class="product-search-page product-page yoho-page center-content">
-    {{# search}}
-        {{> layout/path-nav}}
-
-        {{> product/standard-content}}
-
-        {{> product/latest-walk}}
-    {{/ search}}
-</div>
-{{> layout/footer}}
\ No newline at end of file

-{{> layout/header}}
-<div class="product-list-page product-page yoho-page">
-    {{# list}}
-        {{# brandBanner}}
-            <div class="brand-banner">
-                <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})"></div>
-                <div class="opt-wrap">
-                    <p class="opt center-content">
-                        <a href="{{brandHome}}">
-                            <i class="iconfont">&#xe617;</i>
-                            品牌首页
-                        </a>
-                        <a href="{{brandIntro}}">
-                            <i class="iconfont">&#xe618;</i>
-                            品牌介绍
-                        </a>
-                        <span id="brand-favor" class="brand-favor">
-                            <i class="iconfont{{#if coled}} coled{{/if}}">&#xe616;</i>
-                        </span>
-                    </p>
-                </div>
-            </div>
-        {{/ brandBanner}}
-
-        <div class="center-content clearfix">
-            {{> layout/path-nav}}
-
-            {{# brandAbout}}
-                <div class="brand-about">
-                    {{{brandIntro}}}
-                </div>
-            {{^}}
-                <div class="list-left pull-left">
-                    {{> product/left-content}}
-                </div>
-                <div class="list-right pull-right">
-                    {{> product/standard-content}}
-
-                    {{> product/latest-walk}}
-                </div>
-            {{/ brandAbout}}
-        </div>
-    {{/ list}}
-</div>
-{{> layout/footer}}
\ No newline at end of file
+{{> product/list}}
\ No newline at end of file

-{{> layout/header}}
-<div class="product-search-page product-page yoho-page center-content">
-    {{# search}}
-        {{> layout/path-nav}}
-
-        {{# shopEntry}}
-            <div class="shop-entry clearfix">
-                <a class="pull-left" href="{{home}}">
-                    <img class="logo" src="{{logo}}">
-                </a>
-
-                <div class="name pull-left">
-                    <a class="shop-name" href="{{home}}">{{shopName}}</a>
-                    <p class="sorts">
-                        {{#each sort}}
-                            <a href="{{href}}">{{name}}</a>
-
-                            {{#unless @last}}
-                            /
-                            {{/unless}}
-                        {{/each}}
-                    </p>
-                </div>
-
-                <a class="entry-btn pull-right" href="{{home}}">
-                    进入品牌店铺
-                    <span class="iconfont">&#xe601;</span>
-                </a>
-            </div>
-        {{/ shopEntry}}
-
-        {{> product/standard-content}}
-
-        {{> product/latest-walk}}
-    {{/ search}}
-</div>
-{{> layout/footer}}
\ No newline at end of file

+{{> product/new-sale}}
\ No newline at end of file

-{{> layout/header}}
-<div class="new-sale-page product-page yoho-page">
-    {{# newSale}}
-        {{# saleBanner}}
-            <div class="banner-img" style="height: {{bannerHeight}}px;background:url({{img}}) no-repeat top center;"></div>
-        {{/ saleBanner}}
-
-        <div class="center-content clearfix">
-            {{> layout/path-nav}}
-
-            {{# saleTitle}}
-                <div class="header-title">
-                    {{name}}
-                    <p class="line-through"></p>
-                    <p class="count-wrap">
-                        <span class="count">共{{count}}个结果</span>
-                    </p>
-                </div>
-            {{/ saleTitle}}
-
-            <div class="list-left pull-left">
-                {{> product/left-content}}
-            </div>
-
-            <div class="list-right pull-right">
-                {{# newMain}}
-                    <div class="new-banner">
-                        <a href="{{bannerHref}}">
-                            <img src="{{banner}}">
-                        </a>
-                    </div>
-                    <div class="new-brands clearfix">
-                        <span class="iconfont pre">&#xe607;</span>
-                        <div class="brands-wrap">
-                            <ul class="brands">
-                                {{# brands}}
-                                    <li>
-                                        <a href="{{href}}">
-                                            <img src="{{logo}}">
-                                        </a>
-                                    </li>
-                                {{/ brands}}
-                            </ul>
-                        </div>
-                        <span class="iconfont next">&#xe608;</span>
-                    </div>
-                    <div class="new-floor-title">
-                        <span class="date">{{date}}</span>
-                        <span class="title">{{title}}</span>
-                    </div>
-                {{/ newMain}}
-
-                {{> product/standard-content}}
-            </div>
-        </div>
-    {{/ newSale}}
-</div>
-{{> layout/footer}}
\ No newline at end of file
+{{> product/new-sale}}
\ No newline at end of file

 {{> layout/header}}
 <div class="product-search-page product-page yoho-page center-content">
     {{# search}}
-    {{> layout/path-nav}}
+        {{> layout/path-nav}}
 
-    {{> product/shop-entry}}
+        {{> product/shop-entry}}
 
-    {{> product/standard-content}}
+        {{> product/standard-content}}
 
-    {{> product/latest-walk}}
+        {{> product/latest-walk}}
     {{/ search}}
 </div>
 {{> layout/footer}}

+{{> layout/header}}
+<div class="product-list-page product-page yoho-page">
+    {{# list}}
+        {{# brandBanner}}
+            <div class="brand-banner">
+                <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})"></div>
+                <div class="opt-wrap">
+                    <p class="opt center-content">
+                        <a href="{{brandHome}}">
+                            <i class="iconfont">&#xe617;</i>
+                            品牌首页
+                        </a>
+                        <a href="{{brandIntro}}">
+                            <i class="iconfont">&#xe618;</i>
+                            品牌介绍
+                        </a>
+                        <span id="brand-favor" class="brand-favor">
+                            <i class="iconfont{{#if coled}} coled{{/if}}">&#xe616;</i>
+                        </span>
+                    </p>
+                </div>
+            </div>
+        {{/ brandBanner}}
+
+        <div class="center-content clearfix">
+            {{> layout/path-nav}}
+
+            {{# brandAbout}}
+                <div class="brand-about">
+                    {{{brandIntro}}}
+                </div>
+            {{^}}
+                <div class="list-left pull-left">
+                    {{> product/left-content}}
+                </div>
+                <div class="list-right pull-right">
+                    {{> product/standard-content}}
+
+                    {{> product/latest-walk}}
+                </div>
+            {{/ brandAbout}}
+        </div>
+    {{/ list}}
+</div>
+{{> layout/footer}}
\ No newline at end of file

+{{> layout/header}}
+<div class="new-sale-page product-page yoho-page">
+    {{# newSale}}
+        {{# saleBanner}}
+            <div class="banner-img" style="height: {{bannerHeight}}px;background:url({{img}}) no-repeat top center;"></div>
+        {{/ saleBanner}}
+
+        <div class="center-content clearfix">
+            {{> layout/path-nav}}
+
+            {{# saleTitle}}
+                <div class="header-title">
+                    {{name}}
+                    <p class="line-through"></p>
+                    <p class="count-wrap">
+                        <span class="count">共{{count}}个结果</span>
+                    </p>
+                </div>
+            {{/ saleTitle}}
+
+            <div class="list-left pull-left">
+                {{> product/left-content}}
+            </div>
+
+            <div class="list-right pull-right">
+                {{# newMain}}
+                    <div class="new-banner">
+                        <a href="{{bannerHref}}">
+                            <img src="{{banner}}">
+                        </a>
+                    </div>
+                    <div class="new-brands clearfix">
+                        <span class="iconfont pre">&#xe607;</span>
+                        <div class="brands-wrap">
+                            <ul class="brands">
+                                {{# brands}}
+                                    <li>
+                                        <a href="{{href}}">
+                                            <img src="{{logo}}">
+                                        </a>
+                                    </li>
+                                {{/ brands}}
+                            </ul>
+                        </div>
+                        <span class="iconfont next">&#xe608;</span>
+                    </div>
+                    <div class="new-floor-title">
+                        <span class="date">{{date}}</span>
+                        <span class="title">{{title}}</span>
+                    </div>
+                {{/ newMain}}
+
+                {{> product/standard-content}}
+            </div>
+        </div>
+    {{/ newSale}}
+</div>
+{{> layout/footer}}
\ No newline at end of file

@@ -84,11 +84,11 @@
             {{> product/good}}
         {{/each}}
         {{# hasNextPage}}
-        <div class="block-next-page">
-            <a href="{{href}}">
-                <img src="{{src}}" alt=""/>
-            </a>
-        </div>
+            <div class="block-next-page">
+                <a href="{{href}}">
+                    <img src="{{src}}" alt=""/>
+                </a>
+            </div>
         {{/ hasNextPage}}
         <div class="good-item-wrapper">
             <div class="good-info-main"></div>

@@ -136,7 +136,7 @@ function picCaptchaAjaxFn(page, callback) {
         type: 'POST',
         url: url,
         data: {
-            code: $ca.val()
+            verifyCode: $ca.val()
 
             //mobile: $pn.val(),
             //area: $region.text().split('+')[1]
@@ -169,7 +169,7 @@ function msgCaptchaAjaxFn(page, callback) {
         type: 'POST',
         url: url,
         data: {
-            code: $ca.val(),
+            verifyCode: $ca.val(),
             mobile: $pn.val(),
             area: $region.text().split('+')[1]
         }
@@ -465,7 +465,7 @@ exports.init = function(page) {
 
     $regionSelect.change(function() {
 
-        $region.text('+' + $('#region').val());
+        $region.text($('#region').val());
 
         validateRule(page, $pn, showErrTip); //验证
     });
@@ -493,7 +493,7 @@ exports.init = function(page) {
             data: {
                 area: $region.text().split('+')[1],
                 mobile: $pn.val(),
-                code: $ca.val()
+                verifyCode: $ca.val()
             }
         }).then(function(data) {
             if (data.code === 200) {

+<?php
+
+namespace Product;
+
+use LibModels\Wap\Product\SearchData;
+use LibModels\Web\Product\SearchData as WebProduct;
+use Plugin\HelperSearch;
+use \LibModels\Web\Product\SearchData as Search;
+use Plugin\Images;
+/**
+ * sale首页模板数据模型
+ *
+ */
+class NewModel 
+{
+
+    public static function getNewSearchData($params, $options) 
+    {
+        $data = array();
+        // 调用接口查询商品数据
+        $result = SearchData::searchElasticByCondition($params);
+        if (isset($result['code']) && $result['code'] === 200) {
+            // 调用分类信息
+            $category = Search::getClassesData();
+            if (isset($category['code']) && $category['code'] === 200) {
+                $result['data']['filter']['group_sort'] = $category['data']['sort'];
+            }
+            // 调用折扣区间
+            $discount = Search::getDiscount();
+            if (isset($discount['code']) && $discount['code'] === 200) {
+                $result['data']['filter']['discount'] = $discount['data']['discount'];
+            }
+            // 调用最新上架
+            $recent = Search::recentShelve();
+            if (isset($discount['code']) && $discount['code'] === 200) {
+                $result['data']['filter']['recent'] = $recent['data']['recent'];
+            }
+            //用户浏览记录
+            $result['data']['filter']['review'] = Search::getRecentReview();
+            // 组织模板数据
+            $data = HelperSearch::getList($result, $options);
+            
+            //new页面模拟数据
+            $data['newMain'] = array(
+                'banner' => 'http://img11.static.yhbimg.com/yhb-img01/2015/11/23/07/010a459d41b99a839cba9377532f1c19b2.jpg?imageView/3/w/970/h/200',
+                    'date' => '12月16日',
+                    'title' => '新品到着',
+                    'brands' => array(
+                        array(
+                            'href' => '',
+                            'logo' => 'http://img13.static.yhbimg.com/brandLogo/2012/02/28/15/02b2b5ded161ab31e2e097a327ed475052.jpg?imageView/2/w/170/h/120'
+                        ),
+                        array(
+                            'href' => '',
+                            'logo' => 'http://img13.static.yhbimg.com/brandLogo/2012/11/09/09/023721f44182f775d79904010af421331e.jpg?imageView/2/w/170/h/120'
+                        ),
+                        array(
+                            'href' => '',
+                            'logo' => 'http://img11.static.yhbimg.com/brandLogo/2012/12/13/17/01408fb72646c8f3fa59d870514f08a356.jpg?imageView/2/w/170/h/120'
+                        ),
+                        array(
+                            'href' => '',
+                            'logo' => 'http://img13.static.yhbimg.com/brandLogo/2012/12/24/13/0265b45e37af697c5ba12d5415fb341f27.jpg?imageView/2/w/170/h/120'
+                        ),
+                        array(
+                            'href' => '',
+                            'logo' => 'http://img11.static.yhbimg.com/brandLogo/2015/08/11/15/012d09a5cae187af1f6f3ed246b9b5a4fc.jpg?imageView/2/w/170/h/120'
+                        ),
+                        array(
+                            'href' => '',
+                            'logo' => 'http://img11.static.yhbimg.com/brandLogo/2015/08/20/16/01047ffb3ca182871821d551af31ac2378.jpg?imageView/2/w/170/h/120'
+                        )
+                    )
+            );
+        }
+        
+        return array(
+            'productListPage' => true,
+            'newSale' => $data
+        );
+    }
+
+}

@@ -32,7 +32,7 @@ class SearchModel
         $result = SearchData::searchElasticByCondition($condition);
         if (isset($result['code']) && $result['code'] === 200) {
             // 调用分类信息
-            $category = SearchData::getClassesData();
+            $category = SearchData::getClassesData($condition);
             if (isset($category['code']) && $category['code'] === 200) {
                 $result['data']['filter']['group_sort'] = $category['data']['sort'];
             }

@@ -61,15 +61,15 @@ class IndexController extends WebAction
         
         //每页显示商品数
         if(!isset($condition['viewNum']) || empty($condition['viewNum'])){
-            $condition['viewNum'] = 59;
+            $condition['viewNum'] =60;
         }
         $view_num_arr = array(60, 100, 200);
         if (!in_array($condition['viewNum'], $view_num_arr)) {
-            $condition['viewNum'] = 59;
+            $condition['viewNum'] = 60;
         }
         //每行显示的商品数量
         if(!isset($condition['rowNum']) || empty($condition['rowNum'])){
-            $condition['rowNum'] = 5;
+            $condition['rowNum'] =5;
         }
         if ($condition['rowNum'] == 6) {
             $imgSize = array(195, 260);
@@ -88,11 +88,13 @@ class IndexController extends WebAction
             'gender' => $gender,
             'needPd' => 'Y',
             'rowNum' => $condition['rowNum'],
-            'viewNum' => $condition['viewNum'] - 1,
+            'viewNum' => $condition['viewNum'],
         );
         
         $params = $condition + $_GET;
         $params = array_filter($params);
+        //每页记录数减1，下一页占位
+        $params['viewNum'] = $params['viewNum'] - 1;
         $data = Product\BrandsModel::getBrandSearchData($params,$options,$domain,$uid,$brandId,$node);
         $cate = array('boys','girls','kids','lifestyle');
         $this->setWebNavHeader($cate[$gender-1]);

@@ -73,11 +73,11 @@ class SaleController extends WebAction
         
         //每页显示商品数
         if (!isset($condition['viewNum']) || empty($condition['viewNum'])) {
-            $condition['viewNum'] = 59;
+            $condition['viewNum'] = 60;
         }   
         $view_num_arr = array(60, 100, 200);
         if (!in_array($condition['viewNum'], $view_num_arr)) {
-            $condition['viewNum'] = 59;
+            $condition['viewNum'] = 60;
         }
         //每行显示的商品数量
         if (!isset($condition['rowNum']) || empty($condition['rowNum'])) {
@@ -100,13 +100,15 @@ class SaleController extends WebAction
             'gender' => $gender,
             'needPd' => 'Y',
             'rowNum' => $condition['rowNum'],
-            'viewNum' => $condition['viewNum'] - 1,
+            'viewNum' => $condition['viewNum'],
             'specialsale_id' => 'Y'
         );
         
         $params = $condition + $_GET;
         $params['attribute_not'] = 2;
         $params = array_filter($params);
+        //每页记录数减1，下一页占位
+        $params['viewNum'] = $params['viewNum'] - 1;
         
         $data = Product\SaleModel::getSaleSearchData($params, $options, $specialInfo);
         $cate = array('boys', 'girls', 'kids', 'lifestyle');

@@ -60,7 +60,7 @@ class SearchController extends WebAction
             if (!$price[0]) {
                 $price[0] = 0;
             }
-            if ($price[1]) {
+            if (!$price[1]) {
                 $price[1] = 99999;
             }
             $condition['price'] = implode(',', $price);

+<?php
+
+use Action\WebAction;
+use LibModels\Web\Product\SaleData;
+
+/**
+ * new页
+ *
+ */
+class NewController extends WebAction 
+{
+
+    public function indexAction() 
+    {
+        /* 过滤请求参数 */
+        $condition = array();
+        $condition = filter_input_array(INPUT_GET, array(
+            //'query' => FILTER_SANITIZE_STRING,
+            'sort' => FILTER_VALIDATE_INT,
+            'msort' => FILTER_VALIDATE_INT,
+            'misort' => FILTER_VALIDATE_INT,
+            'color' => FILTER_VALIDATE_INT,
+            'size' => FILTER_VALIDATE_INT,
+            'style' => FILTER_DEFAULT,
+            'price' => FILTER_DEFAULT,
+            'gender' => FILTER_DEFAULT,
+            'p_d' => FILTER_DEFAULT,
+            'shelve_time' => FILTER_DEFAULT,
+            'isNew' => FILTER_DEFAULT,
+            'specialoffer' => FILTER_DEFAULT,
+            'limited' => FILTER_DEFAULT,
+            'order' => FILTER_DEFAULT,
+            'viewNum' => FILTER_VALIDATE_INT,
+            'rowNum' => FILTER_VALIDATE_INT,
+            'page' => FILTER_VALIDATE_INT,), false);
+        
+        //字符转码
+        if (!empty($condition)) {
+            foreach ($condition as &$value) {
+                $value = rawurldecode($value);
+            }
+        }
+        
+        //获取性别数据
+        $gender = $this->get('gender') ? ($this->get('gender') == '2,3' ? 2 : 1) : (!isset($_COOKIE['_Gender']) ? '3' : ($_COOKIE['_Gender'] == '2,3' ? 2 : 1));
+        $condition['gender'] = $gender;
+        
+        //每页显示商品数
+        if (!isset($condition['viewNum']) || empty($condition['viewNum'])) {
+            $condition['viewNum'] = 60;
+        }   
+        $view_num_arr = array(60, 100, 200);
+        if (!in_array($condition['viewNum'], $view_num_arr)) {
+            $condition['viewNum'] = 60;
+        }
+        //每行显示的商品数量
+        if (!isset($condition['rowNum']) || empty($condition['rowNum'])) {
+            $condition['rowNum'] = 5;
+        }
+        if ($condition['rowNum'] == 6) {
+            $imgSize = array(195, 260);
+            $minImgSize = array(50, 67);
+        } else {
+            $condition['rowNum'] = 5;
+            $imgSize = array(235, 314);
+            $minImgSize = array(60, 80);
+        }
+        //搜索词
+        //$query = $this->get('query');
+        $condition['needFilter'] = 1;
+        $options = array(
+            'imgSize' => $imgSize,
+            'minImgSize' => $minImgSize,
+            'gender' => $gender,
+            'needPd' => 'Y',
+            'rowNum' => $condition['rowNum'],
+            'viewNum' => $condition['viewNum'],
+            'specialsale_id' => 'Y'
+        );
+        
+        $params = $condition + $_GET;
+        $params['attribute_not'] = 2;
+        $params = array_filter($params);
+        //每页记录数减1，下一页占位
+        $params['viewNum'] = $params['viewNum'] - 1;
+        
+        $data = Product\NewModel::getNewSearchData($params, $options);
+        $cate = array('boys', 'girls', 'kids', 'lifestyle');
+        $this->setWebNavHeader($cate[$gender - 1]);
+        //渲染模板
+        $this->_view->display('new-sale', $data);
+    }
+
+}