diff --git a/application/api/model/Chat.php b/application/api/model/Chat.php
index a6750d6..995afd1 100644
--- a/application/api/model/Chat.php
+++ b/application/api/model/Chat.php
@@ -89,6 +89,8 @@ class Chat extends Model
         // RoomAuctionPK = 1037,
         //送盲盒礼物推送文字消息
         // RoomGiftBlindBox = 1038,
+        //换麦
+        // RoomChangePit = 1039,
 
         //交友房间内发送消息
         //交友房游戏阶段
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index bf215a7..090893c 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -188,9 +188,9 @@ class RoomPit extends Model
 
         //检查是否在坑位上
         $pit_infos = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->field('id,pit_number')->find();
-        if($pit_infos){
-            return ['code' => 0, 'msg' => '您已上麦', 'data' => null];
-        }
+//        if($pit_infos){
+//            return ['code' => 0, 'msg' => '您已上麦', 'data' => null];
+//        }
 
         if($room_info['label_id'] == 5 && $room_info['step'] != 1 && $pit_number < 9){
             return ['code' => 0, 'msg' => '交友房 此阶段不可操作', 'data' => null];
@@ -235,11 +235,31 @@ class RoomPit extends Model
             }
             //换麦使用
             if(isset($pit_infos) && $pit_infos['pit_number'] > 0){
-                //下麦
-                $dow = $this ->DownPit($user_id,$room_id,$pit_infos['pit_number']);
-                if($dow['code'] != 1){
-                    return ['code' => 0, 'msg' => '操作失败', 'data' => null];
+//                //下麦
+//                $dow = $this ->DownPit($user_id,$room_id,$pit_infos['pit_number']);
+//                if($dow['code'] != 1){
+//                    return ['code' => 0, 'msg' => '操作失败', 'data' => null];
+//                }
+                $exchange = db::name('vs_room_pit')->where(['room_id' => $room_id, 'user_id' => $user_id])->update(['pit_number' => $pit_number]);
+                if(!$exchange){
+                    return ['code' => 0, 'msg' => '换麦失败', 'data' => null];
                 }
+                $FromUserInfo = db::name('user')->where('id',$user_id)->field('id as user_id,nickname,avatar,sex')->find();
+                $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($user_id);//财富图标
+                $FromUserInfo['icon'][1] = model('UserData')->user_charm_icon($user_id);//魅力图标
+                $FromUserInfo['dress'] =  model('Decorate')->user_decorate_detail($user_id,1);
+                $FromUserInfo['charm'] =  db::name('vs_room_user_charm')->where(['user_id' => $user_id,'room_id' => $room_id])->value('charm');
+                if($pit_number == 9){
+                    $pit_text = '主持麦';
+                }elseif ($pit_number == 10) {
+                    $pit_text = '嘉宾麦';
+                }else{
+                    $pit_text = $pit_number . '号麦';
+                }
+                $text['text'] = $FromUserInfo['nickname'].' 换到 ' . $pit_text;
+                $text['FromUserInfo'] = $FromUserInfo;
+                model('Chat')->sendMsg(1039,$room_id,$text);
+                return ['code' => 1, 'msg' => '上麦成功', 'data' => null];
             }
             $ompit = $this->OnPit($user_id,$room_id,$pit_number);//用户上了这个房间的几号麦位
             if($ompit['code'] != 1){