Authored by xuqi

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

@@ -364,7 +364,7 @@ class UserData @@ -364,7 +364,7 @@ class UserData
364 public static function suggestData($udid, $page = 1, $limit = 30) 364 public static function suggestData($udid, $page = 1, $limit = 30)
365 { 365 {
366 $param = Yohobuy::param(); 366 $param = Yohobuy::param();
367 - $param['udid'] = $udid; 367 + $param['udid'] = $udid . '13686403'; // 为了兼容udid长度
368 $param['page'] = $page; 368 $param['page'] = $page;
369 $param['limit'] = $limit; 369 $param['limit'] = $limit;
370 $param['client_secret'] = Sign::getSign($param); 370 $param['client_secret'] = Sign::getSign($param);
@@ -385,7 +385,7 @@ class UserData @@ -385,7 +385,7 @@ class UserData
385 { 385 {
386 $param = Yohobuy::param(); 386 $param = Yohobuy::param();
387 $param['uid'] = $uid; 387 $param['uid'] = $uid;
388 - $param['udid'] = $udid; 388 + $param['udid'] = $udid . '13686403';// 为了兼容udid长度
389 $param['is_reliable'] = $reliable; 389 $param['is_reliable'] = $reliable;
390 $param['suggest_id'] = $suggest_id; 390 $param['suggest_id'] = $suggest_id;
391 $param['client_secret'] = Sign::getSign($param); 391 $param['client_secret'] = Sign::getSign($param);
@@ -88,12 +88,12 @@ @@ -88,12 +88,12 @@
88 position: relative; 88 position: relative;
89 float: left; 89 float: left;
90 color: #fff; 90 color: #fff;
91 - font-size: pxToRem(32px); 91 + font-size: pxToRem(28px);
92 width: pxToRem(320px); 92 width: pxToRem(320px);
93 // width: pxToRem(213px); 三栏宽度 93 // width: pxToRem(213px); 三栏宽度
94 - 94 +
95 p { 95 p {
96 - font-size: pxToRem(22px); 96 + font-size: pxToRem(24px);
97 } 97 }
98 98
99 &:after { 99 &:after {
@@ -23,7 +23,6 @@ @@ -23,7 +23,6 @@
23 overflow: hidden; 23 overflow: hidden;
24 } 24 }
25 .user-name { 25 .user-name {
26 - float: left;  
27 max-width: 240rem / $pxConvertRem; 26 max-width: 240rem / $pxConvertRem;
28 text-overflow:ellipsis; 27 text-overflow:ellipsis;
29 white-space:nowrap; 28 white-space:nowrap;