fix: some

This commit is contained in:
luo
2026-10-14 11:18:29 +08:00
parent 37f24882c9
commit f2344063ff
2 changed files with 103 additions and 11 deletions

View File

@@ -133,13 +133,28 @@
loading.value = true;
try {
const data = await assetApi.getPackageHistory(
userStore.state.identifier,
page.value,
pageSize
);
let visibleItems;
do {
const requestedPage = page.value;
const data = await assetApi.getPackageHistory(
userStore.state.identifier,
requestedPage,
pageSize
);
const items = Array.isArray(data.items) ? data.items : [];
visibleItems = items.filter(item => Number(item?.status) !== 4);
const responseSize = Number(data.size) > 0 ? Number(data.size) : pageSize;
const responseTotal = data.total === null || data.total === undefined
? NaN : Number(data.total);
// Pagination describes the backend's unfiltered records, not the
// visible list. Skip fully hidden pages to reach subsequent records.
noMore.value = Number.isFinite(responseTotal) && responseTotal >= 0
? requestedPage * responseSize >= responseTotal
: items.length < pageSize;
page.value = requestedPage + 1;
} while (visibleItems.length === 0 && !noMore.value);
const newData = (data.items || []).map(item => ({
const newData = visibleItems.map(item => ({
...item,
activated_at: item.activated_at ? formatDate(item.activated_at) : '',
created_at: formatDate(item.created_at),
@@ -152,11 +167,6 @@
packageList.splice(0, packageList.length, ...newData);
}
if (newData.length < pageSize) {
noMore.value = true;
} else {
page.value++;
}
} catch (e) {
console.error('加载套餐历史失败', e);
}