|
@@ -28,7 +28,7 @@ class Auth
|
|
protected $config = [];
|
|
protected $config = [];
|
|
protected $options = [];
|
|
protected $options = [];
|
|
protected $allowFields = ['id', 'u_id', 'username', 'nickname', 'mobile', 'pre_userid', 'has_info', 'is_auth',
|
|
protected $allowFields = ['id', 'u_id', 'username', 'nickname', 'mobile', 'pre_userid', 'has_info', 'is_auth',
|
|
- 'is_guild', 'guild_id', 'avatar', 'empirical', 'image','level', 'gender', 'age_id',
|
|
|
|
|
|
+ 'is_guild', 'guild_id', 'avatar', 'image', 'gender', 'age_id',
|
|
'wealth_level','charm_level',
|
|
'wealth_level','charm_level',
|
|
'job_id', 'longitude', 'latitude','province_id','city_id'
|
|
'job_id', 'longitude', 'latitude','province_id','city_id'
|
|
];
|
|
];
|
|
@@ -538,7 +538,7 @@ class Auth
|
|
$userinfo["userheader"] = $userheader;
|
|
$userinfo["userheader"] = $userheader;
|
|
|
|
|
|
//
|
|
//
|
|
- $userField = 'id,pay_password,openid,is_cool,is_manager,is_stealth,nickname,avatar,age_id,constellation_id,province_id,city_id,desc';
|
|
|
|
|
|
+ $userField = 'id,openid,is_cool,nickname,avatar,age_id,province_id,city_id,desc';
|
|
$user = model('User')->field($userField)->where(["id" => $this->_user->id])->with(['useralipay','userbank','userauth'])->find();
|
|
$user = model('User')->field($userField)->where(["id" => $this->_user->id])->with(['useralipay','userbank','userauth'])->find();
|
|
|
|
|
|
|
|
|
|
@@ -553,7 +553,7 @@ class Auth
|
|
// 是否设置密码
|
|
// 是否设置密码
|
|
$userinfo['is_setpwd'] = $data['password'] ? 1 : 0;
|
|
$userinfo['is_setpwd'] = $data['password'] ? 1 : 0;
|
|
|
|
|
|
- $field = 'id,age_id,constellation_id,province_id,city_id,desc';
|
|
|
|
|
|
+ $field = 'id,age_id,province_id,city_id,desc';
|
|
$fieldArr = explode(',',$field);
|
|
$fieldArr = explode(',',$field);
|
|
$fieldTextArr = ['age_text','constellation_text','province_text','city_text','friends_num','look_num'];
|
|
$fieldTextArr = ['age_text','constellation_text','province_text','city_text','friends_num','look_num'];
|
|
$fieldArr = array_merge($fieldArr,$fieldTextArr);
|
|
$fieldArr = array_merge($fieldArr,$fieldTextArr);
|
|
@@ -565,13 +565,10 @@ class Auth
|
|
$userBank = isset($user['userbank']) ? $user['userbank'] : [];
|
|
$userBank = isset($user['userbank']) ? $user['userbank'] : [];
|
|
$userinfo['realname'] = isset($user['userauth']['realname']) ? $user['userauth']['realname'] : '';
|
|
$userinfo['realname'] = isset($user['userauth']['realname']) ? $user['userauth']['realname'] : '';
|
|
$userinfo['idcard'] = isset($user['userauth']['idcard']) ? $user['userauth']['idcard'] : '';
|
|
$userinfo['idcard'] = isset($user['userauth']['idcard']) ? $user['userauth']['idcard'] : '';
|
|
- $userinfo['is_pay_pwd'] = !empty($user['pay_password']) ? 1 : 0;
|
|
|
|
$userinfo['bind_wechat'] = !empty($user['openid']) ? 1 : 0;
|
|
$userinfo['bind_wechat'] = !empty($user['openid']) ? 1 : 0;
|
|
$userinfo['bind_alipay'] = !empty($userAlipay) ? 1 : 0;
|
|
$userinfo['bind_alipay'] = !empty($userAlipay) ? 1 : 0;
|
|
$userinfo['bind_bank'] = !empty($userBank) ? 1 : 0;
|
|
$userinfo['bind_bank'] = !empty($userBank) ? 1 : 0;
|
|
$userinfo['is_cool'] = isset($user['is_cool']) ? $user['is_cool'] : 0;
|
|
$userinfo['is_cool'] = isset($user['is_cool']) ? $user['is_cool'] : 0;
|
|
- $userinfo['is_manager'] = isset($user['is_manager']) ? $user['is_manager'] : 0;
|
|
|
|
- $userinfo['is_stealth'] = isset($user['is_stealth']) ? $user['is_stealth'] : 0;
|
|
|
|
|
|
|
|
//家族信息
|
|
//家族信息
|
|
$guildField = 'g.id,g.g_id,g.user_id,g.party_id,g.name,g.image,g.desc,g.member,g.status';
|
|
$guildField = 'g.id,g.g_id,g.user_id,g.party_id,g.name,g.image,g.desc,g.member,g.status';
|