Authored by 郭成尧

Merge branch 'release/usercenter'

@@ -134,7 +134,7 @@ const index = (params) => { @@ -134,7 +134,7 @@ const index = (params) => {
134 134
135 if (result[2] && result[2].data) { 135 if (result[2] && result[2].data) {
136 Object.assign(finalResult, { 136 Object.assign(finalResult, {
137 - productFavoriteTotal: result[2].data.product_favorite_total || '0' 137 + productFavoriteTotal: _.get(result[2], 'data.product_favorite_total', '0')
138 }); 138 });
139 } else { 139 } else {
140 Object.assign(finalResult, { 140 Object.assign(finalResult, {
@@ -150,8 +150,8 @@ const index = (params) => { @@ -150,8 +150,8 @@ const index = (params) => {
150 yohoCoinNum: result[3].data.yoho_coin_num, 150 yohoCoinNum: result[3].data.yoho_coin_num,
151 inboxTotal: result[3].data.inbox_total, 151 inboxTotal: result[3].data.inbox_total,
152 couponNum: result[3].data.coupon_num, 152 couponNum: result[3].data.coupon_num,
153 - brandFavoriteTotal: result[3].data.brand_favorite_total || '0',  
154 - productBrowse: result[3].data.product_browse || '0' 153 + brandFavoriteTotal: _.get(result[3], 'data.brand_favorite_total', '0'),
  154 + productBrowse: _.get(result[3], 'data.product_browse', '0')
155 }); 155 });
156 } else { 156 } else {
157 Object.assign(finalResult, { 157 Object.assign(finalResult, {
@@ -206,6 +206,10 @@ @@ -206,6 +206,10 @@
206 &.highlight { 206 &.highlight {
207 background: #eee; 207 background: #eee;
208 } 208 }
  209 +
  210 + .iconfont {
  211 + font-size: 16PX;
  212 + }
209 } 213 }
210 214
211 .order-type { 215 .order-type {