From 70f5332839dd0716e492294c61fb6c6d15eea8a1 Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Fri, 5 Jul 2024 16:30:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=99=BB=E9=99=86=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=EF=BC=9B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/App.jsx       |  1 -
 src/views/Login.jsx     |  9 +++------
 src/views/Standlone.jsx | 14 +++++---------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/views/App.jsx b/src/views/App.jsx
index e31a19d..a9c4937 100644
--- a/src/views/App.jsx
+++ b/src/views/App.jsx
@@ -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)
diff --git a/src/views/Login.jsx b/src/views/Login.jsx
index 647a3fb..43119f5 100644
--- a/src/views/Login.jsx
+++ b/src/views/Login.jsx
@@ -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')}
diff --git a/src/views/Standlone.jsx b/src/views/Standlone.jsx
index 9c7b20f..6ce6113 100644
--- a/src/views/Standlone.jsx
+++ b/src/views/Standlone.jsx
@@ -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>