fe / yohobuy-node · Commits

Go to a project

Authored by 郭成尧
Commit 10acc5cb5d49358795dc3ff2db991d092c4d2ae4 1 parent 9422a8ce

列表数据基本处理

Inline Side-by-side
Showing 3 changed files with 77 additions and 56 deletions
@@ -26,24 +26,24 @@ const simulation = require(`${mRoot}/simulation`); @@ -26,24 +26,24 @@ const simulation = require(`${mRoot}/simulation`);
26 exports.index = (req, res) => { 26 exports.index = (req, res) => {
27 27
28 headerModel.requestHeaderData() 28 headerModel.requestHeaderData()
29 - .then(response => {  
30 - response = headerModel.setHeaderData(response.data, 'sale'); 29 + .then(responseData => {
  30 + responseData = headerModel.setHeaderData(responseData.data, 'sale');
31 31
32 - response.module = 'product';  
33 - response.page = 'sale';  
34 - response.footerTop = true;  
35 - response.devEnv = true; 32 + responseData.module = 'product';
  33 + responseData.page = 'sale';
  34 + responseData.footerTop = true;
  35 + responseData.devEnv = true;
36 36
37 // 假数据输出 37 // 假数据输出
38 - res.render('sale/index', Object.assign(response, simulation.saleIndex())); 38 + res.render('sale/index', Object.assign(responseData, simulation.saleIndex()));
39 39
40 // 真实数据输出 40 // 真实数据输出
41 /* return sale.getSaleDate().then(result => { 41 /* return sale.getSaleDate().then(result => {
42 42
43 - response.result = result;  
44 - response.resultShow = JSON.stringify(result, null, 4); 43 + responseData.result = result;
  44 + responseData.resultShow = JSON.stringify(result, null, 4);
45 45
46 - res.render('sale/index', response); 46 + res.render('sale/index', responseData);
47 });*/ 47 });*/
48 }) 48 })
49 .catch(() => { 49 .catch(() => {
@@ -59,25 +59,25 @@ exports.index = (req, res) => { @@ -59,25 +59,25 @@ exports.index = (req, res) => {
59 */ 59 */
60 exports.discount = (req, res) => { 60 exports.discount = (req, res) => {
61 headerModel.requestHeaderData() 61 headerModel.requestHeaderData()
62 - .then(response => {  
63 - response = headerModel.setHeaderData(response.data, 'sale-discount');  
64 - response.module = 'product';  
65 - response.page = 'sale';  
66 - response.footerTop = true;  
67 - response.devEnv = true; 62 + .then(responseData => {
  63 + responseData = headerModel.setHeaderData(responseData.data, 'sale-discount');
  64 + responseData.module = 'product';
  65 + responseData.page = 'sale';
  66 + responseData.footerTop = true;
  67 + responseData.devEnv = true;
68 68
69 // 假数据输出 69 // 假数据输出
70 - // res.render('sale/discount', Object.assign(response, simulation.discount())); 70 + // res.render('sale/discount', Object.assign(responseData, simulation.discount()));
71 71
72 return sale.getSaleGoodsListData({ 72 return sale.getSaleGoodsListData({
73 saleType: req.params.saleType 73 saleType: req.params.saleType
74 }) 74 })
75 .then(result => { 75 .then(result => {
76 - response.result = result;  
77 - response.resultShow = JSON.stringify(result, null, 4); 76 + responseData.result = result;
  77 + responseData.resultShow = JSON.stringify(result, null, 4);
78 78
79 // log.info(result); 79 // log.info(result);
80 - res.render('sale/discount', response); 80 + res.render('sale/discount', responseData);
81 }); 81 });
82 82
83 }) 83 })
@@ -94,23 +94,23 @@ exports.discount = (req, res) => { @@ -94,23 +94,23 @@ exports.discount = (req, res) => {
94 */ 94 */
95 exports.vip = (req, res) => { 95 exports.vip = (req, res) => {
96 headerModel.requestHeaderData() 96 headerModel.requestHeaderData()
97 - .then(response => {  
98 - response = headerModel.setHeaderData(response.data, 'vip');  
99 - response.module = 'product';  
100 - response.page = 'sale';  
101 - response.footerTop = true;  
102 - response.devEnv = true; 97 + .then(responseData => {
  98 + responseData = headerModel.setHeaderData(responseData.data, 'vip');
  99 + responseData.module = 'product';
  100 + responseData.page = 'sale';
  101 + responseData.footerTop = true;
  102 + responseData.devEnv = true;
103 103
104 // 假数据输出 104 // 假数据输出
105 - res.render('sale/other', Object.assign(response, simulation.other())); 105 + // res.render('sale/other', Object.assign(responseData, simulation.other()));
106 106
107 - /* return sale.getSaleGoodsListData()  
108 - .then(result => {  
109 - response.result = result;  
110 - response.resultShow = JSON.stringify(result, null, 4); 107 + sale.getSaleGoodsListData()
  108 + .then((result) => {
  109 + responseData.result = result;
  110 + responseData.resultShow = JSON.stringify(result, null, 4);
111 111
112 - res.render('sale/other', response);  
113 - });*/ 112 + res.render('sale/other', responseData);
  113 + });
114 114
115 }) 115 })
116 .catch(() => { 116 .catch(() => {
@@ -126,22 +126,22 @@ exports.vip = (req, res) => { @@ -126,22 +126,22 @@ exports.vip = (req, res) => {
126 */ 126 */
127 exports.breakingYards = (req, res) => { 127 exports.breakingYards = (req, res) => {
128 headerModel.requestHeaderData() 128 headerModel.requestHeaderData()
129 - .then(response => {  
130 - response = headerModel.setHeaderData(response.data, 'breakingYards');  
131 - response.module = 'product';  
132 - response.page = 'sale';  
133 - response.footerTop = true;  
134 - response.devEnv = true; 129 + .then(responseData => {
  130 + responseData = headerModel.setHeaderData(responseData.data, 'breakingYards');
  131 + responseData.module = 'product';
  132 + responseData.page = 'sale';
  133 + responseData.footerTop = true;
  134 + responseData.devEnv = true;
135 135
136 // 假数据输出 136 // 假数据输出
137 - res.render('sale/other', Object.assign(response, simulation.other())); 137 + res.render('sale/other', Object.assign(responseData, simulation.other()));
138 138
139 /* return sale.getSaleGoodsListData() 139 /* return sale.getSaleGoodsListData()
140 .then(result => { 140 .then(result => {
141 - response.result = result;  
142 - response.resultShow = JSON.stringify(result, null, 4); 141 + responseData.result = result;
  142 + responseData.resultShow = JSON.stringify(result, null, 4);
143 143
144 - res.render('sale/other', response); 144 + res.render('sale/other', responseData);
145 });*/ 145 });*/
146 146
147 }) 147 })
@@ -158,22 +158,22 @@ exports.breakingYards = (req, res) => { @@ -158,22 +158,22 @@ exports.breakingYards = (req, res) => {
158 */ 158 */
159 exports.newSale = (req, res) => { 159 exports.newSale = (req, res) => {
160 headerModel.requestHeaderData() 160 headerModel.requestHeaderData()
161 - .then(response => {  
162 - response = headerModel.setHeaderData(response.data, 'newSale');  
163 - response.module = 'product';  
164 - response.page = 'sale';  
165 - response.footerTop = true;  
166 - response.devEnv = true; 161 + .then(responseData => {
  162 + responseData = headerModel.setHeaderData(responseData.data, 'newSale');
  163 + responseData.module = 'product';
  164 + responseData.page = 'sale';
  165 + responseData.footerTop = true;
  166 + responseData.devEnv = true;
167 167
168 // 假数据输出 168 // 假数据输出
169 - res.render('sale/other', Object.assign(response, simulation.other())); 169 + res.render('sale/other', Object.assign(responseData, simulation.other()));
170 170
171 /* return sale.getSaleNewSaleData() 171 /* return sale.getSaleNewSaleData()
172 .then(result => { 172 .then(result => {
173 - response.result = result;  
174 - response.resultShow = JSON.stringify(result, null, 4); 173 + responseData.result = result;
  174 + responseData.resultShow = JSON.stringify(result, null, 4);
175 175
176 - res.render('sale/other', response); 176 + res.render('sale/other', responseData);
177 });*/ 177 });*/
178 178
179 }) 179 })
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2016-05-19 10:20:08 3 * @Date: 2016-05-19 10:20:08
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2016-05-19 18:03:33 5 + * @Last Modified time: 2016-05-20 15:05:05
6 */ 6 */
7 7
8 'use strict'; 8 'use strict';
@@ -31,9 +31,28 @@ const handleSaleData = (origin) => { @@ -31,9 +31,28 @@ const handleSaleData = (origin) => {
31 */ 31 */
32 const handleSaleGoodsListData = (origin) => { 32 const handleSaleGoodsListData = (origin) => {
33 var dest = {}; 33 var dest = {};
  34 +
  35 + dest.saleList = {};
  36 + dest.saleList.leftContent = {};
  37 + dest.saleList.goods = [];
  38 +
34 39
35 if (!_.isEmpty(origin.product_list)) { 40 if (!_.isEmpty(origin.product_list)) {
36 - dest.saleList = origin.product_list; 41 +
  42 + _.forEach(origin.product_list, function(value) {
  43 + let goods = {};
  44 +
  45 + goods.tags = value.tags;
  46 + goods.url = ''; // 待处理
  47 + goods.thumb = value.goods_list;
  48 + goods.name = value.product_name;
  49 + goods.brand = {};
  50 + goods.brand.url = ''; // 待处理
  51 + goods.brand.name = value.brand_name;
  52 + goods.marketPrice = value.market_price;
  53 +
  54 + dest.saleList.goods.push(goods);
  55 + });
37 } 56 }
38 57
39 return dest; 58 return dest;
@@ -73,4 +92,3 @@ exports.getSaleGoodsListData = () => { @@ -73,4 +92,3 @@ exports.getSaleGoodsListData = () => {
73 } 92 }
74 }); 93 });
75 }; 94 };
76 -  
  1 +<pre>{{resultShow}}</pre>
  2 +{{# result}}
1 <div class="new-sale-page product-page yoho-page"> 3 <div class="new-sale-page product-page yoho-page">
2 {{# saleList}} 4 {{# saleList}}
3 5
@@ -24,3 +26,4 @@ @@ -24,3 +26,4 @@
24 </div> 26 </div>
25 {{/ saleList}} 27 {{/ saleList}}
26 </div> 28 </div>
  29 +{{/ result}}