Authored by xuqi

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

... ... @@ -364,7 +364,7 @@ class UserData
public static function suggestData($udid, $page = 1, $limit = 30)
{
$param = Yohobuy::param();
$param['udid'] = $udid;
$param['udid'] = $udid . '13686403'; // 为了兼容udid长度
$param['page'] = $page;
$param['limit'] = $limit;
$param['client_secret'] = Sign::getSign($param);
... ... @@ -385,7 +385,7 @@ class UserData
{
$param = Yohobuy::param();
$param['uid'] = $uid;
$param['udid'] = $udid;
$param['udid'] = $udid . '13686403';// 为了兼容udid长度
$param['is_reliable'] = $reliable;
$param['suggest_id'] = $suggest_id;
$param['client_secret'] = Sign::getSign($param);
... ...
... ... @@ -88,12 +88,12 @@
position: relative;
float: left;
color: #fff;
font-size: pxToRem(32px);
font-size: pxToRem(28px);
width: pxToRem(320px);
// width: pxToRem(213px); 三栏宽度
p {
font-size: pxToRem(22px);
font-size: pxToRem(24px);
}
&:after {
... ...
... ... @@ -23,7 +23,6 @@
overflow: hidden;
}
.user-name {
float: left;
max-width: 240rem / $pxConvertRem;
text-overflow:ellipsis;
white-space:nowrap;
... ...