|
@@ -574,13 +574,9 @@ class Auth
|
|
|
unset($userinfo['wechat_openid']);
|
|
|
|
|
|
//装扮
|
|
|
- $usercar = "";
|
|
|
$userheader = "";
|
|
|
- $userlight = "";
|
|
|
- $userpop = "";
|
|
|
- $userandroidpop = "";
|
|
|
|
|
|
- // 获取用户头像框和座驾信息
|
|
|
+ // 获取用户头像框信息
|
|
|
$map = [
|
|
|
'a.user_id' => $this->id,
|
|
|
'a.is_using' => 1,
|
|
@@ -588,26 +584,18 @@ class Auth
|
|
|
];
|
|
|
|
|
|
$backResult = Db::name('user_decorate')->alias('a')
|
|
|
- ->field('a.id,a.decorate_type,b.base_image,b.play_image,b.android_image')
|
|
|
+ ->field('a.id,a.decorate_type,b.base_image,b.play_image')
|
|
|
->join('decorate b', 'a.decorate_id = b.id')
|
|
|
->where($map)->order('a.id desc')->select();
|
|
|
- $backResult = list_domain_image($backResult,['base_image','play_image','android_image']);
|
|
|
+ $backResult = list_domain_image($backResult,['base_image','play_image']);
|
|
|
|
|
|
if ($backResult) {
|
|
|
foreach ($backResult as $k => $v) {
|
|
|
- $v['decorate_type'] == 1 && $usercar = $v['play_image'];
|
|
|
$v['decorate_type'] == 2 && $userheader = $v['play_image'];
|
|
|
- $v['decorate_type'] == 3 && $userlight = $v['base_image'];
|
|
|
- $v['decorate_type'] == 4 && $userpop = $v['base_image'];
|
|
|
- $v['decorate_type'] == 4 && $userandroidpop = $v['android_image'];
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- $userinfo['usercar'] = $usercar;
|
|
|
$userinfo['userheader'] = $userheader;
|
|
|
- $userinfo['userlight'] = $userlight;
|
|
|
- $userinfo['userpop'] = $userpop;
|
|
|
- $userinfo['userandroidpop'] = $userandroidpop;
|
|
|
|
|
|
//用户权限
|
|
|
$userinfo['power'] = Db::name('user_power')->where('user_id',$this->id)->find();
|