sale

@@ -38,7 +38,7 @@ exports.index = (req, res) => {
         pageFooter: true
         pageFooter: true
     };
     };
 
 
-    saleModel.getSaleResources().then((result) => {
+    saleModel.getSaleData().then((result) => {
         res.render('sale', Object.assign(renderData, {
         res.render('sale', Object.assign(renderData, {
             content: result
             content: result
         }));
         }));
@@ -60,7 +60,6 @@ exports.breakCode = (req, res) => {
     };
     };
 
 
     saleModel.getBreakCodeData().then((result) => {
     saleModel.getBreakCodeData().then((result) => {
-        console.log(result);
         res.render('break-code', Object.assign(renderData, result));
         res.render('break-code', Object.assign(renderData, result));
     }).catch((err) => {
     }).catch((err) => {
         saleLogger(err, res);
         saleLogger(err, res);
@@ -91,33 +90,17 @@ exports.special = (req, res) => {
  * 折扣专场专题详情
  * 折扣专场专题详情
  */
  */
 exports.specialDetail = (req, res) => {
 exports.specialDetail = (req, res) => {
-    let headerData = headerModel.setNavHeader('折扣专场');
+    let headerData = headerModel.setNavHeader();
+    let id = req.query.id;
     let renderData = {
     let renderData = {
         module: 'product',
         module: 'product',
-        page: 'special',
-        pageHeader: headerData,
+        page: 'special-detail',
         pageFooter: true
         pageFooter: true
     };
     };
 
 
-    saleModel.getSpecialDetailData().then((result) => {
-        result = {
-            src: 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/0239e814b8121913aa67b9ad509bd4e310.jpg?imageView2/2/w/{width}/h/{height}',
-            goods: {
-                url: 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
-                thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
-                name: 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
-                salePrice: '759.00',
-                price: '799.00',
-                tags: {
-                    isNew: true,
-                    isAdvance: false,
-                    isDiscount: false,
-                    isYohoood: false,
-                    isLimited: false
-                },
-                isSoonSoldOut: true
-            }
-        };
+    saleModel.getSpecialDetailData(id).then((result) => {
+        headerData.navTitle = result.title;
+        renderData.pageHeader = headerData;
         res.render('special-detail', Object.assign(renderData, result));
         res.render('special-detail', Object.assign(renderData, result));
     }).catch((err) => {
     }).catch((err) => {
         saleLogger(err, res);
         saleLogger(err, res);
@@ -137,25 +120,9 @@ exports.vip = (req, res) => {
     };
     };
 
 
     saleModel.getVipData().then((result) => {
     saleModel.getVipData().then((result) => {
-        result = {
-            src: 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/0239e814b8121913aa67b9ad509bd4e310.jpg?imageView2/2/w/{width}/h/{height}',
-            goods: {
-                url: 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',
-                thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',
-                name: 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',
-                salePrice: '759.00',
-                price: '799.00',
-                tags: {
-                    isNew: true,
-                    isAdvance: false,
-                    isDiscount: false,
-                    isYohoood: false,
-                    isLimited: false
-                },
-                isSoonSoldOut: true
-            }
-        };
-        res.render('vip', Object.assign(renderData, result));
+        res.render('vip', Object.assign(renderData, {
+            content: result
+        }));
     }).catch((err) => {
     }).catch((err) => {
         saleLogger(err, res);
         saleLogger(err, res);
     });
     });

@@ -20,6 +20,26 @@ const anHour = 3600000;
 const aDay = anHour * 24;
 const aDay = anHour * 24;
 
 
 /**
 /**
+ * 过期时间处理
+ */
+const processTime = (time) => {
+    let data = {};
+
+    if (time < anHour) {
+        data.warnColor = true;
+        data.time = '低于1小时';
+    } else {
+        if (time > aDay) {
+            data.time = helpers.dateDiffFormat('剩{d}天{h}小时', time, 'ms');
+        } else {
+            data.time = helpers.dateDiffFormat('剩{h}小时', time, 'ms');
+        }
+    }
+
+    return data;
+}
+
+/**
  * 折扣专场列表数据处理
  * 折扣专场列表数据处理
  */
  */
 const processSpecial = (list) => {
 const processSpecial = (list) => {
@@ -31,16 +51,8 @@ const processSpecial = (list) => {
     _.forEach(list, (data) => {
     _.forEach(list, (data) => {
         data.specialUrl = `/product/specialDetail?id=${data.id}`;
         data.specialUrl = `/product/specialDetail?id=${data.id}`;
 
 
-        if (data.leftTime < anHour) {
-            data.warnColor = true;
-            data.leftTime = '低于1小时';
-        } else {
-            if (data.leftTime > aDay) {
-                data.leftTime = helpers.dateDiffFormat('剩{d}天{h}小时', data.leftTime, 'ms');
-            } else {
-                data.leftTime = helpers.dateDiffFormat('剩{h}小时', data.leftTime, 'ms');
-            }
-        }
+        _.merge(data, processTime(data.leftTime));
+
         formatData.push(data);
         formatData.push(data);
     });
     });
 
 
@@ -48,6 +60,27 @@ const processSpecial = (list) => {
 };
 };
 
 
 /**
 /**
+ * 折扣专场详情数据处理
+ */
+const processSpecialDetail = (data) => {
+    let activityData = {};
+
+    data[0] = data[0] || {};
+    data[0] = camelCase(data[0]);
+    
+    _.merge(data[0], processTime(data[0].leftTime));
+
+    return activityData = {
+        title: data[0].title,
+        activity: {
+            coverUrl: data[0].coverUrl,
+            time:  data[0].time,
+            leftTime: data[0].leftTime
+        }
+    };
+}
+
+/**
  * 断码区分类数据处理
  * 断码区分类数据处理
  */
  */
 const processBreakingSort = (list) => {
 const processBreakingSort = (list) => {
@@ -132,7 +165,8 @@ exports.getSearchData = (params) => {
 const getResources = (page) => {
 const getResources = (page) => {
     const contentCode = {
     const contentCode = {
         sale: '7c2b77093421efa8ae9302c91460db73',
         sale: '7c2b77093421efa8ae9302c91460db73',
-        breakCode: '7c2b77093421efa8ae9302c91460db73'
+        breakCode: '7c2b77093421efa8ae9302c91460db73',
+        vip: '7c2b77093421efa8ae9302c91460db73'
     };
     };
 
 
     return serviceAPI.get('operations/api/v5/resource/get', sign.apiSign({
     return serviceAPI.get('operations/api/v5/resource/get', sign.apiSign({
@@ -213,14 +247,15 @@ exports.getSpecialData = (params) => {
  * @param  {[object]} params
  * @param  {[object]} params
  * @return {[object]}
  * @return {[object]}
  */
  */
-exports.getSpecialDetailData = (params) => {
-    return api.get('', sign.apiSign(Object.assign({
+exports.getSpecialDetailData = (id) => {
+    return api.get('', sign.apiSign({
         method: 'app.activity.get',
         method: 'app.activity.get',
         sort: 2,
         sort: 2,
-        plateform: 2
-    }, params))).then((result) => {
+        plateform: 2,
+        id: id
+    })).then((result) => {
         if (result && result.code === 200) {
         if (result && result.code === 200) {
-            return camelCase(result.data);
+            return processSpecialDetail(result.data);
         } else {
         } else {
             return Promise.reject('error');
             return Promise.reject('error');
         }
         }
@@ -234,15 +269,5 @@ exports.getSpecialDetailData = (params) => {
  * @return {[object]}
  * @return {[object]}
  */
  */
 exports.getVipData = (params) => {
 exports.getVipData = (params) => {
-    return api.get('', sign.apiSign(Object.assign({
-        method: 'app.activity.get',
-        sort: 2,
-        plateform: 2
-    }, params))).then((result) => {
-        if (result && result.code === 200) {
-            return camelCase(result.data);
-        } else {
-            return Promise.reject('error');
-        }
-    });
+    return getResources('vip');
 };
 };

@@ -6,7 +6,7 @@
                 <img class="lazy" data-original="{{image coverUrl 640 250}}" />
                 <img class="lazy" data-original="{{image coverUrl 640 250}}" />
                 <p class="special-cont">
                 <p class="special-cont">
                     <span class="special-title">{{title}}</span>
                     <span class="special-title">{{title}}</span>
-                    <span class="special-time {{#if warnColor}}red-color{{/if}}">{{leftTime}}</span>
+                    <span class="special-time {{#if warnColor}}red-color{{/if}}">{{time}}</span>
                 </p>
                 </p>
             </a>
             </a>
         </li>
         </li>

 <div class="banner">
 <div class="banner">
-    <img src="{{image src 640 200}}"/>
-    {{# activityTime}}
-    <p class="activity-time" data-time-ms = '{{msTime}}'><i class="iconfont time-ico">&#xe603;</i><span>剩1天2小时38分4秒</span></p>
-    {{/ activityTime}}
+    {{#content}}
+        {{! 头部banner}}
+        {{#if focus}}
+            {{> resources/banner-top}}
+        {{/if}}
+    {{/content}}
+    {{# activity}}
+        <img src="{{image coverUrl 640 200}}"/>
+        <p class="activity-time" data-time-ms="{{leftTime}}"><i class="iconfont time-ico">&#xe603;</i><span>{{time}}</span></p>
+    {{/ activity}}
 </div>
 </div>
 <ul id="list-nav" class="list-nav clearfix">
 <ul id="list-nav" class="list-nav clearfix">
     <li class="new active">
     <li class="new active">

@@ -35,7 +35,7 @@
                 {{#if saleViplogin}}
                 {{#if saleViplogin}}
                     <i class="vip-grade-{{vipGrade}}"></i>
                     <i class="vip-grade-{{vipGrade}}"></i>
                 {{/if}}
                 {{/if}}
-                <span class="sale-price {{^marketPrice}}no-price{{/price}}">¥{{salesPrice}}</span>
+                <span class="sale-price {{^marketPrice}}no-price{{/marketPrice}}">¥{{salesPrice}}</span>
                 {{#marketPrice}}
                 {{#marketPrice}}
                     <span class="market-price">¥{{.}}</span>
                     <span class="market-price">¥{{.}}</span>
                 {{/marketPrice}}
                 {{/marketPrice}}

@@ -5,57 +5,9 @@
  */
  */
 
 
 var $ = require('yoho-jquery'),
 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');
+    Swiper = require('yoho-swiper');
 
 
-var $goodsContainer = $('#goods-container'),
-    $goodsChildren = $goodsContainer.children(),
-    $ngc = $($goodsChildren.get(0)),
-    $pgc = $($goodsChildren.get(1)),
-    $dgc = $($goodsChildren.get(2));
-
-var winH = $(window).height(),
-    noResult = '<p class="no-result">未找到相关搜索结果</p>';
-
-// 默认筛选条件
-var defaultOpt = require('./query-param');
-
-var $listNav = $('#list-nav'),
-
-    // 导航数据信息
-    navInfo = {
-        newest: {
-            order: 1,
-            reload: true,
-            page: 0,
-            end: false
-        },
-        price: {
-            order: 1,
-            reload: true,
-            page: 0,
-            end: false
-        },
-        discount: {
-            order: 1,
-            reload: true,
-            page: 0,
-            end: false
-        }
-    },
-    $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
-    searching;
-
-require('./suspend-cart'); // 悬浮购物车
-require('../common');
-
-ellipsis.init();
-
-lazyLoad($('img.lazy'));
+require('./search');
 
 
 if ($('.swiper-container .swiper-slide').length > 1) {
 if ($('.swiper-container .swiper-slide').length > 1) {
     new Swiper('.swiper-container', {
     new Swiper('.swiper-container', {
@@ -68,326 +20,3 @@ if ($('.swiper-container .swiper-slide').length > 1) {
         pagination: '.banner-top .pagination-inner'
         pagination: '.banner-top .pagination-inner'
     });
     });
 }
 }
-
-/**
- * 筛选注册的回调，筛选子项点击后逻辑
- * 需要执行search的场景：1.点选筛选项；2.relaod为true时切换导航；3.下拉加载
- * @param opt {type, id}
- */
-function search(opt) {
-    var setting = {},
-        ext,
-        att,
-        nav, navType,
-        page;
-
-    if (searching) {
-        return;
-    }
-
-    if (opt) {
-
-        // 筛选项变更则重置reload为true
-        for (att in navInfo) {
-            if (navInfo.hasOwnProperty(att)) {
-                navInfo[att].reload = true;
-            }
-        }
-
-        // 处理active状态
-        $listNav.children('.active').removeClass('active');
-        $pre.addClass('active');
-
-        switch (opt.type) {
-            case 'gender':
-                ext = {
-                    gender: opt.id
-                };
-                break;
-            case 'brand':
-                ext = {
-                    brand: opt.id
-                };
-                break;
-            case 'sort':
-                ext = {
-                    sort: opt.id
-                };
-                break;
-            case 'color':
-                ext = {
-                    color: opt.id
-                };
-                break;
-            case 'size':
-                ext = {
-                    size: opt.id
-                };
-                break;
-            case 'price':
-                ext = {
-                    price: opt.id
-                };
-                break;
-            case 'discount':
-                ext = {
-                    discount: opt.id
-                };
-                break;
-            default:
-                break;
-        }
-
-        $.extend(defaultOpt, ext); // 扩展筛选项
-    }
-
-
-    // 导航类别
-    if ($pre.hasClass('new')) {
-        navType = 'newest';
-    } else if ($pre.hasClass('price')) {
-        navType = 'price';
-    } else if ($pre.hasClass('discount')) {
-        navType = 'discount';
-    }
-
-    nav = navInfo[navType];
-    page = nav.page + 1;
-    if (nav.reload) {
-        page = 1;
-    } else if (nav.end) {
-
-        // 不需要重新加载并且数据请求结束
-        return;
-    }
-
-    $.extend(setting, defaultOpt, {
-        type: navType,
-        order: nav.order,
-        page: page
-    });
-
-    searching = true;
-    loading.showLoadingMask();
-
-    $.ajax({
-        type: 'GET',
-        url: '/product/sale/search',
-        data: setting,
-        success: function(data) {
-            var $container,
-                num;
-
-            console.log(data);
-
-            switch (navType) {
-                case 'newest':
-                    $container = $ngc;
-                    break;
-                case 'price':
-                    $container = $pgc;
-                    break;
-                case 'discount':
-                    $container = $dgc;
-                    break;
-                default:
-                    break;
-            }
-
-            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/newsale/filter',
-    data: defaultOpt,
-    success: function(data) {
-        $goodsContainer.append(data);
-
-        // 初始化filter&注册filter回调
-        filter.initFilter({
-            fCbFn: search,
-            hCbFn: function() {
-
-                // 切换active状态到$pre上
-                $pre.addClass('active');
-                $pre.siblings('.filter').removeClass('active');
-            },
-            missStatus: true
-        });
-    }
-});
-lazyLoad($('.lazy'));
-
-// 导航栏点击逻辑说明：
-// 1.点击非active项时切换active状态
-// 2.价格和折扣active状态时继续点击切换排序
-// 3.筛选无active时点击展开筛选面板
-// 4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
-// 5.当前active为筛选并且点击其他项时，隐藏筛选面板
-$listNav.bind('contextmenu', function() {
-    return false;
-});
-
-$listNav.on('touchend touchcancel', function(e) {
-    var $this = $(e.target).closest('li'),
-        nav,
-        navType,
-        $active;
-
-    e.preventDefault();
-
-    if (typeof $this === 'undefined' || $this.length === 0) {
-        return;
-    }
-
-    if ($this.hasClass('filter')) {
-
-        // 筛选面板切换状态
-        if ($this.hasClass('active')) {
-            filter.hideFilter();
-
-            // 点击筛选钱的active项回复active
-            $pre.addClass('active');
-            $this.removeClass('active');
-        } else {
-            $pre = $this.siblings('.active');
-
-            $pre.removeClass('active');
-            $this.addClass('active');
-
-            filter.showFilter();
-        }
-    } else {
-
-        if ($this.hasClass('new')) {
-            navType = 'newest';
-        } else if ($this.hasClass('price')) {
-            navType = 'price';
-        } else if ($this.hasClass('discount')) {
-            navType = 'discount';
-        }
-
-        nav = navInfo[navType];
-
-        if ($this.hasClass('active')) {
-
-            // 最新无排序切换
-            if ($this.hasClass('new')) {
-                return;
-            }
-
-            if ($this.hasClass('price') || $this.hasClass('discount')) {
-
-                // 价格/折扣切换排序状态
-                $this.find('.icon > .iconfont').toggleClass('cur');
-                $pre = $this; // 更新pre为当前项
-                nav.reload = true; // 重置reload,HTML会被替换为逆序的HTML
-                nav.order = nav.order === 0 ? 1 : 0; // 切换排序
-            }
-        } else {
-            $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 'newest':
-                        $ngc.removeClass('hide');
-                        break;
-
-                    case 'price':
-                        $pgc.removeClass('hide');
-                        break;
-
-                    case 'discount':
-                        $dgc.removeClass('hide');
-                        break;
-                    default:
-                        break;
-                }
-            }
-
-            $active.removeClass('active');
-            $this.addClass('active');
-        }
-
-        if (nav.reload) {
-            search();
-        }
-    }
-    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();
-
-$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/23
+ */
+var $ = require('yoho-jquery'),
+    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(),
+    $ngc = $($goodsChildren.get(0)),
+    $pgc = $($goodsChildren.get(1)),
+    $dgc = $($goodsChildren.get(2));
+
+var winH = $(window).height(),
+    noResult = '<p class="no-result">未找到相关搜索结果</p>';
+
+// 默认筛选条件
+var defaultOpt = require('./query-param');
+
+var $listNav = $('#list-nav'),
+
+    // 导航数据信息
+    navInfo = {
+        newest: {
+            order: 1,
+            reload: true,
+            page: 0,
+            end: false
+        },
+        price: {
+            order: 1,
+            reload: true,
+            page: 0,
+            end: false
+        },
+        discount: {
+            order: 1,
+            reload: true,
+            page: 0,
+            end: false
+        }
+    },
+    $pre = $listNav.find('.active'), // 纪录进入筛选前的active项，初始为选中项
+    searching;
+
+require('./suspend-cart'); // 悬浮购物车
+require('../common');
+
+ellipsis.init();
+
+lazyLoad($('img.lazy'));
+
+/**
+ * 筛选注册的回调，筛选子项点击后逻辑
+ * 需要执行search的场景：1.点选筛选项；2.relaod为true时切换导航；3.下拉加载
+ * @param opt {type, id}
+ */
+function search(opt) {
+    var setting = {},
+        ext,
+        att,
+        nav, navType,
+        page;
+
+    if (searching) {
+        return;
+    }
+
+    if (opt) {
+
+        // 筛选项变更则重置reload为true
+        for (att in navInfo) {
+            if (navInfo.hasOwnProperty(att)) {
+                navInfo[att].reload = true;
+            }
+        }
+
+        // 处理active状态
+        $listNav.children('.active').removeClass('active');
+        $pre.addClass('active');
+
+        switch (opt.type) {
+            case 'gender':
+                ext = {
+                    gender: opt.id
+                };
+                break;
+            case 'brand':
+                ext = {
+                    brand: opt.id
+                };
+                break;
+            case 'sort':
+                ext = {
+                    sort: opt.id
+                };
+                break;
+            case 'color':
+                ext = {
+                    color: opt.id
+                };
+                break;
+            case 'size':
+                ext = {
+                    size: opt.id
+                };
+                break;
+            case 'price':
+                ext = {
+                    price: opt.id
+                };
+                break;
+            case 'discount':
+                ext = {
+                    discount: opt.id
+                };
+                break;
+            default:
+                break;
+        }
+
+        $.extend(defaultOpt, ext); // 扩展筛选项
+    }
+
+
+    // 导航类别
+    if ($pre.hasClass('new')) {
+        navType = 'newest';
+    } else if ($pre.hasClass('price')) {
+        navType = 'price';
+    } else if ($pre.hasClass('discount')) {
+        navType = 'discount';
+    }
+
+    nav = navInfo[navType];
+    page = nav.page + 1;
+    if (nav.reload) {
+        page = 1;
+    } else if (nav.end) {
+
+        // 不需要重新加载并且数据请求结束
+        return;
+    }
+
+    $.extend(setting, defaultOpt, {
+        type: navType,
+        order: nav.order,
+        page: page
+    });
+
+    searching = true;
+    loading.showLoadingMask();
+
+    $.ajax({
+        type: 'GET',
+        url: '/product/sale/search',
+        data: setting,
+        success: function(data) {
+            var $container,
+                num;
+
+            console.log(data);
+
+            switch (navType) {
+                case 'newest':
+                    $container = $ngc;
+                    break;
+                case 'price':
+                    $container = $pgc;
+                    break;
+                case 'discount':
+                    $container = $dgc;
+                    break;
+                default:
+                    break;
+            }
+
+            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/newsale/filter',
+    data: defaultOpt,
+    success: function(data) {
+        $goodsContainer.append(data);
+
+        // 初始化filter&注册filter回调
+        filter.initFilter({
+            fCbFn: search,
+            hCbFn: function() {
+
+                // 切换active状态到$pre上
+                $pre.addClass('active');
+                $pre.siblings('.filter').removeClass('active');
+            },
+            missStatus: true
+        });
+    }
+});
+lazyLoad($('.lazy'));
+
+// 导航栏点击逻辑说明：
+// 1.点击非active项时切换active状态
+// 2.价格和折扣active状态时继续点击切换排序
+// 3.筛选无active时点击展开筛选面板
+// 4.筛选有active时点击隐藏筛选面板并恢复点击筛选前active项的active状态
+// 5.当前active为筛选并且点击其他项时，隐藏筛选面板
+$listNav.bind('contextmenu', function() {
+    return false;
+});
+
+$listNav.on('touchend touchcancel', function(e) {
+    var $this = $(e.target).closest('li'),
+        nav,
+        navType,
+        $active;
+
+    e.preventDefault();
+
+    if (typeof $this === 'undefined' || $this.length === 0) {
+        return;
+    }
+
+    if ($this.hasClass('filter')) {
+
+        // 筛选面板切换状态
+        if ($this.hasClass('active')) {
+            filter.hideFilter();
+
+            // 点击筛选钱的active项回复active
+            $pre.addClass('active');
+            $this.removeClass('active');
+        } else {
+            $pre = $this.siblings('.active');
+
+            $pre.removeClass('active');
+            $this.addClass('active');
+
+            filter.showFilter();
+        }
+    } else {
+
+        if ($this.hasClass('new')) {
+            navType = 'newest';
+        } else if ($this.hasClass('price')) {
+            navType = 'price';
+        } else if ($this.hasClass('discount')) {
+            navType = 'discount';
+        }
+
+        nav = navInfo[navType];
+
+        if ($this.hasClass('active')) {
+
+            // 最新无排序切换
+            if ($this.hasClass('new')) {
+                return;
+            }
+
+            if ($this.hasClass('price') || $this.hasClass('discount')) {
+
+                // 价格/折扣切换排序状态
+                $this.find('.icon > .iconfont').toggleClass('cur');
+                $pre = $this; // 更新pre为当前项
+                nav.reload = true; // 重置reload,HTML会被替换为逆序的HTML
+                nav.order = nav.order === 0 ? 1 : 0; // 切换排序
+            }
+        } else {
+            $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 'newest':
+                        $ngc.removeClass('hide');
+                        break;
+
+                    case 'price':
+                        $pgc.removeClass('hide');
+                        break;
+
+                    case 'discount':
+                        $dgc.removeClass('hide');
+                        break;
+                    default:
+                        break;
+                }
+            }
+
+            $active.removeClass('active');
+            $this.addClass('active');
+        }
+
+        if (nav.reload) {
+            search();
+        }
+    }
+    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();
+
+$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/20
+ */
+var $ = require('yoho-jquery'),
+    lazyLoad = require('yoho-jquery-lazyload');
+
+var $activityTime = $('.activity-time'),
+    endTime = $activityTime.data('time-ms');
+
+require('./search');
+
+lazyLoad($('img.lazy'));
+
+
+// 倒计时
+function getRTime() {
+    var anHour = 3600000,
+        anMinute = 60000,
+        anSecond = 1000,
+        showTime = '',
+        d = 0,
+        h = 0,
+        m = 0,
+        s = 0;
+
+    endTime = endTime - 1000;
+
+    if (endTime > 1000) {
+        d = Math.floor(endTime / anHour / 24);
+        h = Math.floor(endTime / anHour % 24);
+        m = Math.floor(endTime / anMinute % 60);
+        s = Math.floor(endTime / anSecond % 60);
+    }
+
+    showTime += d > 0 ? d + '剩天' : '';
+    showTime += h > 0 ? h + '小时' : '';
+    showTime += m > 0 ? m + '分钟' : '';
+    showTime += s > 0 ? s + '秒' : '';
+
+    $activityTime.find('span').html(showTime);
+
+    $activityTime.attr('data-time-ms', endTime);
+}
+
+setInterval(getRTime, 1000);

@@ -6,37 +6,4 @@
 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
     lazyLoad = require('yoho-jquery-lazyload');
     lazyLoad = require('yoho-jquery-lazyload');
 
 
-var $activityTime = $('.activity-time');
-
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
-
-function getRTime() {
-    // var EndTime = $activityTime.data('time-ms'),
-    var EndTime = 1463743993785,
-        NowTime = new Date(),
-        t = EndTime - NowTime.getTime(),
-        anHour = 3600000,
-        anMinute = 60000,
-        anSecond = 1000,
-        showTime = '',
-        d = 0,
-        h = 0,
-        m = 0,
-        s = 0;
-
-    if (t >= 0) {
-        d = Math.floor(t / anHour / 24);
-        h = Math.floor(t / anHour % 24);
-        m = Math.floor(t / anMinute % 60);
-        s = Math.floor(t / anSecond % 60);
-    }
-
-    showTime += d > 0 ? d + '剩天' : '';
-    showTime += h > 0 ? h + '小时' : '';
-    showTime += m > 0 ? m + '分钟' : '';
-    showTime += s > 0 ? s + '秒' : '';
-
-    $activityTime.find('span').html(showTime);
-}
-
-setInterval(getRTime, 0);