推送信息变化
This commit is contained in:
@@ -156,11 +156,17 @@ class SingerSong extends BaseCom
|
|||||||
if ($reslut) {
|
if ($reslut) {
|
||||||
//给前端推送下首歌曲信息
|
//给前端推送下首歌曲信息
|
||||||
$next_song_info = db::name('vs_song_log')->where(['id' => $id])->find();
|
$next_song_info = db::name('vs_song_log')->where(['id' => $id])->find();
|
||||||
|
$next_song_info['boss_id'] = $next_song_info['user_id'];
|
||||||
$next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
|
$next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
|
||||||
$next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
|
$next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
|
||||||
|
$next_song_info['boss_dress'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'], 1);
|
||||||
|
$next_song_info['boss_mic_cycle'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'],3);
|
||||||
$singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
|
$singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
|
||||||
|
$next_song_info['singer_id'] = $singer_song['user_id'];
|
||||||
$next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
$next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
||||||
$next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
|
$next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
|
||||||
|
$next_song_info['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1);
|
||||||
|
$next_song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3);
|
||||||
$next_song_info['song_name'] = $singer_song['song_name'];
|
$next_song_info['song_name'] = $singer_song['song_name'];
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
|
|||||||
@@ -2165,11 +2165,17 @@ class Room extends Model
|
|||||||
//给前端推送下首歌曲信息
|
//给前端推送下首歌曲信息
|
||||||
$next_song_info = db::name('vs_song_log')->where(['room_id' => $room_id,'status' => 0])->order('sort desc')->find();
|
$next_song_info = db::name('vs_song_log')->where(['room_id' => $room_id,'status' => 0])->order('sort desc')->find();
|
||||||
if($next_song_info){
|
if($next_song_info){
|
||||||
|
$next_song_info['boss_user_id'] = $next_song_info['user_id'];
|
||||||
$next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
|
$next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
|
||||||
$next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
|
$next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
|
||||||
|
$next_song_info['boss_dress'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'], 1);
|
||||||
|
$next_song_info['boss_mic_cycle'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'],3);
|
||||||
$singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
|
$singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
|
||||||
|
$next_song_info['singer_user_id'] = $singer_song['user_id'];
|
||||||
$next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
$next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
||||||
$next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
|
$next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
|
||||||
|
$next_song_info['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1);
|
||||||
|
$next_song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3);
|
||||||
$next_song_info['song_name'] = $singer_song['song_name'];
|
$next_song_info['song_name'] = $singer_song['song_name'];
|
||||||
}else{
|
}else{
|
||||||
$next_song_info = null;
|
$next_song_info = null;
|
||||||
|
|||||||
@@ -204,11 +204,16 @@ class SingerSong extends Model
|
|||||||
}elseif ($song_info_count == 2){
|
}elseif ($song_info_count == 2){
|
||||||
//给前端推送下首歌曲信息
|
//给前端推送下首歌曲信息
|
||||||
$next_song_info = db::name('vs_song_log')->where(['id' => $result])->find();
|
$next_song_info = db::name('vs_song_log')->where(['id' => $result])->find();
|
||||||
|
$next_song_info['boss_user_id'] = $next_song_info['user_id'];
|
||||||
$next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
|
$next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
|
||||||
$next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
|
$next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
|
||||||
|
$next_song_info['boss_dress'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'], 1);
|
||||||
|
$next_song_info['boss_mic_cycle'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'],3);
|
||||||
$singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
|
$singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
|
||||||
$next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
$next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
||||||
$next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
|
$next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
|
||||||
|
$next_song_info['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1);
|
||||||
|
$next_song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3);
|
||||||
$next_song_info['song_name'] = $singer_song['song_name'];
|
$next_song_info['song_name'] = $singer_song['song_name'];
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
@@ -356,8 +361,8 @@ class SingerSong extends Model
|
|||||||
$song_info['boss_user_id'] = $song_info['user_id'];
|
$song_info['boss_user_id'] = $song_info['user_id'];
|
||||||
$song_info['boss_nickname'] = db::name('user')->where(['id' => $song_info['user_id']])->value('nickname');
|
$song_info['boss_nickname'] = db::name('user')->where(['id' => $song_info['user_id']])->value('nickname');
|
||||||
$song_info['boss_avatar'] = db::name('user')->where(['id' => $song_info['user_id']])->value('avatar');
|
$song_info['boss_avatar'] = db::name('user')->where(['id' => $song_info['user_id']])->value('avatar');
|
||||||
$song_info['boss__dress'] = model('api/Decorate')->user_decorate_detail($song_info['user_id'], 1);
|
$song_info['boss_dress'] = model('api/Decorate')->user_decorate_detail($song_info['user_id'], 1);
|
||||||
$song_info['boss__mic_cycle'] = model('api/Decorate')->user_decorate_detail($song_info['user_id'],3);
|
$song_info['boss_mic_cycle'] = model('api/Decorate')->user_decorate_detail($song_info['user_id'],3);
|
||||||
$singer_song = db::name('vs_singer_song')->where(['id' => $song_info['singer_song_id']])->find();
|
$singer_song = db::name('vs_singer_song')->where(['id' => $song_info['singer_song_id']])->find();
|
||||||
$song_info['singer_user_id'] = $singer_song['user_id'];
|
$song_info['singer_user_id'] = $singer_song['user_id'];
|
||||||
$song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
$song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
||||||
@@ -374,11 +379,17 @@ class SingerSong extends Model
|
|||||||
|
|
||||||
//给前端推送下首歌曲信息
|
//给前端推送下首歌曲信息
|
||||||
$next_song_info = db::name('vs_song_log')->where(['room_id' => $sonng_log['room_id'],'status' => 0])->order('sort desc')->find();
|
$next_song_info = db::name('vs_song_log')->where(['room_id' => $sonng_log['room_id'],'status' => 0])->order('sort desc')->find();
|
||||||
|
$next_song_info['boss_user_id'] = $next_song_info['user_id'];
|
||||||
$next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
|
$next_song_info['boss_nickname'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('nickname');
|
||||||
$next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
|
$next_song_info['boss_avatar'] = db::name('user')->where(['id' => $next_song_info['user_id']])->value('avatar');
|
||||||
|
$next_song_info['boss_dress'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'], 1);
|
||||||
|
$next_song_info['boss_mic_cycle'] = model('api/Decorate')->user_decorate_detail($next_song_info['user_id'],3);
|
||||||
$singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
|
$singer_song = db::name('vs_singer_song')->where(['id' => $next_song_info['singer_song_id']])->find();
|
||||||
|
$next_song_info['singer_user_id'] = $singer_song['user_id'];
|
||||||
$next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
$next_song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname');
|
||||||
$next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
|
$next_song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar');
|
||||||
|
$next_song_info['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1);
|
||||||
|
$next_song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3);
|
||||||
$next_song_info['song_name'] = $singer_song['song_name'];
|
$next_song_info['song_name'] = $singer_song['song_name'];
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
|
|||||||
Reference in New Issue
Block a user