From 848a121689223deca4dfb2d7b87704dfce32ac10 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Sun, 6 Nov 2016 01:11:50 +0800
Subject: [PATCH] =?UTF-8?q?modified=20Ajax=E6=8F=90=E4=BA=A4=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E8=AF=86=E5=88=AB=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=9A=84BUG=20finish=20=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=8C=E6=88=90=E5=92=8C=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E7=9A=84=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Base.php   | 2 +-
 application/admin/controller/User.php   | 8 ++------
 application/admin/view/user/login.html  | 2 +-
 public/static/admin/dist/js/template.js | 9 +++++----
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php
index 7f86dc5..8ecc955 100644
--- a/application/admin/controller/Base.php
+++ b/application/admin/controller/Base.php
@@ -10,7 +10,7 @@ use think\Controller;
 
 class Base extends Controller {
 
-    protected $primaryKey;
+    public $primaryKey;
 
     public function _initialize(){
         $this->primaryKey = config('SQL_PRIMARY_KEY');
diff --git a/application/admin/controller/User.php b/application/admin/controller/User.php
index e22ca57..3a8a707 100644
--- a/application/admin/controller/User.php
+++ b/application/admin/controller/User.php
@@ -32,21 +32,18 @@ class User extends Base {
                 return $this->error('用户名或者密码错误！');
             }else{
                 if( $userInfo['status'] ){
-
                     //保存用户信息和登录凭证
-                    cache($userInfo[$this->primaryKey], session_id(), config('online_time'));
                     session('uid', $userInfo[$this->primaryKey]);
-
+                    cache($userInfo[$this->primaryKey], session_id(), config('online_time'));
                     //获取跳转链接，做到从哪来到哪去
                     if( $request->has('from', 'get') ){
                         $url = $request->get('from');
                     }else{
                         $url = url('Index/index');
                     }
-
                     //更新用户数据
                     $userData = UserData::get(['uid' => $userInfo[$this->primaryKey]]);
-                    if( $userData->uid ){
+                    if( $userData ){
                         $userData->loginTimes += 1;
                         $userData->save();
                     }else{
@@ -55,7 +52,6 @@ class User extends Base {
                         $newUserData->uid = $userInfo[$this->primaryKey];
                         $newUserData->save();
                     }
-
                     return $this->success('登录成功', $url);
                 }else{
                     return $this->error('用户已被封禁，请联系管理员');
diff --git a/application/admin/view/user/login.html b/application/admin/view/user/login.html
index f0ca5b0..102cb41 100644
--- a/application/admin/view/user/login.html
+++ b/application/admin/view/user/login.html
@@ -20,7 +20,7 @@
     </div>
     <div class="login-box-body">
         <p class="login-box-msg">
-            <span class="label label-info">请填写您的账号和密码</span>
+            <span class="label label-info">请填写您的账号和密码（admin/123123）</span>
         </p>
 
         <form action="{:url('User/login')}" id="form-login">
diff --git a/public/static/admin/dist/js/template.js b/public/static/admin/dist/js/template.js
index 7a8542e..26eaf55 100644
--- a/public/static/admin/dist/js/template.js
+++ b/public/static/admin/dist/js/template.js
@@ -31,7 +31,7 @@
         });
         setTimeout(function(){
             dialog.modal('hide');
-        }, 2000);
+        }, 3000);
     };
 
     $.buildDom = function ( jsonStr ) {
@@ -87,20 +87,21 @@
             query = form.serialize();
             target = form.attr('action');
             $.post(target, query).success(function(data) {
-                if (data.status == 1) {
+                if (data.code == 1) {
                     if (data.url) {
-                        message = data.msg + ' 页面即将自动跳转~';
+                        message = data.msg + ' 页面即将自动跳转...';
                     } else {
                         message = data.msg;
                     }
                     $.alertMsg(message);
+                    var wait = 1000*data.wait;
                     setTimeout(function() {
                         if (data.url) {
                             location.href = data.url;
                         } else {
                             location.reload();
                         }
-                    }, 2000);
+                    }, wait);
                 } else {
                     $.alertMsg(data.msg);
                 }