feat: 沉默期已过期强制弹窗,只能去延期,不能关闭
All checks were successful
构建并部署前端到测试环境 / build-and-deploy (push) Successful in 5m37s

This commit is contained in:
邹进
2026-11-08 16:29:12 +09:00
parent b6e55d315c
commit 535f92b818
5 changed files with 38 additions and 14 deletions

View File

@@ -161,7 +161,7 @@
import { consumePendingPaymentRefresh, PAYMENT_REFRESH_TARGETS } from '@/utils/payment.js';
import { getSessionContext, isCurrentSession } from '@/utils/session-context.js';
import { getShanghaiDay } from '@/utils/expiry-reminder.js';
import { pickSilenceReminder, silenceReminderKey, silenceReminderRepeats } from '@/utils/silence.js';
import { isSilenceReminderBlocking, pickSilenceReminder, silenceReminderKey, silenceReminderRepeats } from '@/utils/silence.js';
const userStore = useUserStore();
const assetStore = useAssetStore();
@@ -190,7 +190,7 @@
assetStore.dismissExpiryReminder();
if (resumeQueue) advanceHomePopupQueue();
};
// 沉默期提醒:首页按"临期提醒 → 沉默期提醒 → 站内通知"的顺序依次弹出,同一资产同一笔套餐每天最多一次。
// 沉默期提醒:已过期待延期的为强制弹窗(立即弹出、不可关闭、每次回首页都弹);临近截止的按"临期提醒 → 沉默期提醒 → 站内通知"顺序弹出,同一套餐每次登录最多一次。
const silenceReminder = ref(null);
const silenceReminderShow = ref(false);
let silenceReminderIdentifier = '';
@@ -216,6 +216,11 @@
if (entryId !== homeEntryId || !homeActive.value || identifier !== String(userStore.state.identifier || '').trim()) return;
silenceReminderIdentifier = identifier;
silenceReminder.value = reminder;
// 已过期待延期:不排队,立即强制弹出并盖住其他弹层,未延期前不能做其他操作
if (isSilenceReminderBlocking(reminder)) {
silenceReminderShow.value = true;
return;
}
advanceHomePopupQueue();
} catch (error) {
// 提醒失败不影响首页其他功能
@@ -236,6 +241,8 @@
return true;
};
const closeSilenceReminder = () => {
// 强制延期弹窗不允许关闭
if (isSilenceReminderBlocking(silenceReminder.value)) return;
silenceReminderShow.value = false;
silenceReminder.value = null;
advanceHomePopupQueue();