mirror of
https://github.com/Wei-Shaw/sub2api.git
synced 2026-03-30 05:02:17 +00:00
Merge pull request #861 from bayma888/feature/usage-user-balance-popup
feat(ui): 使用记录页面点击用户邮箱可查看用户信息和充值记录
This commit is contained in:
@@ -4,7 +4,15 @@
|
|||||||
<DataTable :columns="columns" :data="data" :loading="loading">
|
<DataTable :columns="columns" :data="data" :loading="loading">
|
||||||
<template #cell-user="{ row }">
|
<template #cell-user="{ row }">
|
||||||
<div class="text-sm">
|
<div class="text-sm">
|
||||||
<span class="font-medium text-gray-900 dark:text-white">{{ row.user?.email || '-' }}</span>
|
<button
|
||||||
|
v-if="row.user?.email"
|
||||||
|
class="font-medium text-primary-600 underline decoration-dashed underline-offset-2 transition-colors hover:text-primary-700 dark:text-primary-400 dark:hover:text-primary-300"
|
||||||
|
@click="$emit('userClick', row.user_id, row.user?.email)"
|
||||||
|
:title="t('admin.usage.clickToViewBalance')"
|
||||||
|
>
|
||||||
|
{{ row.user.email }}
|
||||||
|
</button>
|
||||||
|
<span v-else class="font-medium text-gray-900 dark:text-white">-</span>
|
||||||
<span class="ml-1 text-gray-500 dark:text-gray-400">#{{ row.user_id }}</span>
|
<span class="ml-1 text-gray-500 dark:text-gray-400">#{{ row.user_id }}</span>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
@@ -278,6 +286,7 @@ import Icon from '@/components/icons/Icon.vue'
|
|||||||
import type { AdminUsageLog } from '@/types'
|
import type { AdminUsageLog } from '@/types'
|
||||||
|
|
||||||
defineProps(['data', 'loading', 'columns'])
|
defineProps(['data', 'loading', 'columns'])
|
||||||
|
defineEmits(['userClick'])
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
|
|
||||||
// Tooltip state - cost
|
// Tooltip state - cost
|
||||||
|
|||||||
@@ -54,6 +54,7 @@
|
|||||||
/>
|
/>
|
||||||
<!-- Deposit button - matches menu style -->
|
<!-- Deposit button - matches menu style -->
|
||||||
<button
|
<button
|
||||||
|
v-if="!hideActions"
|
||||||
@click="emit('deposit')"
|
@click="emit('deposit')"
|
||||||
class="flex items-center gap-2 rounded-lg border border-gray-200 bg-white px-3 py-2 text-sm text-gray-700 transition-colors hover:bg-gray-50 dark:border-dark-600 dark:bg-dark-800 dark:text-gray-300 dark:hover:bg-dark-700"
|
class="flex items-center gap-2 rounded-lg border border-gray-200 bg-white px-3 py-2 text-sm text-gray-700 transition-colors hover:bg-gray-50 dark:border-dark-600 dark:bg-dark-800 dark:text-gray-300 dark:hover:bg-dark-700"
|
||||||
>
|
>
|
||||||
@@ -62,6 +63,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<!-- Withdraw button - matches menu style -->
|
<!-- Withdraw button - matches menu style -->
|
||||||
<button
|
<button
|
||||||
|
v-if="!hideActions"
|
||||||
@click="emit('withdraw')"
|
@click="emit('withdraw')"
|
||||||
class="flex items-center gap-2 rounded-lg border border-gray-200 bg-white px-3 py-2 text-sm text-gray-700 transition-colors hover:bg-gray-50 dark:border-dark-600 dark:bg-dark-800 dark:text-gray-300 dark:hover:bg-dark-700"
|
class="flex items-center gap-2 rounded-lg border border-gray-200 bg-white px-3 py-2 text-sm text-gray-700 transition-colors hover:bg-gray-50 dark:border-dark-600 dark:bg-dark-800 dark:text-gray-300 dark:hover:bg-dark-700"
|
||||||
>
|
>
|
||||||
@@ -176,7 +178,7 @@ import BaseDialog from '@/components/common/BaseDialog.vue'
|
|||||||
import Select from '@/components/common/Select.vue'
|
import Select from '@/components/common/Select.vue'
|
||||||
import Icon from '@/components/icons/Icon.vue'
|
import Icon from '@/components/icons/Icon.vue'
|
||||||
|
|
||||||
const props = defineProps<{ show: boolean; user: AdminUser | null }>()
|
const props = defineProps<{ show: boolean; user: AdminUser | null; hideActions?: boolean }>()
|
||||||
const emit = defineEmits(['close', 'deposit', 'withdraw'])
|
const emit = defineEmits(['close', 'deposit', 'withdraw'])
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
|
|
||||||
|
|||||||
@@ -2875,6 +2875,8 @@ export default {
|
|||||||
billingTypeBalance: 'Balance',
|
billingTypeBalance: 'Balance',
|
||||||
billingTypeSubscription: 'Subscription',
|
billingTypeSubscription: 'Subscription',
|
||||||
ipAddress: 'IP',
|
ipAddress: 'IP',
|
||||||
|
clickToViewBalance: 'Click to view balance history',
|
||||||
|
failedToLoadUser: 'Failed to load user info',
|
||||||
cleanup: {
|
cleanup: {
|
||||||
button: 'Cleanup',
|
button: 'Cleanup',
|
||||||
title: 'Cleanup Usage Records',
|
title: 'Cleanup Usage Records',
|
||||||
|
|||||||
@@ -3043,6 +3043,8 @@ export default {
|
|||||||
billingTypeBalance: '钱包余额',
|
billingTypeBalance: '钱包余额',
|
||||||
billingTypeSubscription: '订阅套餐',
|
billingTypeSubscription: '订阅套餐',
|
||||||
ipAddress: 'IP',
|
ipAddress: 'IP',
|
||||||
|
clickToViewBalance: '点击查看充值记录',
|
||||||
|
failedToLoadUser: '加载用户信息失败',
|
||||||
cleanup: {
|
cleanup: {
|
||||||
button: '清理',
|
button: '清理',
|
||||||
title: '清理使用记录',
|
title: '清理使用记录',
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</UsageFilters>
|
</UsageFilters>
|
||||||
<UsageTable :data="usageLogs" :loading="loading" :columns="visibleColumns" />
|
<UsageTable :data="usageLogs" :loading="loading" :columns="visibleColumns" @userClick="handleUserClick" />
|
||||||
<Pagination v-if="pagination.total > 0" :page="pagination.page" :total="pagination.total" :page-size="pagination.page_size" @update:page="handlePageChange" @update:pageSize="handlePageSizeChange" />
|
<Pagination v-if="pagination.total > 0" :page="pagination.page" :total="pagination.total" :page-size="pagination.page_size" @update:page="handlePageChange" @update:pageSize="handlePageSizeChange" />
|
||||||
</div>
|
</div>
|
||||||
</AppLayout>
|
</AppLayout>
|
||||||
@@ -66,6 +66,13 @@
|
|||||||
:end-date="endDate"
|
:end-date="endDate"
|
||||||
@close="cleanupDialogVisible = false"
|
@close="cleanupDialogVisible = false"
|
||||||
/>
|
/>
|
||||||
|
<!-- Balance history modal triggered from usage table user click -->
|
||||||
|
<UserBalanceHistoryModal
|
||||||
|
:show="showBalanceHistoryModal"
|
||||||
|
:user="balanceHistoryUser"
|
||||||
|
:hide-actions="true"
|
||||||
|
@close="showBalanceHistoryModal = false; balanceHistoryUser = null"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
@@ -79,9 +86,10 @@ import AppLayout from '@/components/layout/AppLayout.vue'; import Pagination fro
|
|||||||
import UsageStatsCards from '@/components/admin/usage/UsageStatsCards.vue'; import UsageFilters from '@/components/admin/usage/UsageFilters.vue'
|
import UsageStatsCards from '@/components/admin/usage/UsageStatsCards.vue'; import UsageFilters from '@/components/admin/usage/UsageFilters.vue'
|
||||||
import UsageTable from '@/components/admin/usage/UsageTable.vue'; import UsageExportProgress from '@/components/admin/usage/UsageExportProgress.vue'
|
import UsageTable from '@/components/admin/usage/UsageTable.vue'; import UsageExportProgress from '@/components/admin/usage/UsageExportProgress.vue'
|
||||||
import UsageCleanupDialog from '@/components/admin/usage/UsageCleanupDialog.vue'
|
import UsageCleanupDialog from '@/components/admin/usage/UsageCleanupDialog.vue'
|
||||||
|
import UserBalanceHistoryModal from '@/components/admin/user/UserBalanceHistoryModal.vue'
|
||||||
import ModelDistributionChart from '@/components/charts/ModelDistributionChart.vue'; import GroupDistributionChart from '@/components/charts/GroupDistributionChart.vue'; import TokenUsageTrend from '@/components/charts/TokenUsageTrend.vue'
|
import ModelDistributionChart from '@/components/charts/ModelDistributionChart.vue'; import GroupDistributionChart from '@/components/charts/GroupDistributionChart.vue'; import TokenUsageTrend from '@/components/charts/TokenUsageTrend.vue'
|
||||||
import Icon from '@/components/icons/Icon.vue'
|
import Icon from '@/components/icons/Icon.vue'
|
||||||
import type { AdminUsageLog, TrendDataPoint, ModelStat, GroupStat } from '@/types'; import type { AdminUsageStatsResponse, AdminUsageQueryParams } from '@/api/admin/usage'
|
import type { AdminUsageLog, TrendDataPoint, ModelStat, GroupStat, AdminUser } from '@/types'; import type { AdminUsageStatsResponse, AdminUsageQueryParams } from '@/api/admin/usage'
|
||||||
|
|
||||||
const { t } = useI18n()
|
const { t } = useI18n()
|
||||||
const appStore = useAppStore()
|
const appStore = useAppStore()
|
||||||
@@ -91,6 +99,19 @@ let abortController: AbortController | null = null; let exportAbortController: A
|
|||||||
let chartReqSeq = 0
|
let chartReqSeq = 0
|
||||||
const exportProgress = reactive({ show: false, progress: 0, current: 0, total: 0, estimatedTime: '' })
|
const exportProgress = reactive({ show: false, progress: 0, current: 0, total: 0, estimatedTime: '' })
|
||||||
const cleanupDialogVisible = ref(false)
|
const cleanupDialogVisible = ref(false)
|
||||||
|
// Balance history modal state
|
||||||
|
const showBalanceHistoryModal = ref(false)
|
||||||
|
const balanceHistoryUser = ref<AdminUser | null>(null)
|
||||||
|
|
||||||
|
const handleUserClick = async (userId: number) => {
|
||||||
|
try {
|
||||||
|
const user = await adminAPI.users.getById(userId)
|
||||||
|
balanceHistoryUser.value = user
|
||||||
|
showBalanceHistoryModal.value = true
|
||||||
|
} catch {
|
||||||
|
appStore.showError(t('admin.usage.failedToLoadUser'))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const granularityOptions = computed(() => [{ value: 'day', label: t('admin.dashboard.day') }, { value: 'hour', label: t('admin.dashboard.hour') }])
|
const granularityOptions = computed(() => [{ value: 'day', label: t('admin.dashboard.day') }, { value: 'hour', label: t('admin.dashboard.hour') }])
|
||||||
// Use local timezone to avoid UTC timezone issues
|
// Use local timezone to avoid UTC timezone issues
|
||||||
|
|||||||
Reference in New Issue
Block a user