From 0779bfce73a2896405238b23a01d191a670e25fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 1 Dec 2025 18:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA=E6=88=BF=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Room.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 10c3f18..f74e82b 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1214,6 +1214,8 @@ class Room extends Model
             $apply_type = 4;
         }elseif ($room_type == 10){//签约房不能退出
             $apply_type = 5;
+        }elseif ($room_type == 2){
+            $apply_type = 6;
         }
 
         if($apply_type == 1){
@@ -1244,11 +1246,6 @@ class Room extends Model
                 $text['pit_number'] = '';
                 model('api/Chat')->sendMsg(1004,$room_id,$text);
             }
-            //获取拍卖位信息
-            $auction_id =  $catdc = Cache::get('auction_user_'.$room_id);
-            if($auction_id == $user_id){
-                return ['code' => 0, 'msg' => '正在拍卖中，不能退出', 'data' => null];
-            }
         }elseif ($apply_type == 3){
             $roomInfoStep = db::name('vs_room')->where(['id' => $room_id])->value('step');
             $room_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->find();
@@ -1267,6 +1264,11 @@ class Room extends Model
             if($vs_room_sign){
                 return ['code' => 0, 'msg' => '在签约麦不能退出', 'data' => null];
             }
+        }elseif ($apply_type == 6){
+            $auction_user_id = Cache::get('auction_user_'.$room_id);
+            if($auction_user_id == $user_id){
+                return ['code' => 0, 'msg' => '拍卖位麦不能退出', 'data' => null];
+            }
         }else{
             //在麦位上 移除用户
             $room_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->find();