feat: 登陆界面增加版本号;调整界面布局

perf/export-docx
Jimmy Liow 2 years ago
parent f77bcf4288
commit 70f5332839

@ -38,7 +38,6 @@ function App() {
const noticeUnRead = useNoticeStore((state) => state.noticeUnRead)
const href = useHref()
const navigate = useNavigate()
const location = useLocation()
// /p...
const needToLogin = href !== '/login' && isEmpty(loginToken)

@ -40,14 +40,15 @@ function Login() {
return (
<Row justify='center' align='middle' className='min-h-96'>
<Form
name='basic'
name='login'
layout='vertical'
form={form}
size='large'
labelCol={{
span: 8,
}}
wrapperCol={{
span: 16,
span: 24,
}}
className='max-w-xl'
initialValues={{
@ -82,10 +83,6 @@ function Login() {
<Input.Password />
</Form.Item>
<Form.Item
wrapperCol={{
offset: 8,
span: 16,
}}
>
<Button type='primary' htmlType='submit' className='w-full'>
{t('Login')}

@ -1,21 +1,17 @@
import { Outlet } from 'react-router-dom'
import { Layout, ConfigProvider, theme, Typography, Row, Col, App as AntApp } from 'antd'
import { Layout, ConfigProvider, theme, Row, Col, App as AntApp } from 'antd'
import 'antd/dist/reset.css'
import AppLogo from '@/assets/logo-gh.png'
import { useThemeContext } from '@/stores/ThemeContext'
import Language from '../i18n/LanguageSwitcher'
import { BUILD_VERSION, } from '@/config';
const { Title } = Typography
const { Header, Content, Footer } = Layout
function Standlone() {
const { colorPrimary } = useThemeContext()
const {
token: { colorBgContainer },
} = theme.useToken()
return (
<ConfigProvider
theme={{
@ -28,10 +24,10 @@ function Standlone() {
<Layout className='min-h-screen'>
<Header className='sticky top-0 z-10 w-full'>
<Row gutter={{ md: 24 }} justify='center'>
<Col span={4}>
<Col span={2}>
<img src={AppLogo} className='float-left h-9 my-4 mr-6 ml-0 bg-white/30' alt='App logo' />
</Col>
<Col span={18}><h1 className='text-white'>Global Highlights Hub</h1></Col>
<Col span={5}><h1 className='text-white text-center'>Global Highlights Hub</h1></Col>
<Col span={2}>
<Language />
</Col>
@ -40,7 +36,7 @@ function Standlone() {
<Content className='p-6 m-0 min-h-72 bg-white'>
<Outlet />
</Content>
<Footer></Footer>
<Footer>China Highlights International Travel Service Co., LTD, Version: {BUILD_VERSION}</Footer>
</Layout>
</AntApp>
</ConfigProvider>

Loading…
Cancel
Save