diff --git a/application/api/model/Room.php b/application/api/model/Room.php index 9fa3a2e..e5bb9db 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -636,7 +636,7 @@ class Room extends Model $user_pit = 0; $pit_list = []; $cp_users = null; - if($room['type_id'] == 1 || $room['type_id'] == 3 || $room['type_id'] == 4) {//1点唱,3男神,4女神 + if($room['type_id'] == 1 || $room['type_id'] == 3 || $room['type_id'] == 4 || $room['type_id'] == 7) {//1点唱,3男神,4女神 if($room['label_id'] == 2){//K歌 $song = $this->get_song_info($room_id,$user_id); $song_list = $song['song_user_info']; @@ -1817,8 +1817,8 @@ class Room extends Model $pit_list = null; $roomauction = null; $cp_users = null; - if($room['type_id'] == 1 || $room['type_id'] == 3 || $room['type_id'] == 4) { - if($room['label_id'] == 1){ + if($room['type_id'] == 1 || $room['type_id'] == 3 || $room['type_id'] == 4 || $room['type_id'] == 7) { + if($room['label_id'] == 1 || $room['label_id'] == 5){ //麦位信息 $pit_list = db::name('vs_room_pit')->alias('a')->join('user b', 'a.user_id = b.id', 'left') ->where(['a.room_id' => $room['id'],'a.status' => 1])