From d8b141cda8d672080c9cbbcb5ebaa4fe953bd44a Mon Sep 17 00:00:00 2001
From: Jimmy Liow <lyj@hainatravel.com>
Date: Wed, 26 Jun 2024 15:50:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E9=BB=98=E8=AE=A4=E9=A6=96=E9=A1=B5=EF=BC=9B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=20GA=20=E6=95=B0=E6=8D=AE=E6=94=B6=E9=9B=86?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.jsx        |  3 +--
 src/stores/Auth.js  |  4 ++--
 src/views/App.jsx   | 19 ++++++++-----------
 src/views/Index.jsx | 13 -------------
 src/views/Login.jsx |  2 +-
 5 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 src/views/Index.jsx

diff --git a/src/main.jsx b/src/main.jsx
index c6764aa..d3f498d 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -9,7 +9,6 @@ import App from "@/views/App";
 import Standlone from "@/views/Standlone";
 import Login from "@/views/Login";
 import Logout from "@/views/Logout";
-import Index from "@/views/index";
 import ErrorPage from "@/components/ErrorPage";
 import RequireAuth from '@/components/RequireAuth'
 import ReservationNewest from "@/views/reservation/Newest";
@@ -60,7 +59,7 @@ const router = createBrowserRouter([
     element: <App />,
     errorElement: <ErrorPage />,
     children: [
-      { index: true, element: <Index /> },
+      { index: true, element: <NoticeIndex /> },
       { path: "account/change-password", element: <ChangePassword />},
       { path: "account/profile", element: <AccountProfile />},
       { path: "account/management", element: <RequireAuth subject={PERM_ACCOUNT_MANAGEMENT} result={true}><AccountManagement /></RequireAuth>},
diff --git a/src/stores/Auth.js b/src/stores/Auth.js
index 59c10c9..6e59ed9 100644
--- a/src/stores/Auth.js
+++ b/src/stores/Auth.js
@@ -85,7 +85,7 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({
     const { startTokenInterval, loadUserPermission } = get()
     const { setStorage } = usingStorage()
 
-    const { token: loginToken  } = await fetchLoginToken(usr, pwd)
+    const { token: loginToken, WU_ID: userId  } = await fetchLoginToken(usr, pwd)
     const userDetail = await fetchUserDetail(loginToken)
     await loadUserPermission(userId)
 
@@ -95,7 +95,7 @@ const useAuthStore = create(obervseLifecycle((set, get) => ({
     }))
 
     setStorage(KEY_LOGIN_TOKEN, loginToken)
-    setStorage(KEY_USER_ID, userDetail.LMI_SN)
+    setStorage(KEY_USER_ID, userId)//userDetail.LMI_SN)
     setStorage(KEY_TRAVEL_AGENCY_ID, userDetail.LMI_VEI_SN)
     appendRequestParams('token', loginToken)
     // loadPageSpy(`${json.Result.VName}-${json.Result.LoginName}`)
diff --git a/src/views/App.jsx b/src/views/App.jsx
index 7ac41a7..516c02d 100644
--- a/src/views/App.jsx
+++ b/src/views/App.jsx
@@ -60,10 +60,6 @@ function App() {
     }
 	}, [href])
 
-	useEffect(() => {
-    window.gtag('event', 'page_view', { page_location: window.location.href });
-  }, [location])
-
   const onSubmit = () => {
     validateUserPassword(userDetail?.username, password)
       .catch(ex => {
@@ -71,23 +67,24 @@ function App() {
         alert(t('Validation.LoginFailed'))
       })
     setPassword('')
-  };
+  }
 
-	const splitPath = href.split('/');
-	let defaultPath = 'reservation';
+	const splitPath = href.split('/')
+	let defaultPath = 'notice'
 
 	if (splitPath.length > 1) {
-		defaultPath = splitPath[1];
+		defaultPath = splitPath[1]
 	}
 
 	const {
 		token: { colorBgContainer },
-	} = theme.useToken();
+	} = theme.useToken()
 
   const [antdLng, setAntdLng] = useState(enLocale);
   useEffect(() => {
     setAntdLng(i18n.language === 'en' ? enLocale : zhLocale);
-  }, [i18n.language]);
+  }, [i18n.language])
+
 	return (
 		<ConfigProvider locale={antdLng}
 			theme={{
@@ -197,7 +194,7 @@ function App() {
         </ErrorBoundary>
 			</AntApp>
 		</ConfigProvider>
-	);
+	)
 }
 
 export default App
diff --git a/src/views/Index.jsx b/src/views/Index.jsx
deleted file mode 100644
index 9034490..0000000
--- a/src/views/Index.jsx
+++ /dev/null
@@ -1,13 +0,0 @@
-export default function Index() {
-  return (
-    <p id="zero-state">
-      Global Highlights Hub
-      <br />
-      Check out{" "}
-      <a href="https://www.chinahighlights.com">
-        the docs at chinahighlights.com
-      </a>
-      .
-    </p>
-  );
-}
\ No newline at end of file
diff --git a/src/views/Login.jsx b/src/views/Login.jsx
index b973b96..f9c3008 100644
--- a/src/views/Login.jsx
+++ b/src/views/Login.jsx
@@ -17,7 +17,7 @@ function Login() {
 
   useEffect (() => {
     if (loginStatus === 302) {
-      navigate('/reservation/newest')
+      navigate('/')
     }
   }, [loginStatus])