From 7ed70bc85d30fd50098a614e0591f5340dbea9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Mon, 11 Sep 2023 14:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E9=AA=8C=E8=AF=81=E7=A0=81=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/js/api/index.js | 1 + static/js/project/user/login.js | 115 ++++++++++++++++++++++++-------- view/login/login.html | 2 +- 3 files changed, 89 insertions(+), 29 deletions(-) diff --git a/static/js/api/index.js b/static/js/api/index.js index 583fb45..6b36922 100644 --- a/static/js/api/index.js +++ b/static/js/api/index.js @@ -4,6 +4,7 @@ var captchaImage_get = '/gkyzm'; //图形验证码接口 var getSmsCode = '/sms/code'; //手机验证码接口 var login_post = '/login'; //用户登录接口 +var login_sms_post = '/sms/login'; //用户手机验证码登录接口 var getInfo_get = '/getInfo' //获取用户信息 diff --git a/static/js/project/user/login.js b/static/js/project/user/login.js index ca23127..6d22c26 100644 --- a/static/js/project/user/login.js +++ b/static/js/project/user/login.js @@ -1,14 +1,15 @@ /** * Created by admin on 2021/4/5. - * + * */ define(['jquery', "Tools","user"], function ($, Tools) { //数据存储 var module = { uuid: '', //验证码uuid computeTime:60, - timer:null + timer:null, + loginType:'login' }; //自定义公共方法 var tools = new Tools(); @@ -39,6 +40,7 @@ define(['jquery', "Tools","user"], function ($, Tools) { module.getSmsCode = function () { var mobile = $('#mobile').val(); + tools.doPost(getSmsCode, {mobile:mobile,code:$('#mobileCode').val(),uuid:module.uuid}, module.getSmsCodeAjax, true) } @@ -69,8 +71,10 @@ define(['jquery', "Tools","user"], function ($, Tools) { //登录方式切换 loginTab = function(type){ document.getElementById('loginTab').style.display = 'none' + document.getElementById('remberPsw').style.display = 'none' document.getElementById('phoneTab').style.display = 'none' document.getElementById(type+'Tab').style.display = 'block' + module.loginType = type; if (type == 'phone'){ //图形验证码加载 @@ -80,6 +84,7 @@ define(['jquery', "Tools","user"], function ($, Tools) { if (type == 'login'){ //图形验证码加载 module.verificationCode() + document.getElementById('remberPsw').style.display = 'block' } $('#loginBtn').attr('class','') @@ -115,14 +120,30 @@ define(['jquery', "Tools","user"], function ($, Tools) { module.login = function () { if (module.check()) { var data = {}; + var usernameVal = tools.encrypt($('#username').val()); var passwordVal = tools.encrypt($('#password').val()); var codeVal = $('#code').val(); - data['username'] = usernameVal; - data['password'] = passwordVal; - data['code'] = codeVal; + + var mobile = $('#mobile').val(); + var mobileCode = $('#mobileCode').val(); + var smsCode = $('#smsCode').val(); + data['uuid'] = module.uuid; - tools.doPost(login_post, data, module.loginData, true) + + if(module.loginType == 'login'){ + data['username'] = usernameVal; + data['password'] = passwordVal; + data['code'] = codeVal; + tools.doPost(login_post, data, module.loginData, true) + } + + if(module.loginType == 'phone'){ + data['mobile'] = mobile; + data['smsCode'] = smsCode; + data['code'] = mobileCode; + tools.doPost(login_sms_post, data, module.loginData, true) + } } }; //手动验证表单 @@ -130,35 +151,73 @@ define(['jquery', "Tools","user"], function ($, Tools) { var usernameVal = $('#username').val(); var passwordVal = $('#password').val(); var codeVal = $('#code').val(); - /* 手机号 */ - if (usernameVal == '') { - $('#username')[0].focus() - tools.initTips('请输入用户名', 'right', $('#username')[0], 2000) - return false; - } - /* 密码 */ - if (passwordVal == '') { - $('#password')[0].focus() - tools.initTips('请输入密码', 'right', $('#password')[0], 2000) - return false; - } else if (parseInt(passwordVal.length) < 6 || parseInt(passwordVal.length) > 18) { - $('#password')[0].focus() - tools.initTips('请输入正确格式密码', 'right', $('#password')[0], 2000) - return false; + + var mobile = $('#mobile').val(); + var mobileCode = $('#mobileCode').val(); + var smsCode = $('#smsCode').val(); + + var type = module.loginType; + + if (type == 'login'){ + /* 手机号 */ + if (usernameVal == '') { + $('#username')[0].focus() + tools.initTips('请输入用户名', 'right', $('#username')[0], 2000) + return false; + } + /* 密码 */ + if (passwordVal == '') { + $('#password')[0].focus() + tools.initTips('请输入密码', 'right', $('#password')[0], 2000) + return false; + } else if (parseInt(passwordVal.length) < 6 || parseInt(passwordVal.length) > 18) { + $('#password')[0].focus() + tools.initTips('请输入正确格式密码', 'right', $('#password')[0], 2000) + return false; + } + /*图形验证码*/ + if (module.uuid == '' || codeVal == '') { + $('#code')[0].focus() + tools.initTips('请输入图形验证码', 'right', $('#code')[0], 2000) + return false; + } } - /*图形验证码*/ - if (module.uuid == '' || codeVal == '') { - $('#code')[0].focus() - tools.initTips('请输入图形验证码', 'right', $('#code')[0], 2000) - return false; + if (type == 'phone'){ + /* 手机号 */ + if (mobile == '') { + $('#mobile')[0].focus() + tools.initTips('请输入手机号码', 'right', $('#mobile')[0], 2000) + return false; + } + /*图形验证码*/ + if (module.uuid == '' || mobileCode == '') { + $('#mobileCode')[0].focus() + tools.initTips('请输入图形验证码', 'right', $('#mobileCode')[0], 2000) + return false; + } + /* 密码 */ + if (smsCode == '') { + $('#smsCode')[0].focus() + tools.initTips('请输入验证码', 'right', $('#smsCode')[0], 2000) + return false; + } } + + return true; } //登录校验 module.loginData = function (data) { console.log(data) if (data.code == 500) { - module.verificationCode() + + if (module.loginType == 'login'){ + module.verificationCode() + } + if (module.loginType == 'phone'){ + module.verificationCode1() + } + } else { tools.setCookie('Admin-Token', data.token, 24 * 60 * 60) //用户资料 @@ -195,4 +254,4 @@ define(['jquery', "Tools","user"], function ($, Tools) { } } return module; -}); \ No newline at end of file +}); diff --git a/view/login/login.html b/view/login/login.html index 7cde6c6..eac57a2 100644 --- a/view/login/login.html +++ b/view/login/login.html @@ -147,7 +147,7 @@ -
+
记住密码