diff --git a/application/api/controller/Sms.php b/application/api/controller/Sms.php
index a6cbe74c..b67cfad2 100644
--- a/application/api/controller/Sms.php
+++ b/application/api/controller/Sms.php
@@ -34,8 +34,10 @@ class Sms extends Api
         //检测是否注销过
         $config_time = get_system_config_value('cancel_no_login');
         $is_del = db::name('user')->where(['mobile' => $mobile,'delete_time' => ['<>', 0]])->find();
-        if (time() - $is_del['delete_time'] < $config_time * 24 * 3600) {//30天内注销过
-            return V(0, '注销30天内，不可操作。');
+        if ($is_del) {
+            if (time() - $is_del['delete_time'] < $config_time * 24 * 3600) {//30天内注销过
+                return V(0, '注销30天内，不可操作。');
+            }
         }
 
         //频率控制
diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 190eef31..34fe04a4 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -167,7 +167,18 @@ class Friend extends Model
             ->where(['id'=>$friending_heart['id']])
             ->update(['status' => 3,'friend_config_id' =>$friending_config_id]);
         $msg = '';
-        if ($originalPairs) {
+        // 修改当前交友阶段
+        $res = db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
+        $res2 = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
+        if ($originalPairs && $res && $res2) {
+            //所有人下麦
+            $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();
+            if($on_pit){
+                foreach ($on_pit as $pit){
+                    model('RoomPit')->DownPit($pit['user_id'], $room_id,$pit['pit_number']);
+                }
+            }
+
             $relation = db::name('vs_relation')->where('id',$friending_config_id)->value('name');
             if($friending_heart['heart_value'] >= get_system_config_value('friend_heart_create_room') && $friending_config_id > 0){
                 //创建小房间
@@ -196,6 +207,7 @@ class Friend extends Model
             }else{
                 $text['text'] = '交友结束未创建房间';
             }
+
             $text['relation_name'] = $relation;
             $text['user1_id'] = $user1;
             $text['user2_id'] = $user2;
@@ -205,17 +217,6 @@ class Friend extends Model
             $text['user2_nickname'] = db::name('user')->where(['id'=>$user2])->value('nickname');
             model('api/Chat')->sendMsg(1051,$room_id,$text);
 
-            // 修改当前交友阶段
-            db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
-            db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
-            //所有人下麦
-            $on_pit = db::name('vs_room_pit')->where(['room_id' => $room_id, 'pit_number' => ['<',7],'user_id' => ['<>',0]])->select();
-            if($on_pit){
-                foreach ($on_pit as $pit){
-                    model('RoomPit')->DownPit($pit['user_id'], $room_id,$pit['pit_number']);
-                }
-            }
-
             $shijian = floor($friending_heart['heart_value']/get_system_config_value('friend_heart_value')) * get_system_config_value('friend_heart_times');
             $friendendtime = time() + $shijian * 3600;
 
@@ -226,17 +227,20 @@ class Friend extends Model
             $room_auction = model('RoomAuction')->room_auction_create_or_add($user1_id,$user2_id,$friending_config_id,$shijian*3600,0);
 
             //推送给前端消息
+            $text1['text'] = '交友结束';
+            $text1['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
+            model('api/Chat')->sendMsg(1049,$room_id,$text1);
+
+            return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null];
+        } else {
+            $ress = db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
+            $re2s = db::name('vs_room')->where(['id' => $room_id])->update(['step' => 1]);
+            //推送给前端消息
+            $text['status1'] = $ress.'<=>'.$re2s.'<=>'.$res.'<=>'.$res2.'<=>'.$originalPairs;
             $text['text'] = '交友结束';
             $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
             model('api/Chat')->sendMsg(1049,$room_id,$text);
 
-            return ['code' => 1, 'msg' => '创建关系成功!'.$msg, 'data' => null];
-        } else {
-            //推送给前端消息
-            $text['text'] = '交友结束';
-            $text['step'] = 1;//1 等待邂逅  2 心动连线  3  牵手良缘
-            model('api/Chat')->sendMsg(1049,$room_id,$text);
-            db::name('vs_user_friending')->where(['id' => $friend_id])->update(['status' => 2]);
             return ['code' => 0, 'msg' => '创建关系失败！', 'data' => null];
         }
     }