diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 9d6dbba..188422c 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -90,7 +90,7 @@ class Friend extends Model
             ->order('heart_value DESC')->find();
         $friend_heart_value = get_system_config_value('friend_heart_value');
         if($originalPairs && $originalPairs['heart_value'] >= $friend_heart_value){
-            $return['is_cp'] = 1;
+            $return['is_cp'] = 1;//卡关系
             $step = 3;//结束进入牵手良缘卡关系
             //心动值达到伐值 返回用户信息与关系列表
             $return['user1_id'] =$originalPairs['user1_id'];
@@ -103,7 +103,7 @@ class Friend extends Model
             $return['heart_id'] = $originalPairs['id'];
         }else{
             $return = [];
-            $return['is_cp'] = 0;
+            $return['is_cp'] = 0;//不卡关系
             $step = 1;//结束下一轮
            //所有人下麦
             $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();
@@ -188,7 +188,7 @@ class Friend extends Model
             $text['text'] = '交友结束';
             $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             model('api/Chat')->sendMsg(1039,$room_id,$text);
-            return ['code' => 1, 'msg' => '创建关系成功', 'data' => ['id' => $room_id['data'],'end_time' =>get_system_config_value('friend_room_timea')]];
+            return ['code' => 1, 'msg' => '创建关系成功', 'data' => null];
         } else {
             return ['code' => 0, 'msg' => '创建关系失败！', 'data' => null];
         }
@@ -199,11 +199,14 @@ class Friend extends Model
     public function outRoom($user_id,$room_id){
         //查询在房间的用户
         $users = db::name('vs_room_visitor')->where(['room_id'=>$room_id])->select();
-
-        //退出房间
-        foreach ($users as $v){
+        if($users){
             //退出房间
-            model('Room')->quit_room($v['user_id'], $room_id,$v['user_id']);
+            foreach ($users as $v){
+                //退出房间
+                model('Room')->quit_room($v['user_id'], $room_id,$v['user_id']);
+            }
+        }else{
+            model('Room')->quit_room($user_id, $room_id,$user_id);
         }
 
         //注销房间