diff --git a/web/public/cloud/admin-billing.js b/web/public/cloud/admin-billing.js index f2ff2e2f..3da3fc7a 100644 --- a/web/public/cloud/admin-billing.js +++ b/web/public/cloud/admin-billing.js @@ -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; diff --git a/web/public/theme/venix/css/admin-home.css b/web/public/theme/venix/css/admin-home.css index cfef6719..f9b23a64 100644 --- a/web/public/theme/venix/css/admin-home.css +++ b/web/public/theme/venix/css/admin-home.css @@ -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)); diff --git a/web/resources/views/venix/admin/billing.tpl b/web/resources/views/venix/admin/billing.tpl index d59d75b1..cf196a69 100644 --- a/web/resources/views/venix/admin/billing.tpl +++ b/web/resources/views/venix/admin/billing.tpl @@ -11,7 +11,7 @@
正在读取账单数据…
@@ -22,48 +22,68 @@ 支付流水 -
+
-
+
- -

记录总数

—
+
+
+

记录总数

+ — +
+ +
-
+
- -

总金额

—
+
+
+

总金额

+ — +
+ +
-
+
- -

待处理

—
+
+
+

待处理

+ — +
+ +
-
+
- -

已完成

—
+
+
+

已完成

+ — +
+ +
-
+

筛选条件

缩小数据范围后再对账;清空条件可恢复默认列表。
-
+ -
+
diff --git a/web/resources/views/venix/admin/index.tpl b/web/resources/views/venix/admin/index.tpl index 6866c78b..e06c10ea 100644 --- a/web/resources/views/venix/admin/index.tpl +++ b/web/resources/views/venix/admin/index.tpl @@ -25,72 +25,72 @@
{/if} -
+
-
+

在管实例

- {$overview.instances.managed} + {$overview.instances.managed}
-
-
+

本月有效实收

- ${$overview.revenue.month|escape:'html'} + ${$overview.revenue.month|escape:'html'}
-
-
+

开通中任务

- {$overview.jobs.active} + {$overview.jobs.active}
-
-
+

7 天内到期

- {$overview.instances.expiring_7d} + {$overview.instances.expiring_7d}
-
diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 7754e78d..15db78ee 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -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'} diff --git a/web/tests/AdminOverviewContractTest.php b/web/tests/AdminOverviewContractTest.php index 927b0cad..3bef909b 100644 --- a/web/tests/AdminOverviewContractTest.php +++ b/web/tests/AdminOverviewContractTest.php @@ -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; diff --git a/web/tests/VirtualizationAssetsTest.php b/web/tests/VirtualizationAssetsTest.php index 9aead02c..85b36001 100644 --- a/web/tests/VirtualizationAssetsTest.php +++ b/web/tests/VirtualizationAssetsTest.php @@ -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('/
') && 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')