fix: 沉默期提醒每次登录都弹,有未支付延期订单时提示去支付或作废
Some checks failed
构建并部署前端到测试环境 / build-and-deploy (push) Has been cancelled
Some checks failed
构建并部署前端到测试环境 / build-and-deploy (push) Has been cancelled
- 频率从每天一次改为每次登录一次:重新登录后会再次提醒,同一次登录内回首页不重复 - 已过期套餐有未支付延期订单时,弹窗提示继续支付或作废
This commit is contained in:
@@ -151,7 +151,8 @@
|
||||
assetApi,
|
||||
deviceApi,
|
||||
hasActiveOrPendingPackage,
|
||||
notificationApi
|
||||
notificationApi,
|
||||
packageSilenceApi
|
||||
} from '@/api/index.js';
|
||||
import {
|
||||
useUserStore,
|
||||
@@ -201,11 +202,20 @@
|
||||
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();
|
||||
if (!reminder || uni.getStorageSync(silenceReminderKey(identifier, reminder, getSessionContext().token))) return;
|
||||
// 已过期的套餐再查一次延期资格:有未支付的延期订单时,弹窗改为提醒去支付或作废
|
||||
if (reminder.kind === 'expired') {
|
||||
try {
|
||||
const eligibility = await packageSilenceApi.getEligibility(reminder.packageUsageId);
|
||||
if (eligibility?.pending_order_no) reminder.pendingOrderNo = eligibility.pending_order_no;
|
||||
} catch (error) {
|
||||
// 资格查询失败不影响提醒本身
|
||||
}
|
||||
}
|
||||
if (entryId !== homeEntryId || !homeActive.value || identifier !== String(userStore.state.identifier || '').trim()) return;
|
||||
silenceReminderIdentifier = identifier;
|
||||
silenceReminder.value = reminder;
|
||||
advanceHomePopupQueue();
|
||||
} catch (error) {
|
||||
// 提醒失败不影响首页其他功能
|
||||
console.error('加载沉默期提醒失败', error);
|
||||
@@ -218,7 +228,7 @@
|
||||
silenceReminder.value = null;
|
||||
return false;
|
||||
}
|
||||
uni.setStorageSync(silenceReminderKey(silenceReminderIdentifier, reminder, getShanghaiDay()), 1);
|
||||
uni.setStorageSync(silenceReminderKey(silenceReminderIdentifier, reminder, getSessionContext().token), 1);
|
||||
silenceReminderShow.value = true;
|
||||
return true;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user