From f7d7c5375d90a22e760d4296a917ab1acc059573 Mon Sep 17 00:00:00 2001 From: Abner <22141172+Silentely@users.noreply.github.com> Date: Sun, 10 Aug 2025 10:51:12 +0800 Subject: [PATCH] =?UTF-8?q?refactor(src):=20=E4=BC=98=E5=8C=96=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=97=B6=E9=97=B4=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新服务时间检查函数，确保使用英国伦敦时区 - 调整服务时间范围为 04:30–21:30 - 优化时间计算方法，避免本地/夏令时偏差 - 统一时间判断逻辑，提高代码可维护性 --- index.html | 5 ++- src/giffgaff/giffgaff_complete_esim.html | 51 +++++++++++++++--------- src/simyo/simyo_complete_esim.html | 2 +- 3 files changed, 36 insertions(+), 22 deletions(-) diff --git a/index.html b/index.html index 1cdf34f..12b18db 100644 --- a/index.html +++ b/index.html @@ -46,8 +46,9 @@ --accent-danger:#ef4444; /* red-500 */ /* Surface & Text */ - --bg-grad-start:var(--brand-start); - --bg-grad-end:var(--brand-end); + /* 背景改为淡色 #f2f5c4 */ + --bg-grad-start:#f2f5c4; + --bg-grad-end:#f1f5bb; --surface:#ffffff; --surface-alpha:92%; --text-primary:#1f2937; /* slate-800 */ diff --git a/src/giffgaff/giffgaff_complete_esim.html b/src/giffgaff/giffgaff_complete_esim.html index b9cdc79..5184ef7 100644 --- a/src/giffgaff/giffgaff_complete_esim.html +++ b/src/giffgaff/giffgaff_complete_esim.html @@ -409,7 +409,7 @@ /* 状态显示面板 */ .status-panel { - background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%); + background: linear-gradient(135deg, #fffff0 0%, #fffbe4 90%); border: 1px solid #dee2e6; border-radius: 12px; padding: 20px; @@ -1683,15 +1683,24 @@ .replace(/=+$/, ''); } - // 服务时间检查函数 + // 服务时间检查函数（英国伦敦时区 04:30–21:30） function isServiceTimeAvailable() { const now = new Date(); - const currentHour = now.getHours(); - const currentMinute = now.getMinutes(); - // 废弃：旧的 04:30-12:30 规则 - const isOutsideServiceTime = false; + // 取伦敦时区下的小时与分钟，避免本地/夏令时偏差 + const parts = new Intl.DateTimeFormat('en-GB', { + timeZone: 'Europe/London', + hour: '2-digit', + minute: '2-digit', + hour12: false + }).formatToParts(now); + const ukHour = parseInt((parts.find(p => p.type === 'hour') || {}).value || '0', 10); + const ukMinute = parseInt((parts.find(p => p.type === 'minute') || {}).value || '0', 10); - return !isOutsideServiceTime; + const minutesSinceMidnight = ukHour * 60 + ukMinute; + const start = 4 * 60 + 30; // 04:30 + const end = 21 * 60 + 30; // 21:30 + + return minutesSinceMidnight >= start && minutesSinceMidnight <= end; } // 显示服务时间警告对话框 @@ -2655,8 +2664,8 @@ timeElement.offsetHeight; // 触发重排 timeElement.style.animation = 'time-update 0.5s ease-out'; - // 使用模块化 JS 统一计算，这里不再内联判断 - const isOutsideServiceTime = false; + // 统一使用同一逻辑判断当前是否在服务时段 + const isOutsideServiceTime = !isServiceTimeAvailable(); const alertElement = document.getElementById('serviceTimeAlert'); const iconElement = document.getElementById('serviceTimeIcon'); @@ -2686,11 +2695,15 @@ document.addEventListener('DOMContentLoaded', function() { console.log('Giffgaff eSIM申请工具已加载'); - // 初始化服务时间检查 + // 初始化服务时间检查（立即渲染一次） checkServiceTime(); - - // 每分钟更新一次时间 - setInterval(checkServiceTime, 60000); + + // 将下一次刷新对齐到“下一分钟整点”，之后每 60s 刷新，避免显示落后一整分钟 + const msToNextMinute = 60000 - (Date.now() % 60000); + setTimeout(() => { + checkServiceTime(); + setInterval(checkServiceTime, 60000); + }, msToNextMinute); // 尝试恢复之前的会话 const sessionRestored = loadSession(); @@ -2826,7 +2839,7 @@ padding: 14px 16px; border-radius: 14px; /* 与 current-time-card 一致的暖黄渐变与柔和阴影 */ - background: linear-gradient(135deg, #fff3d6 60%, #fffaf0 0%); + background: linear-gradient(135deg, #fff3d6 60%, #fffaf0 60%); border: 1px solid rgba(255, 193, 7, 0.25); box-shadow: 0 12px 30px rgba(0, 0, 0, 0.08); position: relative; @@ -3017,7 +3030,7 @@ gap: 14px; padding: 16px 18px; border-radius: var(--st-card-radius); - background: linear-gradient(225deg, #fff3d6 60%, #fffaf0 0%); + background: linear-gradient(135deg, #fffaf0 60%, #fff3d6 60%); box-shadow: var(--st-card-shadow); position: relative; overflow: hidden; @@ -3181,8 +3194,8 @@ /* 警告状态特殊样式 */ .alert-warning #serviceTimeIcon { animation: warning-pulse 2s ease-in-out infinite; - background: #fef3c7; /* 警告态底色 */ - color: #f59e0b; /* 警告态主色 */ + background: #f8ecbb; /* 警告态底色 */ + color: #f59d06; /* 警告态主色 */ box-shadow: inset 0 0 0 2px rgba(245,158,11,0.15); } @@ -3197,8 +3210,8 @@ /* 成功状态特殊样式 */ .alert-success #serviceTimeIcon { - animation: success-bounce 3s ease-in-out infinite; - background: #e6f6ee; /* 成功态底色 */ + animation: breathing-light-green 2s ease-in-out infinite; + background: #e0f6eb; /* 成功态底色 */ color: #10b981; /* 成功态主色 */ box-shadow: inset 0 0 0 2px rgba(16,185,129,0.15); } diff --git a/src/simyo/simyo_complete_esim.html b/src/simyo/simyo_complete_esim.html index 5ebb604..bef71dc 100644 --- a/src/simyo/simyo_complete_esim.html +++ b/src/simyo/simyo_complete_esim.html @@ -457,7 +457,7 @@ /* 状态显示面板 */ .status-panel { - background: linear-gradient(135deg, #f8f9fa 0%, #e9ecef 100%); + background: linear-gradient(135deg, #fffff0 0%, #fffbe4 90%); border: 1px solid #dee2e6; border-radius: 12px; padding: 20px;