From 65704e0e8e0cac94e32991420f2cc523faf66613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Fri, 28 Nov 2025 14:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E9=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Sign.php |  2 +-
 application/api/model/RoomPit.php   | 35 +++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/application/api/controller/Sign.php b/application/api/controller/Sign.php
index bbd91d6..95f27b6 100644
--- a/application/api/controller/Sign.php
+++ b/application/api/controller/Sign.php
@@ -21,7 +21,7 @@ class Sign extends BaseCom
         for ($i = 0; $i < 8; $i++) {
             $sign_coin_list[] = $first_value + $i; // 每个值在第一个值的基础上加i（0到7）
         }
-        return ['code' => 1, 'msg' => '成功', 'data' => $sign_coin_list];
+        return v(1, '成功',  $sign_coin_list);
     }
 
 
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 0dc5586..b65bb7d 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -131,10 +131,33 @@ class RoomPit extends Model
     //用户下麦
     public function DownPit($user_id,$room_id,$pit_number)
     {
+        $roomtype = db::name('vs_room')->where(['id' => $room_id])->value('type_id');
+        if($roomtype == 10){
+            if($pit_number == 1){
+                $pit_text = '签约麦';
+            }elseif ($pit_number == 3 || $pit_number == 4 || $pit_number == 5) {
+                $pit_text = '老板麦';
+            }elseif($pit_number == 9){
+                $pit_text = '主持麦';
+            }elseif ($pit_number == 10) {
+                $pit_text = '嘉宾麦';
+            }else{
+                $pit_text = $pit_number . '号麦';
+            }
+        }else{
+            if($pit_number == 9){
+                $pit_text = '主持麦';
+            }elseif ($pit_number == 10) {
+                $pit_text = '嘉宾麦';
+            }else{
+                $pit_text = $pit_number . '号麦';
+            }
+        }
+
         if(!$pit_number){
             $pit_number = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->value('pit_number');
             if(!$pit_number){
-                return ['code' => 0, 'msg' => '该用户已不在'.$pit_number.'麦', 'data' => null];
+                return ['code' => 0, 'msg' => '该用户已不在'.$pit_text, 'data' => null];
             }
         }
         $where['room_id'] = $room_id;
@@ -142,7 +165,7 @@ class RoomPit extends Model
         $where['user_id'] = $user_id;
         $accept_pit_info = db::name('vs_room_pit')->where($where)->find();
         if(!$accept_pit_info){
-            return ['code' => 0, 'msg' => '该用户已不在'.$pit_number.'麦', 'data' => null];
+            return ['code' => 0, 'msg' => '该用户已不在'.$pit_text, 'data' => null];
         }
 
         //判断当前房间是否正在pk
@@ -176,13 +199,7 @@ class RoomPit extends Model
             if(!$down){
                 return ['code' => 0, 'msg' => '下麦失败', 'data' => null];
             }
-            if($pit_number == 9){
-                $pit_text = '主持麦';
-            }elseif ($pit_number == 10) {
-                $pit_text = '嘉宾麦';
-            }else{
-                $pit_text = $pit_number . '号麦';
-            }
+
             $text['text'] = $FromUserInfo['nickname'].' 下了 ' . $pit_text;
         }