diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 5dc301c..76e996f 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -530,10 +530,14 @@ class Room extends Model
 
     //进入房间
     public function join_room($user_id, $room_id, $password) {
-        $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => 2])->find();
+//        $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => 2])->find();
+        $room = db::name('vs_room')->where(['id' => $room_id,'apply_status' => ['in',[1,2]]])->find();
         if (!isset($room)) {
             return ['code' => 0, 'msg' => '房间不存在',  'data' => ''];
         }
+        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' => ''];