Merge branch 'feature/favApi' of git.yoho.cn:fe/yohobuywap-node into feature/favApi
Showing
2 changed files
with
10 additions
and
2 deletions
@@ -68,7 +68,8 @@ const index = (params) => { | @@ -68,7 +68,8 @@ const index = (params) => { | ||
68 | refundExchangeNum: 0, | 68 | refundExchangeNum: 0, |
69 | commentTotal: 0, | 69 | commentTotal: 0, |
70 | cartUrl: helpers.urlFormat('/cart/index/index'), | 70 | cartUrl: helpers.urlFormat('/cart/index/index'), |
71 | - signinUrl: helpers.urlFormat('/signin.html', {refer: helpers.urlFormat('/home')}) | 71 | + signinUrl: helpers.urlFormat('/signin.html', {refer: helpers.urlFormat('/home')}), |
72 | + profile_name: 'aaaa' | ||
72 | }; | 73 | }; |
73 | 74 | ||
74 | return api.all([ | 75 | return api.all([ |
@@ -77,9 +78,15 @@ const index = (params) => { | @@ -77,9 +78,15 @@ const index = (params) => { | ||
77 | _favoriteData(params), | 78 | _favoriteData(params), |
78 | _infoNum(params) | 79 | _infoNum(params) |
79 | ]).then(result => { | 80 | ]).then(result => { |
81 | + if (result[0] && result[0].data) { | ||
82 | + Object.assign(finalResult, { | ||
83 | + profile_name: result[0].data.profile_name, | ||
84 | + }); | ||
85 | + } | ||
86 | + | ||
80 | if (result[1] && result[1].data) { | 87 | if (result[1] && result[1].data) { |
81 | Object.assign(finalResult, { | 88 | Object.assign(finalResult, { |
82 | - notice: [{title: 'testmessage'}] | 89 | + notice: result[1].data.list |
83 | }); | 90 | }); |
84 | } | 91 | } |
85 | 92 |
-
Please register or login to post a comment