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){