Merge branch 'release/4.6' of http://git.yoho.cn/fe/yohobuywap-node into release/4.6

runner
Commit 7e6fc77837c80f28d9dea194dd0ed25e80118b14 2 parents e2d28aeb bef04493
Showing 6 changed files with 59 additions and 56 deletions
apps/product/controllers/outlet.js
apps/product/controllers/sale.js
apps/product/models/outlet.js
apps/product/models/sale.js
apps/product/views/action/outlet/will-end.hbs
doraemon/views/partial/resources/acivity-outlets.hbs
--- a/apps/product/controllers/outlet.js
View file @7e6fc77
+++ b/apps/product/controllers/outlet.js
View file @7e6fc77
@@ -12,12 +12,12 @@ const renderData = {
     module: 'product'
 };
-const yhChannelMap = {
-    boys: 1,
-    girls: 2,
-    kids: 3,
-    lifestyle: 4
-};
+// const yhChannelMap = {
+//     boys: 1,
+//     girls: 2,
+//     kids: 3,
+//     lifestyle: 4
+// };
 // 奥莱首页控制器
 exports.index = (req, res) => {
@@ -64,9 +64,12 @@ exports.activityList = (req, res) => {
     let type = req.query.type || 2;
     let template = type === 2 ? 'outlet/will-end' : 'outlet/will-start';
     let page = type === 2 ? 'outlet-will-end' : 'outlet-will-start';
-    let yhChannel = req.query.yh_channel || yhChannelMap[req.yoho.channel];
-    outletModel.getNearlyActivity(yhChannel, type, categoryId).then(result => {
+    if (!categoryId) {
+        throw new Error('No parent_id for OUTLET channel page!');
+    }
+
+    outletModel.getRecentActivity(type, categoryId).then(result => {
         res.render(template, Object.assign({
             page: page,
             pageHeader: headerData,
--- a/apps/product/controllers/sale.js
View file @7e6fc77
+++ b/apps/product/controllers/sale.js
View file @7e6fc77
@@ -11,14 +11,14 @@ const mRoot = '../models';
 const headerModel = require('../../../doraemon/models/header');
 const saleModel = require(`${mRoot}/sale`);
-const queryParam = {
-    brand: '0',
-    gender: '1,2,3',
-    sort: '0',
-    size: '0',
-    price: '0',
-    pD: '0.1,0.9'
-};
+// const queryParam = {
+//     brand: '0',
+//     gender: '1,2,3',
+//     sort: '0',
+//     size: '0',
+//     price: '0',
+//     pD: '0.1,0.9'
+// };
 /**
  * 公共数据处理
@@ -57,7 +57,7 @@ exports.index = (req, res, next) => {
     let params = processPublicData(req, 'SALE', 'sale');
     saleModel.getSaleData(params.channel).then((result) => {
-        res.render('sale/index', Object.assign(params.renderData, queryParam, {
+        res.render('sale/index', Object.assign(params.renderData,  {
             content: result,
             floorHeader: {
                 title: {
--- a/apps/product/models/outlet.js
View file @7e6fc77
+++ b/apps/product/models/outlet.js
View file @7e6fc77
@@ -33,7 +33,7 @@ const getOutletResource = (channel, contentcode) => {
             return resourcesProcess(result.data.list);
         } else {
             log.error('奥莱资源位接口返回状态码 不是 200');
-            return result;
+            return [];
         }
     });
 };
@@ -68,7 +68,7 @@ const getNavData = (categoryId) => {
             return data;
         } else {
             log.error('奥莱导航接口返回状态码 不是 200', result);
-            return result;
+            return [];
         }
     });
 };
@@ -115,7 +115,7 @@ const convertActicityData = (data) => {
 const getHomeActivity = (data) => {
     var params = {
         method: 'app.outlets.activityGet',
-        platform: 3,
+        platform: 3
     };
     return api.get('', sign.apiSign(_.assign(params, data))).then(res => {
@@ -124,48 +124,51 @@ const getHomeActivity = (data) => {
 };
 exports.getContent = (categoryId, channel, code) => {
-    let floorsData = {},
-        params = {
-            type: 0,
-            yh_channel: channel
-        };
+    let params = {
+        type: 0,
+        yh_channel: channel
+    };
     const p = [getNavData(categoryId), getOutletResource(channel, code), getHomeActivity(params)];
     return Promise.all(p).then(data => {
-        floorsData.nav = data[0] || [];
-        floorsData.content = data[1] || [];
-        floorsData.activity = {data: data[2]};
-        return floorsData;
+        return {
+            nav: data[0] || [],
+            content: data[1] || [],
+            activity: data[2]
+        };
     });
 };
 exports.getActivity = (id) => {
     return getActivityDetail(id).then(res => {
-        var data = {};
-        data.outletActivity = res;
-        data.productPool = res[0] && res[0].productPoolId || '';
-        data.saleType = 4;
-        return data;
+        return {
+            outletActivity: res,
+            productPool: res[0] || res[0].productPoolId || '',
+            saleType: 4
+        };
     });
 };
-exports.getNearlyActivity = (channel, type, categoryId) => {
+/**
+ * 获取即将开始或即将结束的活动列表
+ * @param  {Number} type 标明是即将开始还是即将技术
+ * @param  {String} categoryId 父级菜单id，用于标明当前页面是奥莱页面
+ * @return {Object} 活动列表数据
+ */
+exports.getRecentActivity = (type, categoryId) => {
     var params = {
         type: type
     };
     return Promise.all([getNavData(categoryId), getHomeActivity(params)]).then(res => {
-        var data = {
+
+        return {
             nav: res[0] || [],
-            activity: {
-                data: res[1]
-            }
+            activity: res[1]
         };
-
-        return data;
     });
 };
--- a/apps/product/models/sale.js
View file @7e6fc77
+++ b/apps/product/models/sale.js
View file @7e6fc77
@@ -27,9 +27,10 @@ const typeCont = {
     price: ['s_p_desc', 's_p_asc'],
     discount: ['p_d_desc', 'p_d_asc'],
     sale: ['s_n_desc', 's_n_asc'],
-    newest: ['s_t_desc,s_s_desc', 's_t_asc,s_s_asc'],
-    // newest: ['s_t_desc', 's_t_asc'],
+    // newest: ['s_t_desc,s_s_desc', 's_t_asc,s_s_asc'],
+
+    newest: ['s_t_desc', 's_t_asc'],
     stock: ['s_s_desc', 's_s_asc'],
     all: ['d_s_desc', 'd_s_asc']
 };
--- a/apps/product/views/action/outlet/will-end.hbs
View file @7e6fc77
+++ b/apps/product/views/action/outlet/will-end.hbs
View file @7e6fc77
 <div class="outlet-page yoho-page">
     {{> product/outlet/nav}}
     {{# activity}}
-        {{#data}}
-            <a class="will-end-back" href="{{activityUrl}}" >
-                <img class="back-image" src="{{image coverUrl 640 300}}">
-                <div class="last-time"><i class="iconfont time-ico">&#xe603;</i><span>{{>product/outlet/countdown}}</span></div>
-                <div class="line-space">
-                    <span class="num">{{promotionName}} </span>
-                    <span class="title">{{title}}</span>
-                    <img class="logo" src="{{image logoUrl 150 100}}"></img>
-                </div>
-            </a>
-        {{/data}}
+        <a class="will-end-back" href="{{activityUrl}}" >
+            <img class="back-image" src="{{image coverUrl 640 300}}">
+            <div class="last-time"><i class="iconfont time-ico">&#xe603;</i><span>{{>product/outlet/countdown}}</span></div>
+            <div class="line-space">
+                <span class="num">{{promotionName}} </span>
+                <span class="title">{{title}}</span>
+                <img class="logo" src="{{image logoUrl 150 100}}"></img>
+            </div>
+        </a>
     {{/ activity}}
 </div>
--- a/doraemon/views/partial/resources/acivity-outlets.hbs
View file @7e6fc77
+++ b/doraemon/views/partial/resources/acivity-outlets.hbs
View file @7e6fc77
 <div class="active-list">
-{{#data}}
     <a class="back-ground-white {{#if hide}} hidden {{/if}}" href="{{activityUrl}}" >
         <img class="back-image" src="{{image coverUrl 640 300}}">
         <div class="center-square">
@@ -9,6 +8,5 @@
             {{>product/outlet/countdown}}
         </div>
     </a>
-{{/data}}
 </div>
 <div class="more-activity hide"><p>更多精彩活动</p><span class="iconfont count-down-icon">&#xe609;</span></div>