Authored by 郭成尧

Merge branch 'release/usercenter'

... ... @@ -134,7 +134,7 @@ const index = (params) => {
if (result[2] && result[2].data) {
Object.assign(finalResult, {
productFavoriteTotal: result[2].data.product_favorite_total || '0'
productFavoriteTotal: _.get(result[2], 'data.product_favorite_total', '0')
});
} else {
Object.assign(finalResult, {
... ... @@ -150,8 +150,8 @@ const index = (params) => {
yohoCoinNum: result[3].data.yoho_coin_num,
inboxTotal: result[3].data.inbox_total,
couponNum: result[3].data.coupon_num,
brandFavoriteTotal: result[3].data.brand_favorite_total || '0',
productBrowse: result[3].data.product_browse || '0'
brandFavoriteTotal: _.get(result[3], 'data.brand_favorite_total', '0'),
productBrowse: _.get(result[3], 'data.product_browse', '0')
});
} else {
Object.assign(finalResult, {
... ...
... ... @@ -206,6 +206,10 @@
&.highlight {
background: #eee;
}
.iconfont {
font-size: 16PX;
}
}
.order-type {
... ...