推送信息变化
This commit is contained in:
@@ -837,7 +837,6 @@ class Room extends Model
|
|||||||
'is_pk' => $room['is_pk'],//1-默认接受PK,2不接受',
|
'is_pk' => $room['is_pk'],//1-默认接受PK,2不接受',
|
||||||
'last_pk_room_id' => $last_pk_room_id,
|
'last_pk_room_id' => $last_pk_room_id,
|
||||||
'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count(),
|
'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count(),
|
||||||
'singer_innfo' => $singer_info,
|
|
||||||
];
|
];
|
||||||
|
|
||||||
//房主信息
|
//房主信息
|
||||||
@@ -904,7 +903,8 @@ class Room extends Model
|
|||||||
'song_pit_list' => $song_pit_list,
|
'song_pit_list' => $song_pit_list,
|
||||||
'friend_info' => $friend,
|
'friend_info' => $friend,
|
||||||
'gift_cycle' => $xlh_info,
|
'gift_cycle' => $xlh_info,
|
||||||
'hour_ranking_open' => $hour_open
|
'hour_ranking_open' => $hour_open,
|
||||||
|
'singer_info' => $singer_info,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -2094,8 +2094,7 @@ class Room extends Model
|
|||||||
'head_line'=>$headline_data,
|
'head_line'=>$headline_data,
|
||||||
'is_pk' => $room['is_pk'],//1-默认接受PK,2不接受',
|
'is_pk' => $room['is_pk'],//1-默认接受PK,2不接受',
|
||||||
'last_pk_room_id' => $last_pk_room_id,
|
'last_pk_room_id' => $last_pk_room_id,
|
||||||
'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count(),
|
'queue_number' => db::name('vs_room_pit_apply')->where(['room_id' => $room_id,'status' => 0])->count()
|
||||||
'singer_innfo' => $singer_info,
|
|
||||||
];
|
];
|
||||||
//房主信息
|
//房主信息
|
||||||
$room_owner = db::name('user')->where('id', $room['user_id'])->field('id as user_id,user_code,sex,nickname,avatar')->find();
|
$room_owner = db::name('user')->where('id', $room['user_id'])->field('id as user_id,user_code,sex,nickname,avatar')->find();
|
||||||
@@ -2139,7 +2138,8 @@ class Room extends Model
|
|||||||
'song_pit_list'=>$song_pit_list,
|
'song_pit_list'=>$song_pit_list,
|
||||||
'friend_info' => $friend,
|
'friend_info' => $friend,
|
||||||
'gift_cycle' => $xlh_info,
|
'gift_cycle' => $xlh_info,
|
||||||
'hour_ranking_open' => $hour_open
|
'hour_ranking_open' => $hour_open,
|
||||||
|
'singer_info' => $singer_info,
|
||||||
]
|
]
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user