提交 c549cb5c authored 作者: chengye's avatar chengye

调整登录返回信息格式为Json

上级 f0d70e61
...@@ -32,7 +32,7 @@ class Login extends Controller ...@@ -32,7 +32,7 @@ class Login extends Controller
'status' => 0, 'status' => 0,
'message' => $validate->getError() 'message' => $validate->getError()
]; ];
return json($data); return $data;
} }
$captcha = new Captcha(); $captcha = new Captcha();
if( !$captcha->check($request->post('verify'))) if( !$captcha->check($request->post('verify')))
...@@ -41,7 +41,7 @@ class Login extends Controller ...@@ -41,7 +41,7 @@ class Login extends Controller
'status' => 0, 'status' => 0,
'message' => '验证码错误' 'message' => '验证码错误'
]; ];
return json($data); return $data;
} }
//如果是邮箱 //如果是邮箱
if(preg_match($pattern,$request->post('name'))){ if(preg_match($pattern,$request->post('name'))){
...@@ -60,10 +60,10 @@ class Login extends Controller ...@@ -60,10 +60,10 @@ class Login extends Controller
$captcha->useNoise = true; $captcha->useNoise = true;
$captcha->imageH=0; $captcha->imageH=0;
$captcha->imageW=0; $captcha->imageW=0;
return $captcha->entry(); return $captcha->entry();
} }
public function loginOut() public function loginOut()
{ {
session(null); session(null);
...@@ -81,7 +81,7 @@ class Login extends Controller ...@@ -81,7 +81,7 @@ class Login extends Controller
'status' => 0, 'status' => 0,
'message' => '用户不存在' 'message' => '用户不存在'
]; ];
return json($data); return $data;
} }
$status=(new StaffModel)->getStaffStatusByName($email); $status=(new StaffModel)->getStaffStatusByName($email);
if(!$status['status']==1){ if(!$status['status']==1){
...@@ -89,7 +89,7 @@ class Login extends Controller ...@@ -89,7 +89,7 @@ class Login extends Controller
'status' => 0, 'status' => 0,
'message' => '该账户当前禁用,请联系管理员开启' 'message' => '该账户当前禁用,请联系管理员开启'
]; ];
return json($data); return $data;
} }
if(decrypt($passwd) == $staff->passwd->passwd){ if(decrypt($passwd) == $staff->passwd->passwd){
$user = [ $user = [
...@@ -106,7 +106,7 @@ class Login extends Controller ...@@ -106,7 +106,7 @@ class Login extends Controller
'status' => 0, 'status' => 0,
'message' => '用户名或密码错误' 'message' => '用户名或密码错误'
]; ];
return json($data); return $data;
} }
} }
...@@ -121,7 +121,7 @@ class Login extends Controller ...@@ -121,7 +121,7 @@ class Login extends Controller
'status' => 0, 'status' => 0,
'message' => '用户名或密码错误' 'message' => '用户名或密码错误'
]; ];
return json($data); return $data;
} else { } else {
loginlog($admin->name,$admin->id,'管理员用户成功登录系统',1); loginlog($admin->name,$admin->id,'管理员用户成功登录系统',1);
$user = [ $user = [
...@@ -156,7 +156,7 @@ class Login extends Controller ...@@ -156,7 +156,7 @@ class Login extends Controller
//存储到redis //存储到redis
Cache::store('redis')->set($encryptKey,json_encode($user),3600); Cache::store('redis')->set($encryptKey,json_encode($user),3600);
return json($data); return $data;
} }
private function getRandomStr($length = 10){ private function getRandomStr($length = 10){
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
data: data.field, data: data.field,
dataType: "json", dataType: "json",
success: function (data) { success: function (data) {
console.log(data);return;
if(data.status == 1){ if(data.status == 1){
layer.alert(data.message, { layer.alert(data.message, {
icon: 6 icon: 6
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论