From d4d536e9b6c585153dd6e77f80314856dd76c8e4 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Tue, 23 Apr 2019 18:46:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(#IVRNQ):=20=E5=A2=9E=E5=8A=A0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=AE=A4=E8=AF=81=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#Issue
https://gitee.com/LongbowEnterprise/dashboard/issues?id=IVRNQ

#Comment
close #IVRNQ
---
 .../Controllers/AccountController.cs          |  4 +--
 Bootstrap.Admin/Models/LoginModel.cs          | 13 +++++++---
 Bootstrap.Admin/Views/Account/Login.cshtml    |  8 ++++++
 .../wwwroot/css/login-responsive.css          | 14 ++++++----
 Bootstrap.Admin/wwwroot/css/login.css         | 26 +++++++++----------
 5 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/Bootstrap.Admin/Controllers/AccountController.cs b/Bootstrap.Admin/Controllers/AccountController.cs
index 93dccc9b..f267a050 100644
--- a/Bootstrap.Admin/Controllers/AccountController.cs
+++ b/Bootstrap.Admin/Controllers/AccountController.cs
@@ -56,8 +56,8 @@ namespace Bootstrap.Admin.Controllers
                 // redirect origin url
                 var originUrl = Request.Query[CookieAuthenticationDefaults.ReturnUrlParameter].FirstOrDefault() ?? "~/Home/Index";
                 return Redirect(originUrl);
-            }
-            return View("Login", new LoginModel());
+            }
+            return View("Login", new LoginModel() { AuthFailed = true });
         }
 
         /// <summary>
diff --git a/Bootstrap.Admin/Models/LoginModel.cs b/Bootstrap.Admin/Models/LoginModel.cs
index af634097..51927862 100644
--- a/Bootstrap.Admin/Models/LoginModel.cs
+++ b/Bootstrap.Admin/Models/LoginModel.cs
@@ -14,10 +14,15 @@ namespace Bootstrap.Admin.Models
         {
             ImageLibUrl = DictHelper.RetrieveImagesLibUrl();
         }
-
-        /// <summary>
-        /// 验证码图床地址
-        /// </summary>
+
+        /// <summary>
+        /// 验证码图床地址
+        /// </summary>
         public string ImageLibUrl { get; protected set; }
+
+        /// <summary>
+        /// 是否登录认证失败
+        /// </summary>
+        public bool AuthFailed { get; set; }
     }
 }
diff --git a/Bootstrap.Admin/Views/Account/Login.cshtml b/Bootstrap.Admin/Views/Account/Login.cshtml
index 1d13da13..170de7f6 100644
--- a/Bootstrap.Admin/Views/Account/Login.cshtml
+++ b/Bootstrap.Admin/Views/Account/Login.cshtml
@@ -46,6 +46,14 @@
     <form id="login" method="post" class="form-signin">
         <h2 class="form-signin-heading">@Model.Title</h2>
         <div class="login-wrap" data-toggle="LgbValidate" data-valid-button="button[type='submit']">
+            @if (Model.AuthFailed)
+            {
+                <div class="alert alert-danger">用户名或密码错误！</div>
+            }
+            else
+            {
+                <div class="alert alert-success">请输入用户名与密码</div>
+            }
             <div class="form-group">
                 <div class="input-group">
                     <div class="input-group-prepend">
diff --git a/Bootstrap.Admin/wwwroot/css/login-responsive.css b/Bootstrap.Admin/wwwroot/css/login-responsive.css
index 2270eb48..bfa54065 100644
--- a/Bootstrap.Admin/wwwroot/css/login-responsive.css
+++ b/Bootstrap.Admin/wwwroot/css/login-responsive.css
@@ -31,17 +31,21 @@
 
     .login-wrap {
         padding: 0;
-        margin: 36px 0 0 370px;
+        margin: 12px 0 0 370px;
         width: 280px;
     }
 
     .slidercaptcha {
-        top: -254px;
+        top: -282px;
         left: -15px;
     }
 
-    .slidercaptcha, .slidercaptcha.forgot {
-        width: 310px;
-        height: 280px;
+        .slidercaptcha, .slidercaptcha.forgot {
+            width: 310px;
+            height: 280px;
+        }
+
+    .form-signin .form-group {
+        margin-bottom: 0.75rem;
     }
 }
diff --git a/Bootstrap.Admin/wwwroot/css/login.css b/Bootstrap.Admin/wwwroot/css/login.css
index 28328ef2..e3a24297 100644
--- a/Bootstrap.Admin/wwwroot/css/login.css
+++ b/Bootstrap.Admin/wwwroot/css/login.css
@@ -14,7 +14,7 @@
 
 .login-wrap {
     padding: 20px;
-    height: 270px;
+    height: 330px;
 }
 
     .login-wrap .rememberPwd {
@@ -87,16 +87,16 @@
             color: #fff;
         }
 
-.slidercaptcha.forgot {
-    position: absolute;
-    left: auto;
-    right: 14px;
-    bottom: 14px;
-    top: auto;
-    margin: 0;
-    width: 274px;
-}
+    .slidercaptcha.forgot {
+        position: absolute;
+        left: auto;
+        right: 14px;
+        bottom: 14px;
+        top: auto;
+        margin: 0;
+        width: 274px;
+    }
 
-.slidercaptcha.reg {
-    bottom: 60px;
-}
\ No newline at end of file
+    .slidercaptcha.reg {
+        bottom: 60px;
+    }