diff --git a/continew-admin-ui/src/api/auth/login.ts b/continew-admin-ui/src/api/auth/login.ts index 0071f91a..63187f8f 100644 --- a/continew-admin-ui/src/api/auth/login.ts +++ b/continew-admin-ui/src/api/auth/login.ts @@ -5,6 +5,7 @@ import { UserState } from '@/store/modules/login/types'; const BASE_URL = '/auth'; export interface LoginReq { + phone?: string; username: string; password: string; captcha: string; diff --git a/continew-admin-ui/src/assets/images/login/banner1.png b/continew-admin-ui/src/assets/images/login/banner1.png deleted file mode 100644 index 835e76e8..00000000 Binary files a/continew-admin-ui/src/assets/images/login/banner1.png and /dev/null differ diff --git a/continew-admin-ui/src/assets/images/login/banner2.png b/continew-admin-ui/src/assets/images/login/banner2.png deleted file mode 100644 index acfc39d6..00000000 Binary files a/continew-admin-ui/src/assets/images/login/banner2.png and /dev/null differ diff --git a/continew-admin-ui/src/assets/images/login/banner3.png b/continew-admin-ui/src/assets/images/login/banner3.png deleted file mode 100644 index f1b10fa5..00000000 Binary files a/continew-admin-ui/src/assets/images/login/banner3.png and /dev/null differ diff --git a/continew-admin-ui/src/assets/images/login/login-bg.png b/continew-admin-ui/src/assets/images/login/login-bg.png new file mode 100644 index 00000000..6bbd1c73 Binary files /dev/null and b/continew-admin-ui/src/assets/images/login/login-bg.png differ diff --git a/continew-admin-ui/src/hooks/user.ts b/continew-admin-ui/src/hooks/user.ts index e594796f..3f610fa5 100644 --- a/continew-admin-ui/src/hooks/user.ts +++ b/continew-admin-ui/src/hooks/user.ts @@ -11,7 +11,7 @@ export default function useUser() { const logout = async (logoutTo?: string) => { await loginStore.logout(); const currentRoute = router.currentRoute.value; - Notification.success(t('login.form.logout.success')); + Notification.success(t('login.logout.success')); router.push({ name: logoutTo && typeof logoutTo === 'string' ? logoutTo : 'login', query: { diff --git a/continew-admin-ui/src/views/login/components/account-login.vue b/continew-admin-ui/src/views/login/components/account-login.vue new file mode 100644 index 00000000..ba091380 --- /dev/null +++ b/continew-admin-ui/src/views/login/components/account-login.vue @@ -0,0 +1,210 @@ + + + + + diff --git a/continew-admin-ui/src/views/login/components/banner.vue b/continew-admin-ui/src/views/login/components/banner.vue deleted file mode 100644 index 67b5ac6d..00000000 --- a/continew-admin-ui/src/views/login/components/banner.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - - - diff --git a/continew-admin-ui/src/views/login/components/login-form.vue b/continew-admin-ui/src/views/login/components/login-form.vue deleted file mode 100644 index 0971ea39..00000000 --- a/continew-admin-ui/src/views/login/components/login-form.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - - - diff --git a/continew-admin-ui/src/views/login/components/phone-login.vue b/continew-admin-ui/src/views/login/components/phone-login.vue new file mode 100644 index 00000000..d5fd9a42 --- /dev/null +++ b/continew-admin-ui/src/views/login/components/phone-login.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/continew-admin-ui/src/views/login/index.vue b/continew-admin-ui/src/views/login/index.vue index d4782966..c2243dfd 100644 --- a/continew-admin-ui/src/views/login/index.vue +++ b/continew-admin-ui/src/views/login/index.vue @@ -1,75 +1,264 @@