Merge remote-tracking branch 'pr-8019-temp/main'

2026-07-18 19:21:36 +08:00
parent 31d3bd18f3 e7f541f37e
commit b71ebbd673
8 changed files with 185 additions and 144 deletions
--- a/apps/web-ele/src/layouts/basic.vue
+++ b/apps/web-ele/src/layouts/basic.vue
@@ -217,7 +217,12 @@ watch(
 </script>

 <template>
-  <BasicLayout @clear-preferences-and-logout="handleLogout">
+  <BasicLayout
+    :avatar
+    :text="userStore.userInfo?.realName"
+    @clear-preferences-and-logout="handleLogout"
+    @logout="handleLogout"
+  >
    <template #user-dropdown>
      <UserDropdown
        :avatar
@@ -225,7 +230,6 @@ watch(
        :text="userStore.userInfo?.realName"
        description="ann.vben@gmail.com"
        tag-text="Pro"
-        @logout="handleLogout"
        @clear-preferences-and-logout="handleLogout"
      />
    </template>