|
@@ -30,7 +30,7 @@ class Auth
|
|
|
'id',
|
|
|
'username',
|
|
|
'nickname',
|
|
|
- 'truename',//
|
|
|
+ //'truename',//
|
|
|
'introcode',
|
|
|
'intro_uid',
|
|
|
|
|
@@ -45,7 +45,7 @@ class Auth
|
|
|
'bio',
|
|
|
'audio_bio',
|
|
|
|
|
|
- 'alipay_account',//
|
|
|
+ //'alipay_account',//
|
|
|
'idcard_status',
|
|
|
|
|
|
'longitude',
|
|
@@ -466,11 +466,13 @@ class Auth
|
|
|
//
|
|
|
$userinfo = info_domain_image($userinfo,['avatar','photo_images']);
|
|
|
|
|
|
+ $idcard_confirm = Db::name('user_idconfirm')->where('user_id',$this->id)->find();
|
|
|
+
|
|
|
$new_data = [
|
|
|
'setpassword' => !empty($this->password) ? 1 : 0,
|
|
|
'age' => birthtime_to_age($this->birthday),
|
|
|
- 'truename' => $this->idcard_status == 1 ? $this->truename : '',
|
|
|
- 'alipay_account' => $this->idcard_status == 1 ? $this->alipay_account : '',
|
|
|
+ 'truename' => ($this->idcard_status == 1 && isset($idcard_confirm['truename'])) ? $idcard_confirm['truename'] : '',
|
|
|
+ 'alipay_account' => ($this->idcard_status == 1 && isset($idcard_confirm['alipay_account'])) ? $idcard_confirm['alipay_account'] : '',
|
|
|
];
|
|
|
|
|
|
$userinfo = array_merge($userinfo,$new_data);
|