- 资产有沉默期已过期且可延期的套餐时弹窗,带去延期入口;待实名 7 天内到截止日时提醒尽快实名 - 排在临期提醒之后、站内通知之前,同一资产同一笔套餐每天最多弹一次 - 套餐历史在后台加载,不阻塞首页其他弹窗
This commit is contained in:
@@ -100,6 +100,9 @@
|
||||
<ExpiryReminderPopup v-if="visibleExpiryReminder" :reminder="visibleExpiryReminder"
|
||||
@close="closeExpiryReminder" @renew="renewFromExpiryReminder" />
|
||||
|
||||
<SilenceReminderPopup v-if="silenceReminderShow && silenceReminder" :reminder="silenceReminder"
|
||||
@close="closeSilenceReminder" @action="openSilenceReminderAction" />
|
||||
|
||||
<NotificationPopup :show="notificationPopupShow" :items="notificationItems"
|
||||
:current="notificationPopupCurrent" @change="onNotificationChange" @close="closeNotificationPopup"
|
||||
@renew="startHomepageRenewal" />
|
||||
@@ -141,6 +144,7 @@
|
||||
import FloatingButton from '@/components/FloatingButton.vue';
|
||||
import NotificationPopup from '@/components/NotificationPopup.vue';
|
||||
import ExpiryReminderPopup from '@/components/ExpiryReminderPopup.vue';
|
||||
import SilenceReminderPopup from '@/components/SilenceReminderPopup.vue';
|
||||
import RenewalPaymentPopup from '@/components/RenewalPaymentPopup.vue';
|
||||
import PopupCandidate from '@/components/PopupCandidate.vue';
|
||||
import {
|
||||
@@ -156,6 +160,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 } from '@/utils/silence.js';
|
||||
|
||||
const userStore = useUserStore();
|
||||
const assetStore = useAssetStore();
|
||||
@@ -175,7 +180,7 @@
|
||||
const showPendingExpiryReminder = () => {
|
||||
const entry = assetStore.state.expiryReminder;
|
||||
if (!homeActive.value || awaitingHomeReminders.value || renewalOpening.value || renewalVisible.value || popupCandidateShow.value || notificationPopupShow.value ||
|
||||
visibleExpiryReminder.value || !entry || entry.shown || !isCurrentSession(entry) || entry.day !== getShanghaiDay()) return;
|
||||
silenceReminderShow.value || visibleExpiryReminder.value || !entry || entry.shown || !isCurrentSession(entry) || entry.day !== getShanghaiDay()) return;
|
||||
shownExpiryReminder.value = { ...entry };
|
||||
assetStore.markExpiryReminderShown();
|
||||
};
|
||||
@@ -184,11 +189,62 @@
|
||||
assetStore.dismissExpiryReminder();
|
||||
if (resumeQueue) advanceHomePopupQueue();
|
||||
};
|
||||
// 沉默期提醒:首页按"临期提醒 → 沉默期提醒 → 站内通知"的顺序依次弹出,同一资产同一笔套餐每天最多一次。
|
||||
const silenceReminder = ref(null);
|
||||
const silenceReminderShow = ref(false);
|
||||
let silenceReminderIdentifier = '';
|
||||
const loadSilenceReminder = async (entryId) => {
|
||||
const identifier = String(userStore.state.identifier || '').trim();
|
||||
silenceReminder.value = null;
|
||||
if (!identifier) return;
|
||||
try {
|
||||
const data = await assetApi.getPackageHistory(identifier, 1, 20, { status: 0 });
|
||||
if (entryId !== homeEntryId || !homeActive.value || identifier !== String(userStore.state.identifier || '').trim()) return;
|
||||
const reminder = pickSilenceReminder(data?.items);
|
||||
if (reminder && !uni.getStorageSync(silenceReminderKey(identifier, reminder, getShanghaiDay()))) {
|
||||
silenceReminderIdentifier = identifier;
|
||||
silenceReminder.value = reminder;
|
||||
advanceHomePopupQueue();
|
||||
}
|
||||
} catch (error) {
|
||||
// 提醒失败不影响首页其他功能
|
||||
console.error('加载沉默期提醒失败', error);
|
||||
}
|
||||
};
|
||||
const showPendingSilenceReminder = () => {
|
||||
const reminder = silenceReminder.value;
|
||||
if (!reminder || silenceReminderShow.value) return false;
|
||||
if (silenceReminderIdentifier !== String(userStore.state.identifier || '').trim()) {
|
||||
silenceReminder.value = null;
|
||||
return false;
|
||||
}
|
||||
uni.setStorageSync(silenceReminderKey(silenceReminderIdentifier, reminder, getShanghaiDay()), 1);
|
||||
silenceReminderShow.value = true;
|
||||
return true;
|
||||
};
|
||||
const closeSilenceReminder = () => {
|
||||
silenceReminderShow.value = false;
|
||||
silenceReminder.value = null;
|
||||
advanceHomePopupQueue();
|
||||
};
|
||||
const openSilenceReminderAction = () => {
|
||||
const reminder = silenceReminder.value;
|
||||
silenceReminderShow.value = false;
|
||||
silenceReminder.value = null;
|
||||
if (!reminder) return;
|
||||
uni.navigateTo({
|
||||
url: reminder.kind === 'expired'
|
||||
? `/pages/silence-extension/silence-extension?package_usage_id=${reminder.packageUsageId}`
|
||||
: '/pages/asset-package-history/asset-package-history'
|
||||
});
|
||||
};
|
||||
|
||||
const advanceHomePopupQueue = () => {
|
||||
if (!homeActive.value || awaitingHomeReminders.value || renewalOpening.value || renewalVisible.value || popupCandidateShow.value ||
|
||||
visibleExpiryReminder.value || notificationPopupShow.value) return;
|
||||
visibleExpiryReminder.value || notificationPopupShow.value || silenceReminderShow.value) return;
|
||||
showPendingExpiryReminder();
|
||||
if (visibleExpiryReminder.value) return;
|
||||
if (showPendingSilenceReminder()) return;
|
||||
if (notificationQueued) {
|
||||
notificationQueued = false;
|
||||
notificationPopupShow.value = true;
|
||||
@@ -1027,6 +1083,8 @@
|
||||
if (!homeActive.value || entryId !== homeEntryId) return;
|
||||
awaitingHomeReminders.value = false;
|
||||
advanceHomePopupQueue();
|
||||
// 沉默期提醒在后台加载,不阻塞首页其他弹窗;加载完成后按队列顺序择机弹出。
|
||||
loadSilenceReminder(entryId);
|
||||
});
|
||||
onHide(() => {
|
||||
homeEntryId++;
|
||||
@@ -1035,6 +1093,8 @@
|
||||
shownExpiryReminder.value = null;
|
||||
notificationPopupShow.value = false;
|
||||
popupCandidateShow.value = false;
|
||||
silenceReminderShow.value = false;
|
||||
silenceReminder.value = null;
|
||||
notificationQueued = false;
|
||||
notificationFallbackPending = false;
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user