This commit is contained in:
@@ -46,24 +46,28 @@
|
||||
if (loading.value || (append && noMore.value)) return;
|
||||
|
||||
loading.value = true;
|
||||
const requestedPage = page.value;
|
||||
|
||||
try {
|
||||
const data = await assetApi.getPackageHistory(
|
||||
userStore.state.identifier,
|
||||
requestedPage,
|
||||
pageSize
|
||||
);
|
||||
const groups = data.items;
|
||||
const responsePage = Number.isInteger(data.page) && data.page > 0
|
||||
? data.page
|
||||
: requestedPage;
|
||||
const responseSize = Number.isInteger(data.size) && data.size > 0
|
||||
? data.size
|
||||
: pageSize;
|
||||
const responseTotal = Number.isFinite(data.total) && data.total >= 0
|
||||
? data.total
|
||||
: 0;
|
||||
let groups;
|
||||
do {
|
||||
const requestedPage = page.value;
|
||||
const data = await assetApi.getPackageHistory(
|
||||
userStore.state.identifier,
|
||||
requestedPage,
|
||||
pageSize
|
||||
);
|
||||
groups = data.items;
|
||||
const responsePage = Number.isInteger(data.page) && data.page > 0
|
||||
? Math.max(data.page, requestedPage)
|
||||
: requestedPage;
|
||||
const responseSize = Number.isInteger(data.size) && data.size > 0
|
||||
? data.size
|
||||
: pageSize;
|
||||
total.value = Number.isFinite(data.total) && data.total >= 0 ? data.total : 0;
|
||||
// Total and pagination describe the unfiltered backend pages. Skip a
|
||||
// page containing only invalidated records so later records stay reachable.
|
||||
noMore.value = responsePage * responseSize >= total.value;
|
||||
page.value = responsePage + 1;
|
||||
} while (groups.length === 0 && !noMore.value);
|
||||
|
||||
if (append) {
|
||||
packageList.value.push(...groups);
|
||||
@@ -71,9 +75,6 @@
|
||||
packageList.value = groups;
|
||||
}
|
||||
|
||||
total.value = responseTotal;
|
||||
noMore.value = responsePage * responseSize >= total.value;
|
||||
page.value = responsePage + 1;
|
||||
} catch (error) {
|
||||
// The shared request layer handles the API's unified error response and authentication errors.
|
||||
console.error('加载套餐历史失败', error);
|
||||
|
||||
Reference in New Issue
Block a user