Merge branch 'dev'

zhaoxiaohao

2020-11-17 b7265cdd6f3e1fbb0d428c27e5b5e29e34d56953

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/login.html

@@ -100,18 +100,19 @@
                success: function (data) {
                    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();
                }
            });
            //阻止表单跳转
@@ -126,9 +127,6 @@
        $('.login-captcha').click(function () {
            this.src = this.src + '?t=' + (new Date).getTime();
        });



    });
</script>
</body>