Merge branch 'feature/sale' of http://git.dev.yoho.cn/web/yohobuy-node into feature/sale

 the commit.

@@ -215,7 +215,12 @@ exports.saleIndex = () => {
  * @return {[type]} [description]
  */
 exports.discount = () => {
-    return {};
+    return {
+        module: 'product',
+        page: 'sale',
+
+
+    };
 };
 
 /**

-<div>keep coding...</div>
\ No newline at end of file
+<div class="sale-discount-page yoho-page center-content">
+    {{# saleList}}
+
+        {{> sale/sale-banner}}
+
+        <div class="center-content clearfix">
+            {{#saleTitle}}
+                <div class="sale-title">
+                    <span class="title">{{title}}</span>
+                    {{#if discount}}
+                        <span class="discount">{{discount}}</span>
+                    {{/if}}
+                    {{#if up}}
+                        起
+                    {{/if}}
+                    <div class="time pull-right">
+                        <span class="iconfont">&#xe60d;</span>{{time}}
+                    </div>
+                </div>
+            {{/saleTitle}}
+            <ul class="sort">
+                <li class="title">分类：</li>
+                {{#sort}}
+                    <li class="{{#if active}}active{{/if}}"><a href="#">{{name}}{{#if number}}({{number}}){{/if}}</a></li>
+                {{/sort}}
+            </ul>
+
+            {{> product/standard-content}}
+        </div>
+
+    {{/ saleList}}
+</div>

-<div>keep coding</div>
\ No newline at end of file
+<div class="new-sale-page product-page yoho-page">
+    {{# saleList}}
+
+        {{> sale/sale-banner}}
+
+        <div class="center-content clearfix">
+            {{# saleTitle}}
+                <div class="header-title">
+                    {{name}}
+                    <p class="line-through"></p>
+                    <p class="count-wrap">
+                        <span class="count">共{{count}}个结果</span>
+                    </p>
+                </div>
+            {{/ saleTitle}}
+
+            <div class="list-left pull-left">
+                {{> product/left-content}}
+            </div>
+
+            <div class="list-right pull-right">
+                {{> product/standard-content}}
+            </div>
+        </div>
+    {{/ saleList}}
+</div>
+{{> layout/f

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

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

@@ -377,7 +377,7 @@
     }
 }
 
-.sale-list-page {
+.sale-discount-page {
 
     .sale-title {
         margin: 30px 0;