登录处理

@@ -83,14 +83,10 @@ class LoginController extends HomeBaseController
 
             if($res){
 
-                if ($res['user_type'] == '2' and $res['student_type'] != '1'){
+                if (($res['user_type'] == '2' and $res['student_type'] != '1') or ($res['user_type'] == '2' and $res['user_status'] != '1') or $res['delete_time'] != '0'){
                     return json(['code'=>'0','msg'=>'抱歉，此用户没有权限登录']);
-                    //用户被拉黑
-                }elseif($res['user_status'] != '1'){
-                    return json(['code'=>'0','msg'=>'抱歉，用户禁止登陆']);
-                }elseif($res['delete_time'] != '0'){
-                    return json(['code'=>'0','msg'=>'抱歉，用户禁止登陆']);
                 }
+
                 //后台添加用户，微信登陆后合并数据
                 if($res['add_type'] == '2'){
                     $op_tel_info = Db::name('user')->where(['openid'=>session('openid'),'mobile'=>$mobile])->find();

@@ -19,7 +19,7 @@ class UserBaseController extends HomeBaseController
     {
         if(session('user.id')){
             $login_info = Db::name('user')->where(['id'=>session('user.id')])->find();
-            var_dump($login_info);
+
             if(!$login_info){
                 session('user.id',null);