Merge branch 'develop' into beta

@@ -867,7 +867,6 @@ class Process
             $cacheKey = sprintf("%s_%s", CacheConfig::KEY_INDEX_BRANDS_LIST_DATA, $type_key);
             Cache::set($cacheKey, $floor, 7200);
             $result['hotBrands']['brandUrl'] = '/common/getIndexResourceBrand?type=' . $type_key;
-            //print_r($result['hotBrands']['brandUrl']);
         }
         return $result;
     }

@@ -29,20 +29,7 @@ var brandsData,
 
 loading.showLoadingMask();
 
-//热门品牌滑动
-hotBrandsSwiper = new Swiper('.brands-swiper', {
-    grabCursor: true,
-    slidesPerView: 'auto',
-    wrapperClass: 'brands-list',
-    slideElement: 'li'
-});
 
-swiper = new Swiper('.swiper-container', {
-    lazyLoading: true,
-    loop: true,
-    autoplay: 3000,
-    pagination: '.swiper-pagination .pagination-inner'
-});
 
 lazyLoad($('img.lazy'));
 $('.yoho-header').css({
@@ -58,6 +45,22 @@ $('.yoho-header').css({
 
     $('.hide-when-loading').show();
     loading.hideLoadingMask();
+
+    //banner滑动
+    swiper = new Swiper('.swiper-container', {
+        lazyLoading: true,
+        loop: true,
+        autoplay: 3000,
+        pagination: '.swiper-pagination .pagination-inner'
+    });
+
+    //热门品牌滑动
+    hotBrandsSwiper = new Swiper('.brands-swiper', {
+    grabCursor: true,
+    slidesPerView: 'auto',
+    wrapperClass: 'brands-list',
+    slideElement: 'li'
+});
 })();
 
 $fixTitleBar = $('<div class="title-bar fixed-title-bar"><h2></h2></div>');

@@ -33,7 +33,9 @@ module.exports = function(specificGender) {
     if (kidsType) {
         url = '/product/recom/maylikekids';
     } else if (lifestyleType) {
-        url = '/product/recom/maylikelife';
+
+        //有货币页面加载男生首页的数据
+        url = specificGender ? '/product/recom/maylike?gender=1,3' : '/product/recom/maylikelife';
     } else {
         gender = (specificGender === 'boys' || $('.mobile-wrap').hasClass('boys-wrap')) ?
                  '1,3' : '2,3',

@@ -202,8 +202,9 @@
         li:before {
             content: "";
             display: inline-block;
-            width: 4px;
-            height: 4px;
+            margin-right: 20rem / $pxConvertRem;
+            width: 8rem / $pxConvertRem;
+            height: 8rem / $pxConvertRem;
             background-color: #000;
             border-radius: 50%;
             position: relative;

@@ -6,5 +6,6 @@
 
     {{> sale/activity-entry}}
     {{> sale/brand-sale}}
+    {{> sale/sale-box}}
 </div>
 {{> layout/footer}}

+<div class="home-page">
+    {{#sale-category}}
+        <div class="floor-header clearfix">
+            <h2 class="floor-title">{{title}}</h2>
+        </div>
+        <ul class="sale-nav">
+            {{#navItem}}
+                <li class="{{#vip}}green{{/vip}} {{#incompleteSize}}yellow{{/incompleteSize}} {{#newDiscount}}red{{/newDiscount}} {{#if @first}}active first{{/if}} {{#if @last}}last{{/if}}" data-url='{{url}}'>aa</li>
+            {{/navItem}}
+        </ul>
+        <div class="commodity-list">
+          <ul class="clearfix">
+              {{#each saleImage}}
+              <li class="commodity-item">
+                 <a href="{{href}}" target= "_blank"><div class="commodity-img">
+                     <img class="lazy" data-original="{{img}}"/></div>
+                    <div class="commodity-content {{#if @last}}hide{{/if}}">
+                        <p class="commodity-name">{{name}}</p>
+                        <p class="commodity-price">
+                            <span class="origin">¥{{originPrice}}</span>
+                            <span>¥{{price}}</span>
+                            {{#vip}}<span class="vip-tag">VIP</span><strong>更优惠</strong>{{/vip}}
+                        </p>
+                    </div>
+                 </a>
+              </li>
+              {{/each}}
+          </ul>
+        </div>
+    {{/sale-category}}
+</div>

+/**
+ * sale页js打包入口文件
+ * @author： zhaobiao<bill.zhao@yoho.cn>
+ * @date: 2016/01/18
+ */
+
+require('./index');

@@ -5,9 +5,15 @@
  */
 
 var $ = require('yoho.jquery'),
+    $navItem = $('.sale-nav li'),
     lazyLoad = require('yoho.lazyload');
 
 require('../common/slider');
 
 lazyLoad($('img.lazy'));
 $('.slide-container').slider();
+
+$navItem.on('click', function() {
+    $(this).siblings('.active').removeClass('active');
+    $(this).addClass('active');
+});

@@ -137,4 +137,198 @@
             }
         }
     }
+
+    .sale-nav li {
+        float: left;
+        width: 20%;
+        height: 40px;
+        line-height: 40px;
+        background-color: #e0e0e0;
+        text-align: center;
+        background-color: #f5f5f5;
+        color: #6d6d6d;
+        margin-bottom: 10px;
+    }
+    .sale-nav li.active {
+        color: #fff;
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .sale-nav li.green.active {
+        color: #fff;
+        background-image: image-url('sale/navactive-green-middle.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .sale-nav li.green.first.active {
+        background-image: image-url('sale/navactive-green-first.png');
+    }
+
+    .sale-nav li.green.last.active {
+        background-image: image-url('sale/navactive-green-last.png');
+    }
+
+    .sale-nav li.yellow.active {
+        color: #fff;
+        background-image: image-url('sale/navactive-yellow-middle.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .sale-nav li.yellow.first.active {
+        background-image: image-url('sale/navactive-yellow-first.png');
+    }
+
+    .sale-nav li.yellow.last.active {
+        background-image: image-url('sale/navactive-yellow-last.png');
+    }
+
+    .sale-nav li.red.active {
+        color: #fff;
+        background-image: image-url('sale/navactive-red-middle.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+    }
+
+    .sale-nav li.red.first.active {
+        background-image: image-url('sale/navactive-red-first.png');
+    }
+
+    .sale-nav li.red.last.active {
+        background-image: image-url('sale/navactive-red-last.png');
+    }
+
+    @media screen and (min-width: 1150px) {
+        .floor-header {
+            margin:80px 0 40px
+        }
+
+        .floor-header .header-navs li {
+            padding: 1px 15px
+        }
+    }
+
+    .commodity-list ul {
+        width: 1004px
+    }
+
+    .commodity-item {
+        float: left;
+        width: 241px;
+        margin: 0 10px 0 0
+    }
+    .commodity-img {
+        position: relative;
+        height: 323px;
+        text-align: center
+    }
+
+    .commodity-img img {
+        width: 100%;
+        height: 100%;
+        vertical-align: middle
+    }
+
+    .commodity-img .top-tag {
+        position: absolute;
+        width: 60px;
+        height: 60px;
+        top: 10px;
+        right: 10px;
+        line-height: 60px;
+        background: url('../assets/images/furniture/top-tag-bg.png?1450667948');
+        font-size: 20px;
+        color: #fff
+    }
+
+    .commodity-img .few-tag {
+        position: absolute;
+        bottom: 0;
+        width: 100%;
+        height: 20px;
+        background: #ffac5b;
+        color: #fff;
+        line-height: 20px;
+        text-align: center;
+        font-size: 12px
+    }
+
+    .commodity-content {
+        padding: 10px 0 0 0;
+        height: 69px;
+        overflow: hidden
+    }
+
+    .commodity-content .commodity-name {
+        font-size: 12px;
+        color: #000;
+        line-height: 18px;
+        text-align: center
+    }
+
+    .commodity-content .commodity-price {
+        position: relative;
+        margin: 3px 0 0 0;
+        text-align: center;
+        line-height: 20px;
+        color: #000
+    }
+
+    .commodity-content .commodity-price span {
+        display: inline-block;
+        *display: inline;
+        *zoom: 1;
+        font-size: 12px;
+        padding: 0 15px;
+    }
+
+    .commodity-content .commodity-price span.origin {
+        text-decoration: line-through;
+    }
+
+    .commodity-content .commodity-price strong {
+        font-weight: normal;
+        color: #565656;
+        font-size: 13px;
+    }
+
+    .commodity-content .commodity-price span.vip-tag {
+        background-image: image-url('sale/vip.png');
+        background-repeat: no-repeat;
+        background-size: 100% 90%;
+        color: #fff;
+        font-style: italic;
+        margin-right: 5px;
+    }
+
+    .commodity-content .commodity-price .price-sale {
+        margin-left: 10px;
+        padding-left: 10px;
+        width: 36px;
+        height: 20px;
+        line-height: 20px;
+        background: url('../assets/images/furniture/sale-tag-bg.png?1450667948');
+        color: #fff
+    }
+
+    @media screen and (min-width: 1150px) {
+        .commodity-list ul {
+            width:1160px
+        }
+
+        .commodity-item {
+            width: 280px
+        }
+
+        .commodity-img {
+            height: 374px
+        }
+
+        .commodity-content {
+            padding: 14px 0 0 0;
+            height: 77px
+        }
+    }
 }

@@ -3,8 +3,6 @@ namespace product;
 
 use Plugin\Images;
 use Api\Yohobuy;
-//use Plugin\Helpers;
-//use LibModels\Web\Home\IndexData;
 use \LibModels\Web\Product\HotrankData;
 use \LibModels\Web\Product\SearchData;
 
@@ -17,14 +15,16 @@ class HotrankModel {
     {
         // 调用接口查询商品数据
         $result = SearchData::searchElasticByCondition($param);
-        //print_r($result);
         
-        if(!empty($result)){
+        if(!empty($result))
+        {
             $res = self::getProductList($result,$page,$ajax);
-            if(!empty($res['popular'])){
+            if(!empty($res['popular']))
+            {
                 $data['popular'] = $res['popular'];
             }
-            if(!empty($res['hotWeek'])){
+            if(!empty($res['hotWeek']))
+            {
                 $data['hotWeek'] = $res['hotWeek'];
             }    
         }
@@ -40,8 +40,10 @@ class HotrankModel {
     {
         $list = \LibModels\Web\Product\HotrankData::getHotranktag($client_type,$channel,$is_concurrent);
         $nav = array();
-        if(!empty($list['data']['list'])){
-                foreach($list['data']['list'] as $li=>$lt){
+        if(!empty($list['data']['list']))
+        {
+                foreach($list['data']['list'] as $li=>$lt)
+                {
                         $nav[$li]['sid'] = $lt['id'];
                         $nav[$li]['textCn'] = $lt['tag_name'];
                 }
@@ -57,54 +59,55 @@ class HotrankModel {
     {
         // 调用发起请求
         Yohobuy::yarConcurrentLoop();
-        /*----product start---------*/
-        if(empty($result) || empty($result['data']) || empty($result['data']['product_list'])){
+ 
+        if(empty($result) || empty($result['data']) || empty($result['data']['product_list']))
+        {
             return;
         }
         $data = $result['data']['product_list'];
-
         $popular = array();
         $hotWeek = array();
-        foreach($data as $key=>$val){
-            if(empty($val['goods_list'])){
+        foreach($data as $key=>$val)
+        {
+            if(empty($val['goods_list']))
+            {
                 continue;
             }
             $defaultGoodsId = 0;
-            foreach ($val['goods_list'] as $v){
-                if($v['is_default'] == 'Y'){
+            foreach ($val['goods_list'] as $v)
+            {
+                if($v['is_default'] == 'Y')
+                {
                     $defaultGoodsId = $v['goods_id'];
                 }
             }
-            if(empty($defaultGoodsId)){
+            if(empty($defaultGoodsId))
+            {
                 $defaultGoodsId = $val['goods_list'][0]['goods_id'];
             }
 
             $product_id = empty($val['product_id']) ? '' : $val['product_id'];
-            $re['url'] = 'http://item.yohobuy.com/product/pro_'.$product_id.'_'.$defaultGoodsId.'.html';
-
             $re['name'] = $val['product_name'];
-            if($key <= 9 && $page == 1 && $ajax == 0){				
+            if($key <= 9 && $page == 1 && $ajax == 0)
+            {	
+                //人气单品
                 $re['rank'] = $key + 1;
-                    if($key <= 5){
-                            $re['price'] = (int)$val['market_price'] == (int)$val['sales_price'] ? '' : '¥'.$val['market_price'];
-                            $re['sPrice'] = empty($val['sales_price']) ? '' : '¥'.$val['sales_price'];
+                $re['href'] = 'http://item.yohobuy.com/product/pro_'.$product_id.'_'.$defaultGoodsId.'.html';
+                $re['price'] = (int)$val['market_price'] == (int)$val['sales_price'] ? '' : $val['market_price'];
+                $re['sPrice'] = empty($val['sales_price']) ? '' : $val['sales_price'];
+                if($key <= 5)
+                {
                     $re['img'] = empty($val['default_images']) ? '' : Images::getImageUrl($val['default_images'], 378, 504, 2);
                     $popular['list'][] = $re;
                 }else{
-                            $re['price'] = (int)$val['market_price'] == (int)$val['sales_price'] ? '' : '¥'.$val['market_price'];
-                            $re['sPrice'] = empty($val['sales_price']) ? '' : '¥'.$val['sales_price'];
                     $re['img'] = empty($val['default_images']) ? '' : Images::getImageUrl($val['default_images'], 280, 373, 2);
                     $popular['list'][] = $re;
                 }
-            }else if ($ajax == 1){
-                    $re['marketPrice'] = (int)$val['market_price'] == (int)$val['sales_price'] ? '' : '¥'.$val['market_price'];
-                    $re['salePrice'] = empty($val['sales_price']) ? '' : '¥'.$val['sales_price'];
-                    $re['rank'] = '';
-                    $re['img'] = empty($val['default_images']) ? '' : Images::getImageUrl($val['default_images'], 280, 373, 2);
-                    $hot[] = $re;
             }else{
-                    $re['marketPrice'] = (int)$val['market_price'] == (int)$val['sales_price'] ? '' : '¥'.$val['market_price'];
-                    $re['salePrice'] = empty($val['sales_price']) ? '' : '¥'.$val['sales_price'];
+                //一周热卖
+                $re['url'] = 'http://item.yohobuy.com/product/pro_'.$product_id.'_'.$defaultGoodsId.'.html';
+                $re['marketPrice'] = (int)$val['market_price'] == (int)$val['sales_price'] ? '' : $val['market_price'];
+                $re['salePrice'] = empty($val['sales_price']) ? '' : $val['sales_price'];
                 $re['rank'] = '';
                 $re['thumb'] = empty($val['default_images']) ? '' : Images::getImageUrl($val['default_images'], 280, 373, 2);
                 $hot[] = $re;

@@ -17,10 +17,6 @@ class LoginController extends WebAction
         // 设置登录有效时间30分钟, 防机器刷
         $this->setSession('_LOGIN_EXPIRE', time() + 1800);
 
-        // 清除客户端
-        $this->setCookie('_UID', '');
-        $this->setCookie('_TOKEN', '');
-
         //登录后跳转页面
         $refer = empty($_SERVER["HTTP_REFERER"]) ? '' : $_SERVER["HTTP_REFERER"];
         if (!empty($refer)) {

@@ -56,221 +56,16 @@ class IndexController extends WebAction
         $this->_view->display('list',$data);
     }
     
-    public function hotrankAction() {
-       
-        $data = array(
-            'hotrankPage' => true,
-            'hotrank' => array(
-                array(
-                    'slide' => array(
-                        'list' => array(
-                            array(
-                                'href' => '/?gender=1,3',
-                                'img' => 'http://img10.static.yhbimg.com/taobaocms/2015/11/26/12/01c3b99f554ad50d9e5a9900719715c94c.jpg'
-                            ),
-                            array(
-                                'href' => '/?gender=1,3',
-                                'img' => 'http://img12.static.yhbimg.com/taobaocms/2015/11/27/09/02a4f1c10e1e81574520e5c0239741a076.jpg'
-                            ),
-                            array(
-                                'href' => '/?gender=1,3',
-                                'img' => 'http://img10.static.yhbimg.com/taobaocms/2015/11/26/12/01c3b99f554ad50d9e5a9900719715c94c.jpg'
-                            ),
-                            array(
-                                'href' => '/?gender=1,3',
-                                'img' => 'http://img12.static.yhbimg.com/taobaocms/2015/11/27/09/02a4f1c10e1e81574520e5c0239741a076.jpg'
-                            ),
-                            array(
-                                'href' => '/?gender=1,3',
-                                'img' => 'http://img10.static.yhbimg.com/taobaocms/2015/11/26/12/01c3b99f554ad50d9e5a9900719715c94c.jpg'
-                            ),
-                            array(
-                                'href' => '/?gender=1,3',
-                                'img' => 'http://img12.static.yhbimg.com/taobaocms/2015/11/27/09/02a4f1c10e1e81574520e5c0239741a076.jpg'
-                            ),
-                            array(
-                                'href' => '/?gender=1,3',
-                                'img' => 'http://img10.static.yhbimg.com/taobaocms/2015/11/26/12/01c3b99f554ad50d9e5a9900719715c94c.jpg'
-                            ),
-                            array(
-                                'href' => '/?gender=1,3',
-                                'img' => 'http://img12.static.yhbimg.com/taobaocms/2015/11/27/09/02a4f1c10e1e81574520e5c0239741a076.jpg'
-                            )
-                        )
-                    )
-                ),
-                array(
-                    'popular' => array(
-                        'name' => '人气单品',
-                        'list' => array(
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '1'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '2'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '3'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '4'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '5'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '6'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '7'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '8'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '9'
-                            ),
-                            array(
-                                'href' => '',
-                                'img' => 'http://img13.static.yhbimg.com/goodsimg/2014/09/16/07/027e03e45e3e88db0adbf6255671546a0b.jpg?imageMogr2/thumbnail/378x504/extent/378x504/background/d2hpdGU=/position/center/quality/90',
-                                'title' => 'YYYOHOOD 黄伟文Wyman X yohood联名商品 圆领卫衣',
-                                'price' => '399',
-                                'sPrice' => '199',
-                                'rank' => '10'
-                            )
-                        )
-                        
-                    )
-                ),
-                array(
-                    'hotBrands' => array(
-                        'name' => '热门品牌',
-                    )
-                ),
-                array(
-                    'hotWeek' => array(
-                        'name' => '一周热卖',
-                        'nav' => array(
-                            array(
-                                'textCn' => 'TOP100',
-                                'url' => '',
-                                'sid' => 1
-                            ),
-                            array(
-                                'textCn' => '上装',
-                                'url' => '',
-                                'sid' => 2
-                            ),
-                            array(
-                                'textCn' => '男生测试',
-                                'url' => '',
-                                'sid' => 3
-                            ),
-                            array(
-                                'textCn' => '配饰',
-                                'url' => '',
-                                'sid' => 4
-                            )
-                        ),
-                        'list' => array(
-                            array(
-                                'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/11/24/10/020dce58a189f3fbfc071b3d5dc7ccc4e9.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90',
-                                'url' => 'http://item.yohobuy.com/product/pro_294497_377385.html',
-                                'name' => 'MARtube马克图布 暖手宝移动电源萌兔',
-                                'marketPrice' => '109',
-                                'salePrice' => '129'
-                            ),
-                            array(
-                                'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/11/24/10/020dce58a189f3fbfc071b3d5dc7ccc4e9.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90',
-                                'url' => 'http://item.yohobuy.com/product/pro_294497_377385.html',
-                                'name' => 'MARtube马克图布 暖手宝移动电源萌兔',
-                                'marketPrice' => '109',
-                                'salePrice' => '129'
-                            ),
-                            array(
-                                'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/11/24/10/020dce58a189f3fbfc071b3d5dc7ccc4e9.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90',
-                                'url' => 'http://item.yohobuy.com/product/pro_294497_377385.html',
-                                'name' => 'MARtube马克图布 暖手宝移动电源萌兔',
-                                'marketPrice' => '109',
-                                'salePrice' => '129'
-                            ),
-                            array(
-                                'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/11/24/10/020dce58a189f3fbfc071b3d5dc7ccc4e9.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90',
-                                'url' => 'http://item.yohobuy.com/product/pro_294497_377385.html',
-                                'name' => 'MARtube马克图布 暖手宝移动电源萌兔',
-                                'marketPrice' => '109',
-                                'salePrice' => '129'
-                            ),
-                            array(
-                                'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/11/24/10/020dce58a189f3fbfc071b3d5dc7ccc4e9.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90',
-                                'url' => 'http://item.yohobuy.com/product/pro_294497_377385.html',
-                                'name' => 'MARtube马克图布 暖手宝移动电源萌兔',
-                                'marketPrice' => '109',
-                                'salePrice' => '129'
-                            ),
-                            array(
-                                'thumb' => 'http://img13.static.yhbimg.com/goodsimg/2015/11/24/10/020dce58a189f3fbfc071b3d5dc7ccc4e9.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90',
-                                'url' => 'http://item.yohobuy.com/product/pro_294497_377385.html',
-                                'name' => 'MARtube马克图布 暖手宝移动电源萌兔',
-                                'marketPrice' => '109',
-                                'salePrice' => '129'
-                            ),
-                        )
-                    )
-                )
-            )
-        );
-        
- 
+    /**
+     * 热销排行
+     */
+    public function hotrankAction() 
+    {
+        //获取频道
         $cookie = $this->getCookie('_Channel');
-        $cookie = 'lifestyle';
         $this->channel = isset($cookie) ? $cookie : 'boys';
-        switch ($this->channel){
+        switch ($this->channel)
+        {
             case 'boys' :
                     $this->gender = '1,3';
                     $this->road = 1;
@@ -298,6 +93,7 @@ class IndexController extends WebAction
                         'footerTop'=> true,
                         'hotrank' => array()
                     );
+        
         //焦点图 热门品牌
         $focus = \Index\HomeModel::getChannelResource($this->channel, $this->code);
         $data['hotrank']['slide'] = $focus[0]['slide'];
@@ -308,10 +104,12 @@ class IndexController extends WebAction
         $sort_id = $this->get('sid',0);
         $viewNum = 60;
         $param = array('order'=>'s_n_desc','viewNum'=>$viewNum,'page'=>$page,'stocknumber'=>1,'status'=>1,'gender'=>$this->gender,'attribute_not'=>2);
-        if($sort_id != 0){
+        if($sort_id != 0)
+        {
             $param['sort'] = $sort_id;
         }
-        if($this->road == 3){
+        if($this->road == 3)
+        {
             $param['msort'] = 365;
         }elseif($this->road == 4){
             $param['msort'] = 10;
@@ -353,9 +151,8 @@ class IndexController extends WebAction
             }				
         }
         $viewNum = 60;		
-        //过滤掉赠品		
-        $param = array('order'=>'s_n_desc','viewNum'=>$viewNum,'page'=>$page,'sort'=>$sort,'stocknumber'=>1,'status'=>1,'gender'=>$this->gender,
-                'attribute_not'=>2);
+        $param = array('order'=>'s_n_desc','viewNum'=>$viewNum,'page'=>$page,'sort'=>$sort,'stocknumber'=>1,'status'=>1,
+                'gender'=>$this->gender,'attribute_not'=>2);
         if(empty($param['sort']))
         {
             if($this->road == 3)
@@ -367,7 +164,7 @@ class IndexController extends WebAction
                 $param['not_maxSortId'] = '10,365';
             }
         }
-        
+        //一周热卖
         $list = \product\HotrankModel::getSearchData($param, $page, 1);
         $lister = $list['hotWeek']['list'];
         $lister = array_values($lister);
@@ -377,12 +174,8 @@ class IndexController extends WebAction
         }else{
             $lister = array_slice($lister, 0, 50);
         }
-        $data = array(
-                'code'=>200,
-                'data'=>$lister,
-        );
+        $data = array( 'code'=>200, 'data'=>$lister,);
         echo json_encode($data);
         exit;   
     }
 }
\ No newline at end of file
-?>
\ No newline at end of file

@@ -152,46 +152,268 @@ class Sale1Controller extends WebAction
                         'title' => '2015春夏海量大促！'
                     )
                 )
+            ),
+            'sale-category' => array(
+                array(
+                'title' => 'VIP会员专享 ',
+                'vip' => true,
+                'navItem' => array(
+                array(
+                    'name' => '12',
+                    'url' => 'xxx'
+                ),
+                array(
+                    'name' => '12',
+                    'url' => 'xxx'
+                ),
+                array(
+                    'name' => '12',
+                    'url' => 'xxx'
+                ),
+                array(
+                    'name' => '12',
+                    'url' => 'xxx'
+                ),
+                array(
+                    'name' => '12',
+                    'url' => 'xxx'
+                ),
+            ),
+            'saleImage'=> array(
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => '短发上课就犯困啦圣诞节',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => '短发上课就犯困啦圣诞节',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => '短发上课就犯困啦圣诞节',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'price' => '888',
+                            'name' => '短发上课就犯困啦圣诞节',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
                         )
-        );
-        $this->setWebNavHeader();
-        $this->_view->display('index', $data);
-    }
 
-    //列表页
-    public function saleListAction()
-    {
-        $data = array(
-            'saleListPage' => true,
-            'saleList' => array(
-                'saleBanner' => array(
-                    'bannerHeight' => 350,
-                    'list' => array(
+                    )
+                ),
                 array(
-                            'bannerHeight' => 350,
-                            'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
+                'title' => '断码区域',
+                'incompleteSize' => true,
+                'navItem' => array(
+                array(
+                    'name' => '12',
                 ),
                 array(
-                            'bannerHeight' => 350,
-                            'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/06/05/02062366574a01418596caa38a773f6beb.jpg?imageView/1/w/1150/h/450'
+                    'name' => '12',
                 ),
                 array(
-                            'bannerHeight' => 350,
-                            'img' => 'http://img11.static.yhbimg.com/yhb-img01/2016/01/06/05/013341a0632177cc3425c3c6082845be57.jpg?imageView/1/w/1150/h/450'
+                    'name' => '12',
                 ),
                 array(
-                            'bannerHeight' => 350,
-                            'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
+                    'name' => '12',
                 ),
                 array(
-                            'bannerHeight' => 350,
-                            'img' => 'http://img12.static.yhbimg.com/yhb-img01/2016/01/06/05/02062366574a01418596caa38a773f6beb.jpg?imageView/1/w/1150/h/450'
+                    'name' => '12',
                 ),
+            ),
+            'saleImage'=> array(
                         array(
-                            'bannerHeight' => 350,
-                            'img' => 'http://img11.static.yhbimg.com/yhb-img01/2016/01/06/05/013341a0632177cc3425c3c6082845be57.jpg?imageView/1/w/1150/h/450'
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        ),
+                        array(
+                            'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                            'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                            'name' => 'test',
+                            'price' => '888',
+                            'originPrice' => '1000'
+                        )
+
+                    )
+                ),
+                array(
+                    'title' => '最新降价',
+                    'newDiscount' => true,
+                    'navItem' => array(
+                    array(
+                        'name' => '12',
+                    ),
+                    array(
+                        'name' => '12',
+                    ),
+                    array(
+                        'name' => '12',
+                    ),
+                    array(
+                        'name' => '12',
+                    ),
+                    array(
+                        'name' => '12',
+                    ),
+                ),
+                'saleImage'=> array(
+                            array(
+                                'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                                'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                                'name' => 'test',
+                                'price' => '888',
+                                'originPrice' => '1000'
+                            ),
+                            array(
+                                'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                                'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                                'name' => 'test',
+                                'price' => '888',
+                                'originPrice' => '1000'
+                            ),
+                            array(
+                                'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                                'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                                'name' => 'test',
+                                'price' => '888',
+                                'originPrice' => '1000'
+                            ),
+                            array(
+                                'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                                'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                                'name' => 'test',
+                                'price' => '888',
+                                'originPrice' => '1000'
+                            ),
+                            array(
+                                'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                                'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                                'name' => 'test',
+                                'price' => '888',
+                                'originPrice' => '1000'
+                            ),
+                            array(
+                                'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                                'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                                'name' => 'test',
+                                'price' => '888',
+                                'originPrice' => '1000'
+                            ),
+                            array(
+                                'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                                'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                                'name' => 'test',
+                                'price' => '888',
+                                'originPrice' => '1000'
+                            ),
+                            array(
+                                'href' => 'http://www.yohobuy.com/product/pro_327765_421995/TUCTUC36205TaoZhuang.html?channel=kids',
+                                'img' => "http://img13.static.yhbimg.com/goodsimg/2015/11/05/09/02eb88e527a57d0e26e13f2eb9cc35ad0e.jpg?imageMogr2/thumbnail/280x373/extent/280x373/background/d2hpdGU=/position/center/quality/90",
+                                'name' => 'test',
+                                'price' => '888',
+                                'originPrice' => '1000'
+                            )
+
+                        )
                 )
             )
+        );
+        $this->setWebNavHeader();
+        $this->_view->display('index', $data);
+    }
+
+    //列表页
+    public function saleListAction()
+    {
+        $data = array(
+            'saleListPage' => true,
+            'saleList' => array(
+                'saleBanner' => array(
+                    'bannerHeight' => 350,
+                    'img' => 'http://img12.static.yhbimg.com/couponImg/2015/12/10/08/02d4c26f19ca2e44359d69d5cff86167fb.jpg'
                 ),
                 'saleTitle' => array(
                     'name' => '全部商品',