Showing
1 changed file
with
15 additions
and
2 deletions
@@ -133,7 +133,8 @@ class IndexModel extends global.yoho.BaseModel { | @@ -133,7 +133,8 @@ class IndexModel extends global.yoho.BaseModel { | ||
133 | 133 | ||
134 | return api.all([ | 134 | return api.all([ |
135 | this._category(), | 135 | this._category(), |
136 | - this._article(param) | 136 | + this._article(param), |
137 | + this._getTopArticles(param) | ||
137 | ]).then(result => { | 138 | ]).then(result => { |
138 | 139 | ||
139 | let type = param.type; | 140 | let type = param.type; |
@@ -204,11 +205,13 @@ class IndexModel extends global.yoho.BaseModel { | @@ -204,11 +205,13 @@ class IndexModel extends global.yoho.BaseModel { | ||
204 | 205 | ||
205 | } | 206 | } |
206 | 207 | ||
208 | + let infoList = _.get(result && result[2], 'data.list.artList', []); | ||
209 | + | ||
207 | if (result && result[1] && result[1].data && result[1].data.list && result[1].data.list.artList) { | 210 | if (result && result[1] && result[1].data && result[1].data.list && result[1].data.list.artList) { |
208 | 211 | ||
209 | let inf = []; | 212 | let inf = []; |
210 | 213 | ||
211 | - let infoList = result[1].data.list.artList; | 214 | + infoList = _.concat(infoList, result[1].data.list.artList); |
212 | 215 | ||
213 | infoList.forEach(val => { | 216 | infoList.forEach(val => { |
214 | inf.push(guangProcess.formatArticle(val, true, false, true)); | 217 | inf.push(guangProcess.formatArticle(val, true, false, true)); |
@@ -321,6 +324,16 @@ class IndexModel extends global.yoho.BaseModel { | @@ -321,6 +324,16 @@ class IndexModel extends global.yoho.BaseModel { | ||
321 | } | 324 | } |
322 | 325 | ||
323 | /** | 326 | /** |
327 | + * 获取置顶的文章 | ||
328 | + * @param {*} params | ||
329 | + */ | ||
330 | + _getTopArticles(params) { | ||
331 | + return serviceAPI.get('guang/api/v6/article/getTopList', { | ||
332 | + gender: params.gender | ||
333 | + }); | ||
334 | + } | ||
335 | + | ||
336 | + /** | ||
324 | * 逛分类 | 337 | * 逛分类 |
325 | */ | 338 | */ |
326 | _category() { | 339 | _category() { |
-
Please register or login to post a comment