张泽世 / yohobuywap-node · Commits

Go to a project

Authored by ccbikai
Commit b54c3f3f2e80f4f8d0ef50f8672c135da58bf5a7 1 parent c5b9db30

断码数据

Inline Side-by-side
Showing 3 changed files with 71 additions and 63 deletions
@@ -38,7 +38,6 @@ exports.index = (req, res) => { @@ -38,7 +38,6 @@ exports.index = (req, res) => {
38 pageFooter: true 38 pageFooter: true
39 }; 39 };
40 40
41 -  
42 saleModel.getSaleResources().then((result) => { 41 saleModel.getSaleResources().then((result) => {
43 res.render('sale', Object.assign(renderData, { 42 res.render('sale', Object.assign(renderData, {
44 content: result 43 content: result
@@ -48,31 +47,30 @@ exports.index = (req, res) => { @@ -48,31 +47,30 @@ exports.index = (req, res) => {
48 }); 47 });
49 }; 48 };
50 49
51 -  
52 /** 50 /**
53 - * 折扣专场列表 51 + * 断码区
54 */ 52 */
55 -exports.special = (req, res) => {  
56 - let headerData = headerModel.setNavHeader('折扣专场'); 53 +exports.breakCode = (req, res) => {
  54 + let headerData = headerModel.setNavHeader('断码区');
57 let renderData = { 55 let renderData = {
58 module: 'product', 56 module: 'product',
59 - page: 'special', 57 + page: 'break-code',
60 pageHeader: headerData, 58 pageHeader: headerData,
61 pageFooter: true 59 pageFooter: true
62 }; 60 };
63 61
64 - saleModel.getSpecialData().then((result) => {  
65 - res.render('special', Object.assign(renderData, result)); 62 + saleModel.getBreakCodeData().then((result) => {
  63 + console.log(result);
  64 + res.render('break-code', Object.assign(renderData, result));
66 }).catch((err) => { 65 }).catch((err) => {
67 saleLogger(err, res); 66 saleLogger(err, res);
68 }); 67 });
69 }; 68 };
70 69
71 -  
72 /** 70 /**
73 - * 折扣专场专题详情 71 + * 折扣专场列表
74 */ 72 */
75 -exports.specialDetail = (req, res) => { 73 +exports.special = (req, res) => {
76 let headerData = headerModel.setNavHeader('折扣专场'); 74 let headerData = headerModel.setNavHeader('折扣专场');
77 let renderData = { 75 let renderData = {
78 module: 'product', 76 module: 'product',
@@ -81,44 +79,27 @@ exports.specialDetail = (req, res) => { @@ -81,44 +79,27 @@ exports.specialDetail = (req, res) => {
81 pageFooter: true 79 pageFooter: true
82 }; 80 };
83 81
84 - saleModel.getSpecialDetailData().then((result) => {  
85 - result = {  
86 - src: 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/0239e814b8121913aa67b9ad509bd4e310.jpg?imageView2/2/w/{width}/h/{height}',  
87 - goods: {  
88 - url: 'http://m.yohobuy.com/product/pro_320421_412063/SYSTAGYuanLingWeiYiSYSA601HC09.html',  
89 - thumb: 'http://img10.static.yhbimg.com/goodsimg/2015/12/07/09/01ced0e2ed6a4f2a6d95be70cd0a6c5a56.jpg?imageView/2/w/235/h/314',  
90 - name: 'NEFF ONE OF US RAGLAN L/S 男款森林风连帽卫衣',  
91 - salePrice: '759.00',  
92 - price: '799.00',  
93 - tags: {  
94 - isNew: true,  
95 - isAdvance: false,  
96 - isDiscount: false,  
97 - isYohoood: false,  
98 - isLimited: false  
99 - },  
100 - isSoonSoldOut: true  
101 - }  
102 - };  
103 - res.render('special-detail', Object.assign(renderData, result)); 82 + saleModel.getSpecialData().then((result) => {
  83 + res.render('special', Object.assign(renderData, result));
104 }).catch((err) => { 84 }).catch((err) => {
105 saleLogger(err, res); 85 saleLogger(err, res);
106 }); 86 });
107 }; 87 };
108 88
  89 +
109 /** 90 /**
110 - * 断码区 91 + * 折扣专场专题详情
111 */ 92 */
112 -exports.breakCode = (req, res) => {  
113 - let headerData = headerModel.setNavHeader('断码区'); 93 +exports.specialDetail = (req, res) => {
  94 + let headerData = headerModel.setNavHeader('折扣专场');
114 let renderData = { 95 let renderData = {
115 module: 'product', 96 module: 'product',
116 - page: 'break-code', 97 + page: 'special',
117 pageHeader: headerData, 98 pageHeader: headerData,
118 pageFooter: true 99 pageFooter: true
119 }; 100 };
120 101
121 - saleModel.getBreakCodeData().then((result) => { 102 + saleModel.getSpecialDetailData().then((result) => {
122 result = { 103 result = {
123 src: 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/0239e814b8121913aa67b9ad509bd4e310.jpg?imageView2/2/w/{width}/h/{height}', 104 src: 'http://img12.static.yhbimg.com/yhb-img01/2016/04/18/05/0239e814b8121913aa67b9ad509bd4e310.jpg?imageView2/2/w/{width}/h/{height}',
124 goods: { 105 goods: {
@@ -137,7 +118,7 @@ exports.breakCode = (req, res) => { @@ -137,7 +118,7 @@ exports.breakCode = (req, res) => {
137 isSoonSoldOut: true 118 isSoonSoldOut: true
138 } 119 }
139 }; 120 };
140 - res.render('break-code', Object.assign(renderData, result)); 121 + res.render('special-detail', Object.assign(renderData, result));
141 }).catch((err) => { 122 }).catch((err) => {
142 saleLogger(err, res); 123 saleLogger(err, res);
143 }); 124 });
@@ -78,9 +78,14 @@ exports.getSearchData = (params) => { @@ -78,9 +78,14 @@ exports.getSearchData = (params) => {
78 }); 78 });
79 }; 79 };
80 80
81 -exports.getSaleResources = () => { 81 +const getResources = (page) => {
  82 + const contentCode = {
  83 + sale: '7c2b77093421efa8ae9302c91460db73',
  84 + breakCode: '7c2b77093421efa8ae9302c91460db73'
  85 + };
  86 +
82 return serviceAPI.get('operations/api/v5/resource/get', sign.apiSign({ 87 return serviceAPI.get('operations/api/v5/resource/get', sign.apiSign({
83 - content_code: '7c2b77093421efa8ae9302c91460db73' 88 + content_code: contentCode[page]
84 })).then((result) => { 89 })).then((result) => {
85 if (result && result.code === 200) { 90 if (result && result.code === 200) {
86 return resourcesProcess(result.data); 91 return resourcesProcess(result.data);
@@ -91,6 +96,44 @@ exports.getSaleResources = () => { @@ -91,6 +96,44 @@ exports.getSaleResources = () => {
91 }); 96 });
92 }; 97 };
93 98
  99 +const getBreakingSort = (yhChannel) => {
  100 + return api.get('', sign.apiSign({
  101 + method: 'app.sale.getBreakingSort',
  102 + yh_channel: yhChannel || '1'
  103 + })).then((result) => {
  104 + if (result && result.code === 200) {
  105 + return result.data;
  106 + } else {
  107 + logger.error('断码区分类接口返回 code 不是 200');
  108 + return {};
  109 + }
  110 + });
  111 +};
  112 +
  113 +/**
  114 + * 获取sale首页数据
  115 + * @param {[object]} params
  116 + * @return {[object]}
  117 + */
  118 +exports.getSaleData = () => {
  119 + return getResources('sale');
  120 +};
  121 +
  122 +/**
  123 + * 获取断码区数据
  124 + * @param {[object]} params
  125 + * @return {[object]}
  126 + */
  127 +exports.getBreakCodeData = (params) => {
  128 + params = params || {};
  129 + return Promise.all([getResources('breakCode'), getBreakingSort(params.yhChannel)]).then((result) => {
  130 + return {
  131 + content: result[0],
  132 + nav: result[1]
  133 + };
  134 + });
  135 +};
  136 +
94 /** 137 /**
95 * 获取折扣专场专题列表数据 138 * 获取折扣专场专题列表数据
96 * @param {[object]} params 139 * @param {[object]} params
@@ -133,25 +176,6 @@ exports.getSpecialDetailData = (params) => { @@ -133,25 +176,6 @@ exports.getSpecialDetailData = (params) => {
133 }); 176 });
134 }; 177 };
135 178
136 -/**  
137 - * 获取断码区数据  
138 - * @param {[object]} params  
139 - * @return {[object]}  
140 - */  
141 -exports.getBreakCodeData = (params) => {  
142 - return api.get('', sign.apiSign(Object.assign({  
143 - method: 'app.activity.get',  
144 - sort: 2,  
145 - plateform: 2  
146 - }, params))).then((result) => {  
147 - if (result && result.code === 200) {  
148 - return camelCase(result.data);  
149 - } else {  
150 - return Promise.reject('error');  
151 - }  
152 - });  
153 -};  
154 -  
155 179
156 /** 180 /**
157 * 获取会员享数据 181 * 获取会员享数据
1 <div class="break-code-page discount-page yoho-page"> 1 <div class="break-code-page discount-page yoho-page">
2 - <div class="banner">  
3 - <img src="{{image src 640 200}}"/>  
4 - </div> 2 + {{#content}}
  3 + {{! 头部banner}}
  4 + {{#if focus}}
  5 + {{> resources/banner-top}}
  6 + {{/if}}
  7 + {{/content}}
5 8
6 <ul id="list-nav" class="list-nav clearfix"> 9 <ul id="list-nav" class="list-nav clearfix">
7 <li class="new active"> 10 <li class="new active">
@@ -46,7 +49,7 @@ @@ -46,7 +49,7 @@
46 <li class="swiper-slide">XXL码</li> 49 <li class="swiper-slide">XXL码</li>
47 </ul> 50 </ul>
48 </div> 51 </div>
49 - 52 +
50 53
51 <div id="goods-container" class="goods-container"> 54 <div id="goods-container" class="goods-container">
52 <div class="new-goods container clearfix"> 55 <div class="new-goods container clearfix">
@@ -63,4 +66,4 @@ @@ -63,4 +66,4 @@
63 {{> common/query-param}} 66 {{> common/query-param}}
64 67
65 {{> common/suspend-cart}} 68 {{> common/suspend-cart}}
66 -</div>  
  69 +</div>