From f495e827e71313698f618ffdd5c09c73ef72b403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 10 Nov 2025 18:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E9=BA=A6=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=88=B5=E4=BD=8D=E6=8E=A8=E9=80=81=E9=87=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/RoomPit.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index f90796f..c220032 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 ;