diff --git a/application/api/controller/BarRoom.php b/application/api/controller/BarRoom.php
index e78808a0..180d11f2 100644
--- a/application/api/controller/BarRoom.php
+++ b/application/api/controller/BarRoom.php
@@ -13,6 +13,8 @@ class BarRoom extends BaseCom
         $reslut = model('BarRoom')->get_pit_duration_list();
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
+
+
     //房间麦位时长设置
     public function set_pit_time(){
         $room_id = input('room_id', 0);
@@ -35,6 +37,7 @@ class BarRoom extends BaseCom
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 
+
     //约Ta礼物详情
     public function get_gift_info_ta(){
         $room_id = input('room_id', 0);
@@ -43,6 +46,7 @@ class BarRoom extends BaseCom
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 
+
     //撩TA
     public function liao_ta(){
         $room_id = input('room_id', 0);
@@ -57,4 +61,12 @@ class BarRoom extends BaseCom
 
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
+
+
+    //约TA
+    public function meeting_ta(){
+        $room_id = input('room_id', 0);
+        $reslut = model('BarRoom')->get_gift_info_ta_list($room_id);
+        return V($reslut['code'], $reslut['msg'], $reslut['data']);
+    }
 }
\ No newline at end of file
diff --git a/application/api/model/BarRoom.php b/application/api/model/BarRoom.php
index 6285589f..057cd581 100644
--- a/application/api/model/BarRoom.php
+++ b/application/api/model/BarRoom.php
@@ -36,6 +36,9 @@ class BarRoom extends Model
        }
         return ['code' => 1, 'msg' => '获取成功', 'data' => $list];
     }
+
+
+
     //实在房间麦位时长
     public function set_pit_duration($room_id,$time){
         $room = db::name('vs_room')->where(['id' => $room_id, 'delete_time' => 0, 'room_status' => 1])->find();
@@ -56,6 +59,9 @@ class BarRoom extends Model
         //推送麦位时长
         return ['code' => 1, 'msg' => '成功', 'data' => null];
     }
+
+
+
     //上麦选择礼物
     public function join_pit_choose_gift($user_id,$room_id,$gift_id){
         $pit_gift = db::name('vs_room_bar_pit_gift')->where(['room_id' => $room_id,'user_id' => $user_id])->find();
@@ -86,6 +92,9 @@ class BarRoom extends Model
         }
         return ['code' => 1, 'msg' => '成功', 'data' => null];
     }
+
+
+
     //约Ta礼物详情
     public function get_gift_info_ta($user_id,$room_id){
         $return_data = [];
@@ -104,6 +113,9 @@ class BarRoom extends Model
         }
         return ['code' => 1, 'msg' => '成功', 'data' => $return_data];
     }
+
+
+
     //撩TA
     public function liao_ta($room_id,$user_id,$to_user_id){
         //查询撩TA礼物
@@ -116,6 +128,9 @@ class BarRoom extends Model
         }
         return ['code' => 1, 'msg' => '成功', 'data' => null];
     }
+
+
+
     //一键全撩
     public function one_key_liao_ta($room_id,$user_id){
         //查询撩TA礼物
@@ -127,13 +142,12 @@ class BarRoom extends Model
             return ['code' => 0, 'msg' => '没有麦上用户', 'data' => null];
         }
         $to_user_ids = [];
-        $userInfos = [];
-        if($room_pit_Users){
-            foreach ($room_pit_Users as $key => $value) {
-                //调用送礼接口
-                $to_user_ids[] = $value;
-            }
+
+        foreach ($room_pit_Users as $key => $value) {
+            //调用送礼接口
+            $to_user_ids[] = $value;
         }
+
         $to_user_ids = implode(',',$to_user_ids);
         $re = model("api/send_gift")->send_gift($user_id,$to_user_ids,$liao_ta_gif_id,1,1,$room_id);
         if($re['code'] != 1){
@@ -142,6 +156,7 @@ class BarRoom extends Model
         return ['code' => 1, 'msg' => '成功', 'data' => null];
     }
 
+
     //获取撩TA礼物
     public function get_liao_ta_gift(){
         $cache_key = 'gift_list_17';