diff --git a/application/api/controller/SingerSong.php b/application/api/controller/SingerSong.php
index 0992bc4..e748456 100644
--- a/application/api/controller/SingerSong.php
+++ b/application/api/controller/SingerSong.php
@@ -88,11 +88,12 @@ class SingerSong extends BaseCom
     public function getSong()
     {
         $room_id = input('room_id', 0);
-        if (!$room_id) {
-            return V(0, '请选择房间');
-        }
         //用户ID
         $user_id = input('user_id', 0);
+        //以上两个参数二选一
+        if (!$room_id && !$user_id) {
+            return V(0, '请选择房间或歌手');
+        }
         $reslut = model('SingerSong')->getSong($user_id, $room_id);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php
index eab4ebb..72d2dbc 100644
--- a/application/api/model/SingerSong.php
+++ b/application/api/model/SingerSong.php
@@ -108,6 +108,9 @@ class SingerSong extends Model
         if ($res) {
             foreach ($res as $k => $v) {
                 $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['base_image']])->value('base_image');
+                $res[$k]['nickname'] = db::name('user')->where(['id' => $v['user_id']])->value('nickname');
             }
             return ['code' => 1, 'msg' => '获取成功', 'data' => $res];
         } else {