Authored by whb

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -48,7 +48,7 @@ @@ -48,7 +48,7 @@
48 48
49 .gift-advance-good .name { 49 .gift-advance-good .name {
50 margin-bottom: 20rem / $pxConvertRem; 50 margin-bottom: 20rem / $pxConvertRem;
51 - width: 440rem / $pxConvertRem; 51 + width: 320rem / $pxConvertRem;
52 font-size: 28rem / $pxConvertRem; 52 font-size: 28rem / $pxConvertRem;
53 } 53 }
54 54
@@ -115,7 +115,7 @@ class UserModel @@ -115,7 +115,7 @@ class UserModel
115 // 处理个人中心页面优选新品数据 115 // 处理个人中心页面优选新品数据
116 if (!empty($preferenceData['data'])) { 116 if (!empty($preferenceData['data'])) {
117 foreach ($preferenceData['data'] as $value) { 117 foreach ($preferenceData['data'] as $value) {
118 - $value = Helpers::formatProduct($value, false, true, true, 299, 388, false, false); 118 + $value = Helpers::formatProduct($value, false, true, true, 299, 388, false);
119 if (false !== $value) { 119 if (false !== $value) {
120 $result['recommendList'][] = $value; 120 $result['recommendList'][] = $value;
121 } 121 }