From fd1a88cdf65bc0d03e28c444342add8657877745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Tue, 13 Jan 2026 14:47:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=92=E5=90=A7=E6=88=BF=20=E6=8A=B1?=
 =?UTF-8?q?=E9=BA=A6=E5=90=8E=E9=80=89=E6=8B=A9=E7=A4=BC=E7=89=A9=E5=9C=A8?=
 =?UTF-8?q?=E4=B8=8A=E9=BA=A6=20=E4=BC=A0=E5=8F=82=20type=20=3D=202=20=20?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=B8=8A=E9=BA=A6=E4=B8=8D=E5=81=9A=E6=8E=92?=
 =?UTF-8?q?=E9=BA=A6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/RoomPit.php | 3 ++-
 application/api/model/RoomPit.php      | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/api/controller/RoomPit.php b/application/api/controller/RoomPit.php
index ac4fc02c..801de1d8 100644
--- a/application/api/controller/RoomPit.php
+++ b/application/api/controller/RoomPit.php
@@ -39,7 +39,8 @@ class RoomPit extends BaseCom
                     return V(0, '请选择礼物', null);
                 }
             }
-            $reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $pit_number,$gift_id);
+            $type = input('type', 0);//2-抱麦后的上麦
+            $reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $pit_number,$gift_id,$type);
         }else{
             $reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $pit_number);
         }
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index a67b651e..f4c8ad0f 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -279,7 +279,7 @@ class RoomPit extends Model
 
 
     //申请上麦
-    public function apply_pit($user_id,$room_id,$pit_number = 0,$gift_id = 0)
+    public function apply_pit($user_id,$room_id,$pit_number = 0,$gift_id = 0,$type = 0)
     {
         //查询房间状态
         $room_info = db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->field('id,room_status,room_up_pit_type,type_id,label_id,step')->find();
@@ -337,7 +337,7 @@ class RoomPit extends Model
         }
         
         //自由麦
-        if($room_info['room_up_pit_type'] == 2){
+        if($room_info['room_up_pit_type'] == 2 || $type == 2){
             if($pit_number > 0){
                 if($room_info['label_id'] == 5 || $room_info['label_id'] == 8){//互娱||酒吧
                    if($pit_number == 7 || $pit_number == 8){