diff --git a/templates/assets/js/anian.js b/templates/assets/js/anian.js index 2126557..1a97d4e 100644 --- a/templates/assets/js/anian.js +++ b/templates/assets/js/anian.js @@ -215,7 +215,7 @@ async function customLogout() { } } -function showPixarCard() { +function open_logout_box() { const wrapper = document.getElementById("pixarNoticeWrapper"); wrapper.style.display = "flex"; } diff --git a/templates/assets/js/app.js b/templates/assets/js/app.js index db4db8d..89c9fa3 100644 --- a/templates/assets/js/app.js +++ b/templates/assets/js/app.js @@ -26,9 +26,9 @@ function highlightMenu() { // 获取清洗后的 pathname(去掉 ? 和 #) function getPathname(url) { - const cleanUrl = url.substring(0, - url.indexOf('?') === -1 - ? (url.indexOf('#') === -1 ? url.length : url.indexOf('#')) + const cleanUrl = url.substring(0, + url.indexOf('?') === -1 + ? (url.indexOf('#') === -1 ? url.length : url.indexOf('#')) : url.indexOf('?') ) return new URL(cleanUrl).pathname @@ -2319,7 +2319,7 @@ function anian_renderLunarUI() { try { const cookieVal = anian_getCookie(cookieName); if (cookieVal) data = JSON.parse(cookieVal); - } catch (_) {} + } catch (_) { } if (data) { doRender(data); @@ -2813,13 +2813,16 @@ function loadMultiplePages(pageCount) { } function initjump() { + let closeLoading = null; + const page = $.cookie('page'); + const scrollParam = $.cookie('scrollParam'); + $.removeCookie('scrollParam', { path: '/', domain: 'anian.cc' }); + $.removeCookie('page', { path: '/', domain: 'anian.cc' }); + window.scroll_param = scrollParam; + if (scrollParam && !isNaN(scrollParam)) { + closeLoading = cocoMessage.loading('自动恢复原线路内容中...'); + } initTagSwitch().then(() => { - const page = $.cookie('page'); - const scrollParam = $.cookie('scrollParam'); - $.removeCookie('scrollParam', { path: '/', domain: 'anian.cc' }); - $.removeCookie('page', { path: '/', domain: 'anian.cc' }); - window.scroll_param = scrollParam; - const loadPageTask = () => { if (page && !isNaN(page)) { const targetPage = Number(page) - 1; @@ -2827,17 +2830,12 @@ function initjump() { } return Promise.resolve(); }; - if (scrollParam && !isNaN(scrollParam)) { - const closeLoading = cocoMessage.loading('自动恢复原线路内容中...'); loadPageTask().then(() => { - // 执行滚动逻辑 const recordScroll = Number(scrollParam); const maxScroll = document.documentElement.scrollHeight - window.innerHeight; const scrollDistance = Math.min(recordScroll, maxScroll); - $('html, body').animate({ scrollTop: scrollDistance }, 500); - if (recordScroll > maxScroll && (recordScroll - maxScroll) > 200) { closeLoading(); cocoMessage.warning('请手动加载原线路内容'); @@ -2926,7 +2924,7 @@ function initBlog() { syncFooterWithAudioState(), highlightMenu(), initializeMomentFold() - // nextBanner() + // nextBanner() } diff --git a/templates/modules/footer.html b/templates/modules/footer.html index 4994cba..2082fdf 100644 --- a/templates/modules/footer.html +++ b/templates/modules/footer.html @@ -41,7 +41,8 @@

您确定要退出登录吗?
- 退出后您仍能以访客身份翻阅本日记簿... + 请注意!
+ 未保存的内容将会被清空!

diff --git a/templates/modules/header/header-tool.html b/templates/modules/header/header-tool.html index 33f96e3..431a960 100644 --- a/templates/modules/header/header-tool.html +++ b/templates/modules/header/header-tool.html @@ -16,7 +16,7 @@
管理面板 - 退出登录 + 退出登录
@@ -47,7 +47,7 @@
管理面板 - 退出登录 + 退出登录
diff --git a/templates/modules/topic-push.html b/templates/modules/topic-push.html index ff41dac..37edadb 100644 --- a/templates/modules/topic-push.html +++ b/templates/modules/topic-push.html @@ -124,7 +124,7 @@