Merge remote-tracking branch 'origin/develop' into develop

application/api/model/Room.php

@@ -1815,7 +1815,7 @@ class Room extends Model
         $user_in_room = db::name('vs_room_visitor')->where(['room_id' => $room_id,'user_id' => $user_id])->find();
         if(!$user_in_room){
 //            return ['code' => 0, 'msg' => '您已不在此房间', 'data' => null];
-            return ['code' => 0, 'msg' => '', 'data' => null];
+//            return ['code' => 0, 'msg' => '', 'data' => null];
         }
         $room = db::name('vs_room')->where(['id' => $room_id])->find();
         $song_list = null;

application/api/model/RoomPk.php

@@ -287,7 +287,7 @@ class RoomPk extends Model
             'a.is_show_room' => 1,
             'b.pit_number' => 9,
             'b.user_id' => ['<>',0],
-            'a.type_id' => ['in',[1,3,4]],
+            'a.type_id' => ['in',[1,3,4,8]],
             'a.label_id' => 1,
         ];