修改完成
This commit is contained in:
+10
-11
@@ -51,7 +51,7 @@
|
||||
<div class="error-message" id="passwordError"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group" id="captchaGroup">
|
||||
<div class="form-group" id="captchaGroup" style="display: none">
|
||||
<label for="captchaInput">验证码</label>
|
||||
<div class="captcha-row">
|
||||
<input
|
||||
@@ -119,6 +119,7 @@
|
||||
let layerInstance = null;
|
||||
let currentCaptchaId = "";
|
||||
let currentVerifyType = "captcha";
|
||||
let currentSlideToken = "";
|
||||
let currentSlideUuid = "";
|
||||
let currentSlideX = 0;
|
||||
|
||||
@@ -147,6 +148,7 @@
|
||||
}
|
||||
|
||||
function refreshCaptcha() {
|
||||
$("#captchaGroup").show();
|
||||
currentCaptchaId = "";
|
||||
currentSlideUuid = "";
|
||||
currentSlideX = 0;
|
||||
@@ -191,11 +193,13 @@
|
||||
function completeSlideCaptcha(result) {
|
||||
const data = result || {};
|
||||
const nested = data.data || {};
|
||||
currentSlideToken =
|
||||
data.slideToken || data.token || nested.slideToken || nested.token || "";
|
||||
currentSlideUuid =
|
||||
data.slideUuid || data.uuid || nested.slideUuid || nested.uuid || "";
|
||||
currentSlideX =
|
||||
Number(data.slideX || data.x || nested.slideX || nested.x || 0) || 0;
|
||||
if (!currentSlideUuid) {
|
||||
if (!currentSlideToken && !currentSlideUuid) {
|
||||
layerInstance.msg("滑动验证未返回凭证,请重试", { icon: 2 });
|
||||
renderSlideCaptchaEntry();
|
||||
return;
|
||||
@@ -216,6 +220,7 @@
|
||||
headers: ApiClient.publicHeaders(),
|
||||
onSuccess: completeSlideCaptcha,
|
||||
onCancel: function () {
|
||||
currentSlideToken = "";
|
||||
currentSlideUuid = "";
|
||||
currentSlideX = 0;
|
||||
},
|
||||
@@ -276,12 +281,13 @@
|
||||
|
||||
function getVerifyParams(show) {
|
||||
if (currentVerifyType === "slide") {
|
||||
if (!currentSlideUuid) {
|
||||
if (!currentSlideToken && !currentSlideUuid) {
|
||||
if (show) layerInstance.msg("请先完成滑动验证", { icon: 2 });
|
||||
return null;
|
||||
}
|
||||
return {
|
||||
verifyType: "slide",
|
||||
slideToken: currentSlideToken,
|
||||
slideUuid: currentSlideUuid,
|
||||
slideX: currentSlideX,
|
||||
};
|
||||
@@ -319,12 +325,6 @@
|
||||
NavigationUtil.open(getLoginRedirectUrl());
|
||||
}
|
||||
|
||||
function bindReferralThenRedirect() {
|
||||
AuthPageUtil.bindPendingReferralInviteCode()
|
||||
.then(redirectAfterLogin)
|
||||
.catch(redirectAfterLogin);
|
||||
}
|
||||
|
||||
function submitLogin() {
|
||||
const payload = Object.assign(
|
||||
{
|
||||
@@ -351,7 +351,7 @@
|
||||
layerInstance.msg(
|
||||
"登录成功,即将跳转到首页",
|
||||
{ icon: 1, time: 1200 },
|
||||
bindReferralThenRedirect,
|
||||
redirectAfterLogin,
|
||||
);
|
||||
return;
|
||||
}
|
||||
@@ -376,7 +376,6 @@
|
||||
|
||||
layui.use(["layer", "jquery"], function () {
|
||||
layerInstance = layui.layer;
|
||||
AuthPageUtil.captureReferralInviteFromUrl();
|
||||
loadVerifyConfig().then(refreshCaptcha);
|
||||
$("#loginForm").on("submit", function (event) {
|
||||
event.preventDefault();
|
||||
|
||||
Reference in New Issue
Block a user