Merge remote-tracking branch 'origin/main'

src/layouts/modules/global-header/components/user-avatar.vue

@@ -40,11 +40,11 @@ function logout() {
     </ButtonIcon>
     <template #overlay>
       <AMenu>
-        <AMenuItem @click="router.push('/user-center/email')">
+      <!--  <AMenuItem @click="router.push('/user-center/email')">
           <div class="flex-center gap-8px">
             {{ $t('common.setemail') }}
           </div>
-        </AMenuItem>
+        </AMenuItem> -->
         <AMenuItem @click="router.push('/user-center/resetpwd')">
           <div class="flex-center gap-8px">
             {{ $t('common.resetpwd') }}

src/router/elegant/routes.ts

@@ -67,18 +67,28 @@ export const generatedRoutes: GeneratedRoute[] = [
       hideInMenu: true
     }
   },
-  // {
-  //   name: 'user-center',
-  //   path: '/user-center',
-  //   component: 'layout.base$view.user-center',
-  //   meta: {
-  //     title: 'user-center',
-  //     hideInMenu: true,
-  //     constant: true,
-  //     keepAlive: false,
-  //     i18nKey: 'route.user-center'
-  //   }
-  // },
+  {
+    name: 'user-center',
+    path: '/user-center',
+    component: 'layout.base',
+    meta: {
+      title: 'user-center',
+      hideInMenu: true,
+      i18nKey: 'route.user-center'
+    },
+    children: [
+      {
+        name: 'user-center_resetpwd',
+        path: '/user-center/resetpwd',
+        component: 'view.user-center_resetpwd',
+        meta: {
+          title: 'user-center_resetpwd',
+          hideInMenu: true,
+          i18nKey: 'common.resetpwd'
+        }
+      },
+    ]
+  },
 
   // 下面是指定角色才有
   {