diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php index e43759e..c323e5d 100644 --- a/application/api/model/SingerSong.php +++ b/application/api/model/SingerSong.php @@ -123,7 +123,7 @@ class SingerSong extends Model $res[$k]['gift_name'] = db::name('vs_gift')->where(['gid' => $v['gift_id']])->value('gift_name'); $res[$k]['gift_price'] = db::name('vs_gift')->where(['gid' => $v['gift_id']])->value('gift_price'); $res[$k]['base_image'] = db::name('vs_gift')->where(['gid' => $v['gift_id']])->value('base_image'); - $res[$k]['nickname'] = db::name('user')->where(['id' => $v['user_id']])->value('nickname'); + $res[$k]['singer_nickname'] = db::name('user')->where(['id' => $v['user_id']])->value('nickname'); } return ['code' => 1, 'msg' => '获取成功', 'data' => ['count' => $count, 'lists' =>$res]]; } else { @@ -185,9 +185,13 @@ class SingerSong extends Model $song_info = db::name('vs_song_log')->where(['id' => $result])->find(); $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_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); $singer_song = db::name('vs_singer_song')->where(['id' => $song_info['singer_song_id']])->find(); $song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname'); $song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar'); + $song_info['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1); + $song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3); $song_info['song_name'] = $singer_song['song_name']; $song_info_data = [ @@ -246,7 +250,7 @@ class SingerSong extends Model $res[$k]['gift_price'] = db::name('vs_gift')->where(['gid' => db::name('vs_singer_song')->where(['id' => $v['singer_song_id']])->value('gift_id')])->value('gift_price'); $res[$k]['base_image'] = db::name('vs_gift')->where(['gid' => db::name('vs_singer_song')->where(['id' => $v['singer_song_id']])->value('gift_id')])->value('base_image'); $res[$k]['gift_num'] = db::name('vs_singer_song')->where(['id' => $v['singer_song_id']])->value('gift_num'); - $res[$k]['nickname'] = db::name('user')->where(['id' => db::name('vs_singer_song')->where(['id' => $v['singer_song_id']])->value('user_id')])->value('nickname'); + $res[$k]['singer_nickname'] = db::name('user')->where(['id' => db::name('vs_singer_song')->where(['id' => $v['singer_song_id']])->value('user_id')])->value('nickname'); } } return ['code' => 1, 'msg' => '获取成功', 'data' => ['count' => $count, 'lists' =>$res]]; @@ -336,9 +340,13 @@ class SingerSong extends Model $song_info = db::name('vs_song_log')->where(['id' => $id])->find(); $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['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1); + $song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3); $singer_song = db::name('vs_singer_song')->where(['id' => $song_info['singer_song_id']])->find(); $song_info['singer_nickname'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('nickname'); $song_info['singer_avatar'] = db::name('user')->where(['id' => $singer_song['user_id']])->value('avatar'); + $song_info['singer_dress'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'], 1); + $song_info['singer_mic_cycle'] = model('api/Decorate')->user_decorate_detail($singer_song['user_id'],3); $song_info['song_name'] = $singer_song['song_name']; $song_info_data = [