fix: some
This commit is contained in:
@@ -98,14 +98,14 @@
|
||||
|
||||
<view class="bottom-spacer"></view>
|
||||
<ExpiryReminderPopup v-if="visibleExpiryReminder" :reminder="visibleExpiryReminder"
|
||||
@close="closeExpiryReminder" />
|
||||
@close="closeExpiryReminder" @renew="renewFromExpiryReminder" />
|
||||
|
||||
<NotificationPopup :show="notificationPopupShow" :items="notificationItems"
|
||||
:current="notificationPopupCurrent" @change="onNotificationChange" @close="closeNotificationPopup"
|
||||
@renew="startHomepageRenewal" />
|
||||
|
||||
<RenewalPaymentPopup ref="renewalPopupRef" :identifier="userStore.state.identifier"
|
||||
paymentRefreshTarget="home" @completed="loadAssetInfo" />
|
||||
paymentRefreshTarget="home" @completed="loadAssetInfo" @visibility-change="onRenewalVisibilityChange" />
|
||||
|
||||
<PopupCandidate v-if='popupCandidateShow' page='home' :identifier='userStore.state.identifier'
|
||||
@close='onPopupCandidateClose' />
|
||||
@@ -162,6 +162,8 @@
|
||||
const homeActive = ref(false);
|
||||
const shownExpiryReminder = ref(null);
|
||||
const awaitingHomeReminders = ref(false);
|
||||
const renewalOpening = ref(false);
|
||||
const renewalVisible = ref(false);
|
||||
let notificationFallbackPending = false;
|
||||
let notificationQueued = false;
|
||||
let homeEntryId = 0;
|
||||
@@ -172,18 +174,18 @@
|
||||
});
|
||||
const showPendingExpiryReminder = () => {
|
||||
const entry = assetStore.state.expiryReminder;
|
||||
if (!homeActive.value || awaitingHomeReminders.value || popupCandidateShow.value || notificationPopupShow.value ||
|
||||
if (!homeActive.value || awaitingHomeReminders.value || renewalOpening.value || renewalVisible.value || popupCandidateShow.value || notificationPopupShow.value ||
|
||||
visibleExpiryReminder.value || !entry || entry.shown || !isCurrentSession(entry) || entry.day !== getShanghaiDay()) return;
|
||||
shownExpiryReminder.value = { ...entry };
|
||||
assetStore.markExpiryReminderShown();
|
||||
};
|
||||
const closeExpiryReminder = () => {
|
||||
const closeExpiryReminder = (resumeQueue = true) => {
|
||||
shownExpiryReminder.value = null;
|
||||
assetStore.dismissExpiryReminder();
|
||||
advanceHomePopupQueue();
|
||||
if (resumeQueue) advanceHomePopupQueue();
|
||||
};
|
||||
const advanceHomePopupQueue = () => {
|
||||
if (!homeActive.value || awaitingHomeReminders.value || popupCandidateShow.value ||
|
||||
if (!homeActive.value || awaitingHomeReminders.value || renewalOpening.value || renewalVisible.value || popupCandidateShow.value ||
|
||||
visibleExpiryReminder.value || notificationPopupShow.value) return;
|
||||
showPendingExpiryReminder();
|
||||
if (visibleExpiryReminder.value) return;
|
||||
@@ -415,7 +417,12 @@
|
||||
}
|
||||
};
|
||||
|
||||
const startHomepageRenewal = () => {
|
||||
const onRenewalVisibilityChange = (visible) => {
|
||||
renewalVisible.value = visible;
|
||||
if (!visible) advanceHomePopupQueue();
|
||||
};
|
||||
const startHomepageRenewal = async () => {
|
||||
if (renewalOpening.value || renewalVisible.value) return;
|
||||
const packageId = Number(deviceInfo.currentPackageId || 0);
|
||||
const packageName = String(deviceInfo.packageName || '').trim();
|
||||
if (!packageId || !packageName || packageName === '-') {
|
||||
@@ -423,7 +430,19 @@
|
||||
return;
|
||||
}
|
||||
|
||||
renewalPopupRef.value?.open([packageId], [packageName], deviceInfo.renewalPrice);
|
||||
renewalOpening.value = true;
|
||||
try {
|
||||
await renewalPopupRef.value?.open([packageId], [packageName], deviceInfo.renewalPrice);
|
||||
} finally {
|
||||
renewalOpening.value = false;
|
||||
advanceHomePopupQueue();
|
||||
}
|
||||
};
|
||||
const renewFromExpiryReminder = async () => {
|
||||
if (!visibleExpiryReminder.value || renewalOpening.value || renewalVisible.value) return;
|
||||
closeExpiryReminder(false);
|
||||
await startHomepageRenewal();
|
||||
advanceHomePopupQueue();
|
||||
};
|
||||
|
||||
const modifyWifi = () => {
|
||||
|
||||
Reference in New Issue
Block a user