diff --git a/assets/js/signin.js b/assets/js/signin.js
index 8682e210..bf62d3e0 100644
--- a/assets/js/signin.js
+++ b/assets/js/signin.js
@@ -11,6 +11,7 @@
}
var signinBusy = false;
+ var refreshSequence = 0;
function api(path, options) {
return window.AksrtRequest.request(path, options || {}).then(function (response) {
@@ -60,24 +61,17 @@
});
}
- function setButtonState(state) {
- currentButtons().forEach(function (button) {
- var label = button.querySelector('[data-signin-label]');
- var text = state === 'done'
- ? button.getAttribute('data-signin-done-label') || '已签到'
- : (state === 'busy' ? '…' : button.getAttribute('data-signin-idle-label') || '签到');
- if (label) label.textContent = text;
- button.disabled = state !== 'idle';
- button.classList.toggle('is-done', state === 'done');
- });
- }
-
// 签到成功后，入口按钮就地替换为「已签到」详情弹窗触发链接
// （参考主题：.initiate-checkin → details_link 的替换行为）。
function swapButtonsToDetailsLink() {
var url = window.aksrtData && window.aksrtData.signinDetailsUrl;
if (!url) return;
currentButtons().forEach(function (button) {
+ var label = button.querySelector('[data-signin-label]');
+ if (label) {
+ label.textContent = button.getAttribute('data-signin-done-label') || '已签到';
+ label.removeAttribute('data-signin-label');
+ }
var link = document.createElement('a');
link.href = 'javascript:;';
link.className = (button.className || '') + ' checkin-details-link';
@@ -88,12 +82,17 @@
link.setAttribute('data-aksrt-modal-mobile-bottom', 'true');
link.setAttribute('data-aksrt-modal-cache', 'false');
link.innerHTML = button.innerHTML;
+ if (link.classList.contains('uc-header__signin-btn')) link.classList.add('is-done');
button.replaceWith(link);
});
}
function refresh() {
+ if (signinBusy) return;
+ var sequence = ++refreshSequence;
api('/signin/today').then(function (result) {
+ // A status read started before a click must not overwrite its result.
+ if (signinBusy || sequence !== refreshSequence) return;
if (!result.ok) {
var message = (result.json && result.json.message) || '签到状态加载失败 (HTTP ' + result.status + ')';
setStatus(message);
@@ -104,17 +103,19 @@
var data = result.json;
if (!data.enabled) {
setStatus('签到功能未启用');
- setButtonState('done');
+ currentButtons().forEach(function (button) {
+ button.disabled = true;
+ button.setAttribute('disabled', '');
+ button.setAttribute('aria-disabled', 'true');
+ });
return;
}
if (data.signed) {
setStatusHtml('已签到 ' + data.streak + ' 天 +' + data.reward_today);
- setButtonState('done');
swapButtonsToDetailsLink();
return;
}
setStatusHtml('连续 ' + data.streak + ' 天，+' + data.reward_if_signin);
- setButtonState('idle');
});
}
@@ -122,62 +123,59 @@
return document.querySelector('[data-signin-captcha]');
}
- function doSignin(captchaPayload) {
- notyf('正在签到…', 'load', '', 'aksrt-balance-signin-toast');
- api('/signin', {
- method: 'POST',
- body: JSON.stringify({ captcha: captchaPayload || {} })
- }).then(function (result) {
- signinBusy = false;
- if (!result.ok) {
- notyf((result.json && result.json.message) || '签到失败', 'danger', 5, 'aksrt-balance-signin-toast');
- setButtonState('idle');
- return;
- }
-
- notyf(result.json.message || '签到成功', 'success', 5, 'aksrt-balance-signin-toast');
- document.querySelectorAll('[data-credits-value]').forEach(function (element) {
- element.textContent = Number(result.json.balance || 0).toLocaleString();
- element.title = element.textContent;
- });
- setButtonState('done');
- swapButtonsToDetailsLink();
- refresh();
- }).finally(function () {
- if (window.AKSRTCaptcha) window.AKSRTCaptcha.reset('signin', captchaMount());
- });
- }
-
freshButtons.forEach(function (button) {
button.addEventListener('click', function (event) {
event.preventDefault();
if (signinBusy || button.disabled) return;
signinBusy = true;
- setButtonState('busy');
+ ++refreshSequence;
+ var originalHtml = button.innerHTML;
+ button.disabled = true;
+ button.setAttribute('disabled', '');
+ button.setAttribute('aria-busy', 'true');
+ button.innerHTML = '请稍后';
+
+ function restoreButton() {
+ button.innerHTML = originalHtml;
+ button.disabled = false;
+ button.removeAttribute('disabled');
+ button.removeAttribute('aria-busy');
+ }
+
var captchaRequired = !!window.aksrtData.captchaSignin;
var captcha = window.AKSRTCaptcha;
var mount = captchaMount();
- if (captchaRequired && (!captcha || !mount)) {
- signinBusy = false;
- notyf('人机验证未正确加载，请刷新页面后重试', 'danger');
- setButtonState('idle');
- return;
- }
- if (!captchaRequired) {
- doSignin({});
- return;
- }
-
- captcha.run('signin', mount).then(function (payload) {
+ Promise.resolve().then(function () {
+ if (captchaRequired && (!captcha || !mount)) {
+ throw new Error('人机验证未正确加载，请刷新页面后重试');
+ }
+ return captchaRequired ? captcha.run('signin', mount) : {};
+ }).then(function (payload) {
if (payload === null) throw new Error('已取消验证');
- doSignin(payload);
+ notyf('正在签到，请稍后...', 'load', '', 'aksrt-balance-signin-toast');
+ return api('/signin', {
+ method: 'POST',
+ body: JSON.stringify({ captcha: payload })
+ });
+ }).then(function (result) {
+ if (!result.ok) throw new Error(result.json.message || '签到失败');
+
+ restoreButton();
+ notyf(result.json.message || '签到成功', 'success', 5, 'aksrt-balance-signin-toast');
+ document.querySelectorAll('[data-credits-value]').forEach(function (element) {
+ element.textContent = Number(result.json.balance || 0).toLocaleString();
+ element.title = element.textContent;
+ });
+ setStatusHtml('已签到 ' + result.json.streak + ' 天 +' + result.json.reward);
+ swapButtonsToDetailsLink();
}).catch(function (error) {
+ restoreButton();
+ notyf((error && error.message) || '签到失败，请稍后重试', 'danger', 5, 'aksrt-balance-signin-toast');
+ }).finally(function () {
signinBusy = false;
- captcha.reset('signin', mount);
- notyf((error && error.message) || '人机验证加载中，请稍候再试', 'danger');
- setButtonState('idle');
+ if (captcha && mount) captcha.reset('signin', mount);
});
});
});
diff --git a/inc/helpers/aksrt-header-userbox.php b/inc/helpers/aksrt-header-userbox.php
index e75fbb23..059b0ac2 100644
--- a/inc/helpers/aksrt-header-userbox.php
+++ b/inc/helpers/aksrt-header-userbox.php
@@ -64,7 +64,7 @@ if (!function_exists('aksrt_header_user_checkin_btn')) :
);
}
return aksrt_get_user_checkin_details_link(
- 'but block c-yellow is-done',
+ 'but block c-yellow',
' '
. esc_html__('今日已签到', 'aksrt')
);
@@ -75,7 +75,6 @@ if (!function_exists('aksrt_header_user_checkin_btn')) :
// instead of the UA button stylesheet (font/UI 1:1 with the reference).
if ($class !== null) {
return ''
. ''
. '' . esc_html__('签到', 'aksrt') . ''
@@ -83,7 +82,6 @@ if (!function_exists('aksrt_header_user_checkin_btn')) :
}
return ''
. ' '
. '' . esc_html__('签到领取今日奖励', 'aksrt') . ''
diff --git a/inc/helpers/user-center-renderers/credits-balance.php b/inc/helpers/user-center-renderers/credits-balance.php
index 62012d64..d91f86f9 100644
--- a/inc/helpers/user-center-renderers/credits-balance.php
+++ b/inc/helpers/user-center-renderers/credits-balance.php
@@ -35,7 +35,7 @@ $currency = (string) ($currency_name ?? __('积分', 'aksrt'));
' . esc_html__('已签到', 'aksrt') . ''); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
-