From 640aef8810e217c82facb058da8358730d71e885 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Tue, 01 Sep 2020 16:52:50 +0800
Subject: [PATCH] 增加用户名密码有误,验证码有误等情况时候,重新刷新验证码的功能

---
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html
index 36d1a27..ff4eb0e 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html
@@ -60,9 +60,9 @@
 </div>
 <script type="text/javascript" src="module/apiUrl.js"></script>
 <script type="text/javascript" src="assets/libs/layui/layui.js"></script>
+<script type="text/javascript" src="module/aes.js"></script>
 <script type="text/javascript" src="assets/libs/login.js"></script>
 <script type="text/javascript" src="module/Math.uuid.js"></script>
-
 <script>
     layui.config({
         base: 'module/'
@@ -87,28 +87,32 @@
                 xhrFields: {
                     withCredentials: true
                 },
-                data: obj.field,
+                data: {
+                    deviceId :$("input[name='deviceId']").val(),
+                    password : getAesString($("input[name='password']").val()),
+                    username : getAesString($("input[name='username']").val()),
+                    validCode : $("input[name='validCode']").val()
+                },
                 type: 'POST',
                 beforeSend: function (xhr) {
-                    xhr.setRequestHeader('Authorization', 'Basic ' + window.btoa(config.clientId + ":" + config.clientSecret));
+                    xhr.setRequestHeader('Authorization', 'Basic ' + getAesString(config.clientId + ":" + config.clientSecret));
                 },
                 success: function (data) {
-                    // console.log(JSON.stringify(data));
-                    // debugger;
                     if (data.code === 0) {
                         config.putToken(data.data);
-                        layer.msg('登录成功', {icon: 1, time: 500}, function () {
+                        layer.msg('登录成功', {icon: 1, time: 2000}, function () {
                             location.replace('./');
                         });
                     } else {
                         layer.closeAll('loading');
-                        layer.msg(data.msg, {icon: 5, time: 500});
+                        layer.msg(data.msg, {icon: 5, time: 2000});
+                        $('.login-captcha').click();
                     }
                 },
                 error: function (xhr) {
-                    //console.log(xhr)
                     layer.closeAll('loading');
-                    layer.msg(xhr.responseJSON.msg, {icon: 5, time: 500});
+                    layer.msg(xhr.responseJSON.msg, {icon: 5, time: 2000});
+                        $('.login-captcha').click();
                 }
             });
             //阻止表单跳转
@@ -123,6 +127,9 @@
         $('.login-captcha').click(function () {
             this.src = this.src + '?t=' + (new Date).getTime();
         });
+
+
+
     });
 </script>
 </body>

--
Gitblit v1.8.0