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

 the commit.

@@ -10,6 +10,7 @@ const library = '../../../library';
 const utils = '../../../utils';
 const utils = '../../../utils';
 const API = require(`${library}/api`).API;
 const API = require(`${library}/api`).API;
 const api = new API();
 const api = new API();
+const list = require('./list');
 const saleApi = require('./sale-api');
 const saleApi = require('./sale-api');
 const outletsProcess = require('./outlets-handler');
 const outletsProcess = require('./outlets-handler');
 const outletsApi = require('./outlets-api');
 const outletsApi = require('./outlets-api');
@@ -130,7 +131,7 @@ exports.getOutletsChannelData = (params) => {
  * @return {[type]}
  * @return {[type]}
  */
  */
 exports.getOutletsSpecialData = (params) => {
 exports.getOutletsSpecialData = (params) => {
-    return Promise.all([
+    return api.all([
         headerModel.requestHeaderData('outlets'),
         headerModel.requestHeaderData('outlets'),
         outletsApi.getOutletsActivityOrigin({
         outletsApi.getOutletsActivityOrigin({
             id: params.id
             id: params.id
@@ -143,6 +144,17 @@ exports.getOutletsSpecialData = (params) => {
             delete specialData.pageErr;
             delete specialData.pageErr;
             Object.assign(specialData,
             Object.assign(specialData,
                 outletsProcess.handleOutletsSpecilData(result[1].data[0]));
                 outletsProcess.handleOutletsSpecilData(result[1].data[0]));
+
+            return api.all([
+                list.getSaleOthersData({
+                    productPool: result[1].data[0].productPoolId,
+                    saleType: 4
+                })
+            ]).then(data => {
+                specialData.specialHead.count = data[0].totalCount;
+                Object.assign(specialData, data[0]);
+                return specialData;
+            });
         }
         }
 
 
         return specialData;
         return specialData;

 {{!-- <pre>{{resultShow}}</pre> --}}
 {{!-- <pre>{{resultShow}}</pre> --}}
 {{# result}}
 {{# result}}
-<div class="outlets-page yoho-page">
+<div class="outlets-page product-page yoho-page">
     {{> common/main-banner}}
     {{> common/main-banner}}
     <div class="center-content">
     <div class="center-content">
         <ul class="column-img-tab">
         <ul class="column-img-tab">

-<div class="outlets-special-page outlets-page yoho-page">
+<pre>{{resultShow}}</pre>
+<div class="outlets-special-page product-page yoho-page">
     {{> common/main-banner}}
     {{> common/main-banner}}
     <div class="center-content clearfix">
     <div class="center-content clearfix">
         {{> common/special-head}}
         {{> common/special-head}}

@@ -14,6 +14,7 @@ var limitTime = [];
 // require('../common');
 // require('../common');
 // require('../outlets/channel');
 // require('../outlets/channel');
 require('../common/slider');
 require('../common/slider');
+require('./outlets/special');
 
 
 lazyLoad($('img.lazy'));
 lazyLoad($('img.lazy'));
 
 

+/**
+ * 活动专题页
+ * @author: yyq<yanqing.yang@yoho.cn>
+ * @date: 2016/06/3
+ */
+
+// var $ = require('yoho-jquery');
+
+require('../product');
+require('../../common/filter');
+require('../../common/sort-pager');