Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -147,6 +147,7 @@ class User extends Model
|
|||||||
}
|
}
|
||||||
//头像装扮
|
//头像装扮
|
||||||
$user_info['dress'] = model('Decorate')->user_decorate_detail($user_info['user_id'],1);
|
$user_info['dress'] = model('Decorate')->user_decorate_detail($user_info['user_id'],1);
|
||||||
|
$user_info['chat_bubble'] = model('Decorate')->user_decorate_detail($user_info['user_id'],9);//聊天气泡
|
||||||
$user_info['auth'] = db::name('user_auth')->where(['mobile' => $user_info['mobile'],'is_real' => 1])->find() ? 1 : 0;
|
$user_info['auth'] = db::name('user_auth')->where(['mobile' => $user_info['mobile'],'is_real' => 1])->find() ? 1 : 0;
|
||||||
|
|
||||||
//是否可以发布动态
|
//是否可以发布动态
|
||||||
|
|||||||
Reference in New Issue
Block a user