进入房间
This commit is contained in:
@@ -636,7 +636,7 @@ class Room extends Model
|
|||||||
$user_pit = 0;
|
$user_pit = 0;
|
||||||
$pit_list = [];
|
$pit_list = [];
|
||||||
$cp_users = null;
|
$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歌
|
if($room['label_id'] == 2){//K歌
|
||||||
$song = $this->get_song_info($room_id,$user_id);
|
$song = $this->get_song_info($room_id,$user_id);
|
||||||
$song_list = $song['song_user_info'];
|
$song_list = $song['song_user_info'];
|
||||||
@@ -1817,8 +1817,8 @@ class Room extends Model
|
|||||||
$pit_list = null;
|
$pit_list = null;
|
||||||
$roomauction = null;
|
$roomauction = null;
|
||||||
$cp_users = null;
|
$cp_users = null;
|
||||||
if($room['type_id'] == 1 || $room['type_id'] == 3 || $room['type_id'] == 4) {
|
if($room['type_id'] == 1 || $room['type_id'] == 3 || $room['type_id'] == 4 || $room['type_id'] == 7) {
|
||||||
if($room['label_id'] == 1){
|
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')
|
$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])
|
->where(['a.room_id' => $room['id'],'a.status' => 1])
|
||||||
|
|||||||
Reference in New Issue
Block a user