diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index 9286f98..33ec7bf 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -336,7 +336,7 @@ class Decorate extends Model $text['jia_jia'] = model('Decorate')->user_decorate_detail($uid,2); $text['FromUserInfo'] = db::name('user')->where('id',$uid)->field('id as user_id,nickname,avatar,sex')->find(); $text['FromUserInfo']['dress'] = model('Decorate')->user_decorate_detail($uid,1); - $text['FromUserInfo']['mic_dress'] = model('Decorate')->user_decorate_detail($uid,4); + $text['FromUserInfo']['mic_cycle'] = model('Decorate')->user_decorate_detail($uid,3); $text['FromUserInfo']['chat_dress'] = model('Decorate')->user_decorate_detail($uid,5); $text['text'] = '用户 ' . $text['FromUserInfo']['nickname'] .' 修改了信息'; model('Chat')->sendMsg(1035,$room_id,$text,$uid); diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 57488d5..f336866 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -848,8 +848,10 @@ class Room extends Model $text['jia_jia'] = model('api/Decorate')->user_decorate_detail($user_id,2); $text['FromUserInfo'] = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find(); $text['FromUserInfo']['dress'] = model('api/Decorate')->user_decorate_detail($user_id,1); - $text['FromUserInfo']['mic_dress'] = model('api/Decorate')->user_decorate_detail($user_id,4); - $text['FromUserInfo']['chat_dress'] = model('api/Decorate')->user_decorate_detail($user_id,5); + $text['FromUserInfo']['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3); + $text['FromUserInfo']['chat_bubble'] = model('api/Decorate')->user_decorate_detail($user_id,9); + $Nobility = model('Nobility')->getUserNobilityInfo($user_id); + $text['FromUserInfo']['enter_image'] = $Nobility['enter_image']; model('api/Chat')->sendMsg(1001,$room_id,$text,$user_id); //记录用户访问记录 @@ -932,6 +934,7 @@ class Room extends Model $song_list = null; $next_song_info = null; if($song){ + $Nobility = model('api/Nobility')->getUserNobilityInfo($song['user_id']); $song_list = [ 'did' => $song['did'], 'song_code' => $song['song_code'], @@ -944,6 +947,9 @@ class Room extends Model 'nickname' => db::name('user')->where('id',$song['user_id'])->value('nickname'), 'avatar' => db::name('user')->where('id',$song['user_id'])->value('avatar'), 'charm' => db::name('vs_room_user_charm')->where(['user_id' =>$song['user_id'],'room_id' => $room_id])->value('charm'), + 'mic_cycle' => model('api/Decorate')->user_decorate_detail($song['user_id'],3), + 'nobility_image' => $Nobility['play_image'], + 'nickname_color' => $Nobility['nick_name_color'], ]; } //下一首歌 @@ -1040,6 +1046,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){ diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php index f90796f..893ac73 100644 --- a/application/api/model/RoomPit.php +++ b/application/api/model/RoomPit.php @@ -62,6 +62,11 @@ class RoomPit extends Model $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 $FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($user_id,1); $FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm'); + $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id); + $FromUserInfo['nobility_info'] = $Nobility; + $FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3); + $FromUserInfo['nobility_image'] = $Nobility['play_image']; + $FromUserInfo['nickname_color'] = $Nobility['nick_name_color']; //推送告诉前端上了几号麦位 if($pit_number == 9){ $pit_text = '主持麦'; @@ -155,6 +160,11 @@ class RoomPit extends Model $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find(); $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标 $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 + $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id); + $FromUserInfo['nobility_info'] = $Nobility; + $FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3); + $FromUserInfo['nobility_image'] = $Nobility['play_image']; + $FromUserInfo['nickname_color'] = $Nobility['nick_name_color']; if($pit_number == 888){ $text['text'] = $FromUserInfo['nickname'].' 下了拍卖位 '; $text['type'] = 2 ; @@ -284,6 +294,11 @@ class RoomPit extends Model $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标 $FromUserInfo['dress'] = model('Decorate')->user_decorate_detail($user_id,1); $FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm'); + $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id); + $FromUserInfo['nobility_info'] = $Nobility; + $FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3); + $FromUserInfo['nobility_image'] = $Nobility['play_image']; + $FromUserInfo['nickname_color'] = $Nobility['nick_name_color']; if($pit_number == 9){ $pit_text = '主持麦'; }elseif ($pit_number == 10) {