diff --git a/README.md b/README.md index 4d324b37..b0e72aca 100644 --- a/README.md +++ b/README.md @@ -216,7 +216,8 @@ continew-admin │ ├─ views # 页面模板 │ │ ├─ login # 登录模块 │ │ └─ system # 系统管理模块 - │ │ └─ user # 用户模块(用户中心) + │ │ └─ user # 用户模块 + │ │ └─ center # 个人中心 │ ├─ App.vue # 视图入口 │ └─ main.ts # 入口文件 ├─ .env.development diff --git a/continew-admin-ui/src/assets/images/login-banner.png b/continew-admin-ui/src/assets/images/login-banner.png deleted file mode 100644 index a3b37760..00000000 Binary files a/continew-admin-ui/src/assets/images/login-banner.png and /dev/null differ diff --git a/continew-admin-ui/src/assets/images/login/banner1.png b/continew-admin-ui/src/assets/images/login/banner1.png new file mode 100644 index 00000000..52078acf Binary files /dev/null and b/continew-admin-ui/src/assets/images/login/banner1.png differ diff --git a/continew-admin-ui/src/assets/images/login/banner2.png b/continew-admin-ui/src/assets/images/login/banner2.png new file mode 100644 index 00000000..97daea29 Binary files /dev/null and b/continew-admin-ui/src/assets/images/login/banner2.png differ diff --git a/continew-admin-ui/src/assets/images/login/banner3.png b/continew-admin-ui/src/assets/images/login/banner3.png new file mode 100644 index 00000000..3b22d5e6 Binary files /dev/null and b/continew-admin-ui/src/assets/images/login/banner3.png differ diff --git a/continew-admin-ui/src/components/navbar/index.vue b/continew-admin-ui/src/components/navbar/index.vue index 7a5281b3..7077f234 100644 --- a/continew-admin-ui/src/components/navbar/index.vue +++ b/continew-admin-ui/src/components/navbar/index.vue @@ -10,7 +10,7 @@ :style="{ margin: 0, fontSize: '18px' }" :heading="5" > - ContiNew Admin + {{ $t('title') }} { await loginStore.logout(); const currentRoute = router.currentRoute.value; - Message.success('退出成功'); + Message.success(t('login.form.logout.success')); router.push({ name: logoutTo && typeof logoutTo === 'string' ? logoutTo : 'login', query: { diff --git a/continew-admin-ui/src/locale/en-US.ts b/continew-admin-ui/src/locale/en-US.ts index 3d6cca79..fd909d49 100644 --- a/continew-admin-ui/src/locale/en-US.ts +++ b/continew-admin-ui/src/locale/en-US.ts @@ -28,6 +28,7 @@ import localeUserCenter from '@/views/system/user/center/locale/en-US'; import localeSettings from './en-US/settings'; export default { + 'title': 'ContiNew Admin', 'menu.dashboard': 'Dashboard', 'menu.server.dashboard': 'Dashboard-Server', 'menu.server.workplace': 'Workplace-Server', diff --git a/continew-admin-ui/src/locale/zh-CN.ts b/continew-admin-ui/src/locale/zh-CN.ts index bc3fa7d1..7a6c4220 100644 --- a/continew-admin-ui/src/locale/zh-CN.ts +++ b/continew-admin-ui/src/locale/zh-CN.ts @@ -28,6 +28,7 @@ import localeUserCenter from '@/views/system/user/center/locale/zh-CN'; import localeSettings from './zh-CN/settings'; export default { + 'title': 'ContiNew Admin', 'menu.dashboard': '仪表盘', 'menu.server.dashboard': '仪表盘-服务端', 'menu.server.workplace': '工作台-服务端', diff --git a/continew-admin-ui/src/views/login/components/banner.vue b/continew-admin-ui/src/views/login/components/banner.vue index aabb1103..67b5ac6d 100644 --- a/continew-admin-ui/src/views/login/components/banner.vue +++ b/continew-admin-ui/src/views/login/components/banner.vue @@ -17,24 +17,26 @@ @@ -71,13 +73,14 @@ &-sub-title { margin-top: 8px; + margin-left: 30px; color: var(--color-text-3); font-size: 14px; line-height: 22px; } &-image { - width: 320px; + width: 360px; margin-top: 30px; } } diff --git a/continew-admin-ui/src/views/login/components/login-form.vue b/continew-admin-ui/src/views/login/components/login-form.vue index 9ed6a03c..632f7a6e 100644 --- a/continew-admin-ui/src/views/login/components/login-form.vue +++ b/continew-admin-ui/src/views/login/components/login-form.vue @@ -4,21 +4,21 @@
{{ $t('login.form.subTitle') }}
{{ errorMessage }}
@@ -29,13 +29,12 @@