diff --git a/application/api/controller/RoomSong.php b/application/api/controller/RoomSong.php
index 02d8b2dd..81fb8c8f 100644
--- a/application/api/controller/RoomSong.php
+++ b/application/api/controller/RoomSong.php
@@ -58,6 +58,15 @@ class RoomSong extends BaseCom
     }
 
 
+    //已点列表搜索
+    public function search_song(){
+        $room_id = input('room_id');
+        $search_user = input('search_user');
+        $res = model('RoomSong')->search_song($room_id,$search_user);
+        return V($res['code'], $res['msg'], $res['data']);
+    }
+
+
     //上移歌 $type 1上移 2置顶
     public function up_song(){
         $room_song_id = input('did');
diff --git a/application/api/model/RoomSong.php b/application/api/model/RoomSong.php
index a30346e4..dc96c8ab 100644
--- a/application/api/model/RoomSong.php
+++ b/application/api/model/RoomSong.php
@@ -213,6 +213,18 @@ class RoomSong extends Model
             $action = 2;//走切歌，当前要唱的歌
         }
 
+        //本房间内总共还有多少首歌曲未唱
+        $room_song = db::name('vs_room_song')->where(['room_id' => $room_id,'times' => $data['times'],'status' => 1])->count();
+        if($room_song >= 60){
+            return ['code'=>0,'msg'=>'房间内未唱歌曲已达上限，请待演唱完一首后再点歌','data'=>null];
+        }
+
+        //查询当前用户还有几首没有唱
+        $user_song = db::name('vs_room_song')->where(['user_id' => $user_id,'room_id' => $room_id,'times' => $data['times'],'status' => 1])->count();
+        if($user_song >= 3){
+            return ['code'=>0,'msg'=>'已经点了三首歌曲了！情演唱后再点','data'=>null];
+        }
+
         $data['room_id'] = $room_id;
         $data['user_id'] = $user_id;
 
@@ -317,6 +329,31 @@ class RoomSong extends Model
     }
 
 
+    //已点歌曲搜索
+    public function search_song($room_id,$search_user){
+        $userId = db::name('user')->where(['user_code' => $search_user])->value('id');
+        if(!$userId){
+            $userId = db::name('vs_user_decorate')
+                ->where(['special_num' => $search_user,'type'=> 6,'is_using' => 1])
+                ->value('user_id');
+        }
+
+        $list = db::name('vs_room_song')
+            ->field('did,room_id,song_code,song_name,singer,poster,duration,sort,user_id')
+            ->where(['room_id' => $room_id,'status' => 1,'times_status' => 1,'user_id' =>$userId])
+            ->order('sort desc')->select();
+        if($list){
+            foreach ($list as &$v){
+                $v['nickname'] = db::name('user')->where('id',$v['user_id'])->value('nickname');
+                $v['avatar'] = db::name('user')->where('id',$v['user_id'])->value('avatar');
+                $v['user_code'] = db::name('user')->where('id',$v['user_id'])->value('user_code');
+                $v['dress'] = model('Decorate')->user_decorate_detail($v['user_id'], 1);
+            }
+        }
+        return ['code'=>1,'msg'=>'操作成功','data'=>$list];
+    }
+
+
     //上移歌 $type 1上移 2置顶
     public function up_song($user_id,$room_song_id,$type=1){
         //查询当前数据的信息