diff --git a/.claude/settings.local.json b/.claude/settings.local.json index 1b2ce9db..629ba56d 100644 --- a/.claude/settings.local.json +++ b/.claude/settings.local.json @@ -774,7 +774,8 @@ "Bash(ssh -J ceshi@103.39.231.231 ceshi@192.168.1.111 \"curl -s http://localhost:3021/api/v2/admin/status\")", "Bash(del \"c:\\\\Users\\\\dong\\\\Desktop\\\\rwadurian\\\\frontend\\\\mining-app\\\\lib\\\\domain\\\\usecases\\\\trading\\\\buy_shares.dart\")", "Bash(del \"c:\\\\Users\\\\dong\\\\Desktop\\\\rwadurian\\\\frontend\\\\mining-app\\\\lib\\\\domain\\\\usecases\\\\trading\\\\sell_shares.dart\")", - "Bash(ls -la \"c:\\\\Users\\\\dong\\\\Desktop\\\\rwadurian\\\\frontend\\\\mining-app\\\\lib\\\\presentation\\\\pages\"\" 2>/dev/null || dir /b \"c:UsersdongDesktoprwadurianfrontendmining-applibpresentationpages \")" + "Bash(ls -la \"c:\\\\Users\\\\dong\\\\Desktop\\\\rwadurian\\\\frontend\\\\mining-app\\\\lib\\\\presentation\\\\pages\"\" 2>/dev/null || dir /b \"c:UsersdongDesktoprwadurianfrontendmining-applibpresentationpages \")", + "Bash(cd:*)" ], "deny": [], "ask": [] diff --git a/backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts b/backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts index 37b47aec..f28e6a2f 100644 --- a/backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts +++ b/backend/services/mining-admin-service/src/api/controllers/dashboard.controller.ts @@ -31,6 +31,7 @@ export class DashboardController { totalUsers: raw.users?.total || 0, adoptedUsers: raw.users?.adopted || 0, networkEffectiveContribution: raw.contribution?.effectiveContribution || '0', + networkTotalContribution: raw.contribution?.totalContribution || '0', totalDistributed: raw.mining?.totalMined || '0', totalBurned: raw.mining?.latestDailyStat?.totalBurned || '0', circulationPool: raw.trading?.circulationPool?.totalShares || '0', diff --git a/frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx b/frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx index 86415d5f..f9eae8b8 100644 --- a/frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx +++ b/frontend/mining-admin-web/src/features/dashboard/components/price-overview.tsx @@ -44,15 +44,19 @@ export function PriceOverview() {
-
+

流通池

{formatCompactNumber(stats?.circulationPool)}

-

全网算力

+

有效算力

{formatCompactNumber(stats?.networkEffectiveContribution)}

+
+

总算力

+

{formatCompactNumber(stats?.networkTotalContribution)}

+

认种用户

{stats?.adoptedUsers?.toLocaleString() ?? '-'}

diff --git a/frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx b/frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx index 63740505..dbc012d7 100644 --- a/frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx +++ b/frontend/mining-admin-web/src/features/dashboard/components/stats-cards.tsx @@ -48,6 +48,7 @@ export function StatsCards() { { title: '全网算力', value: formatCompactNumber(stats?.networkEffectiveContribution), + subValue: `总算力: ${formatCompactNumber(stats?.networkTotalContribution)}`, icon: Activity, iconColor: 'text-blue-500', }, diff --git a/frontend/mining-admin-web/src/types/dashboard.ts b/frontend/mining-admin-web/src/types/dashboard.ts index c7007d72..fe0f2ee5 100644 --- a/frontend/mining-admin-web/src/types/dashboard.ts +++ b/frontend/mining-admin-web/src/types/dashboard.ts @@ -2,6 +2,7 @@ export interface DashboardStats { totalUsers: number; adoptedUsers: number; networkEffectiveContribution: string; + networkTotalContribution: string; totalDistributed: string; totalBurned: string; circulationPool: string; diff --git a/frontend/mining-app/lib/presentation/pages/profile/mining_records_page.dart b/frontend/mining-app/lib/presentation/pages/profile/mining_records_page.dart index 5a6399a6..7ef09cde 100644 --- a/frontend/mining-app/lib/presentation/pages/profile/mining_records_page.dart +++ b/frontend/mining-app/lib/presentation/pages/profile/mining_records_page.dart @@ -9,14 +9,14 @@ import '../../providers/user_providers.dart'; import '../../providers/mining_providers.dart'; /// 分配记录页面(挖矿记录) -class MiningRecordsPage extends ConsumerStatefulWidget { - const MiningRecordsPage({super.key}); +class MiningRecordsListPage extends ConsumerStatefulWidget { + const MiningRecordsListPage({super.key}); @override - ConsumerState createState() => _MiningRecordsPageState(); + ConsumerState createState() => _MiningRecordsListPageState(); } -class _MiningRecordsPageState extends ConsumerState { +class _MiningRecordsListPageState extends ConsumerState { static const Color _orange = Color(0xFFFF6B00); static const Color _green = Color(0xFF22C55E); static const Color _grayText = Color(0xFF6B7280);