diff --git a/frontend/src/i18n/locales/en.ts b/frontend/src/i18n/locales/en.ts index 55b5391a2e..11d2c5066a 100644 --- a/frontend/src/i18n/locales/en.ts +++ b/frontend/src/i18n/locales/en.ts @@ -5100,6 +5100,7 @@ export default { revenue: 'Revenue', dailyRevenue: 'Daily Revenue', paymentDistribution: 'Payment Distribution', + colUser: 'User', topUsers: 'Top Users', noData: 'No data', days: 'days', @@ -5178,7 +5179,7 @@ export default { paymentConfigTitle: 'Payment Config', paymentConfigDesc: 'Configure payment providers and settings', plansPageTitle: 'Subscription Plans', - plansPageDesc: 'Manage subscription plans and user subscriptions', + plansPageDesc: 'Manage subscription plan configuration', tabPlanConfig: 'Plan Configuration', tabUserSubs: 'User Subscriptions', selectGroup: 'Select a group', diff --git a/frontend/src/i18n/locales/zh.ts b/frontend/src/i18n/locales/zh.ts index 47cd3918f4..9c1142ddc9 100644 --- a/frontend/src/i18n/locales/zh.ts +++ b/frontend/src/i18n/locales/zh.ts @@ -5297,6 +5297,7 @@ export default { revenue: '收入', dailyRevenue: '每日收入', paymentDistribution: '支付方式分布', + colUser: '用户', topUsers: '消费排行', noData: '暂无数据', days: '天', @@ -5375,7 +5376,7 @@ export default { paymentConfigTitle: '支付配置', paymentConfigDesc: '管理支付服务商与相关设置', plansPageTitle: '订阅套餐管理', - plansPageDesc: '管理订阅套餐与用户订阅', + plansPageDesc: '管理订阅套餐配置', tabPlanConfig: '套餐配置', tabUserSubs: '用户订阅', selectGroup: '请选择分组', diff --git a/frontend/src/views/admin/orders/AdminOrdersView.vue b/frontend/src/views/admin/orders/AdminOrdersView.vue index 9583f49bcb..dab0b087aa 100644 --- a/frontend/src/views/admin/orders/AdminOrdersView.vue +++ b/frontend/src/views/admin/orders/AdminOrdersView.vue @@ -155,11 +155,11 @@ const orderTypeFilterOptions = computed(() => [ { value: 'subscription', label: t('payment.admin.subscriptionOrder') }, ]) -const orderColumns: Column[] = [ - { key: 'id', label: 'ID' }, { key: 'user_id', label: 'User' }, { key: 'amount', label: 'Amount' }, - { key: 'payment_type', label: 'Method' }, { key: 'status', label: 'Status' }, - { key: 'created_at', label: 'Created' }, { key: 'actions', label: 'Actions' }, -] +const orderColumns = computed((): Column[] => [ + { key: 'id', label: 'ID' }, { key: 'user_id', label: t('payment.admin.colUser') }, { key: 'amount', label: t('payment.orders.amount') }, + { key: 'payment_type', label: t('payment.orders.paymentMethod') }, { key: 'status', label: t('payment.orders.status') }, + { key: 'created_at', label: t('payment.orders.createdAt') }, { key: 'actions', label: t('common.actions') }, +]) function statusBadgeClass(status: string): string { const m: Record = { diff --git a/frontend/src/views/admin/orders/AdminPaymentPlansView.vue b/frontend/src/views/admin/orders/AdminPaymentPlansView.vue index fb8ffc41fe..d225c2b914 100644 --- a/frontend/src/views/admin/orders/AdminPaymentPlansView.vue +++ b/frontend/src/views/admin/orders/AdminPaymentPlansView.vue @@ -7,120 +7,38 @@

{{ t('payment.admin.plansPageTitle') }}

{{ t('payment.admin.plansPageDesc') }}

+
+ + +
- -
- -
- - - + @@ -133,11 +51,7 @@
-
@@ -186,17 +100,16 @@