fe / yohobuy-node · Commits

Go to a project

Authored by yyq
Commit 0a0b63554beaf78d00b47c892290addc0a029c3b 2 parents 93280c95 dbd46e9e

Merge branch 'feature/guangDev' into gray

Inline Side-by-side
Showing 1 changed file with 2 additions and 2 deletions
... ... @@ -53,8 +53,8 @@ exports.index = (req, res, next) => {
guang: {
slider: ret[0],
msgTypes: ret[1],
msgs: (+type === 0 && +page === 1) ?
_.concat(ret[7] && ret[7].msgs, ret[2] && ret[2].msgs) : ret[2] && ret[2].msgs,
msgs: (+type === 0 && +page === 1 && ret[7] && ret[7].msgs) ?
_.concat(ret[7].msgs, ret[2] && ret[2].msgs) : ret[2] && ret[2].msgs,
hotTags: ret[3],
ads: ret[4],
exRecos: ret[5],
... ...