Merge remote-tracking branch 'origin/master'

puzhibing

2023-02-16 b3ec53a9da0c09dd03da33bfc27f278d13a5d8f9

 management/guns-admin/src/main/webapp/WEB-INF/view/login.html

@@ -4,7 +4,7 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">

    <title>OK出行 - 登录</title>
    <title>超省新代驾 - 登录</title>

    <link rel="shortcut icon" href="${ctxPath}/static/favicon1.ico">
    <link href="${ctxPath}/static/css/bootstrap.min.css?v=3.3.6" rel="stylesheet">
@@ -55,31 +55,34 @@
<div style="display: flex;align-items: center;justify-content: center;height: 100%">


<img src="${ctxPath}/static/img/index4.png" style="width: 300px;height: 400px;z-index: 1000">
<!--<img src="${ctxPath}/static/img/index4.png" style="width: 300px;height: 400px;z-index: 1000">-->
<div  style="position: relative;left: -20px; max-width: 300px;min-height: 300px;background: white;border-radius: 8px;box-sizing: border-box;padding: 0 30px 0 50px;display: flex;align-items: center;justify-content: center;">
    <div style="max-height: 100%">
        <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/>&nbsp;OK出行管理后台</h3>
        <h3 style="color: black;"><img src="${ctxPath}/static/img/logo.png" width="30px" height="30px"/>&nbsp;超省新代驾管理后台</h3>
        <br/>
        <h4 style="color: red;">${tips!}</h4>
        <form class="m-t" role="form" action="${ctxPath}/login" method="post">
            <div class="item">
                <img src="${ctxPath}/static/img/account.png" />
                <input hidden id="number" value="${number}">
                <input class="itemInput" type="text" name="username" id="username"  placeholder="请输入您的账号" required="" value="">
            </div>
            <div  class="item">
                <img src="${ctxPath}/static/img/password.png" />
                <input class="itemInput" type="password" name="password" id="password"  placeholder="请输入您的密码" required="" value="">
            </div>
            @if(kaptcha.getKaptchaOnOff() == true){
            <div class="form-group" style="float: left;">
                <div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
                    <input class="form-control" type="text" name="kaptcha" placeholder="验证码" required="">
                </div>
                <div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
                    <img src="${ctxPath}/kaptcha" id="kaptcha" width="100%" height="100%"/>
                </div>
            <div id="verify" style="display: none">
                    @if(kaptcha.getKaptchaOnOff() == true){
                    <div class="form-group" style="float: left;">
                        <div class="col-sm-8" style="padding-left: 0px; padding-right: 0px;">
                            <input class="form-control" type="text" name="kaptcha" id="verifyNumber"  placeholder="验证码" >
                        </div>
                        <div class="col-sm-4" style="padding-left: 0px; padding-right: 0px;">
                            <img src="${ctxPath}/kaptcha" id="kaptcha" width="100%" height="100%"/>
                        </div>
                    </div>
                @}
            </div>
            @}
            <div class="form-group" style="float: left;">
                <div class="checkbox" style="text-align: left">
                    <!--<label>
@@ -100,6 +103,15 @@
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    $(function () {
        console.log($("#number").val())
        if($("#number").val()==5){
            document.getElementById("verifyNumber").setAttribute("required","")
            $("#verify").show()
        }else {
            $("#number").val(0)
            $("#verify").hide()
        }

        $("#kaptcha").on('click', function () {
            $("#kaptcha").attr('src', '${ctxPath}/kaptcha?' + Math.floor(Math.random() * 100)).fadeIn();
        });