Merge branch 'main' into test

2026-02-12 23:43:47 +08:00
parent 7582dc53d2 174d7c774d
commit abf5de69fb
63 changed files with 2018 additions and 282 deletions
--- a/frontend/src/views/admin/RedeemView.vue
+++ b/frontend/src/views/admin/RedeemView.vue
@@ -117,9 +117,9 @@
            </span>
          </template>

-          <template #cell-used_by="{ value }">
+          <template #cell-used_by="{ value, row }">
            <span class="text-sm text-gray-500 dark:text-dark-400">
-              {{ value ? t('admin.redeem.userPrefix', { id: value }) : '-' }}
+              {{ row.user?.email || (value ? t('admin.redeem.userPrefix', { id: value }) : '-') }}
            </span>
          </template>