direv/admin_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin_new P0+P1 全批次合并 (84 commits) #2

Merged
direv merged 85 commits from develop into main 2026-08-07 11:27:17 +08:00
Conversation 0 Commits 85 Files Changed 94 +4 -3
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit db472a0e2f - Show all commits

7
src/modules/order/OrderListView.vue
View File

@ -103,8 +103,9 @@ async function load() {
loading.value = true loading.value = true
error.value = null error.value = null
try { try {
// W12.3 修复: httpGet() 已解开 res.data.data, 所以 r 直接是 {total, list, page, limit}
const r: any = await httpGet(endpoint.value, { page: page.value, limit: limit.value }) const r: any = await httpGet(endpoint.value, { page: page.value, limit: limit.value })
const respList = r?.data?.list || [] const respList: any[] = Array.isArray(r?.list) ? r.list : []
const rows: Order[] = respList.map((it: any) => ({ const rows: Order[] = respList.map((it: any) => ({
id: it.orderId || '', id: it.orderId || '',
orderNo: it.orderId || '', orderNo: it.orderId || '',
@ -123,8 +124,8 @@ async function load() {
raw: it raw: it
})) }))
list.value = rows list.value = rows
// 后端返 total 是 string, 转 number // 后端 total 是字符串 "1356", parseInt 兜底
const t = r?.data?.total const t = r?.total
total.value = typeof t === 'string' ? parseInt(t, 10) : (Number(t) || 0) total.value = typeof t === 'string' ? parseInt(t, 10) : (Number(t) || 0)
} catch (e: any) { } catch (e: any) {
error.value = e?.msg || e?.message || '加载失败' error.value = e?.msg || e?.message || '加载失败'