Merge remote-tracking branch 'origin/master'

puzhibing

2023-05-16 4e8951a439c03e87568789cedeb62033884412db

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

@@ -64,7 +64,6 @@
        <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">
@@ -75,7 +74,7 @@
                    @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="验证码" >
                            <input class="form-control" type="text" name="kaptcha" id="verifyNumber"  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%"/>
@@ -103,13 +102,14 @@
<script src="${ctxPath}/static/crypto-js/crypto-js.js"></script>
<script>
    $(function () {
        if($("#number").val()==5){
            document.getElementById("verifyNumber").setAttribute("required","")
            $("#verify").show()
        }else {
            $("#number").val(0)
            $("#verify").hide()
        }
        // if($("#number").val()==5){
        //     document.getElementById("verifyNumber").setAttribute("required","")
        //     $("#verify").show()
        // }else {
        //     $("#number").val(0)
        //     $("#verify").hide()
        // }
        $("#verify").show()

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