Showing
1 changed file
with
23 additions
and
21 deletions
@@ -55,7 +55,7 @@ const getBannerList = data => { | @@ -55,7 +55,7 @@ const getBannerList = data => { | ||
55 | }; | 55 | }; |
56 | 56 | ||
57 | const getadbannerData = data => { | 57 | const getadbannerData = data => { |
58 | - let obj = { | 58 | + const obj = { |
59 | adbanner: { | 59 | adbanner: { |
60 | href: '', | 60 | href: '', |
61 | img: '', | 61 | img: '', |
@@ -71,14 +71,13 @@ const getadbannerData = data => { | @@ -71,14 +71,13 @@ const getadbannerData = data => { | ||
71 | }; | 71 | }; |
72 | 72 | ||
73 | const getSlideData = srcData => { | 73 | const getSlideData = srcData => { |
74 | - let slideData = { | 74 | + const slideData = { |
75 | slide: { | 75 | slide: { |
76 | list: [], | 76 | list: [], |
77 | pagination: [] | 77 | pagination: [] |
78 | } | 78 | } |
79 | }; | 79 | }; |
80 | 80 | ||
81 | - | ||
82 | slideData.slide.list = getBannerList(srcData.big_image); | 81 | slideData.slide.list = getBannerList(srcData.big_image); |
83 | slideData.slide.pagination = getBannerList(srcData.list); | 82 | slideData.slide.pagination = getBannerList(srcData.list); |
84 | 83 | ||
@@ -95,7 +94,7 @@ const getNewReportFloorData = args => { | @@ -95,7 +94,7 @@ const getNewReportFloorData = args => { | ||
95 | let list = []; | 94 | let list = []; |
96 | let obj = {}; | 95 | let obj = {}; |
97 | 96 | ||
98 | - let data = { | 97 | + const data = { |
99 | newReport: { | 98 | newReport: { |
100 | name: '最新速报', | 99 | name: '最新速报', |
101 | list: [] | 100 | list: [] |
@@ -153,7 +152,7 @@ const getHotGoodsFloorData = (args) => { | @@ -153,7 +152,7 @@ const getHotGoodsFloorData = (args) => { | ||
153 | navs = {}, | 152 | navs = {}, |
154 | products = []; | 153 | products = []; |
155 | 154 | ||
156 | - let data = { | 155 | + const data = { |
157 | recommend: { | 156 | recommend: { |
158 | tplrecommend: [] | 157 | tplrecommend: [] |
159 | } | 158 | } |
@@ -219,19 +218,16 @@ const getHotGoodsFloorData = (args) => { | @@ -219,19 +218,16 @@ const getHotGoodsFloorData = (args) => { | ||
219 | 218 | ||
220 | // 人气单品 | 219 | // 人气单品 |
221 | const getSingleHotFloorData = args => { | 220 | const getSingleHotFloorData = args => { |
222 | - let list = []; | ||
223 | - | ||
224 | const len = 10; | 221 | const len = 10; |
225 | - | ||
226 | - let data = { | 222 | + const data = { |
227 | singlehot: { | 223 | singlehot: { |
228 | name: '人气单品', | 224 | name: '人气单品', |
229 | imgHot: [] | 225 | imgHot: [] |
230 | } | 226 | } |
231 | }; | 227 | }; |
232 | 228 | ||
229 | + let list = []; | ||
233 | let adData; | 230 | let adData; |
234 | - | ||
235 | let floorDatas = []; | 231 | let floorDatas = []; |
236 | 232 | ||
237 | for (let i = 0; i < len; i++) { | 233 | for (let i = 0; i < len; i++) { |
@@ -247,7 +243,6 @@ const getSingleHotFloorData = args => { | @@ -247,7 +243,6 @@ const getSingleHotFloorData = args => { | ||
247 | if (pos > 1) { // 小图 | 243 | if (pos > 1) { // 小图 |
248 | pos = pos - 1; | 244 | pos = pos - 1; |
249 | } | 245 | } |
250 | - | ||
251 | val = args[1].data[pos]; | 246 | val = args[1].data[pos]; |
252 | } | 247 | } |
253 | obj.href = val.url; | 248 | obj.href = val.url; |
@@ -316,20 +311,27 @@ const processFloorData = rawData => { | @@ -316,20 +311,27 @@ const processFloorData = rawData => { | ||
316 | return floorList; | 311 | return floorList; |
317 | }; | 312 | }; |
318 | 313 | ||
319 | -// type => boys, girls, kids, lifestyle | 314 | +/** |
315 | + * 获取频道页数据 | ||
316 | + * @param {string} type 传入频道页类型,值可以是: boys, girls, kids, lifestyle | ||
317 | + * @return {object} | ||
318 | + */ | ||
320 | exports.getContent = type => { | 319 | exports.getContent = type => { |
321 | return Promise.all([headerModel.requestHeaderData(), requestContent(type)]).then(res => { | 320 | return Promise.all([headerModel.requestHeaderData(), requestContent(type)]).then(res => { |
322 | - let headerData = res[0].data, | ||
323 | - contentData = res[1].data.list; | ||
324 | 321 | ||
325 | - let data = {}; | 322 | + if (res[0].code === 200 && res[1].code === 200) { |
323 | + let headerData = res[0].data, | ||
324 | + contentData = res[1].data.list; | ||
326 | 325 | ||
327 | - data = headerModel.setHeaderData(headerData, type); | ||
328 | - data.module = 'channel'; | ||
329 | - data.page = type; | ||
330 | - data.footerTop = true; | ||
331 | - data.channel = processFloorData(contentData); | 326 | + let data = {}; |
332 | 327 | ||
333 | - return data; | 328 | + data = headerModel.setHeaderData(headerData, type); |
329 | + data.module = 'channel'; | ||
330 | + data.page = type; | ||
331 | + data.footerTop = true; | ||
332 | + data.channel = processFloorData(contentData); | ||
333 | + | ||
334 | + return data; | ||
335 | + } | ||
334 | }); | 336 | }); |
335 | }; | 337 | }; |
-
Please register or login to post a comment