diff --git a/application/api/model/Login.php b/application/api/model/Login.php
index abf07a7..8660d8f 100644
--- a/application/api/model/Login.php
+++ b/application/api/model/Login.php
@@ -107,16 +107,37 @@ class Login extends Model
         $block = db::name('block')->where(['type_text' => $user_info['id'],'type' => 1])->find();
 
         if ($block) {
-            return ['code' => 301, 'msg' => '用户已被封禁', 'data' => null];
+            if($block['block_time'] != 0 && $block['block_time'] <= time()){
+                db('block')->where(['id' => $block['id']])->delete();
+            }
+            if($block['block_time'] == 0){
+                return ['code' => 301, 'msg' => '用户已被永久封禁', 'data' => null];
+            }else{
+                return ['code' => 301, 'msg' => '用户已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null];
+            }
         }
         $block = db::name('block')->where(['type_text' => $login_device,'type' => 2])->find();
         if ($block) {
-            return ['code' => 301, 'msg' => '设备已被封禁', 'data' => null];
+            if($block['block_time'] != 0 && $block['block_time'] <= time()){
+                db('block')->where(['id' => $block['id']])->delete();
+            }
+            if($block['block_time'] == 0){
+                return ['code' => 301, 'msg' => '设备已被永久封禁', 'data' => null];
+            }else{
+                return ['code' => 301, 'msg' => '设备已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null];
+            }
         }
         $ip = request()->ip();
         $block = db::name('block')->where(['type_text' => $ip,'type' => 3])->find();
         if ($block) {
-            return ['code' => 301, 'msg' => 'ip已被封禁', 'data' => null];
+            if($block['block_time'] != 0 && $block['block_time'] <= time()){
+                db('block')->where(['id' => $block['id']])->delete();
+            }
+            if($block['block_time'] == 0){
+                return ['code' => 301, 'msg' => 'ip已被永久封禁', 'data' => null];
+            }else{
+                return ['code' => 301, 'msg' => 'ip已被封禁,解封时间:'.date('Y-m-d H:i:s',$block['block_time']), 'data' => null];
+            }
         }
 
         $save_data = [];
@@ -269,9 +290,6 @@ class Login extends Model
         if (empty($user_info)) {
             return ['code' => 0, 'msg' => '用户不存在', 'data' => null];
         }
-        if ($user_info['status'] != 1) {
-            return ['code' => 301, 'msg' => '用户被禁用,请联系管理员', 'data' => null];
-        }
 
         if (md5($password) != $user_info['password']) {
             return ['code' => 0, 'msg' => '密码错误', 'data' => null];