sale 目录结构整理

@@ -44,7 +44,7 @@ exports.index = (req, res) => {
     };
     };
 
 
     saleModel.getSaleData().then((result) => {
     saleModel.getSaleData().then((result) => {
-        res.render('sale', Object.assign(renderData, queryParam, {
+        res.render('sale/index', Object.assign(renderData, queryParam, {
             content: result,
             content: result,
             floorHeader: {
             floorHeader: {
                 title: {
                 title: {
@@ -75,7 +75,7 @@ exports.breakCode = (req, res) => {
     saleModel.getBreakCodeData({
     saleModel.getBreakCodeData({
         yhChannel: req.query.channel
         yhChannel: req.query.channel
     }).then((result) => {
     }).then((result) => {
-        res.render('break-code', Object.assign(renderData, result));
+        res.render('sale/break-code', Object.assign(renderData, result));
     }).catch((err) => {
     }).catch((err) => {
         saleLogger(err, res);
         saleLogger(err, res);
     });
     });
@@ -97,7 +97,7 @@ exports.special = (req, res) => {
     };
     };
 
 
     saleModel.getSpecialData().then((result) => {
     saleModel.getSpecialData().then((result) => {
-        res.render('special', Object.assign(renderData, result));
+        res.render('sale/special', Object.assign(renderData, result));
     }).catch((err) => {
     }).catch((err) => {
         saleLogger(err, res);
         saleLogger(err, res);
     });
     });
@@ -122,7 +122,7 @@ exports.specialDetail = (req, res) => {
     saleModel.getSpecialDetailData(id).then((result) => {
     saleModel.getSpecialDetailData(id).then((result) => {
         headerData.navTitle = result.title;
         headerData.navTitle = result.title;
         renderData.pageHeader = headerData;
         renderData.pageHeader = headerData;
-        res.render('special-detail', Object.assign(renderData, result));
+        res.render('sale/special-detail', Object.assign(renderData, result));
     }).catch((err) => {
     }).catch((err) => {
         saleLogger(err, res);
         saleLogger(err, res);
     });
     });
@@ -144,7 +144,7 @@ exports.vip = (req, res) => {
     };
     };
 
 
     saleModel.getVipData().then((result) => {
     saleModel.getVipData().then((result) => {
-        res.render('vip', Object.assign(renderData, {
+        res.render('sale/vip', Object.assign(renderData, {
             content: result
             content: result
         }));
         }));
     }).catch((err) => {
     }).catch((err) => {

@@ -303,33 +303,6 @@ exports.getFilterData = (params) => {
 };
 };
 
 
 /**
 /**
- * 获取商品数据
- * @param  {[object]} params
- * @param  {[string]} uid
- * @return {[array]}
- */
-exports.getSearchData = (params, uid) => {
-    return Promise.all([
-        searchSales(params).then((result) => {
-            if (result && result.code === 200) {
-                return productProcess.processProductList(result.data.product_list || []);
-            } else {
-                logger.error('SALE 商品搜索返回 code 不是 200');
-                return [];
-            }
-        }),
-        getUserProfile(uid).then((result) => {
-            if (result && result.code === 200) {
-                return camelCase(result.data.vip_info);
-            } else {
-                logger.error('获取用户信息返回 code 不是 200');
-                return {};
-            }
-        })
-    ]);
-};
-
-/**
  * 获取sale首页数据
  * 获取sale首页数据
  * @return {[array]}
  * @return {[array]}
  */
  */

@@ -23,10 +23,10 @@ router.get('/detail/intro/:productskn', detail.intro);
 router.get('/detail/preference/:productskn/:yhchannel/:brandId', detail.preference);
 router.get('/detail/preference/:productskn/:yhchannel/:brandId', detail.preference);
 
 
 router.get('/sale', sale.index);
 router.get('/sale', sale.index);
-router.get('/special', sale.special);
-router.get('/specialDetail', sale.specialDetail);
-router.get('/breakCode', sale.breakCode);
-router.get('/vip', sale.vip);
+router.get('/sale/special', sale.special);
+router.get('/sale/special/detail', sale.specialDetail);
+router.get('/sale/breakCode', sale.breakCode);
+router.get('/sale/vip', sale.vip);
 
 
 router.get('/sale/search', sale.search);
 router.get('/sale/search', sale.search);
 router.get('/sale/filter', sale.filter);
 router.get('/sale/filter', sale.filter);

 <div class="break-code-page discount-page yoho-page">
 <div class="break-code-page discount-page yoho-page">
+
     {{#content}}
     {{#content}}
         {{! 头部banner}}
         {{! 头部banner}}
         {{#if focus}}
         {{#if focus}}
@@ -8,6 +9,7 @@
 
 
     {{# nav}}
     {{# nav}}
         <ul id="list-nav" class="list-nav clearfix">
         <ul id="list-nav" class="list-nav clearfix">
+
             {{# sortData}}
             {{# sortData}}
                 <li {{#if @first}} class="active" {{/if}} data-id="{{sortId}}">
                 <li {{#if @first}} class="active" {{/if}} data-id="{{sortId}}">
                     <a href="javascript:void(0);">
                     <a href="javascript:void(0);">
@@ -15,6 +17,7 @@
                     </a>
                     </a>
                 </li>
                 </li>
             {{/ sortData}}
             {{/ sortData}}
+
             <li class="filter">
             <li class="filter">
                 <a href="javascript:void(0);">
                 <a href="javascript:void(0);">
                     <span class="span-test">筛选</span>
                     <span class="span-test">筛选</span>
@@ -47,9 +50,11 @@
         <div class="other-goods container hide clearfix"></div>
         <div class="other-goods container hide clearfix"></div>
 
 
         {{> common/filter}}
         {{> common/filter}}
+
     </div>
     </div>
 
 
     {{> common/query-param}}
     {{> common/query-param}}
 
 
     {{> common/suspend-cart}}
     {{> common/suspend-cart}}
+
 </div>
 </div>

 <div class="discount-page sale-page yoho-page">
 <div class="discount-page sale-page yoho-page">
+
     {{#content}}
     {{#content}}
         {{! 头部banner}}
         {{! 头部banner}}
         {{#if focus}}
         {{#if focus}}
             {{> resources/banner-top}}
             {{> resources/banner-top}}
         {{/if}}
         {{/if}}
+
         {{! 两个小图}}
         {{! 两个小图}}
         {{#if smallPic}}
         {{#if smallPic}}
             {{> resources/thumb-row}}
             {{> resources/thumb-row}}
         {{/if}}
         {{/if}}
     {{/content}}
     {{/content}}
+
     {{#floorHeader}}
     {{#floorHeader}}
         {{> common/floor-header}}
         {{> common/floor-header}}
     {{/floorHeader}}
     {{/floorHeader}}
+
     <ul id="list-nav" class="list-nav clearfix">
     <ul id="list-nav" class="list-nav clearfix">
         <li class="new active">
         <li class="new active">
             <a href="javascript:void(0);">
             <a href="javascript:void(0);">
@@ -44,5 +48,6 @@
         </li>
         </li>
     </ul>
     </ul>
 
 
-    {{> product/sale-common}}
+    {{> product/sale/common}}
+
 </div>
 </div>

 <div class="sale-channel-page discount-page yoho-page">
 <div class="sale-channel-page discount-page yoho-page">
-    {{> product/sale-banner}}
+
+    {{> product/sale/banner}}
+
     <ul id="list-nav" class="list-nav clearfix">
     <ul id="list-nav" class="list-nav clearfix">
         <li class="all active">
         <li class="all active">
             <a href="javascript:void(0);">
             <a href="javascript:void(0);">
@@ -31,5 +33,7 @@
             </a>
             </a>
         </li>
         </li>
     </ul>
     </ul>
-    {{> product/sale-common}}
+
+    {{> product/sale/common}}
+
 </div>
 </div>

 <div class="sale-vip-page discount-page yoho-page">
 <div class="sale-vip-page discount-page yoho-page">
 
 
-    {{> product/sale-banner}}
+    {{> product/sale/banner}}
+
     <ul id="list-nav" class="list-nav clearfix">
     <ul id="list-nav" class="list-nav clearfix">
         <li class="new active">
         <li class="new active">
             <a href="javascript:void(0);">
             <a href="javascript:void(0);">
@@ -28,5 +29,7 @@
             </a>
             </a>
         </li>
         </li>
     </ul>
     </ul>
-    {{> product/sale-common}}
+
+    {{> product/sale/common}}
+
 </div>
 </div>

 <div class="banner">
 <div class="banner">
+
     {{#content}}
     {{#content}}
         {{! 头部banner}}
         {{! 头部banner}}
         {{#if focus}}
         {{#if focus}}
             {{> resources/banner-top}}
             {{> resources/banner-top}}
         {{/if}}
         {{/if}}
     {{/content}}
     {{/content}}
+
     {{# activity}}
     {{# activity}}
         <img src="{{image coverUrl 640 250}}"/>
         <img src="{{image coverUrl 640 250}}"/>
         <p class="activity-time" data-time-ms="{{leftTime}}"><i class="iconfont time-ico">&#xe603;</i><span>{{time}}</span></p>
         <p class="activity-time" data-time-ms="{{leftTime}}"><i class="iconfont time-ico">&#xe603;</i><span>{{time}}</span></p>
     {{/ activity}}
     {{/ activity}}
+
 </div>
 </div>

-<div id="thumb-row">
-   {{# data}}
-    <a href="{{url}}">
-        <img class="thumb-row-box lazy" data-original="{{image src 275 130}}">
-    </a>
-   {{/ data}}
-</div>

-/**
- * 断码区
- * @author: wsl<shuiling.wang@yoho.cn>
- * @date: 2016/5/20
- */
-
-var $ = require('yoho-jquery'),
-    Swiper = require('yoho-swiper'),
-    ellipsis = require('yoho-mlellipsis'),
-    lazyLoad = require('yoho-jquery-lazyload'),
-    tip = require('../plugin/tip'),
-    filter = require('../plugin/filter'),
-    loading = require('../plugin/loading');
-
-var $goodsContainer = $('#goods-container'),
-    $goodsChildren = $goodsContainer.children(),
-    $coatGc = $($goodsChildren.get(0)),
-    $trouserGc = $($goodsChildren.get(1)),
-    $shoesgc = $($goodsChildren.get(2)),
-    $othergc = $($goodsChildren.get(3));
-
-var winH = $(window).height(),
-    noResult = '<p class="no-result">未找到相关搜索结果</p>';
-
-// 默认筛选条件
-var defaultOpt = require('./query-param');
-
-var storeOpt = $.extend({}, defaultOpt);
-
-var $listNav = $('#list-nav'),
-    $swiperSize = $('.swiper-size'),
-
-    // 导航数据信息
-    navInfo = {
-        coat: {
-            reload: true,
-            page: 0,
-            end: false,
-            saleType: 1
-        },
-        trouser: {
-            reload: true,
-            page: 0,
-            end: false,
-            saleType: 1
-        },
-        shoes: {
-            reload: true,
-            page: 0,
-            end: false,
-            saleType: 1
-        },
-        other: {
-            reload: true,
-            page: 0,
-            end: false,
-            saleType: 1
-        }
-    },
-    $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
-    searching;
-
-var swipers = [],
-    goodsType = ['coat', 'trouser', 'shoes', 'other'];
-
-require('./suspend-cart'); // 悬浮购物车
-require('../common');
-
-ellipsis.init();
-
-lazyLoad($('img.lazy'));
-
-if ($('.banner-swiper .swiper-slide').length > 1) {
-    new Swiper('.swiper-container', {
-        lazyLoading: true,
-        lazyLoadingInPrevNext: true,
-        loop: true,
-        autoplay: 3000,
-        autoplayDisableOnInteraction: true,
-        paginationClickable: true,
-        pagination: '.banner-top .pagination-inner'
-    });
-}
-
-$.each($swiperSize, function(key) {
-    swipers[key] = new Swiper('#size-swiper-' + key, {
-        slidesPerView: 'auto'
-    });
-});
-
-$.each($listNav.find('li'), function(key, item) {
-    $(item).addClass(goodsType[key]);
-});
-
-// 判断导航类型
-function judgeType(dom) {
-    var navType;
-
-    if (dom.hasClass('coat')) {
-        navType = 'coat';
-    } else if (dom.hasClass('trouser')) {
-        navType = 'trouser';
-    } else if (dom.hasClass('shoes')) {
-        navType = 'shoes';
-    } else {
-        navType = 'other';
-    }
-
-    return navType;
-}
-
-/**
- * 筛选注册的回调，筛选子项点击后逻辑
- * 需要执行search的场景：1.点选筛选项；2.relaod为true时切换导航；3.下拉加载
- * @param opt {type, id}
- */
-function search(opt) {
-    var setting = {},
-        ext = {},
-        att,
-        nav, navType,
-        page,
-        i;
-
-    delete defaultOpt.size;
-
-    if (searching) {
-        return;
-    }
-
-    if ($.type(opt) === 'object') {
-        opt = [opt];
-    }
-
-    if (opt) {
-
-        // 筛选项变更则重置reload为true
-        for (att in navInfo) {
-            if (navInfo.hasOwnProperty(att)) {
-                navInfo[att].reload = true;
-            }
-        }
-        for (i = 0; i < opt.length; i++) {
-            switch (opt[i].type) {
-                case 'gender':
-                    ext = {
-                        gender: opt[i].id
-                    };
-                    break;
-                case 'brand':
-                    ext = {
-                        brand: opt[i].id
-                    };
-                    break;
-                case 'sort':
-                    ext = {
-                        sort: opt[i].id
-                    };
-                    break;
-                case 'color':
-                    ext = {
-                        color: opt[i].id
-                    };
-                    break;
-                case 'size':
-                    ext = {
-                        size: opt[i].id
-                    };
-                    break;
-                case 'price':
-                    ext = {
-                        price: opt[i].id
-                    };
-                    break;
-                case 'discount':
-                    ext = {
-                        discount: opt[i].id
-                    };
-                    break;
-                case 'p_d':
-                    ext = {
-                        p_d: opt[i].id
-                    };
-                    break;
-                default:
-                    break;
-            }
-        }
-
-        $.extend(defaultOpt, ext); // 扩展筛选项
-    }
-
-    // 导航类别
-    navType = judgeType($pre);
-
-    nav = navInfo[navType];
-    page = nav.page + 1;
-    if (nav.reload) {
-        page = 1;
-    } else if (nav.end) {
-
-        // 不需要重新加载并且数据请求结束
-        return;
-    }
-
-    $.extend(setting, defaultOpt, {
-        type: 'stock',
-        order: 0,
-        page: page
-    });
-
-    searching = true;
-    loading.showLoadingMask();
-
-    $.ajax({
-        type: 'GET',
-        url: '/product/sale/search',
-        data: setting,
-        success: function(data) {
-            var $container,
-                num;
-
-            switch (navType) {
-                case 'coat':
-                    $container = $coatGc;
-                    break;
-                case 'trouser':
-                    $container = $trouserGc;
-                    break;
-                case 'shoes':
-                    $container = $shoesgc;
-                    break;
-                default:
-                    $container = $othergc;
-                    break;
-            }
-
-            if ($container.hasClass('hide')) {
-                $container.siblings().addClass('hide');
-                $container.removeClass('hide');
-            }
-
-            if (data === '') {
-                nav.end = true;
-
-                if (nav.reload) {
-                    $container.html(noResult);
-                }
-            } else {
-                if (nav.reload) {
-                    $container.html(data);
-                    lazyLoad($container.find('.lazy'));
-                } else {
-                    num = $container.find('.good-info').length;
-                    $container.append(data);
-
-                    // lazy good-infos who append in
-                    lazyLoad($container.find('.good-info:gt(' + (num - 1) + ') .lazy'));
-                }
-            }
-
-            nav.reload = false;
-            nav.page = page;
-
-            searching = false;
-            loading.hideLoadingMask();
-
-            window.rePosFooter();
-
-            $('.good-detail-text .name').each(function() {
-                var $this = $(this),
-                    $title = $this.find('a');
-
-                $title[0].mlellipsis(2);
-            });
-        },
-        error: function() {
-            tip.show('网络断开连接了~');
-            searching = false;
-            loading.hideLoadingMask();
-        }
-    });
-
-}
-
-$.ajax({
-    type: 'GET',
-    url: '/product/sale/filter',
-    data: $.extend(defaultOpt, {
-        saleType: '1'
-    }),
-    success: function(data) {
-        $goodsContainer.append(data);
-
-        // 初始化filter&注册filter回调
-        filter.initFilter({
-            fCbFn: search,
-            hCbFn: function() {
-
-                // 切换active状态到$pre上
-                $pre.addClass('active');
-                $pre.siblings('.filter').removeClass('active');
-
-                $('#size-swiper-' + $pre.index()).show();
-            },
-            missStatus: true
-        });
-    }
-});
-lazyLoad($('.lazy'));
-
-$listNav.bind('contextmenu', function() {
-    return false;
-});
-
-$listNav.on('touchend touchcancel', function(e) {
-    var $this = $(e.target).closest('li'),
-        nav, sortId, navType, $active;
-
-    e.preventDefault();
-    if ($this.hasClass('filter')) {
-
-        // 筛选面板切换状态
-        if ($this.hasClass('active')) {
-            filter.hideFilter();
-
-            // 点击筛选钱的active项回复active
-            $pre.addClass('active');
-            $this.removeClass('active');
-        } else {
-            $pre = $this.siblings('.active');
-            $swiperSize.hide();
-            $pre.removeClass('active');
-            $this.addClass('active');
-            filter.showFilter();
-        }
-    } else {
-
-        // 导航类别
-        navType = judgeType($this);
-
-        nav = navInfo[navType];
-
-        if (!($this.hasClass('active'))) {
-
-            $active = $this.siblings('.active');
-
-            $pre = $this; // $pre为除筛选导航的其他导航项，若当前active的为筛选，则把$pre置为当前点击项
-
-            if ($active.hasClass('filter')) {
-
-                // 若之前active项为筛选，则隐藏筛选面板
-                filter.hideFilter();
-            } else {
-
-                // 切换container显示
-                $goodsContainer.children('.container:not(.hide)').addClass('hide');
-
-                switch (navType) {
-                    case 'coat':
-                        $coatGc.removeClass('hide');
-                        break;
-
-                    case 'trouser':
-                        $trouserGc.removeClass('hide');
-                        break;
-
-                    case 'shoes':
-                        $shoesgc.removeClass('hide');
-                        break;
-                    case 'other':
-                        $othergc.removeClass('hide');
-                        break;
-                    default:
-                        break;
-                }
-
-                // 重置筛选项
-                filter.resetFilter();
-                defaultOpt = $.extend({}, storeOpt);
-            }
-
-            $active.removeClass('active');
-            $this.addClass('active');
-            sortId = $this.data('id');
-            $swiperSize.hide();
-            $('#size-swiper-' + $this.index()).show();
-            swipers[$this.index()].onResize();
-        }
-
-        if (nav.reload) {
-            search([{
-                type: 'sort',
-                id: sortId
-            }]);
-        }
-    }
-    e.stopPropagation();
-});
-
-$swiperSize.on('touchend touchcancel', function(e) {
-    var $this = $(e.target).closest('li'),
-        index = $this.parents('.swiper-size').index(),
-        $parentType = $listNav.find('li').eq(index),
-        nav, sortId, sizeId, navType, $active;
-
-    e.preventDefault();
-
-    if (typeof $this === 'undefined' || $this.length === 0) {
-        return;
-    }
-
-    // 导航类别
-    navType = judgeType($parentType);
-
-    nav = navInfo[navType];
-
-    if ($this.hasClass('active')) {
-        return;
-    } else {
-        nav.reload = true;
-        $active = $this.siblings('.active');
-        $pre = $parentType; // $pre为除筛选导航的其他导航项，若当前active的为筛选，则把$pre置为当前点击项
-        $active.removeClass('active');
-        $this.addClass('active');
-        sortId = $parentType.data('id');
-        sizeId = $this.data('id');
-    }
-
-    if (nav.reload) {
-        search([{
-            type: 'sort',
-            id: sortId
-        }, {
-            type: 'size',
-            id: sizeId
-        }]);
-    }
-    e.stopPropagation();
-});
-
-function scrollHandler() {
-
-    // 当scroll到1/4$goodsContainer高度后继续请求下一页数据
-    if ($(window).scrollTop() + winH >
-        $(document).height() - 0.25 * $goodsContainer.height() - 50) {
-        if (typeof($pre) !== 'undefined') {
-            search();
-        }
-    }
-}
-
-// srcoll to load more
-$(window).scroll(function() {
-    window.requestAnimationFrame(scrollHandler);
-});
-
-// 初始请求最新第一页数据
-search([{
-    type: 'sort',
-    id: $('.coat').data('id')
-}]);
-
-$listNav.on('touchstart', 'li', function() {
-    $(this).addClass('bytouch');
-}).on('touchend touchcancel', function() {
-    $listNav.find('li').removeClass('bytouch');
-});

-require('./break-code');
+/**
+ * 断码区
+ * @author: wsl<shuiling.wang@yoho.cn>
+ * @date: 2016/5/20
+ */
+
+var $ = require('yoho-jquery'),
+    Swiper = require('yoho-swiper'),
+    ellipsis = require('yoho-mlellipsis'),
+    lazyLoad = require('yoho-jquery-lazyload'),
+    tip = require('../plugin/tip'),
+    filter = require('../plugin/filter'),
+    loading = require('../plugin/loading');
+
+var $goodsContainer = $('#goods-container'),
+    $goodsChildren = $goodsContainer.children(),
+    $coatGc = $($goodsChildren.get(0)),
+    $trouserGc = $($goodsChildren.get(1)),
+    $shoesgc = $($goodsChildren.get(2)),
+    $othergc = $($goodsChildren.get(3));
+
+var winH = $(window).height(),
+    noResult = '<p class="no-result">未找到相关搜索结果</p>';
+
+// 默认筛选条件
+var defaultOpt = require('../common/query-param');
+
+var storeOpt = $.extend({}, defaultOpt);
+
+var $listNav = $('#list-nav'),
+    $swiperSize = $('.swiper-size'),
+
+    // 导航数据信息
+    navInfo = {
+        coat: {
+            reload: true,
+            page: 0,
+            end: false,
+            saleType: 1
+        },
+        trouser: {
+            reload: true,
+            page: 0,
+            end: false,
+            saleType: 1
+        },
+        shoes: {
+            reload: true,
+            page: 0,
+            end: false,
+            saleType: 1
+        },
+        other: {
+            reload: true,
+            page: 0,
+            end: false,
+            saleType: 1
+        }
+    },
+    $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
+    searching;
+
+var swipers = [],
+    goodsType = ['coat', 'trouser', 'shoes', 'other'];
+
+require('../common/suspend-cart'); // 悬浮购物车
+require('../common');
+
+ellipsis.init();
+
+lazyLoad($('img.lazy'));
+
+if ($('.banner-swiper .swiper-slide').length > 1) {
+    new Swiper('.swiper-container', {
+        lazyLoading: true,
+        lazyLoadingInPrevNext: true,
+        loop: true,
+        autoplay: 3000,
+        autoplayDisableOnInteraction: true,
+        paginationClickable: true,
+        pagination: '.banner-top .pagination-inner'
+    });
+}
+
+$.each($swiperSize, function(key) {
+    swipers[key] = new Swiper('#size-swiper-' + key, {
+        slidesPerView: 'auto'
+    });
+});
+
+$.each($listNav.find('li'), function(key, item) {
+    $(item).addClass(goodsType[key]);
+});
+
+// 判断导航类型
+function judgeType(dom) {
+    var navType;
+
+    if (dom.hasClass('coat')) {
+        navType = 'coat';
+    } else if (dom.hasClass('trouser')) {
+        navType = 'trouser';
+    } else if (dom.hasClass('shoes')) {
+        navType = 'shoes';
+    } else {
+        navType = 'other';
+    }
+
+    return navType;
+}
+
+/**
+ * 筛选注册的回调，筛选子项点击后逻辑
+ * 需要执行search的场景：1.点选筛选项；2.relaod为true时切换导航；3.下拉加载
+ * @param opt {type, id}
+ */
+function search(opt) {
+    var setting = {},
+        ext = {},
+        att,
+        nav, navType,
+        page,
+        i;
+
+    delete defaultOpt.size;
+
+    if (searching) {
+        return;
+    }
+
+    if ($.type(opt) === 'object') {
+        opt = [opt];
+    }
+
+    if (opt) {
+
+        // 筛选项变更则重置reload为true
+        for (att in navInfo) {
+            if (navInfo.hasOwnProperty(att)) {
+                navInfo[att].reload = true;
+            }
+        }
+        for (i = 0; i < opt.length; i++) {
+            switch (opt[i].type) {
+                case 'gender':
+                    ext = {
+                        gender: opt[i].id
+                    };
+                    break;
+                case 'brand':
+                    ext = {
+                        brand: opt[i].id
+                    };
+                    break;
+                case 'sort':
+                    ext = {
+                        sort: opt[i].id
+                    };
+                    break;
+                case 'color':
+                    ext = {
+                        color: opt[i].id
+                    };
+                    break;
+                case 'size':
+                    ext = {
+                        size: opt[i].id
+                    };
+                    break;
+                case 'price':
+                    ext = {
+                        price: opt[i].id
+                    };
+                    break;
+                case 'discount':
+                    ext = {
+                        discount: opt[i].id
+                    };
+                    break;
+                case 'p_d':
+                    ext = {
+                        p_d: opt[i].id
+                    };
+                    break;
+                default:
+                    break;
+            }
+        }
+
+        $.extend(defaultOpt, ext); // 扩展筛选项
+    }
+
+    // 导航类别
+    navType = judgeType($pre);
+
+    nav = navInfo[navType];
+    page = nav.page + 1;
+    if (nav.reload) {
+        page = 1;
+    } else if (nav.end) {
+
+        // 不需要重新加载并且数据请求结束
+        return;
+    }
+
+    $.extend(setting, defaultOpt, {
+        type: 'stock',
+        order: 0,
+        page: page
+    });
+
+    searching = true;
+    loading.showLoadingMask();
+
+    $.ajax({
+        type: 'GET',
+        url: '/product/sale/search',
+        data: setting,
+        success: function(data) {
+            var $container,
+                num;
+
+            switch (navType) {
+                case 'coat':
+                    $container = $coatGc;
+                    break;
+                case 'trouser':
+                    $container = $trouserGc;
+                    break;
+                case 'shoes':
+                    $container = $shoesgc;
+                    break;
+                default:
+                    $container = $othergc;
+                    break;
+            }
+
+            if ($container.hasClass('hide')) {
+                $container.siblings().addClass('hide');
+                $container.removeClass('hide');
+            }
+
+            if (data === '') {
+                nav.end = true;
+
+                if (nav.reload) {
+                    $container.html(noResult);
+                }
+            } else {
+                if (nav.reload) {
+                    $container.html(data);
+                    lazyLoad($container.find('.lazy'));
+                } else {
+                    num = $container.find('.good-info').length;
+                    $container.append(data);
+
+                    // lazy good-infos who append in
+                    lazyLoad($container.find('.good-info:gt(' + (num - 1) + ') .lazy'));
+                }
+            }
+
+            nav.reload = false;
+            nav.page = page;
+
+            searching = false;
+            loading.hideLoadingMask();
+
+            window.rePosFooter();
+
+            $('.good-detail-text .name').each(function() {
+                var $this = $(this),
+                    $title = $this.find('a');
+
+                $title[0].mlellipsis(2);
+            });
+        },
+        error: function() {
+            tip.show('网络断开连接了~');
+            searching = false;
+            loading.hideLoadingMask();
+        }
+    });
+
+}
+
+$.ajax({
+    type: 'GET',
+    url: '/product/sale/filter',
+    data: $.extend(defaultOpt, {
+        saleType: '1'
+    }),
+    success: function(data) {
+        $goodsContainer.append(data);
+
+        // 初始化filter&注册filter回调
+        filter.initFilter({
+            fCbFn: search,
+            hCbFn: function() {
+
+                // 切换active状态到$pre上
+                $pre.addClass('active');
+                $pre.siblings('.filter').removeClass('active');
+
+                $('#size-swiper-' + $pre.index()).show();
+            },
+            missStatus: true
+        });
+    }
+});
+lazyLoad($('.lazy'));
+
+$listNav.bind('contextmenu', function() {
+    return false;
+});
+
+$listNav.on('touchend touchcancel', function(e) {
+    var $this = $(e.target).closest('li'),
+        nav, sortId, navType, $active;
+
+    e.preventDefault();
+    if ($this.hasClass('filter')) {
+
+        // 筛选面板切换状态
+        if ($this.hasClass('active')) {
+            filter.hideFilter();
+
+            // 点击筛选钱的active项回复active
+            $pre.addClass('active');
+            $this.removeClass('active');
+        } else {
+            $pre = $this.siblings('.active');
+            $swiperSize.hide();
+            $pre.removeClass('active');
+            $this.addClass('active');
+            filter.showFilter();
+        }
+    } else {
+
+        // 导航类别
+        navType = judgeType($this);
+
+        nav = navInfo[navType];
+
+        if (!($this.hasClass('active'))) {
+
+            $active = $this.siblings('.active');
+
+            $pre = $this; // $pre为除筛选导航的其他导航项，若当前active的为筛选，则把$pre置为当前点击项
+
+            if ($active.hasClass('filter')) {
+
+                // 若之前active项为筛选，则隐藏筛选面板
+                filter.hideFilter();
+            } else {
+
+                // 切换container显示
+                $goodsContainer.children('.container:not(.hide)').addClass('hide');
+
+                switch (navType) {
+                    case 'coat':
+                        $coatGc.removeClass('hide');
+                        break;
+
+                    case 'trouser':
+                        $trouserGc.removeClass('hide');
+                        break;
+
+                    case 'shoes':
+                        $shoesgc.removeClass('hide');
+                        break;
+                    case 'other':
+                        $othergc.removeClass('hide');
+                        break;
+                    default:
+                        break;
+                }
+
+                // 重置筛选项
+                filter.resetFilter();
+                defaultOpt = $.extend({}, storeOpt);
+            }
+
+            $active.removeClass('active');
+            $this.addClass('active');
+            sortId = $this.data('id');
+            $swiperSize.hide();
+            $('#size-swiper-' + $this.index()).show();
+            swipers[$this.index()].onResize();
+        }
+
+        if (nav.reload) {
+            search([{
+                type: 'sort',
+                id: sortId
+            }]);
+        }
+    }
+    e.stopPropagation();
+});
+
+$swiperSize.on('touchend touchcancel', function(e) {
+    var $this = $(e.target).closest('li'),
+        index = $this.parents('.swiper-size').index(),
+        $parentType = $listNav.find('li').eq(index),
+        nav, sortId, sizeId, navType, $active;
+
+    e.preventDefault();
+
+    if (typeof $this === 'undefined' || $this.length === 0) {
+        return;
+    }
+
+    // 导航类别
+    navType = judgeType($parentType);
+
+    nav = navInfo[navType];
+
+    if ($this.hasClass('active')) {
+        return;
+    } else {
+        nav.reload = true;
+        $active = $this.siblings('.active');
+        $pre = $parentType; // $pre为除筛选导航的其他导航项，若当前active的为筛选，则把$pre置为当前点击项
+        $active.removeClass('active');
+        $this.addClass('active');
+        sortId = $parentType.data('id');
+        sizeId = $this.data('id');
+    }
+
+    if (nav.reload) {
+        search([{
+            type: 'sort',
+            id: sortId
+        }, {
+            type: 'size',
+            id: sizeId
+        }]);
+    }
+    e.stopPropagation();
+});
+
+function scrollHandler() {
+
+    // 当scroll到1/4$goodsContainer高度后继续请求下一页数据
+    if ($(window).scrollTop() + winH >
+        $(document).height() - 0.25 * $goodsContainer.height() - 50) {
+        if (typeof $pre !== 'undefined') {
+            search();
+        }
+    }
+}
+
+// srcoll to load more
+$(window).scroll(function() {
+    window.requestAnimationFrame(scrollHandler);
+});
+
+// 初始请求最新第一页数据
+search([{
+    type: 'sort',
+    id: $('.coat').data('id')
+}]);
+
+$listNav.on('touchstart', 'li', function() {
+    $(this).addClass('bytouch');
+}).on('touchend touchcancel', function() {
+    $listNav.find('li').removeClass('bytouch');
+});

-/**
- * 商品列表页
- * @author: wsl<shuiling.wang@yoho.cn>
- * @date: 2016/5/17
- */
-
-var $ = require('yoho-jquery'),
-    Swiper = require('yoho-swiper');
-
-require('./search');
-
-if ($('.swiper-container .swiper-slide').length > 1) {
-    new Swiper('.swiper-container', {
-        lazyLoading: true,
-        lazyLoadingInPrevNext: true,
-        loop: true,
-        autoplay: 3000,
-        autoplayDisableOnInteraction: true,
-        paginationClickable: true,
-        pagination: '.banner-top .pagination-inner'
-    });
-}

-require('./sale');
+/**
+ * 商品列表页
+ * @author: wsl<shuiling.wang@yoho.cn>
+ * @date: 2016/5/17
+ */
+
+var $ = require('yoho-jquery'),
+    Swiper = require('yoho-swiper');
+
+require('./sale/search');
+
+if ($('.swiper-container .swiper-slide').length > 1) {
+    new Swiper('.swiper-container', {
+        lazyLoading: true,
+        lazyLoadingInPrevNext: true,
+        loop: true,
+        autoplay: 3000,
+        autoplayDisableOnInteraction: true,
+        paginationClickable: true,
+        pagination: '.banner-top .pagination-inner'
+    });
+}

@@ -6,22 +6,22 @@
 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
     ellipsis = require('yoho-mlellipsis'),
     ellipsis = require('yoho-mlellipsis'),
     lazyLoad = require('yoho-jquery-lazyload'),
     lazyLoad = require('yoho-jquery-lazyload'),
-    tip = require('../plugin/tip'),
-    filter = require('../plugin/filter'),
-    loading = require('../plugin/loading');
+    tip = require('../../plugin/tip'),
+    filter = require('../../plugin/filter'),
+    loading = require('../../plugin/loading');
 
 
 var $goodsContainer = $('#goods-container'),
 var $goodsContainer = $('#goods-container'),
-    $ngc = $($goodsContainer.find('.new-goods')),
-    $dgc = $($goodsContainer.find('.discount-goods')),
-    $pgc = $($goodsContainer.find('.price-goods')),
-    $agc = $($goodsContainer.find('.all-goods')),
-    $sgc = $($goodsContainer.find('.sale-goods'));
+    $ngc = $goodsContainer.find('.new-goods'),
+    $dgc = $goodsContainer.find('.discount-goods'),
+    $pgc = $goodsContainer.find('.price-goods'),
+    $agc = $goodsContainer.find('.all-goods'),
+    $sgc = $goodsContainer.find('.sale-goods');
 
 
 var winH = $(window).height(),
 var winH = $(window).height(),
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
 
 
 // 默认筛选条件
 // 默认筛选条件
-var defaultOpt = require('./query-param');
+var defaultOpt = require('../../common/query-param');
 
 
 var $listNav = $('#list-nav'),
 var $listNav = $('#list-nav'),
 
 
@@ -61,8 +61,8 @@ var $listNav = $('#list-nav'),
     $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
     $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
     searching;
     searching;
 
 
-require('./suspend-cart'); // 悬浮购物车
-require('../common');
+require('../../common/suspend-cart'); // 悬浮购物车
+require('../../common');
 
 
 ellipsis.init();
 ellipsis.init();
 
 
@@ -426,7 +426,7 @@ function scrollHandler() {
     // 当scroll到1/4$goodsContainer高度后继续请求下一页数据
     // 当scroll到1/4$goodsContainer高度后继续请求下一页数据
     if ($(window).scrollTop() + winH >
     if ($(window).scrollTop() + winH >
         $(document).height() - 0.25 * $goodsContainer.height() - 50) {
         $(document).height() - 0.25 * $goodsContainer.height() - 50) {
-        if (typeof($pre) !== 'undefined') {
+        if (typeof $pre !== 'undefined') {
             search();
             search();
         }
         }
     }
     }

@@ -9,7 +9,7 @@ var $ = require('yoho-jquery'),
 var $activityTime = $('.activity-time'),
 var $activityTime = $('.activity-time'),
     endTime = $activityTime.data('time-ms');
     endTime = $activityTime.data('time-ms');
 
 
-require('./search');
+require('./sale/search');
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 

-require('./search');
+require('./sale/search');

+@import "good";
+@import "filter";
+@import "suspend-cart";

@@ -10,12 +10,6 @@
 @import "product/comments-consults";
 @import "product/comments-consults";
 @import "product/product-description";
 @import "product/product-description";
 @import "product/recommend-for-you";
 @import "product/recommend-for-you";
-@import "product/sale";
-@import "product/special";
-@import "product/special-detail";
-@import "product/break-code";
-@import "product/discount";
-@import "product/good";
-@import "product/filter";
-@import "product/suspend-cart";
+@import "product/index";
+@import "common/index";
 @import "cart/chose-panel";
 @import "cart/chose-panel";

+@import "sale/index";

+@import "break-code";
+@import "discount";
+@import "sale";
+@import "special";
+@import "special-detail";

 .sale-page {
 .sale-page {
     overflow: hidden;
     overflow: hidden;
+    background-color: #fff;
 
 
     .banner-top .swiper-container {
     .banner-top .swiper-container {
         height: 200px;
         height: 200px;