- 资产有沉默期已过期且可延期的套餐时弹窗,带去延期入口;待实名 7 天内到截止日时提醒尽快实名 - 排在临期提醒之后、站内通知之前,同一资产同一笔套餐每天最多弹一次 - 套餐历史在后台加载,不阻塞首页其他弹窗
This commit is contained in:
@@ -808,16 +808,18 @@ test('returning home reloads actual polling, network and expiry with one asset r
|
||||
r.api.notificationApi = { getUnreadCount: async () => ({ count: 0 }) };
|
||||
r.payment.consumePendingPaymentRefresh = () => true;
|
||||
const page = await r.load('pages/index/index.vue', ['deviceInfo']);
|
||||
// 首页还会在后台查套餐历史做沉默期提醒;这里只统计资产信息请求。
|
||||
const infoRequests = () => r.requests.filter(request => !String(request.url).includes('package-history'));
|
||||
const first = r.shown[0]();
|
||||
assert.equal(r.requests.length, 1);
|
||||
r.reply(r.requests[0], { enable_polling: false, network_status: 0, estimated_final_expires_at: '2026-10-26T00:00:00Z' });
|
||||
assert.equal(infoRequests().length, 1);
|
||||
r.reply(infoRequests()[0], { enable_polling: false, network_status: 0, estimated_final_expires_at: '2026-10-26T00:00:00Z' });
|
||||
await first;
|
||||
const asset = (await r.load('store/asset.js')).useAssetStore();
|
||||
assert.equal(asset.state.assetInfo.enable_polling, false);
|
||||
r.hidden[0]();
|
||||
const next = r.shown[0]();
|
||||
assert.equal(r.requests.length, 2);
|
||||
r.reply(r.requests[1], { enable_polling: true, network_status: 1, estimated_final_expires_at: '2026-11-26T00:00:00Z' });
|
||||
assert.equal(infoRequests().length, 2);
|
||||
r.reply(infoRequests()[1], { enable_polling: true, network_status: 1, estimated_final_expires_at: '2026-11-26T00:00:00Z' });
|
||||
await next;
|
||||
assert.equal(asset.state.assetInfo.enable_polling, true);
|
||||
assert.equal(page.deviceInfo.network_status, 1);
|
||||
@@ -931,3 +933,31 @@ test('order completion and payment return reread actual asset state, not a presu
|
||||
await r.timers[1]();
|
||||
assert.equal(reads, 4);
|
||||
});
|
||||
|
||||
test('home shows the silence reminder after other popups, once per day, and opens the extension page', async () => {
|
||||
const r = runtime();
|
||||
r.api.assetApi = {
|
||||
getInfo: async () => ({ identifier: 'A' }),
|
||||
getPackageHistory: async () => ({ items: [{
|
||||
package_usage_id: 44961, package_name: '测试1111',
|
||||
silence: { silence_status: 'expired', extendable: true, silence_deadline_at: '2026-11-06T23:59:59+08:00' },
|
||||
children: []
|
||||
}] })
|
||||
};
|
||||
r.api.notificationApi = { getUnreadCount: async () => ({ count: 0 }), getList: async () => ({ items: [] }) };
|
||||
const page = await r.load('pages/index/index.vue', ['silenceReminder', 'silenceReminderShow', 'onPopupCandidateClose', 'openSilenceReminderAction', 'closeSilenceReminder']);
|
||||
await r.shown[0](); await r.tick(); await r.tick();
|
||||
// 运营弹窗仍在时不弹沉默期提醒
|
||||
assert.equal(page.silenceReminderShow.value, false);
|
||||
page.onPopupCandidateClose('empty'); await r.tick();
|
||||
assert.equal(page.silenceReminderShow.value, true);
|
||||
assert.equal(page.silenceReminder.value.kind, 'expired');
|
||||
page.openSilenceReminderAction();
|
||||
assert.equal(page.silenceReminderShow.value, false);
|
||||
assert.equal(r.calls.at(-1).kind, 'navigateTo');
|
||||
assert.equal(r.calls.at(-1).url, '/pages/silence-extension/silence-extension?package_usage_id=44961');
|
||||
// 同一天再次回到首页不再弹
|
||||
r.hidden[0](); await r.shown[0](); await r.tick(); await r.tick();
|
||||
page.onPopupCandidateClose('empty'); await r.tick();
|
||||
assert.equal(page.silenceReminderShow.value, false);
|
||||
});
|
||||
|
||||
@@ -9,6 +9,8 @@ import {
|
||||
isPaymentLink,
|
||||
isSilenceFeatureDisabled,
|
||||
isSilenceOrderFinal,
|
||||
pickSilenceReminder,
|
||||
silenceReminderKey,
|
||||
validateExtensionDays
|
||||
} from '../utils/silence.js';
|
||||
|
||||
@@ -63,3 +65,30 @@ test('资格原因、状态样式、订单终态与支付链接判断', () => {
|
||||
assert.equal(isPaymentLink('weixin://wxpay/bizpayurl?pr=abc'), false);
|
||||
assert.equal(isPaymentLink(''), false);
|
||||
});
|
||||
|
||||
test('首页沉默期提醒:优先已过期可延期,其次 7 天内到期的待实名,含加油包子节点', () => {
|
||||
const now = Date.parse('2026-11-07T10:00:00+08:00');
|
||||
const node = (id, silence, children = []) => ({ package_usage_id: id, package_name: `套餐${id}`, silence, children });
|
||||
assert.equal(pickSilenceReminder([], now), null);
|
||||
assert.equal(pickSilenceReminder([node(1, null)], now), null);
|
||||
assert.equal(pickSilenceReminder([node(1, { silence_status: 'expired', extendable: false })], now), null);
|
||||
|
||||
const expired = pickSilenceReminder([
|
||||
node(1, { silence_status: 'waiting', silence_deadline_at: '2026-11-09T23:59:59+08:00' }),
|
||||
node(2, null, [node(3, { silence_status: 'expired', extendable: true, silence_deadline_at: '2026-11-06T23:59:59+08:00' })])
|
||||
], now);
|
||||
assert.equal(expired.kind, 'expired');
|
||||
assert.equal(expired.packageUsageId, 3);
|
||||
|
||||
const waiting = pickSilenceReminder([
|
||||
node(4, { silence_status: 'waiting', silence_deadline_at: '2026-11-20T23:59:59+08:00' }),
|
||||
node(5, { silence_status: 'waiting', silence_deadline_at: '2026-11-12T23:59:59+08:00' }),
|
||||
node(6, { silence_status: 'waiting', silence_deadline_at: '2026-11-09T23:59:59+08:00' })
|
||||
], now);
|
||||
assert.equal(waiting.kind, 'waiting');
|
||||
assert.equal(waiting.packageUsageId, 6);
|
||||
assert.equal(waiting.remainingDays, 3);
|
||||
|
||||
assert.equal(pickSilenceReminder([node(7, { silence_status: 'ended' })], now), null);
|
||||
assert.equal(silenceReminderKey('A', { packageUsageId: 3, kind: 'expired' }, '2026-11-07'), 'silence_reminder:A:3:expired:2026-11-07');
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user