From a21257f9c3a9ea5fef5f84fe621ff66f69517492 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Thu, 13 Nov 2025 15:26:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/SingerSong.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/api/model/SingerSong.php b/application/api/model/SingerSong.php
index fde5051..787ec84 100644
--- a/application/api/model/SingerSong.php
+++ b/application/api/model/SingerSong.php
@@ -35,7 +35,7 @@ class SingerSong extends Model
         //查询是否提交过认证
         $res = db::name('vs_singer')->where(['user_id' => $user_id])->find();
         if ($res && $res['status'] == 1) {
-            return ['code' => 0, 'msg' => '认证已通过，无需重复提交'];
+            return ['code' => 0, 'msg' => '认证已通过，无需重复提交', 'data' => null];
         }
         if ($res) {
             $data = [
@@ -54,9 +54,9 @@ class SingerSong extends Model
             $result = db::name('vs_singer')->insert($data);
         }
         if ($result) {
-            return ['code' => 1, 'msg' => '提交成功'];
+            return ['code' => 1, 'msg' => '提交成功', 'data' => null];
         } else {
-            return ['code' => 0, 'msg' => '提交失败'];
+            return ['code' => 0, 'msg' => '提交失败', 'data' => null];
         }
     }
 
@@ -72,7 +72,7 @@ class SingerSong extends Model
         //查询是否提交过歌曲
         $res = db::name('vs_singer_song')->where(['user_id' => $user_id, 'song_name' => $song_name])->find();
         if ($res) {
-            return ['code' => 0, 'msg' => '请勿重复提交歌曲'];
+            return ['code' => 0, 'msg' => '请勿重复提交歌曲', 'data' => null];
         }
         $data = [
             'user_id' => $user_id,
@@ -83,9 +83,9 @@ class SingerSong extends Model
         ];
         $result = db::name('vs_singer_song')->insert($data);
         if ($result) {
-            return ['code' => 1, 'msg' => '提交成功'];
+            return ['code' => 1, 'msg' => '提交成功', 'data' => null];
         } else {
-            return ['code' => 0, 'msg' => '提交失败'];
+            return ['code' => 0, 'msg' => '提交失败', 'data' => null];
         }
     }
 
@@ -117,7 +117,7 @@ class SingerSong extends Model
             }
             return ['code' => 1, 'msg' => '获取成功', 'data' => $res];
         } else {
-            return ['code' => 0, 'msg' => '暂无数据'];
+            return ['code' => 0, 'msg' => '暂无数据', 'data' => null];
         }
 
     }
@@ -133,13 +133,13 @@ class SingerSong extends Model
         //查询歌曲信息
         $song = db::name('vs_singer_song')->where(['id' => $song_id])->find();
         if (!$song) {
-            return ['code' => 0, 'msg' => '歌曲不存在'];
+            return ['code' => 0, 'msg' => '歌曲不存在', 'data' => null];
         }
         //查询用户余额
         $user_money = db::name('user_wallet')->where(['user_id' => $user_id])->value('coin');
         $gift_price = db::name('vs_gift')->where(['gid' => $song['gift_id']])->value('gift_price');
         if ($user_money < $gift_price * $song['gift_num']) {
-            return ['code' => 0, 'msg' => '余额不足'];
+            return ['code' => 0, 'msg' => '余额不足', 'data' => null];
         }
 
         //走送礼流程
@@ -153,7 +153,7 @@ class SingerSong extends Model
             ];
             $result = db::name('vs_song_log')->insert($data);
             if (!$result) {
-                return ['code' => 0, 'msg' => '点歌失败'];
+                return ['code' => 0, 'msg' => '点歌失败', 'data' => null];
             }
             //给前端推送
             $text = [
@@ -162,9 +162,9 @@ class SingerSong extends Model
             //聊天室推送系统消息
             model('Chat')->sendMsg(1070,$room_id,$text);
 
-            return ['code' => 1, 'msg' => '点歌成功'];
+            return ['code' => 1, 'msg' => '点歌成功', 'data' => null];
         } else {
-            return ['code' => 0, 'msg' => $res['msg']];
+            return ['code' => 0, 'msg' => $res['msg'], 'data' => null];
         }
     }