sale首页头

@@ -24,33 +24,27 @@ const sale = require(`${mRoot}/sale`);
  * @return {[type]}     [description]
  */
 exports.index = (req, res) => {
-    let responseData = {};
-
     let channel = req.query.channel || req.cookies._Channel || 'boys';
 
-    headerModel.requestHeaderData()
-        .then(headerData => {
-            responseData = headerModel.setHeaderData(headerData.data, channel);
-
-            responseData.module = 'product';
-            responseData.page = 'sale';
-            responseData.footerTop = true;
-
-            // 假数据输出
-            // res.render('sale/index', Object.assign(responseData, simulation.saleIndex()));
+    let responseData = {
+        module: 'product',
+        page: 'sale',
+        footerTop: true
+    };
 
-            // 真实数据输出
-            sale.getSaleIndexData(channel).then(result => {
+    // 假数据输出
+    // res.render('sale/index', Object.assign(responseData, simulation.saleIndex()));
 
-                responseData.result = result;
-                responseData.resultShow = JSON.stringify(result, null, 4);
-
-                res.render('sale/index', responseData);
-            });
-        })
-        .catch(() => {
-            res.render('error', { devEnv: true, pageErr: true });
-        });
+    // 真实数据输出
+    sale.getSaleIndexData(channel).then(result => {
+        responseData.result = result;
+        responseData.resultShow = JSON.stringify(result, null, 4);
+        responseData.headerData = result.headerData;
+        res.render('sale/index', responseData);
+    }).catch(() => {
+        responseData.pageErr = true;
+        res.render('error', responseData);
+    });
 
 };
 
@@ -150,22 +144,22 @@ exports.newSale = (req, res) => {
     let responseData = {};
 
     headerModel.requestHeaderData().then(headerData => {
-        responseData = headerModel.setHeaderData(headerData.data, channel);
-        responseData.module = 'product';
-        responseData.page = 'sale';
-        responseData.footerTop = true;
+            responseData = headerModel.setHeaderData(headerData.data, channel);
+            responseData.module = 'product';
+            responseData.page = 'sale';
+            responseData.footerTop = true;
 
             // 假数据输出
             // res.render('sale/other', Object.assign(responseData, simulation.other()));
 
-        sale.getSaleOthersData(params, channel).then((result) => {
-            responseData.saleList = result;
-            responseData.resultShow = JSON.stringify(result, null, 4);
+            sale.getSaleOthersData(params, channel).then((result) => {
+                responseData.saleList = result;
+                responseData.resultShow = JSON.stringify(result, null, 4);
 
-            res.render('sale/other', responseData);
-        });
+                res.render('sale/other', responseData);
+            });
 
-    })
+        })
         .catch(() => {
             res.render('error', { devEnv: true, pageErr: true });
         });

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date:   2016-05-30 16:20:03
  * @Last Modified by:   Targaryen
- * @Last Modified time: 2016-06-06 17:56:54
+ * @Last Modified time: 2016-06-07 14:48:20
  */
 
 'use strict';

@@ -2,7 +2,7 @@
  * @Author: Targaryen
  * @Date:   2016-05-19 10:20:08
  * @Last Modified by:   Targaryen
- * @Last Modified time: 2016-06-07 14:12:50
+ * @Last Modified time: 2016-06-07 14:49:51
  */
 
 'use strict';
@@ -14,7 +14,7 @@ const saleApi = require('./sale-api');
 const saleHandler = require('./sale-handler');
 const productProcess = require(`${utils}/product-process`);
 const _ = require('lodash');
-
+const headerModel = require('../../../doraemon/models/header');
 
 /**
  * 资源位code码
@@ -129,47 +129,48 @@ exports.getSaleGoodsData = (params) => {
 exports.getSaleIndexData = (channel) => {
 
     return api.all([
+        headerModel.requestHeaderData(channel),
         saleApi.getSaleActivityList('', channel),
         saleApi.getSaleBannerList(contentCode[channel].sale),
         saleApi.getSaleGoodsList({ channel: channel, saleType: '2', limit: '1' }), // 会员专享分类
         saleApi.getSaleGoodsList({ channel: channel, saleType: '1', limit: '1' }), // 断码区分类
         saleApi.getSaleGoodsList({ channel: channel, saleType: '3', limit: '1' }) // 最新降价分类
     ]).then(result => {
-        var finalResult = {};
+        var finalResult = result[0];
 
-        if (result[0].code === 200) {
-            finalResult.brandSale = saleHandler.handleSaleActivityData(result[0].data, channel);
+        if (result[1].code === 200) {
+            finalResult.brandSale = saleHandler.handleSaleActivityData(result[1].data, channel);
         }
 
-        if (result[1].code === 200) {
-            finalResult.topBanner = saleHandler.handleSaleBannerData(result[1].data);
-            finalResult.activityEnter = saleHandler.handleSaleBannerSmallData(result[1].data);
+        if (result[2].code === 200) {
+            finalResult.topBanner = saleHandler.handleSaleBannerData(result[2].data);
+            finalResult.activityEnter = saleHandler.handleSaleBannerSmallData(result[2].data);
         }
 
         // 分类处理
         finalResult.saleCategory = [];
 
         // 会员专享分类处理
-        if (result[2].code === 200) {
+        if (result[3].code === 200) {
 
             finalResult.saleCategory.push(
-                saleHandler.handleSaleCategoryData(result[2].data.filter.group_sort, '2', channel)
+                saleHandler.handleSaleCategoryData(result[3].data.filter.group_sort, '2', channel)
             );
         }
 
         // 断码区分类处理
-        if (result[3].code === 200) {
+        if (result[4].code === 200) {
 
             finalResult.saleCategory.push(
-                saleHandler.handleSaleCategoryData(result[3].data.filter.group_sort, '1', channel)
+                saleHandler.handleSaleCategoryData(result[4].data.filter.group_sort, '1', channel)
             );
         }
 
         // 最新降价分类处理
-        if (result[4].code === 200) {
+        if (result[5].code === 200) {
 
             finalResult.saleCategory.push(
-                saleHandler.handleSaleCategoryData(result[4].data.filter.group_sort, '3', channel)
+                saleHandler.handleSaleCategoryData(result[5].data.filter.group_sort, '3', channel)
             );
         }
         return finalResult;