|
@@ -517,23 +517,15 @@ class Auth
|
|
|
foreach ($backResult as $k => $v) {
|
|
|
$v["type"] == 1 && $usercar = $v["gif_image"];
|
|
|
$v["type"] == 2 && $userheader = $v["gif_image"];
|
|
|
- $v["type"] == 3 && $userlight = $v["file_image"];
|
|
|
- $v["type"] == 4 && $userpop = $v["file_image"];
|
|
|
- $v["type"] == 4 && $userandroidpop = $v["android_image"];
|
|
|
}
|
|
|
}
|
|
|
$userField = 'id,pay_password,openid,is_cool,is_manager,is_stealth,nickname,avatar,age_id,constellation_id,province_id,city_id,desc';
|
|
|
$user = model('User')->field($userField)->where(["id" => $this->_user->id])->with(['useralipay','userbank','userauth'])->find();
|
|
|
- // 获取我的推荐人的邀请码
|
|
|
- $preUserField = 'id,invite_no';
|
|
|
- $preUser = model('User')->field($preUserField)->where(["id" => $this->_user->pre_userid])->find();
|
|
|
- $preCode = isset($preUser['invite_no']) ? $preUser['invite_no'] : '';
|
|
|
- $userinfo["preCode"] = $preCode;
|
|
|
+
|
|
|
+ //
|
|
|
$userinfo["usercar"] = $usercar;
|
|
|
$userinfo["userheader"] = $userheader;
|
|
|
- $userinfo["userlight"] = $userlight;
|
|
|
- $userinfo["userpop"] = $userpop;
|
|
|
- $userinfo["userandroidpop"] = $userandroidpop;
|
|
|
+
|
|
|
$userInfoA = model('User')->getAppendData($userinfo);
|
|
|
$userInfo['age_text'] = $userInfoA['age_text'];
|
|
|
// $userInfo['constellation_text'] = $userInfoA['constellation_text'];
|
|
@@ -619,15 +611,7 @@ class Auth
|
|
|
$userPower = $this->power;
|
|
|
}
|
|
|
$userinfo['user_power'] = $userPower;
|
|
|
- $userinfo['pre_nickname'] = isset($user['pre_nickname']) ? $user['pre_nickname'] : '';
|
|
|
- $userinfo['pre_avatar'] = isset($user['pre_avatar']) ? $user['pre_avatar'] : '';
|
|
|
- $userinfo['nickname_status'] = $userinfo['avatar_status'] = 0;
|
|
|
- if (!empty($user['pre_nickname']) && $user['pre_nickname'] != $user['nickname']) {
|
|
|
- $userinfo['nickname_status'] = 1;
|
|
|
- }
|
|
|
- if (!empty($user['pre_avatar']) && $user['pre_avatar'] != $user['avatar']) {
|
|
|
- $userinfo['avatar_status'] = 1;
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
//贡献等级
|
|
|
$charm_info = Db::name('user_config_charm')->where('level',$this->charm_level)->find();
|