From 0beec368b800cdabc98e6231a582e2318a68b205 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 10 Jun 2025 23:52:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E7=94=A8=E6=88=B7=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E5=92=8C=E7=94=A8=E6=88=B7=E7=BC=96=E8=BE=91=E5=AF=B9?=
 =?UTF-8?q?=E8=AF=9D=E6=A1=86=E4=B8=AD=E7=9A=84=E6=9D=83=E9=99=90=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/cards/UserCard.vue           | 33 +++++++++++----------
 src/components/dialog/UserAddEditDialog.vue | 21 +------------
 2 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/components/cards/UserCard.vue b/src/components/cards/UserCard.vue
index 33addb1f..a3f94049 100644
--- a/src/components/cards/UserCard.vue
+++ b/src/components/cards/UserCard.vue
@@ -183,21 +183,6 @@ onMounted(() => {
             </VChip>
             <VChip v-if="user.is_otp" size="x-small" color="info" variant="tonal" label>2FA</VChip>
           </div>
-          <!-- 权限显示 -->
-          <div v-if="!user.is_superuser && user.permissions" class="d-flex flex-wrap gap-1 mt-1">
-            <VChip v-if="user.permissions.discovery" size="x-small" color="purple" variant="outlined" label>
-              {{ t('dialog.userAddEdit.permissions.discovery') }}
-            </VChip>
-            <VChip v-if="user.permissions.search" size="x-small" color="blue" variant="outlined" label>
-              {{ t('dialog.userAddEdit.permissions.search') }}
-            </VChip>
-            <VChip v-if="user.permissions.subscribe" size="x-small" color="green" variant="outlined" label>
-              {{ t('dialog.userAddEdit.permissions.subscribe') }}
-            </VChip>
-            <VChip v-if="user.permissions.manage" size="x-small" color="orange" variant="outlined" label>
-              {{ t('dialog.userAddEdit.permissions.manage') }}
-            </VChip>
-          </div>
         </div>
 
         <!-- 移动端订阅数据信息 -->
@@ -242,6 +227,22 @@ onMounted(() => {
       </template>
     </VCardItem>
 
+    <!-- 权限显示 -->
+    <div v-if="!user.is_superuser && user.permissions" class="d-flex flex-wrap gap-1 px-7 pb-3">
+      <VChip v-if="user.permissions.discovery" size="x-small" color="purple" variant="outlined" label>
+        {{ t('dialog.userAddEdit.permissions.discovery') }}
+      </VChip>
+      <VChip v-if="user.permissions.search" size="x-small" color="blue" variant="outlined" label>
+        {{ t('dialog.userAddEdit.permissions.search') }}
+      </VChip>
+      <VChip v-if="user.permissions.subscribe" size="x-small" color="green" variant="outlined" label>
+        {{ t('dialog.userAddEdit.permissions.subscribe') }}
+      </VChip>
+      <VChip v-if="user.permissions.manage" size="x-small" color="orange" variant="outlined" label>
+        {{ t('dialog.userAddEdit.permissions.manage') }}
+      </VChip>
+    </div>
+
     <!-- 独立的邮箱显示 -->
     <VDivider class="mx-4" />
 
@@ -252,7 +253,7 @@ onMounted(() => {
 
     <!-- PC端显示订阅统计信息 -->
     <VCardText v-if="!isMobile" class="px-4 pt-0 pb-4">
-      <div rounded="lg" class="d-flex justify-space-around pa-3">
+      <div rounded="lg" class="d-flex justify-space-around">
         <div class="d-flex align-center gap-3">
           <VAvatar
             tile
diff --git a/src/components/dialog/UserAddEditDialog.vue b/src/components/dialog/UserAddEditDialog.vue
index 2973933c..abb48279 100644
--- a/src/components/dialog/UserAddEditDialog.vue
+++ b/src/components/dialog/UserAddEditDialog.vue
@@ -554,27 +554,8 @@ onMounted(() => {
           </VDivider>
           <!-- 权限设置 -->
           <div v-if="canControl">
-            <div class="mb-4">
-              <VBtn
-                variant="outlined"
-                color="primary"
-                size="small"
-                @click="userPermissions = { discovery: true, search: true, subscribe: true, manage: false }"
-                class="me-2"
-              >
-                {{ t('dialog.userAddEdit.permissions.presetNormal') }}
-              </VBtn>
-              <VBtn
-                variant="outlined"
-                color="warning"
-                size="small"
-                @click="userPermissions = { discovery: true, search: true, subscribe: true, manage: true }"
-              >
-                {{ t('dialog.userAddEdit.permissions.presetAdmin') }}
-              </VBtn>
-            </div>
             <VRow>
-              <VCol v-for="option in permissionOptions" :key="option.key" cols="12" md="6">
+              <VCol v-for="option in permissionOptions" :key="option.key" cols="6">
                 <VCard
                   :color="userPermissions[option.key as keyof UserPermissions] ? 'primary' : 'surface'"
                   :variant="userPermissions[option.key as keyof UserPermissions] ? 'tonal' : 'outlined'"