5 Commits

18 changed files with 1123 additions and 446 deletions
+13 -2
View File
@@ -2,11 +2,22 @@
> 基于原作者v1.2.5代码修改 > 基于原作者v1.2.5代码修改
#### v1.2.5-5
1. 朋友圈支持图片显示(需同步更新插件)
2. 手机端底部导航栏新增公告未读提示
3. 更新通讯录、储物柜
4. 优化操作提示、图片排版
#### v1.2.5-4
1. 修复侧边栏测速异常、拖拽片刻图片异常、手机端文章目录异常、页面提示异常
2. 优化多种场景下的提示、衔接、样式
3. 新增片刻删除提示框及删除动画
#### v1.2.5-3 #### v1.2.5-3
1. 朋友圈支持根据作者筛选内容(需同步更新插件) 1. 朋友圈支持根据作者筛选内容(需同步更新插件)
2. 支持前台弹窗登入登出 2. 支持前台弹窗登入登出
2. 附录页面功能补全 3. 附录页面功能补全
3. 对线路切换、加载异常等情况进行了深度优化 4. 对线路切换、加载异常等情况进行了深度优化
#### v1.2.5-2 #### v1.2.5-2
1. 添加侧边栏、页面、文章等HTML内容块 1. 添加侧边栏、页面、文章等HTML内容块
+7 -7
View File
@@ -299,7 +299,7 @@
<div class="people-grid"> <div class="people-grid">
<div class="person"> <div class="person">
<div class="avatar"> <div class="avatar">
<img src="/upload/8aea7800gy1i2vfbxoqhdj24w07c0b2p.jpg"> <img src="/upload/20260416214530_191_129.jpg">
</div> </div>
<div class="info"> <div class="info">
<p class="name">黄诗扶</p> <p class="name">黄诗扶</p>
@@ -310,18 +310,18 @@
</div> </div>
<div class="person"> <div class="person">
<div class="avatar"> <div class="avatar">
<img src="/upload/ec39c62fly1i3rextah4gj22dc35s1ky.jpg">&nbsp; <img src="/upload/20260416213611_190_129.jpg">
</div> </div>
<div class="info"> <div class="info">
<p class="name">双笙</p> <p class="name">双笙</p>
<p class="bio"> <p class="bio">
什么?你问我为什么喜欢包包?可能因为是青春吧? 什么?你问我为什么喜欢包包?可能因为是青春吧?
</p> </p>
</div> </div>
</div> </div>
<div class="person"> <div class="person">
<div class="avatar"> <div class="avatar">
<img src="/upload/005Jyswjgy1hywx7z7sb7j30zk1betbd.jpg"> <img src="/upload/005Jyswjgy1ic7xfxtlu8j33402c0npe.jpg">
</div> </div>
<div class="info"> <div class="info">
<p class="name">浅影阿</p> <p class="name">浅影阿</p>
@@ -332,12 +332,12 @@
</div> </div>
<div class="person"> <div class="person">
<div class="avatar"> <div class="avatar">
<img src="/upload/ab0efe4ely1hnpfzqqw1oj23ls5eoqvg.jpg"> <img src="/upload/67f2efd2gy1i8iv8nkuqjj23344mokjp.jpg">
</div> </div>
<div class="info"> <div class="info">
<p class="name">平生不晚</p> <p class="name">玄觞</p>
<p class="bio"> <p class="bio">
首先是戏腔好听,然后是妆造好看,最后就来到了这里 你们古风圈,怎么都喊女生王子,喊男生二婶呢?
</p> </p>
</div> </div>
</div> </div>
+3 -2
View File
@@ -199,8 +199,9 @@
if (isUnread) { if (isUnread) {
typeof initNoticeTip === 'function' && initNoticeTip(); typeof initNoticeTip === 'function' && initNoticeTip();
noticeCard.querySelector('.notice-title').textContent = `通知书`; $('.footer_menu a[href="/navigator"]').css('color', '#ecc94b').find('i').css('color', '#ecc94b');
noticeCard.querySelector('.notice-desc').textContent = `有新通知待查看`; noticeCard.querySelector('.notice-title').textContent = '通知书';
noticeCard.querySelector('.notice-desc').textContent = '有新通知待查看';
noticeCard.classList.add('notice-unread'); noticeCard.classList.add('notice-unread');
if(decorCircle) decorCircle.style.background = '#fef3c7'; if(decorCircle) decorCircle.style.background = '#fef3c7';
+113 -88
View File
@@ -3,7 +3,6 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
font-family: "Inter", "Microsoft YaHei", Arial;
} }
.store { .store {
@@ -13,7 +12,7 @@
--danger: #E74C3C; --danger: #E74C3C;
--bg: #F9FFFB; --bg: #F9FFFB;
--shadow: 0 12px 30px rgba(80, 200, 120, .12); --shadow: 0 12px 30px rgba(80, 200, 120, .12);
--radius: 18px; --radius: 8px;
padding: 26px 14px; padding: 26px 14px;
background: var(--bg); background: var(--bg);
} }
@@ -59,7 +58,7 @@
#tag-search { #tag-search {
width: 100%; width: 100%;
padding: 7px 12px 7px 34px; padding: 7px 12px 7px 34px;
border-radius: 10px; border-radius: 8px;
border: 1px solid #c9efd6; border: 1px solid #c9efd6;
outline: none; outline: none;
background: #fafffb; background: #fafffb;
@@ -79,7 +78,7 @@
flex-wrap: wrap; flex-wrap: wrap;
gap: 8px; gap: 8px;
padding: 8px; padding: 8px;
border-radius: 12px; border-radius: 8px;
border: 1px solid #c9efd6; border: 1px solid #c9efd6;
background: rgba(144, 238, 144, .08); background: rgba(144, 238, 144, .08);
max-height: 100px; max-height: 100px;
@@ -89,7 +88,7 @@
.store .tag-item { .store .tag-item {
padding: 5px 7px; padding: 5px 7px;
border-radius: 9px; border-radius: 8px;
border: 1px solid #90ee90; border: 1px solid #90ee90;
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
@@ -107,31 +106,66 @@
.store .no-result { .store .no-result {
width: 100%; width: 100%;
text-align: center; text-align: center;
align-items: center;
justify-content: center;
color: #7f8c8d; color: #7f8c8d;
font-size: 13px; font-size: 13px;
padding: 8px 0; min-height: 100%;
padding: 0;
display: none; display: none;
} }
/* 输入框 */ /* 输入框 */
.store .input-group { .store .input-group {
display: flex; display: flex;
gap: 10px; gap: 8px;
margin: 16px 0; margin: 16px 0;
align-items: center;
}
.store .section-divider {
position: relative;
height: 18px;
margin: 6px 0 14px;
}
.store .section-divider::before {
content: "";
position: absolute;
top: 50%;
left: 0;
width: 100%;
height: 1px;
transform: translateY(-50%);
background: linear-gradient(90deg, rgba(80, 200, 120, 0), rgba(80, 200, 120, .55), rgba(80, 200, 120, 0));
box-shadow: 0 1px 0 rgba(80, 200, 120, .12);
}
.store .section-divider::after {
content: "";
position: absolute;
top: 50%;
left: 50%;
width: 10px;
height: 10px;
transform: translate(-50%, -50%) rotate(45deg);
border-radius: 2px;
background: linear-gradient(135deg, #90ee90, #50c878);
box-shadow: -14px 0 0 -3px rgba(80, 200, 120, .5), 14px 0 0 -3px rgba(80, 200, 120, .5), 0 0 0 2px #ffffff;
} }
#file-path { #file-path {
flex: 1; flex: 1;
padding: 8px 14px; padding: 8px 14px;
border-radius: 12px; border-radius: 8px;
border: 2px solid #e8f7ec; border: 2px solid #e8f7ec;
font-size: 14px; font-size: 14px;
outline: none; outline: none;
} }
#submit-btn { #submit-btn {
padding: 10px; padding: 10px 20px;
border-radius: 12px; border-radius: 8px;
border: none; border: none;
background: linear-gradient(135deg, #50c878, #3a9156); background: linear-gradient(135deg, #50c878, #3a9156);
color: #fff; color: #fff;
@@ -139,17 +173,6 @@
cursor: pointer; cursor: pointer;
} }
/* 底部提示(改成浅黄色系) */
.store .tips {
font-size: 12px;
text-align: center;
color: #a97400;
padding: 8px;
border-radius: 8px;
background: rgba(255, 215, 0, .12);
border: 1px solid rgba(243, 156, 18, .25);
}
/* 手机端 */ /* 手机端 */
@media(max-width:520px) { @media(max-width:520px) {
.store { .store {
@@ -166,7 +189,8 @@
} }
.store .input-group { .store .input-group {
flex-direction: column flex-direction: column;
align-items: stretch;
} }
#submit-btn { #submit-btn {
@@ -176,34 +200,11 @@
.store .tag-list { .store .tag-list {
max-height: 120px max-height: 120px
} }
}
/* Toast */ #file-path {
.custom-toast { width: 100%;
position: fixed; box-sizing: border-box;
top: 26px; }
left: 50%;
transform: translateX(-50%) translateY(-80px);
background: #2ECC71;
color: #fff;
padding: 12px 20px;
border-radius: 10px;
transition: .4s;
opacity: 0;
z-index: 9999;
}
.toast-show {
transform: translateX(-50%) translateY(0);
opacity: 1
}
.toast-error {
background: #E74C3C
}
.toast-warning {
background: #F39C12
} }
</style> </style>
@@ -211,58 +212,55 @@
<div class="container"> <div class="container">
<div class="top-bar"></div> <div class="top-bar"></div>
<h1 class="title">Anian的储物柜</h1> <h1 class="title">储物柜</h1>
<div class="input-group">
<input id="file-path" placeholder="请输入翻找目标..." autocomplete="off">
<button id="submit-btn">翻 找</button>
</div>
<div class="section-divider" aria-hidden="true"></div>
<div class="tag-container"> <div class="tag-container">
<div class="tag-search-wrapper"> <div class="tag-search-wrapper">
<span class="search-icon">🔍</span> <span class="search-icon"><i class="ri-search-line"></i></span>
<input id="tag-search" placeholder="搜索标签"> <input id="tag-search" placeholder="搜索标签..." autocomplete="off">
</div> </div>
<div class="tag-list"> <div class="tag-list">
<div class="tag-item" data-value="test.zip">测试压缩包</div> <div class="tag-item" data-value="/upload/jiazai.gif">加载动画</div>
<div class="tag-item" data-value="docs/report.pdf">示例报告</div> <div class="tag-item" data-value="/upload/logo.png">网站Logo</div>
<div class="tag-item" data-value="images/banner.jpg">横幅图片</div> <div class="tag-item" data-value="/upload/jiazai.gif">加载动画</div>
<div class="tag-item" data-value="software/setup.exe">安装程序</div> <div class="tag-item" data-value="/upload/logo.png">网站Logo</div> <div class="tag-item" data-value="/upload/jiazai.gif">加载动画</div>
<div class="tag-item" data-value="/upload/logo.png">网站Logo</div> <div class="tag-item" data-value="/upload/jiazai.gif">加载动画</div>
<div class="tag-item" data-value="/upload/logo.png">网站Logo</div> <div class="tag-item" data-value="/upload/jiazai.gif">加载动画</div>
<div class="tag-item" data-value="/upload/logo.png">网站Logo</div> <div class="tag-item" data-value="/upload/jiazai.gif">加载动画</div>
<div class="tag-item" data-value="/upload/logo.png">网站Logo</div>
<div class="no-result" id="noResult">没有匹配的结果</div> <div class="no-result" id="noResult">没有匹配的结果</div>
</div> </div>
</div> </div>
<div class="input-group">
<input id="file-path" placeholder="请输入路径" autocomplete="off">
<button id="submit-btn">访问 / 下载</button>
</div>
<p class="tips">⚠️ 错误过多将可能被封禁</p>
</div> </div>
<div class="custom-toast" id="customToast"></div>
</div> </div>
<script> <script>
function initializeStoreEvents() { function initializeStoreEvents() {
let closeLoading = null;
const container = document.querySelector(".store"); const container = document.querySelector(".store");
if (!container || container.dataset.init === "1") return; if (!container || container.dataset.init === "1") return;
container.dataset.init = "1"; container.dataset.init = "1";
const input = document.getElementById('file-path'); const input = document.getElementById('file-path');
const btn = document.getElementById('submit-btn'); const btn = document.getElementById('submit-btn');
const toast = document.getElementById('customToast');
const tagItems = document.querySelectorAll('.tag-item'); const tagItems = document.querySelectorAll('.tag-item');
const tagSearch = document.getElementById('tag-search'); const tagSearch = document.getElementById('tag-search');
const noResult = document.getElementById('noResult'); const noResult = document.getElementById('noResult');
function showToast(msg, type = 'warning') {
toast.textContent = msg;
toast.className = 'custom-toast toast-' + type + ' toast-show';
setTimeout(() => toast.classList.remove('toast-show'), 2600);
}
tagItems.forEach(t => { tagItems.forEach(t => {
t.onclick = () => { t.onclick = () => {
input.value = t.dataset.value; input.value = t.dataset.value;
showToast('已填入 ' + t.dataset.value, 'success'); cocoMessage.success('已填入对应标签信息');
}; };
}); });
@@ -277,39 +275,66 @@
if (show) visible++; if (show) visible++;
}); });
noResult.style.display = visible === 0 ? 'block' : 'none'; noResult.style.display = visible === 0 ? 'flex' : 'none';
}; };
function check(url) { function check(url) {
return new Promise(r => { return new Promise(r => {
const xhr = new XMLHttpRequest(); const xhr = new XMLHttpRequest();
xhr.open('HEAD', url, true); try {
xhr.open('HEAD', url, true);
} catch (e) {
r(0);
return;
}
xhr.timeout = 5000; xhr.timeout = 5000;
xhr.onload = () => r(xhr.status === 200); xhr.onload = () => r(xhr.status);
xhr.onerror = () => r(false); xhr.onerror = () => r(0);
xhr.ontimeout = () => r(false); xhr.ontimeout = () => r(0);
xhr.send(); xhr.send();
}); });
} }
function normalizeDestination(value) {
const trimmed = value.trim();
if (!trimmed || /\\/.test(trimmed)) return null;
const url = trimmed.charAt(0) === '/' ? trimmed : '/' + trimmed;
if (/^\/\//.test(url)) return null;
return url;
}
async function go() { async function go() {
const v = input.value.trim(); const v = input.value.trim();
if (!v) return showToast('请输入路径'); if (!v) return cocoMessage.warning('请输入翻找目标');
const url = '/' + v; const url = normalizeDestination(v);
btn.textContent = '检测中...'; if (!url) return cocoMessage.warning('翻找目标无效');
btn.textContent = '翻找中...';
closeLoading = cocoMessage.loading('正在翻找中,请稍候...');
btn.disabled = true; btn.disabled = true;
const ok = await check(url); try {
if (ok) { const status = await check(url);
showToast('资源存在,跳转中', 'success'); if (status === 200) {
setTimeout(() => location.href = url, 700); cocoMessage.success('翻找成功,即将打开目标页面');
} else showToast('资源不存在', 'error'); window.open(url, '_blank');
setTimeout(() => { btn.textContent = '访问 / 下载'; btn.disabled = false }, 700); } else if (status === 404) {
cocoMessage.warning('翻找失败,失败过多将被封禁');
} else {
cocoMessage.error('翻找异常,请重试或刷新页面');
}
} finally {
closeLoading?.();
closeLoading = null;
btn.textContent = '翻 找';
btn.disabled = false;
}
} }
btn.onclick = go; btn.onclick = go;
input.onkeydown = e => { if (e.key === 'Enter') go(); }; input.onkeydown = e => { if (e.key === 'Enter') go(); };
} }
document.addEventListener("DOMContentLoaded", initializeStoreEvents); initializeStoreEvents();
document.addEventListener("pjax:complete", initializeStoreEvents);
</script> </script>
+259
View File
@@ -304,6 +304,15 @@
0 var(--pixar-button-depth) 0 var(--pixar-ui-dark); 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 { .pixar-notice-btn-close {
background: var(--pixar-ui-red); background: var(--pixar-ui-red);
box-shadow: box-shadow:
@@ -324,3 +333,253 @@
.pixar-notice-btn-close:hover { .pixar-notice-btn-close:hover {
border-color: var(--pixar-ui-red-border) !important; 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);
}
}
+1 -1
View File
@@ -5977,7 +5977,7 @@ a.change i.ri-refresh-line {
display: none; display: none;
position: fixed; position: fixed;
z-index: 999; z-index: 999;
top: 485px; top: 50%;
left: 0; left: 0;
background-color: var(--toc-color); background-color: var(--toc-color);
color: #fff; color: #fff;
+2 -1
View File
@@ -504,11 +504,12 @@ a:visited {
color: #252525; color: #252525;
} }
/* 侧边栏颜色异常
a:hover, a:hover,
a:focus, a:focus,
a:active { a:active {
color: #191970; color: #191970;
} } */
a:focus { a:focus {
outline: thin dotted; outline: thin dotted;
+66 -23
View File
@@ -30,6 +30,7 @@ let csrfToken = '';
let publicKey = ''; let publicKey = '';
let loginTimer = null; let loginTimer = null;
let countdownSeconds = 3; let countdownSeconds = 3;
let closeLoading = null;
const login_modal = document.getElementById('customLoginModal'); const login_modal = document.getElementById('customLoginModal');
const login_closeBtn = document.getElementById('closeLoginModal'); const login_closeBtn = document.getElementById('closeLoginModal');
const login_loginBtn = document.getElementById('customLoginBtn'); const login_loginBtn = document.getElementById('customLoginBtn');
@@ -39,6 +40,7 @@ async function fetchCSRFToken() {
login_modal.classList.add('show'); login_modal.classList.add('show');
login_loginBtn.disabled = true; login_loginBtn.disabled = true;
login_loginBtn.textContent = '加载中...'; login_loginBtn.textContent = '加载中...';
closeLoading = cocoMessage.loading('正在加载署名信息...');
try { try {
const response = await fetch('/login', { credentials: 'include' }); const response = await fetch('/login', { credentials: 'include' });
@@ -62,19 +64,23 @@ async function fetchCSRFToken() {
publicKey = publicKeyMatch[1].replace(/\\\//g, '/'); publicKey = publicKeyMatch[1].replace(/\\\//g, '/');
return 'ok'; return 'ok';
} catch (err) { } catch (err) {
closeLoading?.()
cocoMessage.error('署名信息加载失败,请刷新');
if (loginTimer) { clearInterval(loginTimer) }
login_loginBtn.textContent = '错误!请刷新';
login_loginBtn.disabled = true;
return 'error'; return 'error';
} }
} }
// 打开弹窗逻辑 // 打开弹窗逻辑
async function open_login_box() { async function open_login_box() {
if (loginTimer) { if (loginTimer) { clearInterval(loginTimer) }
clearInterval(loginTimer);
}
countdownSeconds = 3; countdownSeconds = 3;
const success = await fetchCSRFToken(); const success = await fetchCSRFToken();
if (success === 'logged') { if (success === 'logged') {
cocoMessage.success('您已经署名过了,请刷新'); closeLoading?.()
cocoMessage.success('您已署名成功,请刷新');
login_modal.classList.remove('show'); login_modal.classList.remove('show');
} else if (success === 'ok') { } else if (success === 'ok') {
loginTimer = setInterval(() => { loginTimer = setInterval(() => {
@@ -82,12 +88,15 @@ async function open_login_box() {
login_loginBtn.textContent = '请稍等...' + countdownSeconds; login_loginBtn.textContent = '请稍等...' + countdownSeconds;
} else { } else {
clearInterval(loginTimer); clearInterval(loginTimer);
closeLoading?.()
cocoMessage.success('署名信息加载完成');
login_loginBtn.textContent = '署 名'; login_loginBtn.textContent = '署 名';
login_loginBtn.disabled = false; login_loginBtn.disabled = false;
} }
countdownSeconds--; countdownSeconds--;
}, 1000); }, 1000);
} else { } else {
closeLoading?.()
cocoMessage.error('服务器错误,请刷新'); cocoMessage.error('服务器错误,请刷新');
login_modal.classList.remove('show'); login_modal.classList.remove('show');
} }
@@ -95,6 +104,7 @@ async function open_login_box() {
// 关闭弹窗 // 关闭弹窗
login_closeBtn.addEventListener('click', () => { login_closeBtn.addEventListener('click', () => {
closeLoading?.()
login_modal.classList.remove('show'); login_modal.classList.remove('show');
}); });
@@ -111,6 +121,7 @@ function encryptPassword(password) {
// 提交登录 // 提交登录
login_loginBtn.addEventListener('click', async () => { login_loginBtn.addEventListener('click', async () => {
let islogin = false;
const username = document.getElementById('customUsername').value.trim(); const username = document.getElementById('customUsername').value.trim();
const password = document.getElementById('customPassword').value.trim(); const password = document.getElementById('customPassword').value.trim();
if (!username || !password) { if (!username || !password) {
@@ -119,7 +130,9 @@ login_loginBtn.addEventListener('click', async () => {
} }
const encryptedPwd = encryptPassword(password); const encryptedPwd = encryptPassword(password);
login_loginBtn.disabled = true; login_loginBtn.disabled = true;
login_closeBtn.disabled = true;
login_loginBtn.textContent = '验证中...'; login_loginBtn.textContent = '验证中...';
closeLoading = cocoMessage.loading('正在验证信息...');
try { try {
countdownSeconds = 3 countdownSeconds = 3
const response = await fetch('/login', { const response = await fetch('/login', {
@@ -141,30 +154,41 @@ login_loginBtn.addEventListener('click', async () => {
clearInterval(loginTimer); clearInterval(loginTimer);
} }
if (finalUrl.includes('/uc')) { if (finalUrl.includes('/uc')) {
islogin = true;
closeLoading?.()
cocoMessage.success('署名成功,正在跳转...'); cocoMessage.success('署名成功,正在跳转...');
login_loginBtn.textContent = '跳转中...'; login_loginBtn.textContent = '跳转中...';
setTimeout(() => { const currentScrollTop = window.scrollY || document.documentElement.scrollTop;
window.location.reload(); $.cookie('scrollParam', currentScrollTop, { path: '/', domain: 'anian.cc' });
}, 800); $.cookie('load_type', 'login', { path: '/', domain: 'anian.cc' });
window.location.reload();
} else if (finalUrl.includes('error=invalid-credential')) { } else if (finalUrl.includes('error=invalid-credential')) {
closeLoading?.()
cocoMessage.warning('署名人与心上锁不匹配'); cocoMessage.warning('署名人与心上锁不匹配');
fetchCSRFToken();
} else { } else {
closeLoading?.()
cocoMessage.error('速度过快,请稍后重试'); cocoMessage.error('速度过快,请稍后重试');
} }
} catch (err) { } catch (err) {
closeLoading?.()
cocoMessage.error('服务器连接失败'); cocoMessage.error('服务器连接失败');
} finally { } finally {
loginTimer = setInterval(() => { if (!islogin) {
if (countdownSeconds > 0) { fetchCSRFToken();
login_loginBtn.textContent = '请稍等...' + countdownSeconds; login_closeBtn.disabled = false;
} else { loginTimer = setInterval(() => {
clearInterval(loginTimer); if (countdownSeconds > 0) {
login_loginBtn.textContent = '署 名'; login_loginBtn.textContent = '请稍等...' + countdownSeconds;
login_loginBtn.disabled = false; } else {
} clearInterval(loginTimer);
countdownSeconds--; closeLoading?.()
}, 1000); cocoMessage.success('请重新尝试署名');
login_loginBtn.textContent = '署 名';
login_loginBtn.disabled = false;
}
countdownSeconds--;
}, 1000);
}
} }
}); });
@@ -181,6 +205,8 @@ document.addEventListener("keydown", function (e) {
// 退出登录 // 退出登录
async function customLogout() { async function customLogout() {
$('.pixar-notice-btn-confirm, .pixar-notice-btn-close').prop('disabled', true);
let closeLoading = cocoMessage.loading('退出登录中...');
try { try {
const getResponse = await fetch('/logout', { credentials: 'include' }); const getResponse = await fetch('/logout', { credentials: 'include' });
const htmlText = await getResponse.text(); const htmlText = await getResponse.text();
@@ -189,6 +215,8 @@ async function customLogout() {
const logoutCsrfToken = doc.querySelector('input[name="_csrf"]')?.value; const logoutCsrfToken = doc.querySelector('input[name="_csrf"]')?.value;
if (!logoutCsrfToken) { if (!logoutCsrfToken) {
cocoMessage.error('页面未找到 CSRF 令牌'); cocoMessage.error('页面未找到 CSRF 令牌');
$('.pixar-notice-btn-confirm, .pixar-notice-btn-close').prop('disabled', false);
closeLoading();
return; return;
} }
const postResponse = await fetch('/logout', { const postResponse = await fetch('/logout', {
@@ -202,20 +230,26 @@ async function customLogout() {
}) })
}); });
if (postResponse.ok) { if (postResponse.ok) {
closeLoading();
cocoMessage.success('您已成功退出登录'); cocoMessage.success('您已成功退出登录');
setTimeout(() => { const currentScrollTop = window.scrollY || document.documentElement.scrollTop;
window.location.reload(); $.cookie('scrollParam', currentScrollTop, { path: '/', domain: 'anian.cc' });
}, 800); $.cookie('load_type', 'logout', { path: '/', domain: 'anian.cc' });
window.location.reload();
} else { } else {
closeLoading();
$('.pixar-notice-btn-confirm, .pixar-notice-btn-close').prop('disabled', false);
throw new Error('退出请求被拒绝'); throw new Error('退出请求被拒绝');
} }
} catch (err) { } catch (err) {
closeLoading();
$('.pixar-notice-btn-confirm, .pixar-notice-btn-close').prop('disabled', false);
console.error('Logout Error:', err); console.error('Logout Error:', err);
cocoMessage.error('退出失败,请手动刷新页面'); cocoMessage.error('退出失败,请手动刷新页面');
} }
} }
function showPixarCard() { function open_logout_box() {
const wrapper = document.getElementById("pixarNoticeWrapper"); const wrapper = document.getElementById("pixarNoticeWrapper");
wrapper.style.display = "flex"; wrapper.style.display = "flex";
} }
@@ -229,7 +263,16 @@ function confirmPixarAction() {
customLogout(); 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);
}
+62 -74
View File
@@ -383,13 +383,7 @@ $(document).on('click', '.wp_get_media_list li', function () {
//删除图片/视频(保留事件冒泡修复) //删除图片/视频(保留事件冒泡修复)
$(document).on('click', '.topic-img-de', function (e) { $(document).on('click', '.topic-img-de', function (e) {
e.stopPropagation(); e.stopPropagation();
$(this).parent().remove();
var msg = "确认删除此媒体文件?";
if (confirm(msg)) {
$(this).parent().remove();
} else {
return false;
}
var num = $('.add_img_box .t_media_item').length; var num = $('.add_img_box .t_media_item').length;
if (num < 9) { if (num < 9) {
$("a.up_img_btn").show(); $("a.up_img_btn").show();
@@ -606,9 +600,8 @@ $(document).on('click', '.loca_text', function () {
//发布更新瞬间 //发布更新瞬间
let isSubmittingMoment = false; let isSubmittingMoment = false;
$(document).on('click', '.push_item', function () { $(document).on('click', '.push_item', function () {
if (isSubmittingMoment) return false; if (isSubmittingMoment) return false;
let closeLoading = null;
var content = $("#topic_content").val(); var content = $("#topic_content").val();
var catname = $(".t_cat_toogle span").text(); var catname = $(".t_cat_toogle span").text();
var loca = $(".loca_text").text(); var loca = $(".loca_text").text();
@@ -669,7 +662,8 @@ $(document).on('click', '.push_item', function () {
pushData.metadata.annotations = { mylocal: loca }; pushData.metadata.annotations = { mylocal: loca };
} }
cocoMessage.info("发布.."); closeLoading = cocoMessage.loading('正在发布...');
$('.push_close, .push_item').prop('disabled', true);
$.ajax({ $.ajax({
type: "POST", type: "POST",
@@ -677,10 +671,16 @@ $(document).on('click', '.push_item', function () {
contentType: "application/json", contentType: "application/json",
data: JSON.stringify(pushData), data: JSON.stringify(pushData),
success() { success() {
closeLoading?.()
cocoMessage.success('发布成功!'); 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(); location.reload();
}, },
error() { error() {
$('.push_close, .push_item').prop('disabled', false);
closeLoading?.()
cocoMessage.error('发布失败!'); cocoMessage.error('发布失败!');
release(); release();
} }
@@ -717,7 +717,8 @@ $(document).on('click', '.push_item', function () {
updateData.metadata.annotations = { mylocal: loca }; updateData.metadata.annotations = { mylocal: loca };
} }
cocoMessage.info("更新.."); closeLoading = cocoMessage.loading('正在更新...');
$('.push_close, .push_item').prop('disabled', true);
$.ajax({ $.ajax({
type: "PUT", type: "PUT",
@@ -725,11 +726,17 @@ $(document).on('click', '.push_item', function () {
contentType: "application/json", contentType: "application/json",
data: JSON.stringify(updateData), data: JSON.stringify(updateData),
success() { success() {
closeLoading?.()
cocoMessage.success('更新成功!'); 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(); location.reload();
}, },
error() { error() {
closeLoading?.()
cocoMessage.error('更新失败!'); cocoMessage.error('更新失败!');
$('.push_close, .push_item').prop('disabled', false);
release(); release();
} }
}); });
@@ -1052,8 +1059,6 @@ $(document).on('click', '#t_pagination a', function () {
const currentPage = parseInt(href.match(/\d+/)[0]); const currentPage = parseInt(href.match(/\d+/)[0]);
const $pagingArea = $('#t_pagination .post-paging'); const $pagingArea = $('#t_pagination .post-paging');
const originalPagingHtml = $pagingArea.html(); const originalPagingHtml = $pagingArea.html();
const isauto_loading = window.isAutoLoading
if (window.isAutoLoading) window.isAutoLoading = false;
$.ajax({ $.ajax({
type: "GET", type: "GET",
@@ -1075,13 +1080,9 @@ $(document).on('click', '#t_pagination a', function () {
} else { } else {
$("#t_pagination a").hide(); $("#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);
$body.animate({ scrollTop: result.offset().top - 58 }, 500); } else window.forceStopLoading = true;
} else {
window.forceStopLoading = true;
}
} else $body.animate({ scrollTop: result.offset().top - 58 }, 500);
getMomentAudio(); getMomentAudio();
initAgree(); initAgree();
lazyLoadInstance.update(); lazyLoadInstance.update();
@@ -1214,8 +1215,6 @@ $(document).on('click', '#p_pagination a', function () {
const $pagingArea = $('#p_pagination .post-paging'); const $pagingArea = $('#p_pagination .post-paging');
const originalPagingHtml = $pagingArea.html(); const originalPagingHtml = $pagingArea.html();
const targetOffsetTop = $('#p_pagination a').offset().top; const targetOffsetTop = $('#p_pagination a').offset().top;
const isauto_loading = window.isAutoLoading
if (window.isAutoLoading) window.isAutoLoading = false;
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: href, url: href,
@@ -1234,13 +1233,9 @@ $(document).on('click', '#p_pagination a', function () {
} else { } else {
$("#p_pagination a").hide(); //如果没有下一页了,隐藏 $("#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);
$body.animate({ scrollTop: targetOffsetTop - 358 }, 500); } else window.forceStopLoading = true;
} else {
window.forceStopLoading = true;
}
} else $body.animate({ scrollTop: targetOffsetTop - 358 }, 500);
pix.initGalleryPhotos(); pix.initGalleryPhotos();
$.cookie('page', currentPage, { path: '/', domain: 'anian.cc' }); $.cookie('page', currentPage, { path: '/', domain: 'anian.cc' });
} else { } else {
@@ -1492,8 +1487,6 @@ $('body').on('click', '#pagination a', function () {
const originalPagingHtml = $pagingArea.html(); const originalPagingHtml = $pagingArea.html();
var href = $(this).attr('data'); var href = $(this).attr('data');
const currentPage = parseInt(href.match(/\d+/)[0]); const currentPage = parseInt(href.match(/\d+/)[0]);
const isauto_loading = window.isAutoLoading
if (window.isAutoLoading) window.isAutoLoading = false;
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: href, url: href,
@@ -1519,13 +1512,9 @@ $('body').on('click', '#pagination a', function () {
} else { } else {
$("#pagination a").hide(); //如果没有下一页了,隐藏 $("#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);
$body.animate({ scrollTop: result.offset().top - 58 }, 500); } else window.forceStopLoading = true;
} else {
window.forceStopLoading = true;
}
} else $body.animate({ scrollTop: result.offset().top - 58 }, 500);
initAgree() initAgree()
lazyLoadInstance.update(); lazyLoadInstance.update();
$.cookie('page', currentPage, { path: '/', domain: 'anian.cc' }); $.cookie('page', currentPage, { path: '/', domain: 'anian.cc' });
@@ -1548,8 +1537,6 @@ $('body').on('click', '.arc_pagenav a', function () {
const $pagingArea = $('.arc_pagenav'); const $pagingArea = $('.arc_pagenav');
const originalPagingHtml = $pagingArea.html(); const originalPagingHtml = $pagingArea.html();
const postListElement = document.getElementById("post_item"); const postListElement = document.getElementById("post_item");
const isauto_loading = window.isAutoLoading
if (window.isAutoLoading) window.isAutoLoading = false;
var href = $(this).attr('data'); var href = $(this).attr('data');
const currentPage = parseInt(href.match(/\d+/)[0]); const currentPage = parseInt(href.match(/\d+/)[0]);
@@ -1579,15 +1566,10 @@ $('body').on('click', '.arc_pagenav a', function () {
} else { } else {
$(".arc_pagenav a").hide(); //如果没有下一页了,隐藏 $(".arc_pagenav a").hide(); //如果没有下一页了,隐藏
} }
$('.arc_pagenav .uk-spinner').remove(); $('.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);
$body.animate({ scrollTop: post.offset().top - 58 }, 500); } else window.forceStopLoading = true;
} else {
window.forceStopLoading = true;
}
} else $body.animate({ scrollTop: post.offset().top - 58 }, 500);
initAgree() initAgree()
lazyLoadInstance.update(); lazyLoadInstance.update();
$.cookie('page', currentPage, { path: '/', domain: 'anian.cc' }); $.cookie('page', currentPage, { path: '/', domain: 'anian.cc' });
@@ -2319,7 +2301,7 @@ function anian_renderLunarUI() {
try { try {
const cookieVal = anian_getCookie(cookieName); const cookieVal = anian_getCookie(cookieName);
if (cookieVal) data = JSON.parse(cookieVal); if (cookieVal) data = JSON.parse(cookieVal);
} catch (_) {} } catch (_) { }
if (data) { if (data) {
doRender(data); doRender(data);
@@ -2579,6 +2561,7 @@ async function initNoticeTip() {
if (hasUnread) { if (hasUnread) {
noticeBubble.classList.add('show'); noticeBubble.classList.add('show');
noticeBtn.classList.add('has-notice'); noticeBtn.classList.add('has-notice');
$('.footer_menu a[href="/navigator"]').css('color', '#ecc94b').find('i').css('color', '#ecc94b');
} else { } else {
noticeBubble.classList.remove('show'); noticeBubble.classList.remove('show');
noticeBtn.classList.remove('has-notice'); noticeBtn.classList.remove('has-notice');
@@ -2622,11 +2605,11 @@ if (location.hostname === "anian.cc") {
anianxSpeedMainLine.addEventListener("click", () => { anianxSpeedMainLine.addEventListener("click", () => {
if (anianxSpeedGlobalLock) return; if (anianxSpeedGlobalLock) return;
anianxSpeedMoveArrow(anianxSpeedMainLine);
anianxSpeedGlobalLock = true; anianxSpeedGlobalLock = true;
if (anianxSpeedMainLine.classList.contains("anianx-fixed")) { if (anianxSpeedMainLine.classList.contains("anianx-fixed")) {
anianxSpeedBubbleText.classList.remove("anianx-loading"); anianxSpeedBubbleText.classList.remove("anianx-loading");
anianxSpeedBubbleText.innerText = "当前为主线路"; anianxSpeedBubbleText.innerText = "当前为主线路";
anianxSpeedMoveArrow(anianxSpeedMainLine);
anianxSpeedGlobalLock = false; anianxSpeedGlobalLock = false;
} else { } else {
anianxSpeedBubbleText.classList.add("anianx-loading"); anianxSpeedBubbleText.classList.add("anianx-loading");
@@ -2642,11 +2625,11 @@ anianxSpeedMainLine.addEventListener("click", () => {
anianxSpeedSubLine.addEventListener("click", () => { anianxSpeedSubLine.addEventListener("click", () => {
if (anianxSpeedGlobalLock) return; if (anianxSpeedGlobalLock) return;
anianxSpeedMoveArrow(anianxSpeedSubLine);
anianxSpeedGlobalLock = true; anianxSpeedGlobalLock = true;
if (anianxSpeedSubLine.classList.contains("anianx-fixed")) { if (anianxSpeedSubLine.classList.contains("anianx-fixed")) {
anianxSpeedBubbleText.classList.remove("anianx-loading"); anianxSpeedBubbleText.classList.remove("anianx-loading");
anianxSpeedBubbleText.innerText = "当前为副线路"; anianxSpeedBubbleText.innerText = "当前为副线路";
anianxSpeedMoveArrow(anianxSpeedSubLine);
anianxSpeedGlobalLock = false; anianxSpeedGlobalLock = false;
} else { } else {
anianxSpeedBubbleText.classList.add("anianx-loading"); anianxSpeedBubbleText.classList.add("anianx-loading");
@@ -2662,10 +2645,10 @@ anianxSpeedSubLine.addEventListener("click", () => {
anianxSpeedTestLine.addEventListener("click", () => { anianxSpeedTestLine.addEventListener("click", () => {
if (anianxSpeedGlobalLock) return; if (anianxSpeedGlobalLock) return;
anianxSpeedMoveArrow(anianxSpeedTestLine);
anianxSpeedGlobalLock = true; anianxSpeedGlobalLock = true;
anianxSpeedBubbleText.classList.add("anianx-loading"); anianxSpeedBubbleText.classList.add("anianx-loading");
anianxSpeedBubbleText.innerText = "测速中"; anianxSpeedBubbleText.innerText = "测速中";
anianxSpeedMoveArrow(anianxSpeedTestLine);
anianxSpeedTestWithTimeout(7500).then(result => { anianxSpeedTestWithTimeout(7500).then(result => {
anianxSpeedBubbleText.classList.remove("anianx-loading"); anianxSpeedBubbleText.classList.remove("anianx-loading");
anianxSpeedBubbleText.innerText = result; anianxSpeedBubbleText.innerText = result;
@@ -2744,7 +2727,7 @@ function initTagSwitch() {
// 1. 定义一个全局标志位,用于外部强制终止 // 1. 定义一个全局标志位,用于外部强制终止
window.forceStopLoading = false; window.forceStopLoading = false;
window.isAutoLoading = false; window.loadMoreTimeout = false;
function loadMultiplePages(pageCount) { function loadMultiplePages(pageCount) {
return new Promise((resolve) => { return new Promise((resolve) => {
let loadedCount = 0; let loadedCount = 0;
@@ -2772,9 +2755,6 @@ function loadMultiplePages(pageCount) {
const $pager = $btn.closest('.post-paging'); const $pager = $btn.closest('.post-paging');
const oldHref = $btn.attr('data'); const oldHref = $btn.attr('data');
window.isAutoLoading = true;
const pageStartTime = Date.now(); const pageStartTime = Date.now();
$btn.trigger('click'); // 加载更多 $btn.trigger('click'); // 加载更多
@@ -2786,8 +2766,9 @@ function loadMultiplePages(pageCount) {
resolve(); resolve();
return; return;
} }
if (now - pageStartTime > 2000) { if (now - pageStartTime > 3000) {
clearInterval(waitInterval); clearInterval(waitInterval);
window.loadMoreTimeout = true;
resolve(); // 解决 Promise,触发后续滚动 resolve(); // 解决 Promise,触发后续滚动
return; return;
} }
@@ -2813,13 +2794,18 @@ function loadMultiplePages(pageCount) {
} }
function initjump() { function initjump() {
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(() => { 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 = () => { const loadPageTask = () => {
if (page && !isNaN(page)) { if (page && !isNaN(page)) {
const targetPage = Number(page) - 1; const targetPage = Number(page) - 1;
@@ -2827,28 +2813,30 @@ function initjump() {
} }
return Promise.resolve(); return Promise.resolve();
}; };
if (scrollParam && !isNaN(scrollParam)) { if (scrollParam && !isNaN(scrollParam)) {
const closeLoading = cocoMessage.loading('自动恢复原线路内容中...');
loadPageTask().then(() => { loadPageTask().then(() => {
// 执行滚动逻辑 closeLoading?.()
const recordScroll = Number(scrollParam); const recordScroll = Number(scrollParam);
const maxScroll = document.documentElement.scrollHeight - window.innerHeight; const maxScroll = document.documentElement.scrollHeight - window.innerHeight;
const scrollDistance = Math.min(recordScroll, maxScroll); const scrollDistance = Math.min(recordScroll, maxScroll);
$('html, body').animate({ scrollTop: scrollDistance }, 500); $('html, body').animate({ scrollTop: scrollDistance }, 500);
if (recordScroll > maxScroll && (recordScroll - maxScroll) > 200) { if (recordScroll > maxScroll && (recordScroll - maxScroll) > 200) {
closeLoading();
cocoMessage.warning('请手动加载原线路内容'); 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 { } else {
const msg = location.hostname === "anian.cc" ? '主线路' : (location.hostname === "www.anian.cc" ? '副线路' : '测试线路'); const msg = location.hostname === "anian.cc" ? '主线路' : (location.hostname === "www.anian.cc" ? '副线路' : '测试线路');
closeLoading(); cocoMessage.success('已成功切换至' + msg);
cocoMessage.success(`已成功切换至${msg}`);
} }
}); }).catch(() => closeLoading?.());
} }
}); }).catch(() => closeLoading?.());
} }
@@ -2926,7 +2914,7 @@ function initBlog() {
syncFooterWithAudioState(), syncFooterWithAudioState(),
highlightMenu(), highlightMenu(),
initializeMomentFold() initializeMomentFold()
// nextBanner() // nextBanner()
} }
+160 -142
View File
@@ -1,13 +1,13 @@
main_content = $('.moment_type_main'); main_content = $('.moment_type_main');
function remove_image_temp(){ function remove_image_temp() {
if(!$('.image_edit_temp .add_img_box').length > 0){ if (!$('.image_edit_temp .add_img_box').length > 0) {
var temp = $('.add_img_box'); var temp = $('.add_img_box');
$('.image_edit_temp').html(temp); $('.image_edit_temp').html(temp);
} }
main_content.empty(); main_content.empty();
} }
function back_image_temp(){ function back_image_temp() {
var temp = $('.add_img_box'); var temp = $('.add_img_box');
main_content.html(temp); main_content.html(temp);
$('.image_edit_temp').empty(); $('.image_edit_temp').empty();
@@ -58,7 +58,7 @@ $('body').on('click', '.edit_content .push_card', function () {
} }
}); });
function card_post(card_url){ function card_post(card_url) {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: `/apis/api.console.halo.run/v1alpha1/posts?keyword=${card_url}&labelSelector=content.halo.run%2Fdeleted%3Dfalse&page=1&size=20`, url: `/apis/api.console.halo.run/v1alpha1/posts?keyword=${card_url}&labelSelector=content.halo.run%2Fdeleted%3Dfalse&page=1&size=20`,
@@ -68,12 +68,12 @@ function card_post(card_url){
success: function (data) { success: function (data) {
$('.edit_card_box .edit_content input').val(''); $('.edit_card_box .edit_content input').val('');
if (data.total > 0) { if (data.total > 0) {
if(data.total>1){ if (data.total > 1) {
cocoMessage.error('当前搜索的文章有多个无法选择'); cocoMessage.error('当前搜索的文章有多个无法选择');
}else{ } else {
var item = data.items[0] var item = data.items[0]
$('.show_card').show(); $('.show_card').show();
$('.card_sortble').append(getcard(item.post.metadata.name,item.post.spec.cover,item.post.spec.title,'post')); $('.card_sortble').append(getcard(item.post.metadata.name, item.post.spec.cover, item.post.spec.title, 'post'));
cocoMessage.success('已生成卡片'); cocoMessage.success('已生成卡片');
} }
@@ -86,7 +86,7 @@ function card_post(card_url){
} }
function edit_page(card_url){ function edit_page(card_url) {
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: `/apis/api.console.halo.run/v1alpha1/singlepages?keyword=${card_url}&labelSelector=content.halo.run%2Fdeleted%3Dfalse&page=1&size=20`, url: `/apis/api.console.halo.run/v1alpha1/singlepages?keyword=${card_url}&labelSelector=content.halo.run%2Fdeleted%3Dfalse&page=1&size=20`,
@@ -96,12 +96,12 @@ function edit_page(card_url){
success: function (data) { success: function (data) {
$('.edit_card_box .edit_content input').val(''); $('.edit_card_box .edit_content input').val('');
if (data.total > 0) { if (data.total > 0) {
if(data.total>1){ if (data.total > 1) {
cocoMessage.error('当前搜索的页面有多个无法选择'); cocoMessage.error('当前搜索的页面有多个无法选择');
}else{ } else {
var item = data.items[0] var item = data.items[0]
$('.show_card').show(); $('.show_card').show();
$('.card_sortble').append(getcard(item.page.metadata.name,item.page.spec.cover,item.page.spec.title,'page')); $('.card_sortble').append(getcard(item.page.metadata.name, item.page.spec.cover, item.page.spec.title, 'page'));
cocoMessage.success('已生成卡片'); cocoMessage.success('已生成卡片');
} }
@@ -113,7 +113,7 @@ function edit_page(card_url){
}); });
} }
function getcard(name,cover,title,type){ function getcard(name, cover, title, type) {
return `<div class="moment_card_item" pid="${name}" type="${type}"> return `<div class="moment_card_item" pid="${name}" type="${type}">
<a> <a>
@@ -127,31 +127,25 @@ function getcard(name,cover,title,type){
</div>` </div>`
} }
$(document).on('click', '.de_card', function() { $(document).on('click', '.de_card', function () {
var msg = "确认删除此卡片?";
var num = $('.moment_card_item').length; var num = $('.moment_card_item').length;
if (confirm(msg)==true){ $(this).parents('.moment_card_item').remove();
$(this).parents('.moment_card_item').remove(); if (num == 1) {
} else {
return false;
}
if(num == 1){
$(".show_card").hide(); $(".show_card").hide();
} }
}); });
//图文编辑 返回图文编辑区域 //图文编辑 返回图文编辑区域
$('body').on('click', '.moment_image_type a', function() { $('body').on('click', '.moment_image_type a', function () {
back_image_temp(); back_image_temp();
$('.push_item').attr('type','image'); $('.push_item').attr('type', 'image');
}); });
//发布音乐-------------------------------------------------------------- //发布音乐--------------------------------------------------------------
$('body').on('click', '.moment_audio_type a', function() { $('body').on('click', '.moment_audio_type a', function () {
$('.push_item').attr('type','audio'); $('.push_item').attr('type', 'audio');
main_content = $('.moment_type_main'); main_content = $('.moment_type_main');
if($('.add_audio_box').length > 0){ if ($('.add_audio_box').length > 0) {
return false; return false;
} }
remove_image_temp(); remove_image_temp();
@@ -180,57 +174,57 @@ $('body').on('click', '.moment_audio_type a', function() {
}); });
//音乐和视频上传 //音乐和视频上传
$(document).on('change','#moment_img_up',function(){ $(document).on('change', '#moment_img_up', function () {
if($('#moment_img_up').val() == '') if ($('#moment_img_up').val() == '')
return; return;
var f = this.files[0]; var f = this.files[0];
var formData = new FormData(); var formData = new FormData();
formData.append('file',f); formData.append('file', f);
const policyName = Theme.moments.policy_name; const policyName = Theme.moments.policy_name;
const groupName = Theme.moments.group_name; const groupName = Theme.moments.group_name;
policyName && formData.append('policyName',policyName) policyName && formData.append('policyName', policyName)
groupName && formData.append('groupName',groupName) groupName && formData.append('groupName', groupName)
$.ajax({ $.ajax({
type: "POST", type: "POST",
url: `${Theme.moments.attachments_upload_api}`, url: `${Theme.moments.attachments_upload_api}`,
dataType: 'json', dataType: 'json',
data: formData, data: formData,
processData : false, processData: false,
contentType : false, contentType: false,
beforeSend: function () { beforeSend: function () {
cocoMessage.info('上传中...'); cocoMessage.info('上传中...');
$('.m_media_left i').remove(); $('.m_media_left i').remove();
$('.m_media_left').append("<div class='up_loading' uk-spinner='ratio: .6'></div>"); $('.m_media_left').append("<div class='up_loading' uk-spinner='ratio: .6'></div>");
var imged = $('.m_media_left img'); var imged = $('.m_media_left img');
if(imged.length > 0){ if (imged.length > 0) {
imged.remove(); imged.remove();
} }
}, },
success: function(data){ success: function (data) {
var thum = data.metadata.annotations["storage.halo.run/uri"] || data.metadata.annotations["storage.halo.run/external-link"] var thum = data.metadata.annotations["storage.halo.run/uri"] || data.metadata.annotations["storage.halo.run/external-link"]
$('.m_media_left .up_loading').remove(); $('.m_media_left .up_loading').remove();
$('.m_media_left').append('<img src="/themes/theme-pix/assets/img/video.png" data="'+thum+'">'); $('.m_media_left').append('<img src="/themes/theme-pix/assets/img/video.png" data="' + thum + '">');
cocoMessage.success('上传成功'); cocoMessage.success('上传成功');
$('input#moment_video_url').val(thum) $('input#moment_video_url').val(thum)
} }
}); });
}); });
$('body').on('click', '.audio_choose a', function() { $('body').on('click', '.audio_choose a', function () {
var text = '# 请插入封面,歌名以及歌曲外链'; var text = '# 请插入封面,歌名以及歌曲外链';
var type = $(this).attr('au_type'); var type = $(this).attr('au_type');
if(type != 'local'){ if (type != 'local') {
var text = '# 请输入歌曲ID'; var text = '# 请输入歌曲ID';
} }
$('.edit_audio_box .tips').text(text); $('.edit_audio_box .tips').text(text);
}); });
//发布视频-------------------------------------------------------------- //发布视频--------------------------------------------------------------
$('body').on('click', '.moment_video_type a', function() { $('body').on('click', '.moment_video_type a', function () {
$('.push_item').attr('type','video'); $('.push_item').attr('type', 'video');
main_content = $('.moment_type_main'); main_content = $('.moment_type_main');
if($('.add_video_box').length > 0){ if ($('.add_video_box').length > 0) {
return false; return false;
} }
remove_image_temp(); remove_image_temp();
@@ -265,10 +259,10 @@ $('body').on('click', '.moment_video_type a', function() {
}); });
$('body').on('click', '.video_choose a', function() { $('body').on('click', '.video_choose a', function () {
var text = '# 请上传视频或填写视频外链'; var text = '# 请上传视频或填写视频外链';
var type = $(this).attr('vi_type'); var type = $(this).attr('vi_type');
if(type == 'bili'){ if (type == 'bili') {
var text = '# 请输入B站视频bvid'; var text = '# 请输入B站视频bvid';
} }
$('.edit_video_box .tips').text(text); $('.edit_video_box .tips').text(text);
@@ -279,75 +273,91 @@ $('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 () {
$.ajax({ window.currentDeletePid = $(this).parent().attr('pid');
type: 'DELETE', openModal('删除确认', '确定删除瞬间?该条数据将被永久移除。', 'red');
dataType: 'json', });
url: `/apis/${Theme.moments.api}/v1alpha1/moments/`+pid,
contentType: "application/json",
beforeSend: function () {
cocoMessage.info('处理中..');
},
success: function (data) {
cocoMessage.success('删除成功');
setTimeout(()=>{
$(`#post-${pid}`)[0].remove()
},1000)
},
error: function (request) {
if(request.status){
cocoMessage.error('瞬间不存在或已删除');
}else{
cocoMessage.error('删除失败');
}
console.log(request)
},
});
} else {
return false;
}
// 点击取消按钮 - 关闭弹窗
$('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",
success: function (data) {
$('#momentsDeleteModal').fadeOut(200);
closeLoading?.()
cocoMessage.success('删除成功');
window.currentDeletePid = null;
const $post = $(`#post-${pid}`);
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);
},
});
}); });
//置顶片刻 //置顶片刻
$('body').on('click', '.sticky_btn', function() { $('body').on('click', '.sticky_btn', function () {
var pid = $(this).parent().attr('pid'); var pid = $(this).parent().attr('pid');
var stick = $(this).hasClass('stick'); var stick = $(this).hasClass('stick');
if(stick){ if (stick) {
var state = 'stick'; var state = 'stick';
} else { } else {
var state = 'unstick'; var state = 'unstick';
} }
var msg = "确定执行此操作?"; var msg = "确定执行此操作?";
if (confirm(msg)==true){ if (confirm(msg) == true) {
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
dataType: 'json', dataType: 'json',
url: Theme.ajaxurl, url: Theme.ajaxurl,
data: { data: {
'action':'stick_moment', 'action': 'stick_moment',
pid:pid, pid: pid,
state:state state: state
}, },
beforeSend: function () { beforeSend: function () {
cocoMessage.info('处理中..'); cocoMessage.info('处理中..');
}, },
success: function (data) { success: function (data) {
if(data.state == '1'){ if (data.state == '1') {
cocoMessage.success(data.msg); cocoMessage.success(data.msg);
if(data.type == 'stick'){ if (data.type == 'stick') {
var post_item = $('#post-'+pid+'.moment_item'); var post_item = $('#post-' + pid + '.moment_item');
post_item.remove(); post_item.remove();
$('.moment_list').prepend(post_item.prop('outerHTML')); $('.moment_list').prepend(post_item.prop('outerHTML'));
$('#post-'+pid+'.moment_item').find('.post_footer_meta .right').prepend('<span class="sticky_icon"><i class="ri-fire-line"></i> TOP</span>'); $('#post-' + pid + '.moment_item').find('.post_footer_meta .right').prepend('<span class="sticky_icon"><i class="ri-fire-line"></i> TOP</span>');
$('#post-'+pid+'.moment_item').find('.post_control').remove(); $('#post-' + pid + '.moment_item').find('.post_control').remove();
} else { } else {
$('#post-'+pid+'.moment_item').find('.sticky_icon').remove(); $('#post-' + pid + '.moment_item').find('.sticky_icon').remove();
} }
} else { } else {
@@ -362,46 +372,48 @@ $('body').on('click', '.sticky_btn', function() {
}); });
//编辑片刻 //编辑片刻
$('body').on('click', '.control_edit_post', function() { $('body').on('click', '.control_edit_post', function () {
$(".loca_text").empty().attr("state",'0'); $('.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;"); $(".loca_text").attr("uk-tooltip", "title:获取位置; pos: top; offset:2;");
$('.moment_image_type a').click(); $('.moment_image_type a').click();
$('#topic_content').val(''); $('#topic_content').val('');
$(".simi a").html('<i class="ri-lock-unlock-line"></i>').attr('visible','PUBLIC'); $(".simi a").html('<i class="ri-lock-unlock-line"></i>').attr('visible', 'PUBLIC');
$(".simi a").children().css({"background":"#e3efe7","color":"#66c187"}); $(".simi a").children().css({ "background": "#e3efe7", "color": "#66c187" });
$('.t_media_item').remove(); $('.t_media_item').remove();
$('#moment_audio_api').remove(); $('#moment_audio_api').remove();
var pid = $(this).parent().attr('pid'); var pid = $(this).parent().attr('pid');
$('.push_item').html('<i class="ri-edit-box-line"></i>更新'); $('.push_item').html('<i class="ri-edit-box-line"></i>更新');
$('.push_item').attr('pid',pid).attr('action','update') $('.push_item').attr('pid', pid).attr('action', 'update')
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
url: `/apis/${Theme.moments.api}/v1alpha1/moments/`+pid, url: `/apis/${Theme.moments.api}/v1alpha1/moments/` + pid,
beforeSend: function () { beforeSend: function () {
cocoMessage.info('数据拉取中'); closeLoading = cocoMessage.loading('数据拉取中...');
//$('.t_form').before('<div class="edit_overlay"></div>'); //$('.t_form').before('<div class="edit_overlay"></div>');
}, },
success: function (data) { success: function (data) {
$('.push_item').attr('version',data.metadata.version) $('.push_item').attr('version', data.metadata.version)
$('.push_item').attr('owner',data.spec.owner) $('.push_item').attr('owner', data.spec.owner)
$('.push_item').attr('releaseTime',data.spec.releaseTime) $('.push_item').attr('releaseTime', data.spec.releaseTime)
//发布状态 //发布状态
if(data.spec.visible == 'PRIVATE'){ if (data.spec.visible == 'PRIVATE') {
$(".simi a").html('<i class="ri-lock-line"></i>').attr('visible','PRIVATE'); $(".simi a").html('<i class="ri-lock-line"></i>').attr('visible', 'PRIVATE');
$(".simi a").children().css({"background":"#ddd","color":"#c6c6c6"}); $(".simi a").children().css({ "background": "#ddd", "color": "#c6c6c6" });
} else { } else {
$(".simi a").html('<i class="ri-lock-unlock-line"></i>').attr('visible','PUBLIC'); $(".simi a").html('<i class="ri-lock-unlock-line"></i>').attr('visible', 'PUBLIC');
$(".simi a").children().css({"background":"#e3efe7","color":"#66c187"}); $(".simi a").children().css({ "background": "#e3efe7", "color": "#66c187" });
} }
var medium = data.spec.content.medium; var medium = data.spec.content.medium;
var tags = data.spec.tags var tags = data.spec.tags
if(medium.length > 0){ if (medium.length > 0) {
var type = medium[0].type; var type = medium[0].type;
} }
let content = data.spec.content.html; let content = data.spec.content.html;
if(content == null){ if (content == null) {
content = ''; content = '';
}else{ } else {
// 创建一个新的HTML解析器对象 // 创建一个新的HTML解析器对象
var parser = new DOMParser(); var parser = new DOMParser();
@@ -423,16 +435,15 @@ $('body').on('click', '.control_edit_post', function() {
} }
$('#topic_content').val(content); $('#topic_content').val(content);
if(tags.length > 0){ if (tags.length > 0) {
$('.t_cat_toogle span').text(tags[0]); $('.t_cat_toogle span').text(tags[0]);
} }
if(data.metadata.annotations?.mylocal!=null && data.metadata.annotations?.mylocal!='') { if (data.metadata.annotations?.mylocal != null && data.metadata.annotations?.mylocal != '') {
$('.loca_text').text(data.metadata.annotations?.mylocal); $('.loca_text').text(data.metadata.annotations?.mylocal);
} }
switch(type) switch (type) {
{
case "PHOTO": case "PHOTO":
//if(data.moment_data.length > 0){ 文字片刻没有数据 //if(data.moment_data.length > 0){ 文字片刻没有数据
edit_image(data); edit_image(data);
@@ -448,35 +459,42 @@ $('body').on('click', '.control_edit_post', function() {
edit_video(data); edit_video(data);
break; break;
} }
cocoMessage.success('拉取完成'); closeLoading();
cocoMessage.success('数据拉取完成');
$('.push_close, .push_item').prop('disabled', false);
},
error: function () {
closeLoading();
cocoMessage.error('数据拉取失败');
$('.push_close').prop('disabled', false);
} }
}); });
}); });
//发布片刻重置 //发布片刻重置
$('body').on('click', '.normal_edit,.center .mobile_edit', function() { $('body').on('click', '.normal_edit,.center .mobile_edit', function () {
$('.push_item').attr('action','push').html('<i class="ri-send-plane-2-line"></i>发布'); $('.push_item').attr('action', 'push').html('<i class="ri-send-plane-2-line"></i>发布');
$('.moment_image_type a').click(); $('.moment_image_type a').click();
$(".simi a").html('<i class="ri-lock-unlock-line"></i>').attr('visible','PUBLIC'); $(".simi a").html('<i class="ri-lock-unlock-line"></i>').attr('visible', 'PUBLIC');
$(".simi a").children().css({"background":"#e3efe7","color":"#66c187"}); $(".simi a").children().css({ "background": "#e3efe7", "color": "#66c187" });
$('#topic_content').val(''); $('#topic_content').val('');
$(".loca_text").empty().attr("state",'0'); $(".loca_text").empty().attr("state", '0');
$('#set_local, [name="set_local"]').val(''); $('#set_local, [name="set_local"]').val('');
$('.t_media_item').remove(); $('.t_media_item').remove();
$('.t_cat_toogle span').text('叽里咕噜'); $('.t_cat_toogle span').text('叽里咕噜');
}); });
//编辑片刻类型(已兼容图片+视频)------------------------------------------------------------------------------ //编辑片刻类型(已兼容图片+视频)------------------------------------------------------------------------------
function edit_image(data){ function edit_image(data) {
var m_data = data.spec.content.medium; var m_data = data.spec.content.medium;
$('.t_media_item').remove(); $('.t_media_item').remove();
$('.moment_image_type a').click(); $('.moment_image_type a').click();
if(m_data && m_data.length > 0){ if (m_data && m_data.length > 0) {
// reverse() 是为了配合 prepend,确保显示顺序与发布时一致 // reverse() 是为了配合 prepend,确保显示顺序与发布时一致
var new_data = [...m_data].reverse(); var new_data = [...m_data].reverse();
$.each(new_data, function(index, value) { $.each(new_data, function (index, value) {
var src = value.url; var src = value.url;
var type = value.originType || ""; // 获取 MIME 类型 var type = value.originType || ""; // 获取 MIME 类型
var mediaInnerHtml = ''; var mediaInnerHtml = '';
@@ -485,9 +503,9 @@ function edit_image(data){
// 1. 检查 MIME 类型是否以 video/ 开头 // 1. 检查 MIME 类型是否以 video/ 开头
// 2. 检查文件名后缀是否为常见的视频格式(防止 originType 丢失的情况) // 2. 检查文件名后缀是否为常见的视频格式(防止 originType 丢失的情况)
var isVideo = type.startsWith('video/') || var isVideo = type.startsWith('video/') ||
src.toLowerCase().endsWith('.mp4') || src.toLowerCase().endsWith('.mp4') ||
src.toLowerCase().endsWith('.webm') || src.toLowerCase().endsWith('.webm') ||
src.toLowerCase().endsWith('.mov'); src.toLowerCase().endsWith('.mov');
if (isVideo) { if (isVideo) {
// 如果是视频,使用 video 标签预览 // 如果是视频,使用 video 标签预览
@@ -508,24 +526,24 @@ function edit_image(data){
} }
} }
function edit_video(data){ function edit_video(data) {
var m_data = data.spec.content.medium[0]; var m_data = data.spec.content.medium[0];
var type = m_data.originType; var type = m_data.originType;
//var url = m_data.url; //var url = m_data.url;
$('.moment_video_type a').click(); $('.moment_video_type a').click();
var add = setInterval(function() { var add = setInterval(function () {
if(type != 'video/bili'){ if (type != 'video/bili') {
var url = m_data.url; var url = m_data.url;
$('input#moment_video_url').val(url); $('input#moment_video_url').val(url);
if(url !== ''){ if (url !== '') {
$('.m_media_left i').remove(); $('.m_media_left i').remove();
$('.m_media_left').append('<img src="/themes/theme-pix/assets/img/video.png" data="'+url+'">'); $('.m_media_left').append('<img src="/themes/theme-pix/assets/img/video.png" data="' + url + '">');
} }
} else if(type == 'video/bili') { } else if (type == 'video/bili') {
if($('.video_choose').length > 0){ if ($('.video_choose').length > 0) {
var bvid = m_data.url; var bvid = m_data.url;
UIkit.switcher('.video_choose').show(1); UIkit.switcher('.video_choose').show(1);
$('input#moment_video_bili').val(bvid); $('input#moment_video_bili').val(bvid);
@@ -533,26 +551,26 @@ function edit_video(data){
} }
if($('.edit_video_box').length == 1){ if ($('.edit_video_box').length == 1) {
clearInterval(add); clearInterval(add);
} }
}, 100); }, 100);
} }
function edit_audio(data){ function edit_audio(data) {
var m_data = data.spec.content.medium[0]; var m_data = data.spec.content.medium[0];
var type = m_data.originType; var type = m_data.originType;
$('.moment_audio_type a').click(); $('.moment_audio_type a').click();
var add = setInterval(function() { var add = setInterval(function () {
if(type == 'audio/netease' || type == 'audio/tencent' || type == 'audio/kugou' || type == 'audio/kuwo'){ if (type == 'audio/netease' || type == 'audio/tencent' || type == 'audio/kugou' || type == 'audio/kuwo') {
var result = type.substring(type.indexOf("audio/") + 6); var result = type.substring(type.indexOf("audio/") + 6);
if($('.audio_choose').length > 0){ if ($('.audio_choose').length > 0) {
var n_id = m_data.url; var n_id = m_data.url;
var index = $('.audio_choose li.'+result+'').index(); var index = $('.audio_choose li.' + result + '').index();
UIkit.switcher('.audio_choose').show(index); UIkit.switcher('.audio_choose').show(index);
$('.edit_audio_box .tips').text('# 请输入歌曲ID'); $('.edit_audio_box .tips').text('# 请输入歌曲ID');
$('.'+result+'_audio').append('<input type="text" placeholder="歌曲ID" name="moment_audio_api" id="moment_audio_api" class="required" required="required">'); $('.' + result + '_audio').append('<input type="text" placeholder="歌曲ID" name="moment_audio_api" id="moment_audio_api" class="required" required="required">');
$('input#moment_audio_api').val(n_id); $('input#moment_audio_api').val(n_id);
} }
} else { } else {
@@ -562,7 +580,7 @@ function edit_audio(data){
$('.edit_audio_box .tips').text('# 请插入歌曲外链'); $('.edit_audio_box .tips').text('# 请插入歌曲外链');
$('input#moment_audio_url').val(url); $('input#moment_audio_url').val(url);
} }
if($('.edit_audio_box').length == 1){ if ($('.edit_audio_box').length == 1) {
clearInterval(add); clearInterval(add);
} }
@@ -574,15 +592,15 @@ function edit_card(data) {
$('.card_sortble .moment_card_item').remove(); $('.card_sortble .moment_card_item').remove();
$('.moment_card_type a').click(); $('.moment_card_type a').click();
var pid = data.metadata.name; var pid = data.metadata.name;
var card_list = $("#post-"+pid+"").find('.moment_card_item'); var card_list = $("#post-" + pid + "").find('.moment_card_item');
var add = setInterval(function() { var add = setInterval(function () {
$('.show_card').show(); $('.show_card').show();
$.each(m_data, function(index, value) { $.each(m_data, function (index, value) {
var srcValue = card_list.eq(index).find('img').attr('src'); var srcValue = card_list.eq(index).find('img').attr('src');
var h4Text = card_list.eq(index).find('h4').text(); var h4Text = card_list.eq(index).find('h4').text();
$('.card_sortble').append(getcard(value.url,srcValue,h4Text,value.originType)); $('.card_sortble').append(getcard(value.url, srcValue, h4Text, value.originType));
}); });
if($('.edit_card_box').length == 1){ if ($('.edit_card_box').length == 1) {
clearInterval(add); clearInterval(add);
} }
}, 100); }, 100);
+2 -1
View File
@@ -3541,7 +3541,8 @@ iframe[uk-cover] {
.uk-sortable-drag { .uk-sortable-drag {
position: fixed !important; position: fixed !important;
z-index: 1050 !important; z-index: 1050 !important;
pointer-events: none width: auto !important;
pointer-events: none;
} }
.uk-sortable-placeholder { .uk-sortable-placeholder {
+36 -14
View File
@@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html xmlns:th="https://www.thymeleaf.org" <html xmlns:th="https://www.thymeleaf.org"
th:replace="~{modules/layouts/layout :: layout(_head = null,_content = ~{::content},_title = ${title + ' - ' + site.title})}"> th:replace="~{modules/layouts/layout :: layout(_head = null,_content = ~{::content},_title = ${title + ' - ' + site.title})}">
<th:block th:fragment="content"> <th:block th:fragment="content">
@@ -19,7 +19,7 @@
<li> <li>
<!-- 全部按钮 --> <!-- 全部按钮 -->
<a th:attr="data-href=@{/friends}" <a th:attr="data-href=@{/friends}"
th:classappend="${#lists.isEmpty(param.author) ? 'active' : ''}" class="cat-link"> th:classappend="${#lists.isEmpty(param.author) ? 'active' : ''}" class="cat-link">
全部<span></span> 全部<span></span>
</a> </a>
</li> </li>
@@ -27,8 +27,8 @@
<th:block th:each="author : ${authors}"> <th:block th:each="author : ${authors}">
<li> <li>
<a th:attr="data-href=@{|/friends?author=${author}|}" <a th:attr="data-href=@{|/friends?author=${author}|}"
th:classappend="${#strings.equals(param.author, author) ? 'active' : ''}" th:classappend="${#strings.equals(param.author, author) ? 'active' : ''}"
th:text="${author}" class="cat-link"> th:text="${author}" class="cat-link">
<span></span> <span></span>
</a> </a>
</li> </li>
@@ -38,10 +38,9 @@
<div id="post_item" class="moment_list"> <div id="post_item" class="moment_list">
<div th:each="postInfo, iterstat: ${friends.items}" <div th:each="postInfo, iterstat: ${friends.items}" th:id="${'post-'+postInfo.metadata.name}"
th:id="${'post-'+postInfo.metadata.name}" class="loop_content p_item moment_item uk-animation-slide-bottom-small"
class="loop_content p_item moment_item uk-animation-slide-bottom-small" th:with="spec = ${postInfo.spec}">
th:with="spec = ${postInfo.spec}">
<div class="p_item_inner"> <div class="p_item_inner">
@@ -58,7 +57,7 @@
</div> </div>
<time itemprop="datePublished" <time itemprop="datePublished"
th:datetime="${#dates.format(spec.pubDate, 'yyyy-MM-dd HH:mm')}"> th:datetime="${#dates.format(spec.pubDate, 'yyyy-MM-dd HH:mm')}">
<th:block th:replace="~{modules/widgets/time :: time(${spec.pubDate})}"> <th:block th:replace="~{modules/widgets/time :: time(${spec.pubDate})}">
</th:block> </th:block>
</time> </time>
@@ -72,9 +71,34 @@
<div th:utext="${spec.description}"></div> <div th:utext="${spec.description}"></div>
</a> </a>
</div> </div>
<!-- 图片列表 -->
<div class="img_list img-dynamic-container">
<div class="list_inner"
th:with="isImgList=${#strings.startsWith(spec.title, 'img:::')}"
th:attr="num=${isImgList ? #arrays.length(#strings.substringAfter(spec.title, 'img:::').split(',')) : 0}">
<!-- 只有识别为图片列表时才渲染 -->
<th:block th:if="${isImgList}">
<!-- 去掉前缀,分割数组 -->
<th:block
th:with="imgArray=${#strings.substringAfter(spec.title, 'img:::').split(',')}">
<th:block th:each="url : ${imgArray}"
th:with="cleanUrl=${#strings.trim(url)}">
<span class="fancybox mo_img"
th:if="${not #strings.isEmpty(cleanUrl)}"
th:href="|/upload/image-host/${cleanUrl}|"
th:data-fancybox="${'post-' + postInfo.metadata.name}">
<img class="lazy"
src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
th:data-src="|/upload/image-host/${cleanUrl}|"
alt="">
</span>
</th:block>
</th:block>
</th:block>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@@ -88,11 +112,9 @@
<!-- 分页:必须保持在 blog_list_inner 里面 --> <!-- 分页:必须保持在 blog_list_inner 里面 -->
<th:block th:if="${friends.totalPages>1}"> <th:block th:if="${friends.totalPages>1}">
<div id="t_pagination"> <div id="t_pagination">
<div class="post-paging" <div class="post-paging" th:if="${friends.hasNext()}">
th:if="${friends.hasNext()}">
<!-- 直接使用后端生成的完整 nextUrl --> <!-- 直接使用后端生成的完整 nextUrl -->
<a th:data="${friends.nextUrl}" <a th:data="${friends.nextUrl}" th:text="${theme.config.base_set.site_page}">
th:text="${theme.config.base_set.site_page}">
</a> </a>
</div> </div>
</div> </div>
+30 -2
View File
@@ -1,5 +1,5 @@
<th:block th:fragment="footer"> <th:block th:fragment="footer">
<th:block th:with="customJsVersion='1.2.5-3'"> <th:block th:with="customJsVersion='1.2.5-5'">
<!-- 奇遇容器 --> <!-- 奇遇容器 -->
<div class="center-img-container" id="centerImgContainer"> <div class="center-img-container" id="centerImgContainer">
@@ -41,7 +41,8 @@
<div class="pixar-notice-image-area"> <div class="pixar-notice-image-area">
<p class="pixar-notice-caption"> <p class="pixar-notice-caption">
您确定要退出登录吗?<br> 您确定要退出登录吗?<br>
退出后您仍能以访客身份翻阅本日记簿... 请注意!<br>
未保存的内容将会被清空!
</p> </p>
</div> </div>
@@ -64,6 +65,33 @@
</div> </div>
</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')}" <script th:if="${pluginFinder.available('plugin-douban')}"
th:src="@{/plugins/plugin-douban/assets/static/db.min.js(v=${customJsVersion})}" class="pjax"></script> 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> <script th:src="@{/assets/libs/axios/axios.min.js(v=${customJsVersion})}" id="axios.min-js"></script>
+1 -1
View File
@@ -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-5'}">
<th:block th:replace="~{'modules/variables/msg'}" /> <th:block th:replace="~{'modules/variables/msg'}" />
<meta charset="UTF-8"> <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"> <meta name="viewport" content="width=device-width,initial-scale=1.0,maximum-scale=1.0,minimum-scale=1.0,user-scalable=no">
+2 -2
View File
@@ -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="user_pannel round12" uk-dropdown="mode: click;toggle:#top_ava;pos:bottom-right;animation:uk-animation-slide-top-small">
<div class="inner"> <div class="inner">
<a href="/console" target="_blank" pjax="exclude"><i class="ri-function-line"></i>管理面板</a> <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>
</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="user_pannel round12" uk-dropdown="mode: click;toggle:#top_ava2;pos:bottom-right;animation:uk-animation-slide-top-small">
<div class="inner"> <div class="inner">
<a href="/console" target="_blank" pjax="exclude"><i class="ri-function-line"></i>管理面板</a> <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>
</div> </div>
+1 -1
View File
@@ -124,7 +124,7 @@
<div class="form_footer"> <div class="form_footer">
<div class="admin_tool"> <div class="admin_tool">
<a href="/console" target="_blank"><i class="ri-function-line"></i> 管理</a> <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>
<div class="moment_sure"> <div class="moment_sure">
<button class="uk-modal-close push_close">取消</button> <button class="uk-modal-close push_close">取消</button>
@@ -1,5 +1,4 @@
<style th:if="${theme.config.moments.img_style == 'one'}"> <style th:if="${theme.config.moments.img_style == 'one'}">
.img_list .list_inner { .img_list .list_inner {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
@@ -48,14 +47,13 @@
width: 30%; width: 30%;
margin: 2px; margin: 2px;
} }
.img_list span:nth-child(1):nth-last-child(4), .img_list span:nth-child(1):nth-last-child(4),
.img_list span:nth-child(3):nth-last-child(2), .img_list span:nth-child(3):nth-last-child(2),
.img_list span:nth-child(4):nth-last-child(1) { .img_list span:nth-child(4):nth-last-child(1) {
width: 30%; width: 30%;
} }
} }
</style> </style>
<style th:if="${theme.config.moments.img_style == 'two'}"> <style th:if="${theme.config.moments.img_style == 'two'}">
.img_list span:nth-last-child(1):first-child { .img_list span:nth-last-child(1):first-child {
@@ -137,7 +135,8 @@
grid-area: 5 / 4 / 7 / 7; grid-area: 5 / 4 / 7 / 7;
} }
.img_list .list_inner[num='5'] span:nth-child(4) img,.img_list .list_inner[num='5'] span:nth-child(5) img { .img_list .list_inner[num='5'] span:nth-child(4) img,
.img_list .list_inner[num='5'] span:nth-child(5) img {
height: 127.35px; height: 127.35px;
} }
@@ -165,82 +164,363 @@
grid-area: 3 / 3 / 4 / 4; grid-area: 3 / 3 / 4 / 4;
} }
.img_list .list_inner[num='7'] { .img_list .list_inner[num='7'] {
display: grid; display: grid;
/* 采用 6 列网格,支持 50% (span 3) 和 33.3% (span 2) 两种尺寸 */ /* 采用 6 列网格,支持 50% (span 3) 和 33.3% (span 2) 两种尺寸 */
grid-template-columns: repeat(6, 1fr); grid-template-columns: repeat(6, 1fr);
/* 间距修正 */ /* 间距修正 */
gap: 6px; gap: 6px;
padding: 3px; padding: 3px;
/* 清除干扰 */ /* 清除干扰 */
justify-content: unset; justify-content: unset;
align-content: unset; align-content: unset;
align-items: unset; align-items: unset;
} }
.img_list .list_inner[num='7'] span { .img_list .list_inner[num='7'] span {
/* 清除干扰,保持稳定性 */ /* 清除干扰,保持稳定性 */
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
width: auto; width: auto;
height: auto; height: auto;
/* 默认尺寸:中等 (33.3% 宽度, span 2/6) */ /* 默认尺寸:中等 (33.3% 宽度, span 2/6) */
grid-column: span 2; grid-column: span 2;
} }
/* 第一行 (Item 1, 2):大尺寸 (50% 宽度, span 3/6) */ /* 第一行 (Item 1, 2):大尺寸 (50% 宽度, span 3/6) */
.img_list .list_inner[num='7'] span:nth-child(1), .img_list .list_inner[num='7'] span:nth-child(1),
.img_list .list_inner[num='7'] span:nth-child(2) { .img_list .list_inner[num='7'] span:nth-child(2) {
grid-column: span 3; grid-column: span 3;
} }
/* 第三行 (Item 6, 7):大尺寸 (50% 宽度, span 3/6) */ /* 第三行 (Item 6, 7):大尺寸 (50% 宽度, span 3/6) */
.img_list .list_inner[num='7'] span:nth-child(6), .img_list .list_inner[num='7'] span:nth-child(6),
.img_list .list_inner[num='7'] span:nth-child(7) { .img_list .list_inner[num='7'] span:nth-child(7) {
grid-column: span 3; grid-column: span 3;
} }
/* 容器设置:保持 6 列网格,用于计算 1/3 和 1/2 宽度 */ /* 容器设置:保持 6 列网格,用于计算 1/3 和 1/2 宽度 */
.img_list .list_inner[num='8'] { .img_list .list_inner[num='8'] {
display: grid; display: grid;
grid-template-columns: repeat(6, 1fr); /* 6 列 */ grid-template-columns: repeat(6, 1fr);
/* 6 列 */
max-height: 100vw; max-height: 100vw;
gap: 6px; gap: 6px;
padding: 3px; padding: 3px;
justify-content: unset; justify-content: unset;
align-content: unset; align-content: unset;
align-items: unset; align-items: unset;
} }
/* 默认规则:应用到所有子项,用于第 1 行和第 3 行 (1/3 宽度) */ /* 默认规则:应用到所有子项,用于第 1 行和第 3 行 (1/3 宽度) */
.img_list .list_inner[num='8'] span { .img_list .list_inner[num='8'] span {
margin: 0 !important; margin: 0 !important;
padding: 0 !important; padding: 0 !important;
width: auto; width: auto;
height: auto; height: auto;
/* 跨 2 列 = 1/3 宽度 (6列/2=3张/行) */ /* 跨 2 列 = 1/3 宽度 (6列/2=3张/行) */
grid-column: span 2; grid-column: span 2;
} }
/* 特殊规则:仅应用于第 2 行的 2 张图片 (1/2 宽度) */ /* 特殊规则:仅应用于第 2 行的 2 张图片 (1/2 宽度) */
.img_list .list_inner[num='8'] span:nth-child(4), .img_list .list_inner[num='8'] span:nth-child(4),
.img_list .list_inner[num='8'] span:nth-child(5) { .img_list .list_inner[num='8'] span:nth-child(5) {
/* 跨 3 列 = 1/2 宽度 (6列/3=2张/行) */ /* 跨 3 列 = 1/2 宽度 (6列/3=2张/行) */
grid-column: span 3; grid-column: span 3;
} }
/* 确保第 1 行和第 3 行的宽度不被其他 CSS 规则干扰 */ /* 确保第 1 行和第 3 行的宽度不被其他 CSS 规则干扰 */
.img_list .list_inner[num='8'] span:nth-child(-n+3), /* 第 1, 2, 3 个 */ .img_list .list_inner[num='8'] span:nth-child(-n+3),
.img_list .list_inner[num='8'] span:nth-child(n+6) { /* 第 6, 7, 8 个 */ /* 第 1, 2, 3 个 */
grid-column: span 2; .img_list .list_inner[num='8'] span:nth-child(n+6) {
} /* 第 6, 7, 8 个 */
grid-column: span 2;
}
/* 10 张:完整矩形(6 列,3+2+2+3 */
.img_list .list_inner[num='10'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='10'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='10'] span:nth-child(4),
.img_list .list_inner[num='10'] span:nth-child(5),
.img_list .list_inner[num='10'] span:nth-child(6),
.img_list .list_inner[num='10'] span:nth-child(7) {
grid-column: span 3;
}
/* 11 张:完整矩形(6 列,2+3+3+3 */
.img_list .list_inner[num='11'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='11'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='11'] span:nth-child(1),
.img_list .list_inner[num='11'] span:nth-child(2) {
grid-column: span 3;
}
/* 13 张:完整矩形(6 列,3+2+3+2+3 */
.img_list .list_inner[num='13'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='13'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='13'] span:nth-child(4),
.img_list .list_inner[num='13'] span:nth-child(5),
.img_list .list_inner[num='13'] span:nth-child(9),
.img_list .list_inner[num='13'] span:nth-child(10) {
grid-column: span 3;
}
/* 14 张:完整矩形(6 列,3+3+2+3+3 */
.img_list .list_inner[num='14'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='14'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='14'] span:nth-child(7),
.img_list .list_inner[num='14'] span:nth-child(8) {
grid-column: span 3;
}
/* 16 张:完整矩形(6 列,3+2+3+3+2+3 */
.img_list .list_inner[num='16'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='16'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='16'] span:nth-child(4),
.img_list .list_inner[num='16'] span:nth-child(5),
.img_list .list_inner[num='16'] span:nth-child(12),
.img_list .list_inner[num='16'] span:nth-child(13) {
grid-column: span 3;
}
/* 17 张:完整矩形(6 列,2+3+2+3+2+3+2 */
.img_list .list_inner[num='17'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='17'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='17'] span:nth-child(1),
.img_list .list_inner[num='17'] span:nth-child(2),
.img_list .list_inner[num='17'] span:nth-child(6),
.img_list .list_inner[num='17'] span:nth-child(7),
.img_list .list_inner[num='17'] span:nth-child(11),
.img_list .list_inner[num='17'] span:nth-child(12),
.img_list .list_inner[num='17'] span:nth-child(16),
.img_list .list_inner[num='17'] span:nth-child(17) {
grid-column: span 3;
}
/* 19 张:完整矩形(6 列,3+3+2+3+3+2+3 */
.img_list .list_inner[num='19'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='19'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='19'] span:nth-child(7),
.img_list .list_inner[num='19'] span:nth-child(8),
.img_list .list_inner[num='19'] span:nth-child(15),
.img_list .list_inner[num='19'] span:nth-child(16) {
grid-column: span 3;
}
/* 20 张:完整矩形(6 列,3+2+3+2+3+2+3+2 */
.img_list .list_inner[num='20'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='20'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='20'] span:nth-child(4),
.img_list .list_inner[num='20'] span:nth-child(5),
.img_list .list_inner[num='20'] span:nth-child(9),
.img_list .list_inner[num='20'] span:nth-child(10),
.img_list .list_inner[num='20'] span:nth-child(14),
.img_list .list_inner[num='20'] span:nth-child(15),
.img_list .list_inner[num='20'] span:nth-child(19),
.img_list .list_inner[num='20'] span:nth-child(20) {
grid-column: span 3;
}
/* 22 张:完整矩形(6 列,3+3+2+3+3+2+3+3 */
.img_list .list_inner[num='22'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='22'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='22'] span:nth-child(7),
.img_list .list_inner[num='22'] span:nth-child(8),
.img_list .list_inner[num='22'] span:nth-child(15),
.img_list .list_inner[num='22'] span:nth-child(16) {
grid-column: span 3;
}
/* 23 张:完整矩形(6 列,3+2+3+2+3+2+3+2+3 */
.img_list .list_inner[num='23'] {
display: grid;
grid-template-columns: repeat(6, 1fr);
gap: 6px;
padding: 3px;
justify-content: unset;
align-content: unset;
align-items: unset;
}
.img_list .list_inner[num='23'] span {
margin: 0 !important;
padding: 0 !important;
width: auto;
height: auto;
grid-column: span 2;
}
.img_list .list_inner[num='23'] span:nth-child(4),
.img_list .list_inner[num='23'] span:nth-child(5),
.img_list .list_inner[num='23'] span:nth-child(9),
.img_list .list_inner[num='23'] span:nth-child(10),
.img_list .list_inner[num='23'] span:nth-child(14),
.img_list .list_inner[num='23'] span:nth-child(15),
.img_list .list_inner[num='23'] span:nth-child(19),
.img_list .list_inner[num='23'] span:nth-child(20) {
grid-column: span 3;
}
.img_list span img { .img_list span img {
+1 -1
View File
@@ -17,7 +17,7 @@ spec:
issues: "https://github.com/chengzhongxue/halo-theme-pix/issues" issues: "https://github.com/chengzhongxue/halo-theme-pix/issues"
settingName: "theme-pix-setting" settingName: "theme-pix-setting"
configMapName: "theme-pix-configMap" configMapName: "theme-pix-configMap"
version: "1.2.5-3" version: "1.2.5-4"
require: ">=2.20.0" require: ">=2.20.0"
customTemplates: customTemplates:
page: page: