diff --git a/application/api/controller/UserData.php b/application/api/controller/UserData.php
index 98a1269..79c17d0 100644
--- a/application/api/controller/UserData.php
+++ b/application/api/controller/UserData.php
@@ -149,4 +149,13 @@ class UserData extends BaseCom
         $reslut = model('UserData')->real_name_info($this->uid);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
+
+
+    //隐身设置
+    public function modify_hide_status()
+    {
+        $status = input('hide_status', 0);//0-取消隐身，1-设置隐身
+        $reslut = model('UserData')->modify_hide_status($this->uid,$status);
+        return V($reslut['code'], $reslut['msg'], $reslut['data']);
+    }
 }
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index f336866..a2df61e 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -852,6 +852,7 @@ class Room extends Model
         $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'];
+        $text['FromUserInfo']['enter_text'] = '欢迎 ' . $Nobility['nobility_name'] .' 进入房间';
         model('api/Chat')->sendMsg(1001,$room_id,$text,$user_id);
 
         //记录用户访问记录
diff --git a/application/api/model/User.php b/application/api/model/User.php
index 719b109..bf8f972 100644
--- a/application/api/model/User.php
+++ b/application/api/model/User.php
@@ -163,6 +163,16 @@ class User extends Model
         $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-隐身进入
 
         return ['code' => 1, 'msg' => '获取成功', 'data' => $user_info];
     }
diff --git a/application/api/model/UserData.php b/application/api/model/UserData.php
index eec8ced..2613282 100644
--- a/application/api/model/UserData.php
+++ b/application/api/model/UserData.php
@@ -606,4 +606,34 @@ class UserData extends Model
 
         return ['code' => 1, 'msg' => '获取成功','data' =>$data];
     }
+
+
+    //设置隐身状态
+    //$status   0-取消隐身，1-设置隐身
+    public function modify_hide_status($user_id,$status)
+    {
+        if(!in_array($status,[0,1])){
+            return ['code' => 0, 'msg' => '参数错误','data' =>null];
+        }
+        if($status == 1){
+            $is_hide = 0;
+            //获取用户的就爵位信息
+            $Nobility = model('Nobility')->getUserNobilityInfo($user_id);
+            if($Nobility['power_list']){
+                foreach ($Nobility['power_list'] as $key => $value){
+                    if($value['id'] == 8){
+                        $is_hide = 1;
+                    }
+                }
+            }
+            if($is_hide != 1){
+                return ['code' => 0, 'msg' => '当前爵位无法设置隐身状态','data' =>null];
+            }
+        }
+        $data = [
+            'hide_status' => $status,
+        ];
+        $reslut = db::name('user_data')->where('user_id',$user_id)->update($data);
+        return ['code' => 1, 'msg' => '设置成功','data' =>null];
+    }
 }
\ No newline at end of file