朋友圈支持图片显示;手机端新增全局公告提示;更新部分页面;优化部分效果
This commit is contained in:
@@ -30,6 +30,7 @@ let csrfToken = '';
|
||||
let publicKey = '';
|
||||
let loginTimer = null;
|
||||
let countdownSeconds = 3;
|
||||
let closeLoading = null;
|
||||
const login_modal = document.getElementById('customLoginModal');
|
||||
const login_closeBtn = document.getElementById('closeLoginModal');
|
||||
const login_loginBtn = document.getElementById('customLoginBtn');
|
||||
@@ -39,6 +40,7 @@ async function fetchCSRFToken() {
|
||||
login_modal.classList.add('show');
|
||||
login_loginBtn.disabled = true;
|
||||
login_loginBtn.textContent = '加载中...';
|
||||
closeLoading = cocoMessage.loading('正在加载署名信息...');
|
||||
|
||||
try {
|
||||
const response = await fetch('/login', { credentials: 'include' });
|
||||
@@ -62,19 +64,23 @@ async function fetchCSRFToken() {
|
||||
publicKey = publicKeyMatch[1].replace(/\\\//g, '/');
|
||||
return 'ok';
|
||||
} catch (err) {
|
||||
closeLoading?.()
|
||||
cocoMessage.error('署名信息加载失败,请刷新');
|
||||
if (loginTimer) { clearInterval(loginTimer) }
|
||||
login_loginBtn.textContent = '错误!请刷新';
|
||||
login_loginBtn.disabled = true;
|
||||
return 'error';
|
||||
}
|
||||
}
|
||||
|
||||
// 打开弹窗逻辑
|
||||
async function open_login_box() {
|
||||
if (loginTimer) {
|
||||
clearInterval(loginTimer);
|
||||
}
|
||||
if (loginTimer) { clearInterval(loginTimer) }
|
||||
countdownSeconds = 3;
|
||||
const success = await fetchCSRFToken();
|
||||
if (success === 'logged') {
|
||||
cocoMessage.success('您已经署名过了,请刷新');
|
||||
closeLoading?.()
|
||||
cocoMessage.success('您已署名成功,请刷新');
|
||||
login_modal.classList.remove('show');
|
||||
} else if (success === 'ok') {
|
||||
loginTimer = setInterval(() => {
|
||||
@@ -82,12 +88,15 @@ async function open_login_box() {
|
||||
login_loginBtn.textContent = '请稍等...' + countdownSeconds;
|
||||
} else {
|
||||
clearInterval(loginTimer);
|
||||
closeLoading?.()
|
||||
cocoMessage.success('署名信息加载完成');
|
||||
login_loginBtn.textContent = '署 名';
|
||||
login_loginBtn.disabled = false;
|
||||
}
|
||||
countdownSeconds--;
|
||||
}, 1000);
|
||||
} else {
|
||||
closeLoading?.()
|
||||
cocoMessage.error('服务器错误,请刷新');
|
||||
login_modal.classList.remove('show');
|
||||
}
|
||||
@@ -95,6 +104,7 @@ async function open_login_box() {
|
||||
|
||||
// 关闭弹窗
|
||||
login_closeBtn.addEventListener('click', () => {
|
||||
closeLoading?.()
|
||||
login_modal.classList.remove('show');
|
||||
});
|
||||
|
||||
@@ -111,6 +121,7 @@ function encryptPassword(password) {
|
||||
|
||||
// 提交登录
|
||||
login_loginBtn.addEventListener('click', async () => {
|
||||
let islogin = false;
|
||||
const username = document.getElementById('customUsername').value.trim();
|
||||
const password = document.getElementById('customPassword').value.trim();
|
||||
if (!username || !password) {
|
||||
@@ -119,7 +130,9 @@ login_loginBtn.addEventListener('click', async () => {
|
||||
}
|
||||
const encryptedPwd = encryptPassword(password);
|
||||
login_loginBtn.disabled = true;
|
||||
login_closeBtn.disabled = true;
|
||||
login_loginBtn.textContent = '验证中...';
|
||||
closeLoading = cocoMessage.loading('正在验证信息...');
|
||||
try {
|
||||
countdownSeconds = 3
|
||||
const response = await fetch('/login', {
|
||||
@@ -141,6 +154,8 @@ login_loginBtn.addEventListener('click', async () => {
|
||||
clearInterval(loginTimer);
|
||||
}
|
||||
if (finalUrl.includes('/uc')) {
|
||||
islogin = true;
|
||||
closeLoading?.()
|
||||
cocoMessage.success('署名成功,正在跳转...');
|
||||
login_loginBtn.textContent = '跳转中...';
|
||||
const currentScrollTop = window.scrollY || document.documentElement.scrollTop;
|
||||
@@ -148,24 +163,32 @@ login_loginBtn.addEventListener('click', async () => {
|
||||
$.cookie('load_type', 'login', { path: '/', domain: 'anian.cc' });
|
||||
window.location.reload();
|
||||
} else if (finalUrl.includes('error=invalid-credential')) {
|
||||
closeLoading?.()
|
||||
cocoMessage.warning('署名人与心上锁不匹配');
|
||||
fetchCSRFToken();
|
||||
} else {
|
||||
closeLoading?.()
|
||||
cocoMessage.error('速度过快,请稍后重试');
|
||||
}
|
||||
} catch (err) {
|
||||
closeLoading?.()
|
||||
cocoMessage.error('服务器连接失败');
|
||||
} finally {
|
||||
loginTimer = setInterval(() => {
|
||||
if (countdownSeconds > 0) {
|
||||
login_loginBtn.textContent = '请稍等...' + countdownSeconds;
|
||||
} else {
|
||||
clearInterval(loginTimer);
|
||||
login_loginBtn.textContent = '署 名';
|
||||
login_loginBtn.disabled = false;
|
||||
}
|
||||
countdownSeconds--;
|
||||
}, 1000);
|
||||
if (!islogin) {
|
||||
fetchCSRFToken();
|
||||
login_closeBtn.disabled = false;
|
||||
loginTimer = setInterval(() => {
|
||||
if (countdownSeconds > 0) {
|
||||
login_loginBtn.textContent = '请稍等...' + countdownSeconds;
|
||||
} else {
|
||||
clearInterval(loginTimer);
|
||||
closeLoading?.()
|
||||
cocoMessage.success('请重新尝试署名');
|
||||
login_loginBtn.textContent = '署 名';
|
||||
login_loginBtn.disabled = false;
|
||||
}
|
||||
countdownSeconds--;
|
||||
}, 1000);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -242,13 +265,13 @@ function confirmPixarAction() {
|
||||
|
||||
// 打开确认模态框
|
||||
function openModal(title, msg, type) {
|
||||
var modal = $('#momentsDeleteModal');
|
||||
var card = modal.find('.moments-card-widget');
|
||||
modal.find('.moments-title-text').text(title);
|
||||
modal.find('.moments-message-text').text(msg);
|
||||
card.removeClass('theme-red theme-yellow theme-green').addClass('theme-' + type);
|
||||
$('.moments-btn-cancel, .moments-btn-confirm').prop('disabled', false);
|
||||
modal.fadeIn(200);
|
||||
var modal = $('#momentsDeleteModal');
|
||||
var card = modal.find('.moments-card-widget');
|
||||
modal.find('.moments-title-text').text(title);
|
||||
modal.find('.moments-message-text').text(msg);
|
||||
card.removeClass('theme-red theme-yellow theme-green').addClass('theme-' + type);
|
||||
$('.moments-btn-cancel, .moments-btn-confirm').prop('disabled', false);
|
||||
modal.fadeIn(200);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user