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

@@ -30,6 +30,7 @@ const nl2r = (data) => {
             url: value.url
         });
     });
+    console.log(result);
     return result;
 };
 
@@ -282,8 +283,6 @@ exports.handleOutletsActivityData = (origin, name) => {
 exports.handleOutletsSpecilData = (origin) => {
     let dest = {};
 
-    let nowTime = Math.round(new Date().getTime() / 1000);
-
     dest.mainBanner = {
         src: origin.webUrl
     };
@@ -292,7 +291,7 @@ exports.handleOutletsSpecilData = (origin) => {
         logo: origin.logoUrl,
         special: origin.title,
         title: '全部商品',
-        limit: (origin.endTime - nowTime) * 1000
+        limit: origin.endLeftTime * 1000
     };
 
     if (origin.promotionName) {

@@ -92,10 +92,10 @@ exports.getOutletsChannelData = (params) => {
 
     if (channelCode[params]) {
         apiArr.push(outletsApi.getChannelResouceData({
-            content_code: channelCode[params.channel]
+            content_code: channelCode[params]
         }));
         apiArr.push(outletsApi.getOutletsActivityOrigin({
-            platform: 2,
+            platform: 1,
             size: 0,
             type: 1
         }));

@@ -23,24 +23,28 @@
             <div class="page-nav">
                 {{#if preHref}}
                     <a class="pjax" href="{{preHref}}">
-                        <span class="page-prev"><i class="arrow-left"></i></span>
+                        <span class="page-prev">
+                            <i class="iconfont">&#xe618;</i>
+                        </span>
                     </a>
                 {{^}}
-                    <span class="page-prev"><i class="arrow-left"></i></span>
+                    <span class="page-prev">
+                        <i class="iconfont">&#xe618;</i>
+                    </span>
                 {{/if}}
 
                 {{#if nextHref}}
                     <a class="pjax" href="{{nextHref}}">
                         <span class="page-next">
                             下一页
-                            <i class="arrow-right"></i>
+                            <i class="iconfont">&#xe619;</i>
                             <i class="pages">{{curPage}}</i>/{{pageCount}}
                         </span>
                     </a>
                 {{^}}
                     <span class="page-next">
                          下一页
-                        <i class="arrow-right"></i>
+                        <i class="iconfont">&#xe619;</i>
                         <i class="pages">{{curPage}}</i>/{{pageCount}}
                     </span>
                 {{/if}}

@@ -26,6 +26,7 @@
         </div>
     </div>
 {{/ goodsBoard}}
-<div class="pager">
-    {{{pager}}}
+<div class="product-pager clearfix">
+    <span class="total">{{{total}}}</span>
+    <div class="pager">{{{pager}}}</div>
 </div>
\ No newline at end of file

@@ -10,7 +10,7 @@
                         </a>
                         <div class="item-info">
                             <a href="{{href}}" target="_blank">
-                                <img src="{{logo}}" class="brand-logo">
+                                <img src="{{image logo 150 50}}" class="brand-logo">
                             </a>
                             <div class="activity-info">
                                 <p>

@@ -2,7 +2,7 @@
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <svg xmlns="http://www.w3.org/2000/svg">
 <metadata>
-Created by FontForge 20120731 at Tue May 31 15:22:26 2016
+Created by FontForge 20120731 at Tue Jun  7 15:10:09 2016
  By admin
 </metadata>
 <defs>
@@ -19,7 +19,7 @@ Created by FontForge 20120731 at Tue May 31 15:22:26 2016
     bbox="0 -212 1158 896"
     underline-thickness="50"
     underline-position="-100"
-    unicode-range="U+0078-E617"
+    unicode-range="U+0078-E619"
   />
 <missing-glyph horiz-adv-x="374" 
 d="M34 0v682h272v-682h-272zM68 34h204v614h-204v-614z" />
@@ -92,5 +92,9 @@ d="M877 896h-730q-61 0 -104 -43t-43 -104v-730q0 -61 43 -104t104 -43h730q61 0 104
     <glyph glyph-name="uniE617" unicode="&#xe617;" 
 d="M939 -128h-854q-35 0 -60 25t-25 60v854q0 35 25 60t60 25h854q35 0 60 -25t25 -60v-854q0 -35 -25 -60t-60 -25zM939 789q0 10 -6 16t-16 6h-810q-10 0 -16 -6t-6 -16v-810q0 -10 6 -16t16 -6h810q10 0 16 6t6 16v810zM457 183q-10 -12 -30.5 -12t-29.5 12l-171 171
 q-13 10 -13 30q0 18 12.5 30.5t30.5 12.5q20 0 30 -13l141 -141l311 312q13 12 30 12q18 0 30.5 -12.5t12.5 -29.5q0 -21 -13 -30z" />
+    <glyph glyph-name="uniE618" unicode="&#xe618;" horiz-adv-x="1000" 
+d="M662 662v-499l-299 250zM662 662z" />
+    <glyph glyph-name="uniE619" unicode="&#xe619;" 
+d="M384 640v-513l321 257z" />
   </font>
 </defs></svg>

@@ -7,7 +7,9 @@
 var $ = require('yoho-jquery'),
     lazyLoad = require('yoho-jquery-lazyload');
 
-var $limitList = $('.limit-main .good-list');
+var $limitList = $('.limit-main .good-list'),
+    $fixNav = $('.sort-layer .full-line'),
+    $navPar;
 
 var limitTime = [];
 
@@ -67,6 +69,20 @@ function limitPageSwitch(num) {
 // function formatExtraGood() {
 
 // }
+//
+if ($fixNav.length) {
+    $navPar = $fixNav.parent();
+
+    $(window).scroll(function() {
+        var navTop = $navPar.position().top;
+
+        if ($(this).scrollTop() >= navTop) {
+            $fixNav.addClass('fixed');
+        } else {
+            $fixNav.removeClass('fixed');
+        }
+    });
+}
 
 $('.time').each(function() {
     var data = $(this).data();

@@ -32,6 +32,43 @@
         display: none;
     }
 
+    .page-nav {
+        padding: 7px 0;
+        float: right;
+        font-size: 14px;
+
+        .page-prev {
+            width: 33px;
+            height: 33px;
+            line-height: 34px;
+            background: #ccc;
+            text-align: center;
+            float: left;
+        }
+
+        a .page-prev,
+        a .page-next {
+            background: #000;
+            color: #fff;
+        }
+
+        .page-next {
+            min-width: 110px;
+            height: 33px;
+            background: #a9a9a9;
+            float: left;
+            margin-left: 1px;
+            line-height: 33px;
+            padding-left: 10px;
+            box-sizing: border-box;
+            padding-right: 10px;
+        }
+
+        .pages {
+            margin-left: 10px;
+        }
+    }
+
     .pager-wrap {
         float: right;
         padding: 15px 0;

@@ -172,7 +172,7 @@
     }
 
     .debris-slider {
-        height: 510px;
+        height: 450px;
         width: 100%;
 
         .col {

@@ -113,6 +113,8 @@
 
             .list-page {
                 width: 33%;
+                max-height: 918px;
+                overflow: hidden;
                 display: inline-block;
             }
 
@@ -279,7 +281,7 @@
             position: fixed;
             top: 0;
             z-index: 1010;
-            opacity: 0.8;
+            opacity: 0.9;
         }
 
         .sort-pager {