diff --git a/application/api/model/Room.php b/application/api/model/Room.php index e68c15e..e8a9552 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -933,7 +933,6 @@ class Room extends Model $next_song_info = null; if($song){ $Nobility = model('api/Nobility')->getUserNobilityInfo($song['user_id']); - $song_list = [ 'did' => $song['did'], 'song_code' => $song['song_code'], @@ -1045,6 +1044,11 @@ class Room extends Model $auction['gift_name'] = db::name('vs_gift')->where('gid',$auction['gift_id'])->value('gift_name'); $auction['time_day'] = $auction['time_day'] / 60 / 60; $auction['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $auction['user_id']])->value('charm') ?? 0; + $Nobility = model('api/Nobility')->getUserNobilityInfo($auction['user_id']); + $auction['nobility_info'] = $Nobility; + $auction['mic_cycle'] = model('api/Decorate')->user_decorate_detail($auction['user_id'],3); + $auction['nobility_image'] = $Nobility['play_image']; + $auction['nickname_color'] = $Nobility['nick_name_color']; $auction_list = model('api/RoomAuction')->room_auction_list_on($auction['auction_id']); $auction_user = $auction; if($auction['user_id'] == $user_id){