fix: compact admin overview and billing layout

dev
admin 2 months ago
parent 8b2cb35b58
commit f781e5065d

@ -536,7 +536,7 @@ async function loadList(updateUrl = true) {
renderRows();
renderSummary(payload?.summary || {});
byId('billing-result-count').textContent = `本页 ${state.items.length} 条 · 共 ${state.pagination.total} 条`;
setNotice(`已加载 ${state.pagination.total} 条${VIEWS[state.view].title}。刷新时间 ${new Date().toLocaleTimeString('zh-CN', { hour12: false })}`, 'success');
setNotice(`${state.pagination.total} 条 · 更新 ${new Date().toLocaleTimeString('zh-CN', { hour12: false })}`, 'success');
if (updateUrl) writeUrl(false, filters);
} catch (error) {
if (error?.name === 'AbortError') return;

@ -192,6 +192,14 @@
letter-spacing: 0;
}
.admin-stat-card .admin-stat-value {
color: #00081a;
font-size: 30px;
font-weight: 800;
line-height: 1.2;
letter-spacing: 0;
}
.admin-stat-icon {
width: 52px;
height: 52px;
@ -203,6 +211,72 @@
font-size: 28px;
}
.admin-overview-kpis > [class*="col-"],
.admin-billing-summary > [class*="col-"] {
display: flex;
}
.admin-overview-kpis .admin-stat-card,
.admin-billing-summary .admin-stat-card {
width: 100%;
margin-bottom: 0;
}
.admin-overview-kpis .admin-stat-footer {
min-height: 42px;
flex-wrap: wrap;
gap: 8px;
font-size: 13px;
}
.admin-overview-kpis .admin-stat-footer > span {
min-width: 0;
}
.admin-overview-kpis .admin-stat-link {
flex: 0 0 auto;
color: #6c7c8f;
text-decoration: none;
white-space: nowrap;
}
.admin-overview-kpis .admin-stat-link:hover,
.admin-overview-kpis .admin-stat-link:focus-visible {
color: #08785b;
}
.admin-billing-summary .admin-stat-card .card-body {
min-height: 108px;
}
.admin-billing-stat-copy {
min-width: 0;
}
.admin-overview-kpis .admin-stat-icon,
.admin-billing-summary .admin-stat-icon {
flex: 0 0 52px;
}
.admin-billing-summary .admin-billing-stat-value {
max-width: 100%;
font-size: clamp(22px, 1.55vw, 30px);
word-break: keep-all;
}
.admin-billing-filter .card-header {
padding-bottom: 14px;
}
.admin-billing-filter .card-body {
padding-top: 16px;
}
.admin-billing-filter-actions {
min-height: 38px;
align-items: center;
}
.admin-summary-grid {
display: grid;
grid-template-columns: repeat(4, minmax(0, 1fr));

@ -11,7 +11,7 @@
<div class="text-sm-end mt-2 mt-sm-0 admin-checkout-actions">
<span class="admin-config-status is-loading" id="billing-notice" role="status" aria-live="polite">正在读取账单数据…</span>
<button class="btn btn-light" id="billing-refresh" type="button">
<i class="mdi mdi-refresh me-1" aria-hidden="true"></i>刷新当前视图
<i class="mdi mdi-refresh me-1" aria-hidden="true"></i>刷新
</button>
</div>
</div>
@ -22,48 +22,68 @@
<a href="/admin/billing?view=payments" data-billing-view="payments">支付流水</a>
</nav>
<section class="row g-3 mb-3" id="billing-summary" aria-label="当前视图摘要" aria-busy="true">
<section class="row g-3 mb-3 admin-billing-summary" id="billing-summary" aria-label="当前视图摘要" aria-busy="true">
<div class="col-md-6 col-xxl-3">
<article class="card admin-ticket-stat h-100">
<article class="card overflow-hidden admin-stat-card admin-billing-stat">
<div class="card-body">
<span class="admin-ticket-stat-icon"><i class="mdi mdi-file-document-multiple-outline" aria-hidden="true"></i></span>
<div><p class="text-muted mb-1">记录总数</p><strong class="d-block fs-24" id="billing-summary-total">—</strong></div>
<div class="d-flex align-items-center justify-content-between gap-3">
<div class="admin-billing-stat-copy">
<h2 class="text-muted fs-14 fw-normal mb-1">记录总数</h2>
<strong class="admin-stat-value admin-billing-stat-value d-block mb-0" id="billing-summary-total">—</strong>
</div>
<span class="admin-stat-icon text-primary"><i class="mdi mdi-file-document-multiple-outline" aria-hidden="true"></i></span>
</div>
</div>
</article>
</div>
<div class="col-md-6 col-xxl-3">
<article class="card admin-ticket-stat h-100">
<article class="card overflow-hidden admin-stat-card admin-billing-stat">
<div class="card-body">
<span class="admin-ticket-stat-icon"><i class="mdi mdi-currency-usd" aria-hidden="true"></i></span>
<div><p class="text-muted mb-1" id="billing-summary-amount-label">总金额</p><strong class="d-block fs-24" id="billing-summary-amount">—</strong></div>
<div class="d-flex align-items-center justify-content-between gap-3">
<div class="admin-billing-stat-copy">
<h2 class="text-muted fs-14 fw-normal mb-1" id="billing-summary-amount-label">总金额</h2>
<strong class="admin-stat-value admin-billing-stat-value d-block mb-0" id="billing-summary-amount">—</strong>
</div>
<span class="admin-stat-icon text-success"><i class="mdi mdi-currency-usd" aria-hidden="true"></i></span>
</div>
</div>
</article>
</div>
<div class="col-md-6 col-xxl-3">
<article class="card admin-ticket-stat h-100">
<article class="card overflow-hidden admin-stat-card admin-billing-stat">
<div class="card-body">
<span class="admin-ticket-stat-icon is-open"><i class="mdi mdi-alert-circle-outline" aria-hidden="true"></i></span>
<div><p class="text-muted mb-1" id="billing-summary-focus-label">待处理</p><strong class="d-block fs-24" id="billing-summary-focus">—</strong></div>
<div class="d-flex align-items-center justify-content-between gap-3">
<div class="admin-billing-stat-copy">
<h2 class="text-muted fs-14 fw-normal mb-1" id="billing-summary-focus-label">待处理</h2>
<strong class="admin-stat-value admin-billing-stat-value d-block mb-0" id="billing-summary-focus">—</strong>
</div>
<span class="admin-stat-icon text-warning"><i class="mdi mdi-alert-circle-outline" aria-hidden="true"></i></span>
</div>
</div>
</article>
</div>
<div class="col-md-6 col-xxl-3">
<article class="card admin-ticket-stat h-100">
<article class="card overflow-hidden admin-stat-card admin-billing-stat">
<div class="card-body">
<span class="admin-ticket-stat-icon is-closed"><i class="mdi mdi-check-circle-outline" aria-hidden="true"></i></span>
<div><p class="text-muted mb-1" id="billing-summary-result-label">已完成</p><strong class="d-block fs-24" id="billing-summary-result">—</strong></div>
<div class="d-flex align-items-center justify-content-between gap-3">
<div class="admin-billing-stat-copy">
<h2 class="text-muted fs-14 fw-normal mb-1" id="billing-summary-result-label">已完成</h2>
<strong class="admin-stat-value admin-billing-stat-value d-block mb-0" id="billing-summary-result">—</strong>
</div>
<span class="admin-stat-icon text-success"><i class="mdi mdi-check-circle-outline" aria-hidden="true"></i></span>
</div>
</div>
</article>
</div>
</section>
<section class="card mb-3" aria-labelledby="billing-filter-title">
<section class="card mb-3 admin-billing-filter" aria-labelledby="billing-filter-title">
<div class="card-header">
<h2 class="h5 card-title mb-1" id="billing-filter-title">筛选条件</h2>
<span class="text-muted fs-13">缩小数据范围后再对账;清空条件可恢复默认列表。</span>
</div>
<div class="card-body">
<form id="billing-filter-form" class="row g-3 align-items-end">
<form id="billing-filter-form" class="row g-2 align-items-end">
<label class="col-xl-4 col-lg-6" for="billing-query">
<span class="form-label d-block">关键词</span>
<input class="form-control" id="billing-query" name="q" type="search" maxlength="80"
@ -109,7 +129,7 @@
<option value="100">100 条</option>
</select>
</label>
<div class="col-12 admin-form-actions mt-0">
<div class="col-xl-4 col-lg-6 col-12 admin-form-actions admin-billing-filter-actions mt-0">
<button class="btn btn-primary" id="billing-apply" type="submit">应用筛选</button>
<button class="btn btn-light" id="billing-reset" type="button">清空条件</button>
</div>

@ -25,72 +25,72 @@
</div>
{/if}
<div class="row g-3">
<div class="row g-3 admin-overview-kpis">
<div class="col-md-6 col-xxl-3">
<div class="card overflow-hidden admin-stat-card h-100">
<div class="card overflow-hidden admin-stat-card">
<div class="card-body">
<div class="d-flex align-items-center justify-content-between gap-3">
<div>
<h2 class="text-muted fs-14 fw-normal mb-1">在管实例</h2>
<strong class="h3 d-block fw-bold mb-0">{$overview.instances.managed}</strong>
<strong class="admin-stat-value d-block mb-0">{$overview.instances.managed}</strong>
</div>
<span class="admin-stat-icon text-primary"><i class="mdi mdi-server-network" aria-hidden="true"></i></span>
</div>
</div>
<div class="card-footer bg-muted-color border-top py-2 d-flex align-items-center justify-content-between flex-wrap gap-2">
<span class="text-muted">服务正常 {$overview.instances.service_normal} 台 · {$overview.instances.customer_count} 位客户</span>
<a class="link-primary fw-medium" href="/admin/cloud/instances">查看实例</a>
<div class="card-footer bg-muted-color border-top py-2 d-flex align-items-center justify-content-between admin-stat-footer">
<span class="text-muted">正常 {$overview.instances.service_normal} 台 · 客户 {$overview.instances.customer_count} 位</span>
<a class="admin-stat-link fw-medium" href="/admin/cloud/instances">查看实例</a>
</div>
</div>
</div>
<div class="col-md-6 col-xxl-3">
<div class="card overflow-hidden admin-stat-card h-100">
<div class="card overflow-hidden admin-stat-card">
<div class="card-body">
<div class="d-flex align-items-center justify-content-between gap-3">
<div>
<h2 class="text-muted fs-14 fw-normal mb-1">本月有效实收</h2>
<strong class="h3 d-block fw-bold mb-0">${$overview.revenue.month|escape:'html'}</strong>
<strong class="admin-stat-value d-block mb-0">${$overview.revenue.month|escape:'html'}</strong>
</div>
<span class="admin-stat-icon text-success"><i class="mdi mdi-receipt-text-check-outline" aria-hidden="true"></i></span>
</div>
</div>
<div class="card-footer bg-muted-color border-top py-2 d-flex align-items-center justify-content-between flex-wrap gap-2">
<div class="card-footer bg-muted-color border-top py-2 d-flex align-items-center justify-content-between admin-stat-footer">
<span class="text-muted">今日 ${$overview.revenue.today|escape:'html'} · {$overview.revenue.today_count} 笔</span>
<a class="link-primary fw-medium" href="/admin/billing">进入账单</a>
<a class="admin-stat-link fw-medium" href="/admin/billing">进入账单</a>
</div>
</div>
</div>
<div class="col-md-6 col-xxl-3">
<div class="card overflow-hidden admin-stat-card h-100">
<div class="card overflow-hidden admin-stat-card">
<div class="card-body">
<div class="d-flex align-items-center justify-content-between gap-3">
<div>
<h2 class="text-muted fs-14 fw-normal mb-1">开通中任务</h2>
<strong class="h3 d-block fw-bold mb-0">{$overview.jobs.active}</strong>
<strong class="admin-stat-value d-block mb-0">{$overview.jobs.active}</strong>
</div>
<span class="admin-stat-icon text-warning"><i class="mdi mdi-progress-clock" aria-hidden="true"></i></span>
</div>
</div>
<div class="card-footer bg-muted-color border-top py-2 d-flex align-items-center justify-content-between flex-wrap gap-2">
<span class="text-muted">待核对 {$overview.jobs.uncertain} 项 · 近 24 小时失败 {$overview.jobs.failed_24h} 项</span>
<a class="link-primary fw-medium" href="/admin/billing?view=orders">查看任务</a>
<div class="card-footer bg-muted-color border-top py-2 d-flex align-items-center justify-content-between admin-stat-footer">
<span class="text-muted">待核对 {$overview.jobs.uncertain} 项 · 24h 失败 {$overview.jobs.failed_24h} 项</span>
<a class="admin-stat-link fw-medium" href="/admin/billing?view=orders">查看任务</a>
</div>
</div>
</div>
<div class="col-md-6 col-xxl-3">
<div class="card overflow-hidden admin-stat-card h-100">
<div class="card overflow-hidden admin-stat-card">
<div class="card-body">
<div class="d-flex align-items-center justify-content-between gap-3">
<div>
<h2 class="text-muted fs-14 fw-normal mb-1">7 天内到期</h2>
<strong class="h3 d-block fw-bold mb-0">{$overview.instances.expiring_7d}</strong>
<strong class="admin-stat-value d-block mb-0">{$overview.instances.expiring_7d}</strong>
</div>
<span class="admin-stat-icon text-danger"><i class="mdi mdi-calendar-clock-outline" aria-hidden="true"></i></span>
</div>
</div>
<div class="card-footer bg-muted-color border-top py-2 d-flex align-items-center justify-content-between flex-wrap gap-2">
<span class="text-muted">到期或宽限期 {$overview.instances.grace} 台 · 待收续费 {$overview.receivables.renewal_count} 张</span>
<a class="link-primary fw-medium" href="/admin/cloud/instances">处理续期</a>
<div class="card-footer bg-muted-color border-top py-2 d-flex align-items-center justify-content-between admin-stat-footer">
<span class="text-muted">宽限期 {$overview.instances.grace} 台 · 待收续费 {$overview.receivables.renewal_count} 张</span>
<a class="admin-stat-link fw-medium" href="/admin/cloud/instances">处理续期</a>
</div>
</div>
</div>

@ -1,2 +1,2 @@
{* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *}
{assign var=venix_asset_version value='2026092904' scope='global'}
{assign var=venix_asset_version value='2026093001' scope='global'}

@ -70,6 +70,10 @@ $assert(str_contains($schema, 'cloud_invoice_overview_paid (status, paid_at, pur
'Overview range queries must have bounded operational indexes.');
$assert(str_contains($template, 'card overflow-hidden admin-stat-card')
&& str_contains($template, 'row g-3 admin-overview-kpis')
&& substr_count($template, 'admin-stat-value d-block mb-0') === 4
&& substr_count($template, 'admin-stat-footer') === 4
&& !preg_match('/card overflow-hidden admin-stat-card h-100/', $template)
&& str_contains($template, 'admin-progress-list')
&& str_contains($template, 'admin-live-grid mb-0')
&& str_contains($template, 'admin-report-list')
@ -97,6 +101,9 @@ foreach (['/admin/cloud/instances', '/admin/billing', '/admin/hosts', '/admin/ti
$assert(str_contains($header, '/theme/venix/css/admin-home.css')
&& !str_contains($header, 'admin_extra_css_href')
&& str_contains($styles, '.admin-stat-card .card-body')
&& str_contains($styles, '.admin-stat-card .admin-stat-value')
&& str_contains($styles, '.admin-overview-kpis > [class*="col-"]')
&& str_contains($styles, '.admin-overview-kpis .admin-stat-link')
&& preg_match('/\.admin-live-grid\s*\{[^}]*grid-template-columns:\s*repeat\(2,\s*minmax\(0,\s*1fr\)\)/s', $styles)
&& str_contains($styles, '.admin-progress-list')
&& str_contains($styles, '.admin-shortcuts')
@ -133,8 +140,8 @@ $assert(preg_match('/\.admin-template-body\s*\{(?=[^}]*--admin-viewport-height:\
$assetVersion = [];
$assert(preg_match("/venix_asset_version value='([0-9]+)'/", $assets, $assetVersion) === 1
&& (int) $assetVersion[1] >= 2026092904
&& (int) $assetVersion[1] >= 2026093001
&& str_contains($assets, 'cache key'),
'This administrator asset release must use cache key 2026092904 or newer.');
'This administrator asset release must use cache key 2026093001 or newer.');
echo 'Administrator operational overview contracts passed.' . PHP_EOL;

@ -757,7 +757,9 @@ $assert(str_contains($adminBillingSource,
&& str_contains($adminBillingSource, "{include file='admin/static_footer.tpl'}")
&& !str_contains($adminBillingSource, '/cloud/admin-billing.css')
&& !is_file($adminBillingStyles)
&& str_contains($adminBillingSource, 'admin-ticket-stat')
&& str_contains($adminBillingSource, 'admin-billing-summary')
&& preg_match_all('/<article class="[^"]*\badmin-billing-stat\b/', $adminBillingSource) === 4
&& !str_contains($adminBillingSource, 'admin-ticket-stat h-100')
&& str_contains($adminBillingSource, 'admin-checkout-table')
&& str_contains($adminBillingSource, 'admin-modal-panel'),
'Unified administrator billing must reuse Venix admin styles and version its functional script');
@ -783,6 +785,9 @@ foreach ($billingIds as $billingId) {
}
$assert(str_contains($adminBillingSource, '<main data-admin-billing>')
&& substr_count($adminBillingSource, 'data-billing-view=') === 3
&& str_contains($adminBillingSource, 'admin-billing-filter-actions')
&& str_contains($adminSharedStyles, '.admin-billing-summary .admin-billing-stat-value')
&& str_contains($adminSharedStyles, '.admin-billing-filter-actions')
&& str_contains($adminBillingRuntime, "document.querySelector('[data-admin-billing]')")
&& str_contains($adminBillingRuntime, "document.querySelectorAll('[data-billing-view]')")
&& str_contains($adminBillingRuntime, 'button.dataset.invoiceId')

Loading…
Cancel
Save