diff --git a/application/api/controller/SingerSong.php b/application/api/controller/SingerSong.php
index 6393bb8..f2b029f 100644
--- a/application/api/controller/SingerSong.php
+++ b/application/api/controller/SingerSong.php
@@ -62,6 +62,7 @@ class SingerSong extends BaseCom
         if (!$id) {
             return V(0, '请选择歌曲');
         }
+        db::name('vs_singer_song')->where(['id' => $id])->update(['deletetime' => time()]);
         $song_name = input('song_name', 0);
         if (!$song_name) {
             return V(0, '请输入歌曲名称');
@@ -71,10 +72,12 @@ class SingerSong extends BaseCom
             return V(0, '请选择礼物');
         }
         $gift_num = input('gift_num', 1);
-        $reslut = db::name('vs_singer_song')->where(['id' => $id])->update([
+        $reslut = db::name('vs_singer_song')->insert([
+            'user_id' => $this->uid,
             'song_name' => $song_name,
             'gift_id' => $gift_id,
             'gift_num' => $gift_num,
+            'createtime' => time(),
         ]);
         if ($reslut) {
             return V(1, '修改成功');
diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php
index a67c22e..dcc31ec 100644
--- a/application/api/model/SingerSong.php
+++ b/application/api/model/SingerSong.php
@@ -103,16 +103,16 @@ class SingerSong extends Model
     public function getSong($uid, $user_id, $room_id, $page, $page_limit)
     {
         if($user_id > 0){
-            $count = db::name('vs_singer_song')->where(['user_id' => $user_id])->count();
-            $res = db::name('vs_singer_song')->where(['user_id' => $user_id])->page($page, $page_limit)->select();
+            $count = db::name('vs_singer_song')->where(['user_id' => $user_id,'deletetime' => 0])->count();
+            $res = db::name('vs_singer_song')->where(['user_id' => $user_id,'deletetime' => 0])->page($page, $page_limit)->select();
         }else{
             //查询当前房间内麦位上的歌手
             $room_singer = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',9]])->column('user_id');
             if ($room_singer) {
                 //$uid 是当前自己，有自己就去除自己
                 $room_singer = array_diff($room_singer, [$uid]);
-                $count = db::name('vs_singer_song')->where(['user_id' => ['in', $room_singer]])->count();
-                $res = db::name('vs_singer_song')->where(['user_id' => ['in', $room_singer]])->page($page, $page_limit)->select();
+                $count = db::name('vs_singer_song')->where(['user_id' => ['in', $room_singer],'deletetime' => 0])->count();
+                $res = db::name('vs_singer_song')->where(['user_id' => ['in', $room_singer],'deletetime' => 0])->page($page, $page_limit)->select();
             }else{
                 $res = [];
                 $count = 0;