From 992acb62de2fb5ea830e9ccf1d46973598dbbcfc Mon Sep 17 00:00:00 2001 From: maxitio Date: Tue, 27 Aug 2019 19:03:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E9=A1=B5?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E6=9E=81=E9=AA=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=AC=AC=E4=BA=8C=E6=AC=A1=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- resources/views/malio/auth/login.tpl | 52 ++++++++++++------------- resources/views/malio/auth/register.tpl | 12 +++--- 3 files changed, 32 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index 129417d8..68e0f6ca 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # 请勿泄露源码给他人 -# 不能删除页面底部的 Powered by SSPANEL. Theme by editXY +# 不能删改页面底部的 Powered by SSPANEL. Theme by editXY,不能删改staff页面的任何信息。 ## 安装 在网站目录下 `git clone -b malio https://gitlab.com/maxitio/malio-theme-for-sspanel.git tmp && mv tmp/.git . && rm -rf tmp && git reset --hard` diff --git a/resources/views/malio/auth/login.tpl b/resources/views/malio/auth/login.tpl index 4ed92ab1..7679bc77 100644 --- a/resources/views/malio/auth/login.tpl +++ b/resources/views/malio/auth/login.tpl @@ -233,6 +233,27 @@ + {if $geetest_html != null} + + + {/if} + {/if} -{if $geetest_html != null} - - -{/if} {if $recaptcha_sitekey != null} {/if} diff --git a/resources/views/malio/auth/register.tpl b/resources/views/malio/auth/register.tpl index 8bfe431b..f5301387 100644 --- a/resources/views/malio/auth/register.tpl +++ b/resources/views/malio/auth/register.tpl @@ -281,12 +281,10 @@ // eof vaildation {if $geetest_html != null} - if (typeof validate == 'undefined') { - swal('请验证身份', '请滑动验证码来完成验证。', 'error'); - return; - } - if (!validate) { - swal('请验证身份', '请滑动验证码来完成验证。', 'error'); + validate = captcha.getValidate(); + if (typeof validate === 'undefined' || !validate) { + swal('请验证身份', '请滑动验证码来完成验证。', 'info'); + $('#register-confirm').removeAttr("disabled","disabled") return; } {/if} @@ -337,7 +335,7 @@ } else { $('#register-confirm').removeAttr("disabled") {if $geetest_html != null} - captcha.refresh(); + captcha.reset(); {/if} $("#code").val(code); swal({