diff --git a/application/api/controller/Room.php b/application/api/controller/Room.php
index 162f5d37..c032a886 100644
--- a/application/api/controller/Room.php
+++ b/application/api/controller/Room.php
@@ -128,6 +128,16 @@ class Room extends BaseCom
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 
+
+    //进入房间前的判断
+    public function before_join_room_check()
+    {
+        $room_id = input('room_id', 0);
+        $reslut = model('Room')->before_join_room_check($this->uid, $room_id);
+        return V($reslut['code'], $reslut['msg'], $reslut['data']);
+    }
+
+
     /*
      * 进入房间
      */
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index f63e90cd..cb53b258 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -555,8 +555,8 @@ class Room extends Model
         return ['code' => 1, 'msg' => '成功', 'data' => ['total_amount' => $total_amount, 'total_earning' => $total_earning,'list' => $list_data_array]];
     }
 
-    //进入房间
-    public function join_room($user_id, $room_id, $password) {
+    //进入房间前的判断
+    public function before_join_room_check($user_id, $room_id) {
         $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => ['in',[1,2]]])->find();
         if (!isset($room)) {
             return ['code' => 0, 'msg' => '房间不存在',  'data' => ''];
@@ -564,11 +564,6 @@ class Room extends Model
         if($room['apply_status'] == 1){
             return ['code' => 0, 'msg' => '房间正在审核中……',  'data' => ''];
         }
-        if(isset($room['password']) && $user_id != $room['user_id']){
-            if (empty($password) || $room['password'] != md5($password)) {
-                return ['code' => 0, 'msg' => '密码错误',   'data' => ''];
-            }
-        }
 
         if ($room['room_status'] == 2) {//1正常2封禁3关闭
             $minutes = floor(($room['seal_time'] - time()) % 86400 / 60);
@@ -646,7 +641,22 @@ class Room extends Model
                 $this->quit_room($user_id, $room_user,$user_id);
             }
         }
+        return ['code' => 1,
+            'msg' => '成功',
+            'data' => null
+        ];
+    }
 
+    //进入房间
+    public function join_room($user_id, $room_id, $password) {
+        $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => ['in',[1,2]]])->find();
+        if(isset($room['password']) && $user_id != $room['user_id']){
+            if (empty($password) || $room['password'] != md5($password)) {
+                return ['code' => 0, 'msg' => '密码错误',   'data' => ''];
+            }
+        }
+
+        $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => ['in',[1,2]]])->find();
         //K歌模式下获取歌曲信息
         $song_pit_list = null;
         $song_list = null;