diff --git a/application/adminapi/controller/User.php b/application/adminapi/controller/User.php
index fd167363..a9819ca1 100644
--- a/application/adminapi/controller/User.php
+++ b/application/adminapi/controller/User.php
@@ -36,7 +36,7 @@ class User extends adminApi
         $search_str = input('search', '');
         $search_user_code = input('search_user_code', '');
         $where['a.is_robot'] =0;
-        $where['a.delete_time'] = 0;
+//        $where['a.delete_time'] = 0;
         //如果是手机号查手机号
         if($search_str !==''){
             if(is_numeric($search_str)) {
@@ -112,7 +112,14 @@ class User extends adminApi
             ->field($field)
             ->order('a.id desc')->count();
         foreach ($lists as $key => $value) {
-            $lists[$key]['status_str'] = $value['status'] == 1 ? '正常' : '禁用';
+            if($value['status'] == 1){
+                $lists[$key]['status_str'] ='正常';
+            }elseif($value['status'] == 2){
+                $lists[$key]['status_str'] ='禁用';
+            }else{
+                $lists[$key]['status_str'] ='注销';
+            }
+
             $lists[$key]['is_real_str'] = $value['is_real'] == 1 ? '已实名' : '未实名';
             //禁用状态
             //1:禁用账号 2:禁用设备号 3:禁用IP
@@ -779,4 +786,78 @@ class User extends adminApi
         $user = db::name('user')->field('id,nickname,avatar')->where($where)->where(['status'=>1,'is_robot'=>0,'delete_time'=>0])->select();
         return V(1,"操作成功", $user);
     }
+
+
+
+    //注销用户找回
+    public function cancel_user(){
+        $mobile = input('mobile', 0);
+
+        if (!$mobile){
+            return V(0, "手机号不能为空");
+        }
+        $user = db::name('user')->where(['mobile'=>$mobile,'delete_time' => ['<>',0],'status'=>0])->find();
+        if (!$user){
+            return V(0, "该手机号未注销");
+        }
+        $user_count = db::name('user')->where(['mobile'=>$mobile,'delete_time' => 0])->count();
+        if ($user_count > 3){
+            return V(0, "该手机号绑定账号超限了");
+        }
+        $user_del = db::name('user')->where(['mobile'=>$mobile,'delete_time' => ['<>',0]])->count();
+        if ($user_del > 1){
+            return V(0, "相关注销超过1个，暂不支持找回");
+        }
+        //开启事务
+        db::startTrans();
+        try{
+            $user_id = db::name('user')->where(['mobile'=>$mobile,'delete_time' => ['<>',0]])->value('id');
+            db::name('user')->where(['id'=>$user_id])->update([
+                'delete_time' => 0,
+                'status' => 1,
+                'nickname' => '游客_'.$user_id.rand(1000,9999),
+                'avatar' => get_system_config_value('web_site').'/data/avatar/head_pic.png',
+                'updatetime' => time(),
+            ]);
+            db::name('user_data')->where(['user_id'=>$user_id])->update([
+                'deletetime' => 0,
+                'updatetime' => time(),
+            ]);
+            //查询创建的房间
+            $room_list = db::name('vs_room')->where(['user_id'=>$user_id,'type_id' => ['<>',6]])->find();
+            if($room_list){
+                db::name('vs_room')->where(['id'=>$room_list['id']])->update([
+                    'room_status' => 1,
+                    'updatetime' => time(),
+                ]);
+            }
+            //查他的钱包
+            $wallet = db::name('user_wallet')->where(['user_id'=>$user_id])->find();
+            if($wallet){
+                db::name('user_wallet')->where(['id'=>$wallet['id']])->update([
+                    'coin' => 0,
+                    'earnings' => 0,
+                    'updatetime' => time(),
+                ]);
+            }
+            //他的装扮
+            $dress = db::name('vs_user_decorate')->where(['user_id'=>$user_id])->select();
+            if($dress){
+                foreach ($dress as $key => $value) {
+                    if($value['end_time'] > time()){
+                        db::name('vs_user_decorate')->where(['id'=>$value['id']])->update([
+                            'is_perpetual' => 2,
+                            'end_time' => time(),
+                            'updatetime' => time(),
+                        ]);
+                    }
+                }
+            }
+            db::commit();
+            return V(1,"操作成功", null);
+        }catch (\Exception $e){
+            db::rollback();
+            return V(0, "操作失败,".$e->getMessage());
+        }
+    }
 }
\ No newline at end of file
diff --git a/application/api/model/Login.php b/application/api/model/Login.php
index 42d38036..05c36fc9 100644
--- a/application/api/model/Login.php
+++ b/application/api/model/Login.php
@@ -46,9 +46,9 @@ class Login extends Model
         $data['mobile'] = $user_name;
         $data['nickname'] = '游客'.$user_code;
         $data['joinip'] = $login_ip;
-        $data['birthday'] = date('Y-m-d');
+        $data['birthday'] = '1990-01-01';
         $data['avatar'] = get_system_config_value('web_site').'/data/avatar/head_pic.png';
-        $data['profile'] = '这个人很懒，什么都没写';
+        $data['profile'] = '这个人很佛系，什么都没写';
         $data['system'] = $system;
         $data['login_device'] = $login_device;
         $data['createtime'] = time();