|
@@ -298,8 +298,8 @@ class User extends BaseModel
|
|
|
}
|
|
}
|
|
|
if ($userInfo->spread_uid) {
|
|
if ($userInfo->spread_uid) {
|
|
|
$data = [
|
|
$data = [
|
|
|
-// 'nickname' => $wechatUser['nickname'] ?: '',
|
|
|
|
|
-// 'avatar' => $wechatUser['headimgurl'] ?: '',
|
|
|
|
|
|
|
+ 'nickname' => $wechatUser['nickname'] ?: '',
|
|
|
|
|
+ 'avatar' => $wechatUser['headimgurl'] ?: '',
|
|
|
'is_promoter' => $status ? 1 : $userInfo->is_promoter,
|
|
'is_promoter' => $status ? 1 : $userInfo->is_promoter,
|
|
|
'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
|
|
'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
|
|
|
];
|
|
];
|
|
@@ -308,8 +308,8 @@ class User extends BaseModel
|
|
|
return self::edit($data, $uid, 'uid');
|
|
return self::edit($data, $uid, 'uid');
|
|
|
} else {
|
|
} else {
|
|
|
$data = [
|
|
$data = [
|
|
|
-// 'nickname' => $wechatUser['nickname'] ?: '',
|
|
|
|
|
-// 'avatar' => $wechatUser['headimgurl'] ?: '',
|
|
|
|
|
|
|
+ 'nickname' => $wechatUser['nickname'] ?: '',
|
|
|
|
|
+ 'avatar' => $wechatUser['headimgurl'] ?: '',
|
|
|
'is_promoter' => $status ? 1 : $userInfo->is_promoter,
|
|
'is_promoter' => $status ? 1 : $userInfo->is_promoter,
|
|
|
'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
|
|
'login_type' => isset($wechatUser['login_type']) ? $wechatUser['login_type'] : $userInfo->login_type,
|
|
|
// 'spread_uid' => 0,
|
|
// 'spread_uid' => 0,
|
