diff --git a/application/api/controller/SingerSong.php b/application/api/controller/SingerSong.php index db0e754..6393bb8 100644 --- a/application/api/controller/SingerSong.php +++ b/application/api/controller/SingerSong.php @@ -156,13 +156,13 @@ class SingerSong extends BaseCom if ($reslut) { //给前端推送下首歌曲信息 $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_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_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(); - $next_song_info['singer_id'] = $singer_song['user_id']; + $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_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); diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php index f82185d..bca47dc 100644 --- a/application/api/model/SingerSong.php +++ b/application/api/model/SingerSong.php @@ -210,6 +210,7 @@ class SingerSong extends Model $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(); + $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_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);