新增片刻删除提示框、动画；修复异常；深度优化

README.md

@@ -2,11 +2,16 @@
 
 > 基于原作者v1.2.5代码修改
 
+#### v1.2.5-4
+1. 修复侧边栏测速异常、拖拽片刻图片异常、手机端文章目录异常、页面提示异常
+2. 优化多种场景下的提示、衔接、样式
+3. 新增片刻删除提示框及删除动画
+
 #### v1.2.5-3
 1. 朋友圈支持根据作者筛选内容（需同步更新插件）
 2. 支持前台弹窗登入登出
-2. 附录页面功能补全
+3. 附录页面功能补全
-3. 对线路切换、加载异常等情况进行了深度优化
+4. 对线路切换、加载异常等情况进行了深度优化
 
 #### v1.2.5-2
 1. 添加侧边栏、页面、文章等HTML内容块

templates/assets/css/anian.css

@@ -304,6 +304,15 @@
         0 var(--pixar-button-depth) 0 var(--pixar-ui-dark);
 }
 
+.pixar-notice-btn-close:disabled,
+.pixar-notice-btn-confirm:disabled {
+    cursor: not-allowed;
+    transform: translateY(var(--pixar-button-depth));
+    box-shadow:
+        0 0 0 var(--pixar-ui-green-shadow),
+        0 var(--pixar-button-depth) 0 var(--pixar-ui-dark);
+}
+
 .pixar-notice-btn-close {
     background: var(--pixar-ui-red);
     box-shadow:
@@ -324,3 +333,253 @@
 .pixar-notice-btn-close:hover {
     border-color: var(--pixar-ui-red-border) !important;
 }
+
+/* 按钮禁用样式 */
+.push_item:disabled {
+    background: #c7d4ce;
+    cursor: not-allowed;
+    color: #f0fdf4;
+}
+
+/* 删除确认弹窗样式 */
+.moments-modal-overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.5);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 1999;
+    padding: 20px;
+    box-sizing: border-box;
+    animation: momentsFadeIn 0.2s ease;
+}
+
+.moments-card-widget {
+    overflow: hidden;
+    position: relative;
+    background-color: #ffffff;
+    text-align: left;
+    border-radius: 0.5rem;
+    width: 100%;
+    max-width: 400px;
+    box-shadow: 0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 10px 10px -5px rgba(0, 0, 0, 0.04);
+    animation: momentsSlideUp 0.3s ease;
+}
+
+.moments-card-header {
+    padding: 1.5rem;
+    background-color: #ffffff;
+}
+
+.moments-header-row {
+    display: flex;
+    align-items: center;
+    gap: 1rem;
+}
+
+.moments-icon-wrapper {
+    display: flex;
+    flex-shrink: 0;
+    justify-content: center;
+    align-items: center;
+    background-color: #fee2e2;
+    width: 3rem;
+    height: 3rem;
+    border-radius: 9999px;
+}
+
+.moments-icon-wrapper svg {
+    color: #dc2626;
+    width: 1.5rem;
+    height: 1.5rem;
+}
+
+.moments-text-content {
+    flex: 1;
+    text-align: left;
+}
+
+.moments-title-text {
+    color: #111827;
+    font-size: 1.125rem;
+    font-weight: 600;
+    line-height: 1.5rem;
+    display: block;
+}
+
+.moments-message-text {
+    margin-top: 0.5rem;
+    margin-bottom: 0;
+    color: #6b7280;
+    font-size: 0.875rem;
+    line-height: 1.25rem;
+}
+
+.moments-button-group {
+    margin-top: 1rem;
+    display: flex;
+    gap: 0.75rem;
+    flex-direction: row-reverse;
+}
+
+.moments-btn-confirm {
+    flex: 1;
+    display: inline-flex;
+    padding: 0.5rem 1rem;
+    background-color: #dc2626;
+    color: #ffffff;
+    font-size: 0.875rem;
+    line-height: 1.5rem;
+    font-weight: 500;
+    justify-content: center;
+    border-radius: 0.375rem;
+    border-width: 1px;
+    border-color: transparent;
+    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+    cursor: pointer;
+    transition: background-color 0.2s;
+    white-space: nowrap;
+}
+
+.moments-btn-confirm:hover {
+    background-color: #b91c1c;
+}
+
+.moments-btn-cancel {
+    flex: 1;
+    display: inline-flex;
+    padding: 0.5rem 1rem;
+    background-color: #ffffff;
+    color: #374151;
+    font-size: 0.875rem;
+    line-height: 1.5rem;
+    font-weight: 500;
+    justify-content: center;
+    border-radius: 0.375rem;
+    border: 1px solid #d1d5db;
+    box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+    cursor: pointer;
+    transition: background-color 0.2s;
+    white-space: nowrap;
+}
+
+.moments-btn-cancel:hover {
+    background-color: #f3f4f6;
+}
+
+.moments-btn-confirm:disabled {
+    background-color: #fecaca;
+    cursor: not-allowed;
+    box-shadow: none;
+    opacity: 0.7;
+}
+
+.moments-btn-cancel:disabled,
+.push_close:disabled {
+    background-color: #e7f0e5;
+    color: #9ca3af;
+    border-color: #e7f0e5;
+    cursor: not-allowed;
+    box-shadow: none;
+    opacity: 0.7;
+}
+
+/* --- 追加：黄色警告模式 --- */
+.theme-yellow .moments-icon-wrapper {
+    background-color: #fef3c7;
+}
+
+.theme-yellow .moments-icon-wrapper svg {
+    color: #d97706;
+}
+
+.theme-yellow .moments-btn-confirm {
+    background-color: #d97706;
+}
+
+.theme-yellow .moments-btn-confirm:hover {
+    background-color: #b45309;
+}
+
+/* --- 追加：绿色确认模式 --- */
+.theme-green .moments-icon-wrapper {
+    background-color: #d1fae5;
+}
+
+.theme-green .moments-icon-wrapper svg {
+    color: #059669;
+}
+
+.theme-green .moments-btn-confirm {
+    background-color: #059669;
+}
+
+.theme-green .moments-btn-confirm:hover {
+    background-color: #047857;
+}
+
+/* --- 追加：红色保持默认，这里只是为了统一命名，可不加 --- */
+.theme-red .moments-icon-wrapper {
+    background-color: #fee2e2;
+}
+
+.theme-red .moments-icon-wrapper svg {
+    color: #dc2626;
+}
+
+.theme-red .moments-btn-confirm {
+    background-color: #dc2626;
+}
+
+@keyframes momentsFadeIn {
+    from {
+        opacity: 0;
+    }
+
+    to {
+        opacity: 1;
+    }
+}
+
+@keyframes momentsSlideUp {
+    from {
+        opacity: 0;
+        transform: translateY(10px);
+    }
+
+    to {
+        opacity: 1;
+        transform: translateY(0);
+    }
+}
+
+/* --- 删除动画 --- */
+/* 飘散消失动画 (持续 0.8s) */
+.moments-delete-disperse {
+    animation: momentsDeleteDisperse 0.8s ease-in forwards;
+    transform-origin: center bottom;
+    pointer-events: none;
+}
+
+@keyframes momentsDeleteDisperse {
+    0% {
+        opacity: 1;
+        transform: translateY(0) rotate(0deg) scale(1);
+        filter: blur(0);
+    }
+
+    20% {
+        opacity: 0.9;
+        transform: translateY(-10px) rotate(2deg) scale(1.02);
+    }
+
+    100% {
+        opacity: 0;
+        transform: translateY(-120px) rotate(-8deg) scale(0.6);
+        filter: blur(3px);
+    }
+}

templates/assets/css/main.css

@@ -5977,7 +5977,7 @@ a.change i.ri-refresh-line {
     display: none;
     position: fixed;
     z-index: 999;
-    top: 485px;
+    top: 50%;
     left: 0;
     background-color: var(--toc-color);
     color: #fff;

templates/assets/js/anian.js

@@ -143,9 +143,10 @@ login_loginBtn.addEventListener('click', async () => {
     if (finalUrl.includes('/uc')) {
       cocoMessage.success('署名成功，正在跳转...');
       login_loginBtn.textContent = '跳转中...';
-      setTimeout(() => {
+      const currentScrollTop = window.scrollY || document.documentElement.scrollTop;
+      $.cookie('scrollParam', currentScrollTop, { path: '/', domain: 'anian.cc' });
+      $.cookie('load_type', 'login', { path: '/', domain: 'anian.cc' });
       window.location.reload();
-      }, 800);
     } else if (finalUrl.includes('error=invalid-credential')) {
       cocoMessage.warning('署名人与心上锁不匹配');
       fetchCSRFToken();
@@ -181,6 +182,8 @@ document.addEventListener("keydown", function (e) {
 
 // 退出登录
 async function customLogout() {
+  $('.pixar-notice-btn-confirm, .pixar-notice-btn-close').prop('disabled', true);
+  let closeLoading = cocoMessage.loading('退出登录中...');
   try {
     const getResponse = await fetch('/logout', { credentials: 'include' });
     const htmlText = await getResponse.text();
@@ -189,6 +192,8 @@ async function customLogout() {
     const logoutCsrfToken = doc.querySelector('input[name="_csrf"]')?.value;
     if (!logoutCsrfToken) {
       cocoMessage.error('页面未找到 CSRF 令牌');
+      $('.pixar-notice-btn-confirm, .pixar-notice-btn-close').prop('disabled', false);
+      closeLoading();
       return;
     }
     const postResponse = await fetch('/logout', {
@@ -202,20 +207,26 @@ async function customLogout() {
       })
     });
     if (postResponse.ok) {
+      closeLoading();
       cocoMessage.success('您已成功退出登录');
-      setTimeout(() => {
+      const currentScrollTop = window.scrollY || document.documentElement.scrollTop;
+      $.cookie('scrollParam', currentScrollTop, { path: '/', domain: 'anian.cc' });
+      $.cookie('load_type', 'logout', { path: '/', domain: 'anian.cc' });
       window.location.reload();
-      }, 800);
     } else {
+      closeLoading();
+      $('.pixar-notice-btn-confirm, .pixar-notice-btn-close').prop('disabled', false);
       throw new Error('退出请求被拒绝');
     }
   } catch (err) {
+    closeLoading();
+    $('.pixar-notice-btn-confirm, .pixar-notice-btn-close').prop('disabled', false);
     console.error('Logout Error:', err);
     cocoMessage.error('退出失败，请手动刷新页面');
   }
 }
 
-function showPixarCard() {
+function open_logout_box() {
   const wrapper = document.getElementById("pixarNoticeWrapper");
   wrapper.style.display = "flex";
 }
@@ -229,7 +240,16 @@ function confirmPixarAction() {
   customLogout();
 }
 
-
+// 打开确认模态框
+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);
+}
 
 
 

templates/assets/js/app.js

@@ -383,13 +383,7 @@ $(document).on('click', '.wp_get_media_list li', function () {
 //删除图片/视频（保留事件冒泡修复）
 $(document).on('click', '.topic-img-de', function (e) {
     e.stopPropagation();
-
-    var msg = "确认删除此媒体文件？";
-    if (confirm(msg)) {
     $(this).parent().remove();
-    } else {
-        return false;
-    }
     var num = $('.add_img_box .t_media_item').length;
     if (num < 9) {
         $("a.up_img_btn").show();
@@ -606,9 +600,8 @@ $(document).on('click', '.loca_text', function () {
 //发布更新瞬间
 let isSubmittingMoment = false;
 $(document).on('click', '.push_item', function () {
-
     if (isSubmittingMoment) return false;
-
+    let closeLoading = null;
     var content = $("#topic_content").val();
     var catname = $(".t_cat_toogle span").text();
     var loca = $(".loca_text").text();
@@ -669,7 +662,8 @@ $(document).on('click', '.push_item', function () {
             pushData.metadata.annotations = { mylocal: loca };
         }
 
-        cocoMessage.info("发布中..");
+        closeLoading = cocoMessage.loading('正在发布...');
+        $('.push_close, .push_item').prop('disabled', true);
 
         $.ajax({
             type: "POST",
@@ -677,10 +671,16 @@ $(document).on('click', '.push_item', function () {
             contentType: "application/json",
             data: JSON.stringify(pushData),
             success() {
+                closeLoading?.()
                 cocoMessage.success('发布成功！');
+                const currentScrollTop = window.scrollY || document.documentElement.scrollTop;
+                $.cookie('scrollParam', currentScrollTop, { path: '/', domain: 'anian.cc' });
+                $.cookie('load_type', 'create', { path: '/', domain: 'anian.cc' });
                 location.reload();
             },
             error() {
+                $('.push_close, .push_item').prop('disabled', false);
+                closeLoading?.()
                 cocoMessage.error('发布失败！');
                 release();
             }
@@ -717,7 +717,8 @@ $(document).on('click', '.push_item', function () {
             updateData.metadata.annotations = { mylocal: loca };
         }
 
-        cocoMessage.info("更新中..");
+        closeLoading = cocoMessage.loading('正在更新...');
+        $('.push_close, .push_item').prop('disabled', true);
 
         $.ajax({
             type: "PUT",
@@ -725,11 +726,17 @@ $(document).on('click', '.push_item', function () {
             contentType: "application/json",
             data: JSON.stringify(updateData),
             success() {
+                closeLoading?.()
                 cocoMessage.success('更新成功！');
+                const currentScrollTop = window.scrollY || document.documentElement.scrollTop;
+                $.cookie('scrollParam', currentScrollTop, { path: '/', domain: 'anian.cc' });
+                $.cookie('load_type', 'update', { path: '/', domain: 'anian.cc' });
                 location.reload();
             },
             error() {
+                closeLoading?.()
                 cocoMessage.error('更新失败！');
+                $('.push_close, .push_item').prop('disabled', false);
                 release();
             }
         });
@@ -1052,8 +1059,6 @@ $(document).on('click', '#t_pagination a', function () {
     const currentPage = parseInt(href.match(/\d+/)[0]);
     const $pagingArea = $('#t_pagination .post-paging');
     const originalPagingHtml = $pagingArea.html();
-    const isauto_loading = window.isAutoLoading
-    if (window.isAutoLoading) window.isAutoLoading = false;
 
     $.ajax({
         type: "GET",
@@ -1075,13 +1080,9 @@ $(document).on('click', '#t_pagination a', function () {
                 } else {
                     $("#t_pagination a").hide();
                 }
-                if (isauto_loading) {
+                if (!window.scroll_param || (!window.loadMoreTimeout && window.scroll_param > result.offset().top - 58)) {
-                    if (window.scroll_param > result.offset().top - 58) {
                     $body.animate({ scrollTop: result.offset().top - 58 }, 500);
-                    } else {
+                } else window.forceStopLoading = true;
-                        window.forceStopLoading = true;
-                    }
-                } else $body.animate({ scrollTop: result.offset().top - 58 }, 500);
                 getMomentAudio();
                 initAgree();
                 lazyLoadInstance.update();
@@ -1214,8 +1215,6 @@ $(document).on('click', '#p_pagination a', function () {
     const $pagingArea = $('#p_pagination .post-paging');
     const originalPagingHtml = $pagingArea.html();
     const targetOffsetTop = $('#p_pagination a').offset().top;
-    const isauto_loading = window.isAutoLoading
-    if (window.isAutoLoading) window.isAutoLoading = false;
     $.ajax({
         type: "GET",
         url: href,
@@ -1234,13 +1233,9 @@ $(document).on('click', '#p_pagination a', function () {
                 } else {
                     $("#p_pagination a").hide(); //如果没有下一页了，隐藏
                 }
-                if (isauto_loading) {
+                if (!window.scroll_param || (!window.loadMoreTimeout && window.scroll_param > targetOffsetTop - 358)) {
-                    if (window.scroll_param > targetOffsetTop - 358) {
                     $body.animate({ scrollTop: targetOffsetTop - 358 }, 500);
-                    } else {
+                } else window.forceStopLoading = true;
-                        window.forceStopLoading = true;
-                    }
-                } else $body.animate({ scrollTop: targetOffsetTop - 358 }, 500);
                 pix.initGalleryPhotos();
                 $.cookie('page', currentPage, { path: '/', domain: 'anian.cc' });
             } else {
@@ -1492,8 +1487,6 @@ $('body').on('click', '#pagination a', function () {
     const originalPagingHtml = $pagingArea.html();
     var href = $(this).attr('data');
     const currentPage = parseInt(href.match(/\d+/)[0]);
-    const isauto_loading = window.isAutoLoading
-    if (window.isAutoLoading) window.isAutoLoading = false;
     $.ajax({
         type: "GET",
         url: href,
@@ -1519,13 +1512,9 @@ $('body').on('click', '#pagination a', function () {
                 } else {
                     $("#pagination a").hide(); //如果没有下一页了，隐藏
                 }
-                if (isauto_loading) {
+                if (!window.scroll_param || (!window.loadMoreTimeout && window.scroll_param > result.offset().top - 58)) {
-                    if (window.scroll_param > result.offset().top - 58) {
                     $body.animate({ scrollTop: result.offset().top - 58 }, 500);
-                    } else {
+                } else window.forceStopLoading = true;
-                        window.forceStopLoading = true;
-                    }
-                } else $body.animate({ scrollTop: result.offset().top - 58 }, 500);
                 initAgree()
                 lazyLoadInstance.update();
                 $.cookie('page', currentPage, { path: '/', domain: 'anian.cc' });
@@ -1548,8 +1537,6 @@ $('body').on('click', '.arc_pagenav a', function () {
     const $pagingArea = $('.arc_pagenav');
     const originalPagingHtml = $pagingArea.html();
     const postListElement = document.getElementById("post_item");
-    const isauto_loading = window.isAutoLoading
-    if (window.isAutoLoading) window.isAutoLoading = false;
     var href = $(this).attr('data');
     const currentPage = parseInt(href.match(/\d+/)[0]);
 
@@ -1579,15 +1566,10 @@ $('body').on('click', '.arc_pagenav a', function () {
                 } else {
                     $(".arc_pagenav a").hide(); //如果没有下一页了，隐藏
                 }
-
                 $('.arc_pagenav .uk-spinner').remove();
-                if (isauto_loading) {
+                if (!window.scroll_param || (!window.loadMoreTimeout && window.scroll_param > post.offset().top - 58)) {
-                    if (window.scroll_param > post.offset().top - 58) {
                     $body.animate({ scrollTop: post.offset().top - 58 }, 500);
-                    } else {
+                } else window.forceStopLoading = true;
-                        window.forceStopLoading = true;
-                    }
-                } else $body.animate({ scrollTop: post.offset().top - 58 }, 500);
                 initAgree()
                 lazyLoadInstance.update();
                 $.cookie('page', currentPage, { path: '/', domain: 'anian.cc' });
@@ -2622,11 +2604,11 @@ if (location.hostname === "anian.cc") {
 
 anianxSpeedMainLine.addEventListener("click", () => {
     if (anianxSpeedGlobalLock) return;
+    anianxSpeedMoveArrow(anianxSpeedMainLine);
     anianxSpeedGlobalLock = true;
     if (anianxSpeedMainLine.classList.contains("anianx-fixed")) {
         anianxSpeedBubbleText.classList.remove("anianx-loading");
         anianxSpeedBubbleText.innerText = "当前为主线路";
-        anianxSpeedMoveArrow(anianxSpeedMainLine);
         anianxSpeedGlobalLock = false;
     } else {
         anianxSpeedBubbleText.classList.add("anianx-loading");
@@ -2642,11 +2624,11 @@ anianxSpeedMainLine.addEventListener("click", () => {
 
 anianxSpeedSubLine.addEventListener("click", () => {
     if (anianxSpeedGlobalLock) return;
+    anianxSpeedMoveArrow(anianxSpeedSubLine);
     anianxSpeedGlobalLock = true;
     if (anianxSpeedSubLine.classList.contains("anianx-fixed")) {
         anianxSpeedBubbleText.classList.remove("anianx-loading");
         anianxSpeedBubbleText.innerText = "当前为副线路";
-        anianxSpeedMoveArrow(anianxSpeedSubLine);
         anianxSpeedGlobalLock = false;
     } else {
         anianxSpeedBubbleText.classList.add("anianx-loading");
@@ -2662,10 +2644,10 @@ anianxSpeedSubLine.addEventListener("click", () => {
 
 anianxSpeedTestLine.addEventListener("click", () => {
     if (anianxSpeedGlobalLock) return;
+    anianxSpeedMoveArrow(anianxSpeedTestLine);
     anianxSpeedGlobalLock = true;
     anianxSpeedBubbleText.classList.add("anianx-loading");
     anianxSpeedBubbleText.innerText = "测速中";
-    anianxSpeedMoveArrow(anianxSpeedTestLine);
     anianxSpeedTestWithTimeout(7500).then(result => {
         anianxSpeedBubbleText.classList.remove("anianx-loading");
         anianxSpeedBubbleText.innerText = result;
@@ -2744,7 +2726,7 @@ function initTagSwitch() {
 
 // 1. 定义一个全局标志位，用于外部强制终止
 window.forceStopLoading = false;
-window.isAutoLoading = false;
+window.loadMoreTimeout = false;
 function loadMultiplePages(pageCount) {
     return new Promise((resolve) => {
         let loadedCount = 0;
@@ -2772,9 +2754,6 @@ function loadMultiplePages(pageCount) {
 
             const $pager = $btn.closest('.post-paging');
             const oldHref = $btn.attr('data');
-
-            window.isAutoLoading = true;
-
             const pageStartTime = Date.now();
             $btn.trigger('click'); // 加载更多
 
@@ -2786,8 +2765,9 @@ function loadMultiplePages(pageCount) {
                     resolve();
                     return;
                 }
-                if (now - pageStartTime > 2000) {
+                if (now - pageStartTime > 3000) {
                     clearInterval(waitInterval);
+                    window.loadMoreTimeout = true;
                     resolve(); // 解决 Promise，触发后续滚动
                     return;
                 }
@@ -2813,13 +2793,18 @@ function loadMultiplePages(pageCount) {
 }
 
 function initjump() {
-    initTagSwitch().then(() => {
+    let closeLoading = null;
     const page = $.cookie('page');
     const scrollParam = $.cookie('scrollParam');
+    const loadType = $.cookie('load_type')
     $.removeCookie('scrollParam', { path: '/', domain: 'anian.cc' });
     $.removeCookie('page', { path: '/', domain: 'anian.cc' });
+    $.removeCookie('load_type', { path: '/', domain: 'anian.cc' });
     window.scroll_param = scrollParam;
-
+    if (scrollParam && !isNaN(scrollParam)) {
+        closeLoading = cocoMessage.loading('自动恢复原线路内容中...');
+    }
+    initTagSwitch().then(() => {
         const loadPageTask = () => {
             if (page && !isNaN(page)) {
                 const targetPage = Number(page) - 1;
@@ -2827,28 +2812,30 @@ function initjump() {
             }
             return Promise.resolve();
         };
-
         if (scrollParam && !isNaN(scrollParam)) {
-            const closeLoading = cocoMessage.loading('自动恢复原线路内容中...');
             loadPageTask().then(() => {
-                // 执行滚动逻辑
+                closeLoading?.()
                 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('请手动加载原线路内容');
+                } else if (loadType === 'create') {
+                    cocoMessage.success('发布成功！');
+                } else if (loadType === 'update') {
+                    cocoMessage.success('更新成功！');
+                } else if (loadType === 'login') {
+                    cocoMessage.success('登录成功！');
+                } else if (loadType === 'logout') {
+                    cocoMessage.success('登出成功！');
                 } else {
                     const msg = location.hostname === "anian.cc" ? '主线路' : (location.hostname === "www.anian.cc" ? '副线路' : '测试线路');
-                    closeLoading();
+                    cocoMessage.success('已成功切换至${msg}');
-                    cocoMessage.success(`已成功切换至${msg}`);
                 }
-            });
+            }).catch(() => closeLoading?.());
         }
-    });
+    }).catch(() => closeLoading?.());
 }
 
 

templates/assets/js/moment-push.js

@@ -128,14 +128,8 @@ function getcard(name,cover,title,type){
 }
 
 $(document).on('click', '.de_card', function () {
-    var msg = "确认删除此卡片？";
     var num = $('.moment_card_item').length;
-    if (confirm(msg)==true){
     $(this).parents('.moment_card_item').remove();
-    } else {
-        return false;
-    }
-
     if (num == 1) {
         $(".show_card").hide();
     }
@@ -279,39 +273,55 @@ $('body').on('click', '.video_choose a', function() {
 
 //});
 
-//删除片刻文章
+//删除片刻
-$('body').on('click', '.control_delete_post', function() {
+// 全局变量暂存当前要删除的 ID
-    var pid = $(this).parent().attr('pid');
+window.currentDeletePid = null;
 
-    var msg = "确定删除瞬间？";
+// 删除片刻文章 - 打开弹窗
-    if (confirm(msg)==true){
+$('body').on('click', '.control_delete_post', function () {
+    window.currentDeletePid = $(this).parent().attr('pid');
+    openModal('删除确认', '确定删除瞬间？该条数据将被永久移除。', 'red');
+});
+
+// 点击取消按钮 - 关闭弹窗
+$('body').on('click', '#momentsCancelDeleteBtn', function (e) {
+    $('#momentsDeleteModal').fadeOut(200);
+    window.currentDeletePid = null;
+});
+
+// 点击确认删除 - 执行 AJAX
+$('body').on('click', '#momentsConfirmDeleteBtn', function () {
+    var pid = window.currentDeletePid;
+    if (!pid) return;
+    let closeLoading = cocoMessage.loading('正在删除...');
+    $('.moments-btn-cancel, .moments-btn-confirm').prop('disabled', true);
     $.ajax({
         type: 'DELETE',
         dataType: 'json',
         url: `/apis/${Theme.moments.api}/v1alpha1/moments/` + pid,
         contentType: "application/json",
-            beforeSend: function () {
-                cocoMessage.info('处理中..');
-            },
         success: function (data) {
+            $('#momentsDeleteModal').fadeOut(200);
+            closeLoading?.()
             cocoMessage.success('删除成功');
-                setTimeout(()=>{
+            window.currentDeletePid = null;
-                    $(`#post-${pid}`)[0].remove()
+            const $post = $(`#post-${pid}`);
-                },1000)
+            if (!$post.length) return;
+            $post.addClass('moments-delete-disperse');
+            setTimeout(() => $post.remove(), 800);
         },
         error: function (request) {
             if (request.status) {
+                closeLoading?.()
                 cocoMessage.error('瞬间不存在或已删除');
             } else {
+                closeLoading?.()
                 cocoMessage.error('删除失败');
             }
             console.log(request)
+            $('.moments-btn-cancel, .moments-btn-confirm').prop('disabled', false);
         },
     });
-    } else {
-        return false;
-    }
-
 });
 
 //置顶片刻
@@ -363,6 +373,8 @@ $('body').on('click', '.sticky_btn', function() {
 
 //编辑片刻
 $('body').on('click', '.control_edit_post', function () {
+    $('.push_close, .push_item').prop('disabled', true);
+    let closeLoading = null;
     $(".loca_text").empty().attr("state", '0');
     $(".loca_text").attr("uk-tooltip", "title:获取位置; pos: top; offset:2;");
     $('.moment_image_type a').click();
@@ -378,7 +390,7 @@ $('body').on('click', '.control_edit_post', function() {
         type: 'GET',
         url: `/apis/${Theme.moments.api}/v1alpha1/moments/` + pid,
         beforeSend: function () {
-            cocoMessage.info('数据拉取中');
+            closeLoading = cocoMessage.loading('数据拉取中...');
             //$('.t_form').before('<div class="edit_overlay"></div>');
         },
         success: function (data) {
@@ -431,8 +443,7 @@ $('body').on('click', '.control_edit_post', function() {
                 $('.loca_text').text(data.metadata.annotations?.mylocal);
             }
 
-            switch(type)
+            switch (type) {
-            {
                 case "PHOTO":
                     //if(data.moment_data.length > 0){ 文字片刻没有数据
                     edit_image(data);
@@ -448,7 +459,14 @@ $('body').on('click', '.control_edit_post', function() {
                     edit_video(data);
                     break;
             }
-            cocoMessage.success('拉取完成');
+            closeLoading();
+            cocoMessage.success('数据拉取完成');
+            $('.push_close, .push_item').prop('disabled', false);
+        },
+        error: function () {
+            closeLoading();
+            cocoMessage.error('数据拉取失败');
+            $('.push_close').prop('disabled', false);
         }
     });
 });

templates/assets/libs/uikit/uikit.min.css

@@ -3541,7 +3541,8 @@ iframe[uk-cover] {
 .uk-sortable-drag {
     position: fixed !important;
     z-index: 1050 !important;
-    pointer-events: none
+    width: auto !important;
+    pointer-events: none;
 }
 
 .uk-sortable-placeholder {

templates/modules/footer.html

@@ -1,5 +1,5 @@
 <th:block th:fragment="footer">
-    <th:block th:with="customJsVersion='1.2.5-3'">
+    <th:block th:with="customJsVersion='1.2.5-4'">
 
         <!-- 奇遇容器 -->
         <div class="center-img-container" id="centerImgContainer">
@@ -41,7 +41,8 @@
                 <div class="pixar-notice-image-area">
                     <p class="pixar-notice-caption">
                         您确定要退出登录吗？<br>
-                        退出后您仍能以访客身份翻阅本日记簿...
+                        请注意！<br>
+                        未保存的内容将会被清空！
                     </p>
                 </div>
 
@@ -64,6 +65,33 @@
             </div>
         </div>
 
+        <!-- 删除确认弹窗 -->
+        <div class="moments-modal-overlay" id="momentsDeleteModal" style="display: none;">
+            <div class="moments-card-widget">
+                <div class="moments-card-header">
+                    <!-- 新增这一层包裹 -->
+                    <div class="moments-header-row">
+                        <div class="moments-icon-wrapper">
+                            <svg aria-hidden="true" stroke="currentColor" stroke-width="1.5" viewBox="0 0 24 24"
+                                fill="none">
+                                <path
+                                    d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z"
+                                    stroke-linejoin="round" stroke-linecap="round"></path>
+                            </svg>
+                        </div>
+                        <div class="moments-text-content">
+                            <span class="moments-title-text"></span>
+                            <p class="moments-message-text"></p>
+                        </div>
+                    </div>
+                    <div class="moments-button-group">
+                        <button class="moments-btn-confirm" type="button" id="momentsConfirmDeleteBtn">确认</button>
+                        <button class="moments-btn-cancel" type="button" id="momentsCancelDeleteBtn">取消</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+
         <script th:if="${pluginFinder.available('plugin-douban')}"
             th:src="@{/plugins/plugin-douban/assets/static/db.min.js(v=${customJsVersion})}" class="pjax"></script>
         <script th:src="@{/assets/libs/axios/axios.min.js(v=${customJsVersion})}" id="axios.min-js"></script>

templates/modules/head.html

@@ -1,4 +1,4 @@
-<th:block th:fragment="head" th:with="customJsVersion=${'1.2.5-3'}">
+<th:block th:fragment="head" th:with="customJsVersion=${'1.2.5-4'}">
     <th:block th:replace="~{'modules/variables/msg'}" />
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no">

templates/modules/header/header-tool.html

@@ -16,7 +16,7 @@
             <div class="user_pannel round12" uk-dropdown="mode: click;toggle:#top_ava;pos:bottom-right;animation:uk-animation-slide-top-small">
                 <div class="inner">
                     <a href="/console" target="_blank" pjax="exclude"><i class="ri-function-line"></i>管理面板</a>
-                    <a class="logout" href="javascript:void(0);" onclick="showPixarCard()"><i class="ri-logout-circle-r-line"></i>退出登录</a>
+                    <a class="logout" href="javascript:void(0);" onclick="open_logout_box()"><i class="ri-logout-circle-r-line"></i>退出登录</a>
                 </div>
 
             </div>
@@ -47,7 +47,7 @@
             <div class="user_pannel round12" uk-dropdown="mode: click;toggle:#top_ava2;pos:bottom-right;animation:uk-animation-slide-top-small">
                 <div class="inner">
                     <a href="/console" target="_blank" pjax="exclude"><i class="ri-function-line"></i>管理面板</a>
-                    <a class="logout" href="javascript:void(0);" onclick="showPixarCard()"><i class="ri-logout-circle-r-line"></i>退出登录</a>
+                    <a class="logout" href="javascript:void(0);" onclick="open_logout_box()"><i class="ri-logout-circle-r-line"></i>退出登录</a>
                 </div>
 
             </div>

templates/modules/topic-push.html

@@ -124,7 +124,7 @@
                 <div class="form_footer">
                     <div class="admin_tool">
                         <a href="/console" target="_blank"><i class="ri-function-line"></i> 管理</a>
-                        <a class="logout" href="javascript:void(0);" onclick="showPixarCard()"><i class="ri-logout-circle-r-line"></i> 登出</a>
+                        <a class="logout" href="javascript:void(0);" onclick="open_logout_box()"><i class="ri-logout-circle-r-line"></i> 登出</a>
                     </div>
                     <div class="moment_sure">
                         <button class="uk-modal-close push_close">取消</button>

theme.yaml

@@ -17,7 +17,7 @@ spec:
   issues: "https://github.com/chengzhongxue/halo-theme-pix/issues"
   settingName: "theme-pix-setting"
   configMapName: "theme-pix-configMap"
-  version: "1.2.5-3"
+  version: "1.2.5-4"
   require: ">=2.20.0"
   customTemplates:
     page: