From 60134a68f7ba98b9fb58c2fa7ca963f53db98c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 11 Dec 2025 11:11:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=98=A6?=
 =?UTF-8?q?=E8=BA=AB=EF=BC=8C=E6=AD=8C=E6=89=8B=E7=AD=89=E7=BA=A7=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Family.php   |  13 ++-
 application/api/model/Login.php    |  20 +++--
 application/api/model/Room.php     |  81 ++++++++---------
 application/api/model/RoomPit.php  |  82 ++++-------------
 application/api/model/Sign.php     |  22 +----
 application/api/model/User.php     | 136 +++++++++++++----------------
 application/api/model/UserZone.php |   6 +-
 7 files changed, 146 insertions(+), 214 deletions(-)

diff --git a/application/api/model/Family.php b/application/api/model/Family.php
index e75b69f2..5811d80d 100644
--- a/application/api/model/Family.php
+++ b/application/api/model/Family.php
@@ -71,8 +71,11 @@ class Family extends Model
         $myFamily['group_owner_info']['icon'][0] = model('api/UserData')->user_wealth_icon($user_id);//财富图标
         $myFamily['group_owner_info']['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
-        $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level');
-        $myFamily['group_owner_info']['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+        $isSinger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->find();
+        if($isSinger){
+            $myFamily['group_owner_info']['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])
+                ->value('image');//等级图标
+        }
 
         $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id);
         $myFamily['group_owner_info']['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
@@ -98,9 +101,11 @@ class Family extends Model
                     $lists[$k]['icon'][0] = model('api/UserData')->user_wealth_icon($v['user_id']);//财富图标
                     $lists[$k]['icon'][1] = model('api/UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标
-                    $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level');
-                    $lists[$k]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])
+                    $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                    if($isSinger){
+                        $lists[$k]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])
                             ->value('image');//等级图标
+                    }
 
                     $Nobility = model('api/Nobility')->getUserNobilityInfo($v['user_id']);
                     $lists[$k]['mic_cycle'] = model('api/Decorate')->user_decorate_detail($v['user_id'],3);
diff --git a/application/api/model/Login.php b/application/api/model/Login.php
index 0b35cbcc..026db3c6 100644
--- a/application/api/model/Login.php
+++ b/application/api/model/Login.php
@@ -112,8 +112,10 @@ class Login extends Model
         $return_res[0]['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
         $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
-        $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level');
-        $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+        $isSinger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->find();
+        if($isSinger){
+            $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+        }
 
         return ['code' => 1, 'msg' => '登录成功', 'data' => $return_res];
     }
@@ -222,8 +224,10 @@ class Login extends Model
             $return_res[0]['icon'][0] = model('UserData')->user_wealth_icon($user_info['id']);//财富图标
             $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_info['id']);//魅力图标
             //判断是否是歌手 如果是 返回等级图标
-            $isSinnger = db::name('vs_singer')->where(['user_id' => $user_info['id'],'status' => 1])->value('level');
-            $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+            $isSinger = db::name('vs_singer')->where(['user_id' => $user_info['id'],'status' => 1])->find();
+            if($isSinger){
+                $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+            }
 
             $return_res[0]['dress'] = model('Decorate')->user_decorate_detail($user_info['id'],1);
             $return_res[0]['chat_bubble'] = model('Decorate')->user_decorate_detail($user_info['id'],9);//聊天气泡
@@ -427,9 +431,11 @@ class Login extends Model
                 $return_res[0]['icon'][0] = model('UserData')->user_wealth_icon($user_info_data['user_id']);//财富图标
                 $return_res[0]['icon'][1] = model('UserData')->user_charm_icon($user_info_data['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
-                $isSinnger = db::name('vs_singer')->where(['user_id' => $user_info_data['user_id'],'status' => 1])->value('level');
-                $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-
+                $isSinger = db::name('vs_singer')->where(['user_id' => $user_info_data['user_id'],'status' => 1])->find();
+                if($isSinger){
+                    $return_res[0]['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])
+                        ->value('image');//等级图标
+                }
                 return ['code' => 1, 'msg' => '登录成功', 'data' => $return_res];
             }
 
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 99074e6d..41417ad7 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1009,19 +1009,13 @@ class Room extends Model
     //房间内当前用户信息
     public function get_user_info($room_id,$user_id,$user_pit,$is_join = 0)
     {
-        $user_info = db::name('user')->where('id', $user_id)->field('id as user_id,user_code,sex,nickname,avatar')->find();
-        $user_info['dress'] = model('api/Decorate')->user_decorate_detail($user_id,1);
-        $user_info['user_code'] = model('api/Decorate')->user_decorate_detail($user_id,6);
+        $user_info = model('api/User')->get_user_base_info($user_id);
+
         $user_info['pit_number'] = (isset($user_pit['pit_number'])) ? $user_pit['pit_number'] : 0;
         $user_info['count_down'] =  0;
         $user_info['is_collect'] = db::name('user_follow')->where(['follow_id' => $room_id,'user_id' => $user_id,'type' => 2])->find() ? 1 : 0;
         $user_info['is_host'] = db::name('vs_room_host')->where(['room_id' => $room_id,'user_id' => $user_id,'type' => 1,'delete_time' => null])->find() ? 1 : 0;
         $user_info['is_management'] = db::name('vs_room_host')->where(['room_id' => $room_id,'user_id' => $user_id,'type' => 2,'delete_time' => null])->find() ? 1 : 0;
-        $user_info['icon'][0] = model('api/UserData')->user_wealth_icon($user_id);//财富图标
-        $user_info['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标
-        //判断是否是歌手 如果是 返回等级图标
-        $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level');
-        $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
 
         if($is_join){
             $user_info['agora_token'] =model('api/Agora')->agora_token_info($user_id, $room_id);
@@ -1029,11 +1023,6 @@ class Room extends Model
         }
         $user_info['is_mute'] = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 1])->find() ? 1 : 0;
         $user_info['is_mute_pit'] = db::name('vs_room_user_muted')->where(['room_id' => $room_id, 'user_id' => $user_id,'status' => 2])->find() ? 1 : 0;
-        $Nobility = model('api/Nobility')->getUserNobilityInfo($user_id);
-//        $user_info['nobility_info'] = $Nobility;
-        $user_info['mic_cycle'] = model('api/Decorate')->user_decorate_detail($user_id,3);
-        $user_info['nobility_image'] = $Nobility['play_image'];
-        $user_info['nickname_color'] = $Nobility['nick_name_color'];
 
         return $user_info;
     }
@@ -1281,13 +1270,8 @@ class Room extends Model
             }
             if(db::name('vs_room_pit_simulate')->where(['room_id' => $room_id, 'user_id' => $user_id])->find()){
                 db::name('vs_room_pit_simulate')->where(['room_id' => $room_id, 'user_id' => $user_id])->delete();
-                $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
-                $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($user_id);//财富图标
-                $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标
-                //判断是否是歌手 如果是 返回等级图标
-                $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level');
-                $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
 
+                $FromUserInfo = model('api/User')->get_user_base_info($user_id);
                 //推送告诉前端下了几号麦位
                 $text['text'] = $FromUserInfo['nickname'].' 下麦了 ';
                 $text['FromUserInfo'] = $FromUserInfo;
@@ -1347,16 +1331,8 @@ class Room extends Model
         if(db::name('vs_room_pit_apply')->where(['room_id' => $room_id, 'user_id' => $user_id])->find()){
             db::name('vs_room_pit_apply')->where(['room_id' => $room_id, 'user_id' => $user_id])->delete();
         }
-        $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
-        $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($user_id);//财富图标
-        $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($user_id);//魅力图标
-        //判断是否是歌手 如果是 返回等级图标
-        $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level');
-        $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
 
-        $FromUserInfo['dress'] =  model('api/Decorate')->user_decorate_detail($user_id,1);
-
-        $text['FromUserInfo'] = $FromUserInfo;
+        $text['FromUserInfo'] = model('api/User')->get_user_base_info($user_id);
         //1-踢出房间
         if($type == 1){
             //房主
@@ -1436,8 +1412,10 @@ class Room extends Model
                 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
-                $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level');
-                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+                $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                if($isSinger){
+                    $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+                }
             }
         }
         return ['code' => 1, 'msg' => '成功', 'data' => $list];
@@ -1535,8 +1513,10 @@ class Room extends Model
                 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
-                $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level');
-                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+                $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                if($isSinger){
+                    $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+                }
 
                 //用户的角色
                 $role = $this->get_user_role($v['user_id'], $room_id);
@@ -1832,8 +1812,10 @@ class Room extends Model
                     $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                     $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标
-                    $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'], 'status' => 1])->value('level');
-                    $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger, 'deletetime' => 0])->value('image');//等级图标
+                    $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                    if($isSinger){
+                        $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+                    }
 
                     //用户的角色
                     $role = $this->get_user_role($v['user_id'], $room_id);
@@ -1860,8 +1842,10 @@ class Room extends Model
                     $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                     $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标
-                    $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'], 'status' => 1])->value('level');
-                    $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger, 'deletetime' => 0])->value('image');//等级图标
+                    $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                    if($isSinger){
+                        $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+                    }
 
                     //用户的角色
                     $role = $this->get_user_role($v['user_id'], $room_id);
@@ -1886,8 +1870,10 @@ class Room extends Model
                     $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                     $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                     //判断是否是歌手 如果是 返回等级图标
-                    $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'], 'status' => 1])->value('level');
-                    $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger, 'deletetime' => 0])->value('image');//等级图标
+                    $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                    if($isSinger){
+                        $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+                    }
 
                     //用户的角色
                     $role = $this->get_user_role($v['user_id'], $room_id);
@@ -1952,9 +1938,10 @@ class Room extends Model
         $user_info['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
         $user_info['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
         //判断是否是歌手 如果是 返回等级图标
-        $isSinnger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->value('level');
-        $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-
+        $isSinger = db::name('vs_singer')->where(['user_id' => $user_id,'status' => 1])->find();
+        if($isSinger){
+            $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+        }
         //是否使用靓号
         $user_info['is_use_code'] = 0;
         $user_code = model('Decorate')->user_decorate_detail($user_info['user_id'],6);
@@ -2150,8 +2137,10 @@ class Room extends Model
                 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
-                $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level');
-                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+                $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                if($isSinger){
+                    $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+                }
 
                 $v['earnings'] = db::name('vs_user_money_log')->where(['user_id' => $v['user_id'],'room_id' => $room_id,'money_type' => 2,'change_type' => 19])->sum('change_value');
             }
@@ -3197,8 +3186,10 @@ class Room extends Model
                 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
-                $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level');
-                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+                $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                if($isSinger){
+                    $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+                }
             }
         }
         return ['code' => 1, 'msg' => '操作成功', 'data' => $list];
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 9df0d088..70652d04 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -56,18 +56,10 @@ class RoomPit extends Model
         if(!$on){
             return ['code' => 0, 'msg' => '上麦失败', 'data' => null];
         }
-//        $nickname = model('User')->where(['id' => $user_id])->value('nickname');
-        $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
+
+        $FromUserInfo = model('api/User')->get_user_base_info($user_id);
         $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
-        $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
-        $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'];
 
         $roomtype = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
         if($roomtype == 10){
@@ -231,14 +223,8 @@ class RoomPit extends Model
             return ['code' => 0, 'msg' => '签约麦 不可下麦', 'data' => null];
         }
 
-        $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'];
+        $FromUserInfo = model('api/User')->get_user_base_info($user_id);
+
         if($pit_number == 888){
             $text['text'] = $FromUserInfo['nickname'].' 下了拍卖位 ';
             $text['type'] = 2 ;
@@ -382,17 +368,11 @@ class RoomPit extends Model
                 if(!$exchange || !$exchange1){
                     return ['code' => 0, 'msg' => '换麦失败', 'data' => null];
                 }
-                $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
+
+                $FromUserInfo = model('api/User')->get_user_base_info($user_id);
                 $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
-                $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
-                $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) {
@@ -442,11 +422,9 @@ class RoomPit extends Model
                         if(!$exchange || !$exchange1){
                             return ['code' => 0, 'msg' => '换麦失败', 'data' => null];
                         }
-                        $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
+
+                        $FromUserInfo = model('api/User')->get_user_base_info($user_id);
                         $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $user_id,'room_id' => $room_id])->value('is_online');
-                        $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
-                        $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');
 
                         $text['text'] = $FromUserInfo['nickname'].' 换到主持麦 ';
@@ -745,11 +723,9 @@ class RoomPit extends Model
                         continue;
                     }
                     //聊天室推送系统消息
-                    $FromUserInfo = db::name('user')->where('id',$value)->field('id as user_id,nickname,avatar,sex')->find();
+                    $FromUserInfo = model('api/User')->get_user_base_info($value);
                     $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value,'room_id' => $room_id])->value('is_online');
-                    $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value);//财富图标
-                    $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($value);//魅力图标
-                    $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($value,1);
+
                     $text['text'] = $FromUserInfo['nickname'].' 上麦了 ';
                     $text['FromUserInfo'] = $FromUserInfo;
                     $text['pit_number'] = 9999;
@@ -792,11 +768,10 @@ class RoomPit extends Model
 //                    }
                     Cache::set('auction_user_'.$room_id,$value);
                     //聊天室推送系统消息
-                    $FromUserInfo = db::name('user')->where('id',$value)->field('id as user_id,nickname,avatar,sex')->find();
+
+                    $FromUserInfo = model('api/User')->get_user_base_info($value);
                     $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $value,'room_id' => $room_id])->value('is_online');
-                    $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value);//财富图标
-                    $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($value);//魅力图标
-                    $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($value,1);
+
                     $text['text'] = $FromUserInfo['nickname'].' 上了拍卖位 ';
                     $text['FromUserInfo'] = $FromUserInfo;
                     $text['pit_number'] = 888;
@@ -870,16 +845,9 @@ class RoomPit extends Model
                     return ['code' => 0, 'msg' => '操作失败', 'data' => null];
                 }
                 //制造上麦信息
-                $FromUserInfo = db::name('user')->where('id',$uid)->field('id as user_id,nickname,avatar,sex')->find();
+                $FromUserInfo = model('api/User')->get_user_base_info($uid);
                 $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $uid,'room_id' => $room_id])->value('is_online');
-                $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($uid);//财富图标
-                $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标
-                $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($uid,1);
                 $FromUserInfo['charm'] =  db::name('vs_room_user_charm')->where(['user_id' => $uid,'room_id' => $room_id])->value('charm');
-                $Nobility = model('api/Nobility')->getUserNobilityInfo($uid);
-                $FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($uid,3);
-                $FromUserInfo['nobility_image'] = $Nobility['play_image'];
-                $FromUserInfo['nickname_color'] = $Nobility['nick_name_color'];
                 //推送告诉前端上了几号麦位
                 $text['text'] = $FromUserInfo['nickname'].' 上了签约麦位';
                 $text['FromUserInfo'] = $FromUserInfo;
@@ -1119,16 +1087,10 @@ class RoomPit extends Model
                     return ['code' => 0, 'msg' => '操作失败', 'data' => null];
                 }
                 //制造上麦信息
-                $FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex,market_value')->find();
+                $FromUserInfo = model('api/User')->get_user_base_info($accept_user_id);
                 $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
-                $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($accept_user_id);//财富图标
-                $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($accept_user_id);//魅力图标
-                $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($accept_user_id,1);
                 $FromUserInfo['charm'] =  db::name('vs_room_user_charm')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('charm');
-                $Nobility = model('api/Nobility')->getUserNobilityInfo($accept_user_id);
-                $FromUserInfo['mic_cycle'] = model('api/Decorate')->user_decorate_detail($accept_user_id,3);
-                $FromUserInfo['nobility_image'] = $Nobility['play_image'];
-                $FromUserInfo['nickname_color'] = $Nobility['nick_name_color'];
+
                 //推送告诉前端上了几号麦位
                 if($pit_number == 1){
                     $pit_text = '签约麦';
@@ -1176,11 +1138,8 @@ class RoomPit extends Model
                     if(Cache::get('auction_user_'.$room_id)){
                         return ['code' => 0, 'msg' => '拍卖位上已有人，请先抱对方下麦', 'data' => null];
                     }else{
-                        $FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex')->find();
+                        $FromUserInfo = model('api/User')->get_user_base_info($accept_user_id);
                         $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
-                        $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($accept_user_id);//财富图标
-                        $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($accept_user_id);//魅力图标
-                        $FromUserInfo['dress'] =  model('api/Decorate')->user_decorate_detail($accept_user_id,1);
                         $FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $accept_user_id])->value('charm');
                         //推送告诉前端上了几号麦位
                         $text['text'] = $FromUserInfo['nickname'].' 上了拍卖位 ';
@@ -1220,11 +1179,8 @@ class RoomPit extends Model
                 }
             }else{
                 if($pit_number == 888){
-                    $FromUserInfo = db::name('user')->where('id',$accept_user_id)->field('id as user_id,nickname,avatar,sex')->find();
+                    $FromUserInfo = model('api/User')->get_user_base_info($accept_user_id);
                     $FromUserInfo['is_online'] = db::name('vs_room_visitor')->where(['user_id' => $accept_user_id,'room_id' => $room_id])->value('is_online');
-                    $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($accept_user_id);//财富图标
-                    $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($accept_user_id);//魅力图标
-                    $FromUserInfo['dress'] =  model('api/Decorate')->user_decorate_detail($accept_user_id,1);
                     $FromUserInfo['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $accept_user_id])->value('charm');
                     //推送告诉前端上了几号麦位
                     $text['text'] = $FromUserInfo['nickname'].' 上了拍卖位 ';
diff --git a/application/api/model/Sign.php b/application/api/model/Sign.php
index b2e3dd3c..70c29a06 100644
--- a/application/api/model/Sign.php
+++ b/application/api/model/Sign.php
@@ -145,12 +145,7 @@ class Sign extends Model
         //处理麦位
         $this->pit_number($room_id,$sign_user['user_id'],1);
         //给前端推送数据
-        $FromUserInfo = db::name('user')->where('id',$sign_user['user_id'])->field('id as user_id,nickname,avatar,sex')->find();
-        $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($sign_user['user_id']);//财富图标
-        $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($sign_user['user_id']);//魅力图标
-        //判断是否是歌手 如果是 返回等级图标
-        $isSinnger = db::name('vs_singer')->where(['user_id' => $sign_user['user_id'],'status' => 1])->value('level');
-        $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+        $FromUserInfo = model('api/User')->get_user_base_info($sign_user['user_id']);
 
         //组个列表
         $sign_market_value = get_system_config_value('sign_market_value');
@@ -407,19 +402,8 @@ class Sign extends Model
             //提交事务
             db::commit();
             //给前端推送
-            $FromUserInfo = db::name('user')->where('id',$max_sign_user['user_id'])->field('id as user_id,nickname,avatar,sex')->find();
-            $FromUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($max_sign_user['user_id']);//财富图标
-            $FromUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($max_sign_user['user_id']);//魅力图标
-            //判断是否是歌手 如果是 返回等级图标
-            $isSinnger = db::name('vs_singer')->where(['user_id' => $max_sign_user['user_id'],'status' => 1])->value('level');
-            $FromUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-
-            $ToUserInfo = db::name('user')->where('id',$max_sign_user['sign_user_id'])->field('id as user_id,nickname,avatar,sex')->find();
-            $ToUserInfo['icon'][0] = model('api/UserData')->user_wealth_icon($max_sign_user['sign_user_id']);//财富图标
-            $ToUserInfo['icon'][1] = model('api/UserData')->user_charm_icon($max_sign_user['sign_user_id']);//魅力图标
-            //判断是否是歌手 如果是 返回等级图标
-            $isSinnger = db::name('vs_singer')->where(['user_id' => $max_sign_user['sign_user_id'],'status' => 1])->value('level');
-            $ToUserInfo['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+            $FromUserInfo = model('api/User')->get_user_base_info($max_sign_user['user_id']);
+            $ToUserInfo =model('api/User')->get_user_base_info($max_sign_user['sign_user_id']);
 
             $text['text'] = '签约出价最高用户';
             $text['FromUserInfo'] = $FromUserInfo;
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 2d8a2d56..608a1c82 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -113,23 +113,8 @@ class User extends Model
     //我的
     public function get_me($uid)
     {
-        $user_info = db::name('user')
-            ->field('id as user_id,nickname,user_code,avatar,sex,mobile,market_value')
-            ->where('id', $uid)->find();
-        if (empty($user_info)) {
-            return ['code' => 0, 'msg' => '用户不存在', 'data' => null];
-        }
-        //头像判断 路径里面是否有https
-        if (strpos($user_info['avatar'], 'https') === false) {
-            $user_info['avatar'] = localpath_to_netpath($user_info['avatar']);
-        }
-
-        $user_info['icon'][0] = model('UserData')->user_wealth_icon($uid);//财富图标
-        $user_info['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标
-        //判断是否是歌手 如果是 返回等级图标
-        $isSinnger = db::name('vs_singer')->where(['user_id' => $uid,'status' => 1])->value('level');
-        $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-
+        $user_info = $this->get_user_base_info($uid);
+        $user_info['is_use_code'] = $user_info['is_special_code'];
 
         //关注数
         $user_info['follow_num'] = db::name('user_follow')->where(['user_id' => $uid,'type'=>1])->count();
@@ -142,18 +127,6 @@ class User extends Model
         //我的魅力等级
         $user_info['charm_level'] = model('UserData')->where('user_id',$uid)->value('charm_level');
 
-        //查询用户是否有使用靓号
-        $user_info['is_use_code'] = 0;
-        $liang = db::name('vs_user_decorate')->where(['user_id' =>$uid,'type' => 6,'is_using' => 1])->where('end_time',['>=',time()],'or')->find();
-        if($liang){
-            $user_info['is_use_code'] = 1;
-            $user_info['user_code'] = $liang['special_num'];
-        }
-        //头像装扮
-        $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_rechange = db::name('vs_user_recharge')->field('sum(money) as money')->where(['user_id' => $uid,'pay_status' => 2])->find();
         //系统配置
@@ -164,23 +137,8 @@ class User extends Model
             $user_info['is_can_chat'] = 1;
         }
         $user_info['can_chat_money'] = $config_money;
-        $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
-        $user_info['nobility_image'] = $Nobility['play_image'];
-        $user_info['nickname_color'] = $Nobility['nick_name_color'];
-        $is_hide = 0;
-        if($Nobility['power_list']){
-            foreach ($Nobility['power_list'] as $key => $value){
-                if($value['id'] == 8){
-                    $is_hide = 1;
-                }
-            }
-        }
-        $user_info['is_hide'] = $is_hide;//是否可以设置隐藏
+
         $user_info['hide_status'] = db::name('user')->where('id',$uid)->value('hide_status');//0-取消隐身，1-隐身进入
-        //歌手认证
-        $singer = model('api/SingerSong')->singerAuthStatus($uid);
-        $user_info['singer_status'] = $singer['status'];//歌手认证状态0-待审核，1-通过，2-拒绝  -1-未认证
-        $user_info['singer_level'] = $singer['level'];
 
         //cp
         //查询用户Cp空间
@@ -224,10 +182,53 @@ class User extends Model
             $user_info['guild_name'] = null;
         }
 
-
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
 
+
+    //获取用户基础信息
+    public function get_user_base_info($uid)
+    {
+        $user_info = db::name('user')
+            ->field('id as user_id,nickname,avatar,sex,mobile,market_value,user_code as code')
+            ->where('id', $uid)->find();
+
+        if (empty($user_info)) {
+            return ['code' => 0, 'msg' => '用户不存在', 'data' => null];
+        }
+        $user_info['dress'] = model('api/Decorate')->user_decorate_detail($uid,1);//头像装扮
+        $user_info['user_code'] = model('api/Decorate')->user_decorate_detail($uid,6);//靓号
+        $user_info['is_special_code'] = 0;//是否是靓号:0-普通，1-靓号
+        if($user_info['user_code'] != $user_info['code']){
+            $user_info['is_special_code'] = 1;//是靓号:0-普通，1-靓号
+        }
+        $user_info['mic_cycle'] = model('api/Decorate')->user_decorate_detail($uid,3);//麦圈
+        $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;//是否实名：0-未实名，1-实名
+
+        $Nobility = model('api/Nobility')->getUserNobilityInfo($uid);//爵位
+        $user_info['nobility_image'] = $Nobility['play_image'];//爵位图标
+        $user_info['nickname_color'] = $Nobility['nick_name_color'];//昵称颜色
+
+        $user_info['is_hide'] = 0;//是否可以设置隐身：0-不可以，1-可以
+        if($Nobility['power_list']){
+            foreach ($Nobility['power_list'] as $key => $value){
+                if($value['id'] == 8){
+                    $user_info['is_hide'] = 1;//隐身
+                }
+            }
+        }
+
+        $user_info['icon'][0] = model('UserData')->user_wealth_icon($uid);//财富图标
+        $user_info['icon'][1] = model('UserData')->user_charm_icon($uid);//魅力图标
+        //判断是否是歌手 如果是 返回等级图标
+        $isSinger = db::name('vs_singer')->where(['user_id' => $uid,'status' => 1])->find();
+        if($isSinger){
+            $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+        }
+        return $user_info;
+    }
+
     //获取用户关注列表
     public function get_user_follow_list($uid, $page, $page_limit)
     {
@@ -240,17 +241,15 @@ class User extends Model
             $v['user_id'] = $v['follow_id'];
             $v['is_online'] = 2;
             $v['is_follow'] = 1;
-//            $is_follow = db::name('user_follow')->where(['user_id' => $v['follow_id'], 'follow_id' => $uid])->find();
-//            if ($is_follow) {
-//                $v['is_follow'] = 1;
-//            }
 
             //等级获取对应图标
             $v['icon'][0] = model('UserData')->user_wealth_icon($v['follow_id']);//财富图标
             $v['icon'][1] = model('UserData')->user_charm_icon($v['follow_id']);//魅力图标
             //判断是否是歌手 如果是 返回等级图标
-            $isSinnger = db::name('vs_singer')->where(['user_id' => $v['follow_id'],'status' => 1])->value('level');
-            $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+            $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+            if($isSinger){
+                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+            }
         }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }
@@ -275,8 +274,10 @@ class User extends Model
             $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
             $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
             //判断是否是歌手 如果是 返回等级图标
-            $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level');
-            $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+            $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+            if($isSinger){
+                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+            }
         }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }
@@ -360,11 +361,15 @@ class User extends Model
     public function get_user_home($from_uid,$uid)
     {
         $user_info = db::name('user')->alias('u')->join('user_data ud', 'u.id = ud.user_id')
-            ->field('u.market_value,u.id as user_id,u.nickname,u.user_code,u.avatar,u.sex,u.birthday,u.profile,ud.tag_id,ud.home_bgimages,u.is_online')
+            ->field('u.birthday,u.profile,ud.tag_id,ud.home_bgimages,u.is_online')
             ->where(['u.id' => $uid,'u.status' => ['<>',0]])->find();
         if(!$user_info){
              return ['code' => 0, 'msg' => '用户不存在或已注销', 'data' => null];
         }
+        $userInfo = $this->get_user_base_info($uid);
+        //把$userInfo合并到后面
+        $user_info = array_merge($user_info, $userInfo);
+
         //标签
         $user_info['tag_list'] = [];
         if(isset($user_info['tag_id'])) {
@@ -375,19 +380,8 @@ class User extends Model
         //礼物墙 获取收到的礼物图片名称数量 以及送每个礼物数量最多的用户的头像昵称 数量一样选最后送的用户
         $user_info['gift_wall'] = [];
 
-        $user_info['icon'][0] = model('UserData')->user_wealth_icon($uid) ?? '';//财富图标
-        $user_info['icon'][1] = model('UserData')->user_charm_icon($uid) ??  '';//魅力图标
-        //判断是否是歌手 如果是 返回等级图标
-        $isSinnger = db::name('vs_singer')->where(['user_id' => $uid,'status' => 1])->value('level');
-        $user_info['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
-
         //查询用户是否有使用靓号
-        $user_info['is_use_code'] = 0;
-        $liang = db::name('vs_user_decorate')->where(['user_id' => $uid, 'is_using' => 1, 'type' => 6, 'end_time' => ['>=', time()]])->find();
-        if($liang){
-            $user_info['is_use_code'] = 1;
-            $user_info['user_code'] = $liang['special_num'] ?? '';
-        }
+        $user_info['is_use_code'] = $userInfo['is_special_code'];
 
         //是否关注
         $user_info['is_follow'] = 0;
@@ -398,10 +392,6 @@ class User extends Model
         $user_info['room_id'] =  db::name('vs_room_visitor')->where(['user_id' => $uid, 'is_delete' => 1])->order('id desc')->value('room_id') ?? 0;
         //用户年龄
         $user_info['age'] = getAge($user_info['birthday']);
-        //头像装扮
-        $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);//聊天气泡
 
         //记录用户访问记录
         if($from_uid != $uid){
@@ -417,9 +407,6 @@ class User extends Model
             $user_info['guild_id'] = null;
             $user_info['guild_name'] = null;
         }
-        $Nobility = model('Nobility')->getUserNobilityInfo($uid);//nobility_image
-        $user_info['nobility_image'] = $Nobility['play_image'];
-        $user_info['nickname_color'] = $Nobility['nick_name_color'];
 
         //cp
         //查询用户Cp空间
@@ -452,6 +439,7 @@ class User extends Model
         $coin_market_value =  explode(',', get_system_config_value('coin_market_value'));;
         $user_info['market_value_coin'] = $coin_market_value[0];
         $user_info['market_value_market'] = $coin_market_value[1];
+
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
 
diff --git a/application/api/model/UserZone.php b/application/api/model/UserZone.php
index bd5ed519..f12d49e9 100644
--- a/application/api/model/UserZone.php
+++ b/application/api/model/UserZone.php
@@ -659,8 +659,10 @@ class UserZone extends Model
                 $v['icon'][0] = model('UserData')->user_wealth_icon($v['user_id']);//财富图标
                 $v['icon'][1] = model('UserData')->user_charm_icon($v['user_id']);//魅力图标
                 //判断是否是歌手 如果是 返回等级图标
-                $isSinnger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->value('level');
-                $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinnger,'deletetime' => 0])->value('image');//等级图标
+                $isSinger = db::name('vs_singer')->where(['user_id' => $v['user_id'],'status' => 1])->find();
+                if($isSinger){
+                    $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标
+                }
 
                 $Nobility = model('Nobility')->getUserNobilityInfo($v['user_id']);//nobility_image
                 $v['nobility_image'] = $Nobility['play_image'];