diff --git a/src/main.jsx b/src/main.jsx index cc33218..f65faa8 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -11,13 +11,10 @@ import "@/assets/global.css"; import App from "@/views/App"; import Standlone from "@/views/Standlone"; import Login from "@/views/Login"; -import SignOut from "@/views/SignOut"; import Index from "@/views/index"; import ErrorPage from "@/views/error-page"; import ReservationNewest from "@/views/reservation/Newest"; import ReservationDetail from "@/views/reservation/Detail"; -import ReservationPrint from "@/views/reservation/Print"; -import ReservationNameCard from "@/views/reservation/NameCard"; import ChangePassword from "@/views/account/ChangePassword"; import AccountProfile from "@/views/account/Profile"; import FeedbackIndex from "@/views/feedback/Index"; @@ -46,8 +43,6 @@ const router = createBrowserRouter([ { index: true, element: }, { path: "reservation/newest", element: }, { path: "reservation/:reservationId", element: }, - { path: "reservation/:reservationId/print", element: }, - { path: "reservation/:reservationId/name-card", element: }, { path: "account/change-password", element: }, { path: "account/profile", element: }, { path: "feedback", element: }, @@ -62,7 +57,6 @@ const router = createBrowserRouter([ element: , children: [ { path: "/login", element: }, - { path: "/sign-out", element: } ] } ]); diff --git a/src/views/App.jsx b/src/views/App.jsx index 0fce29c..42c25f9 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -40,8 +40,7 @@ function App() { const loginToken = login.token; const navigate = useNavigate(); useEffect(() => { - // Check location - console.info("href: " + href + '; login.token: ' + loginToken + '; timeout: ' + login.timeout); + // console.info("href: " + href + '; login.token: ' + loginToken + '; timeout: ' + login.timeout); if (href !== '/login' && isEmpty(loginToken)) { navigate('/login'); } diff --git a/src/views/SignOut.jsx b/src/views/SignOut.jsx deleted file mode 100644 index 6da4c92..0000000 --- a/src/views/SignOut.jsx +++ /dev/null @@ -1,42 +0,0 @@ -import { Button, Checkbox, Form, Input, Row, Typography, Layout } from 'antd'; -const { Header, Footer, Sider, Content } = Layout; -const { Title } = Typography; -const headerStyle = { - textAlign: 'center', - // color: '#fff', - height: 64, - paddingInline: 50, - lineHeight: '64px', - backgroundColor: '#f5f5f5', -}; -const contentStyle = { - textAlign: 'center', - minHeight: 600, - lineHeight: '120px', - // color: '#fff', - // backgroundColor: '#108ee9', -}; -const footerStyle = { - textAlign: 'center', - // color: '#fff', - // backgroundColor: '#7dbcea', -}; -const onFinish = (values) => { - console.log('Success:', values); -}; -const onFinishFailed = (errorInfo) => { - console.log('Failed:', errorInfo); -}; -const SignOut = () => ( - -
- Global Highlights Hub -
- - See you. - -
Footer
-
- -); -export default SignOut; \ No newline at end of file diff --git a/src/views/reservation/Detail.jsx b/src/views/reservation/Detail.jsx index aefcad0..5f8c346 100644 --- a/src/views/reservation/Detail.jsx +++ b/src/views/reservation/Detail.jsx @@ -54,9 +54,9 @@ function Detail() { 'https://view.officeapps.live.com/op/embed.aspx?wdPrint=1&wdHideGridlines=0&wdHideComments=1&wdEmbedCode=0&src='; // 测试文档:https://www.chinahighlights.com/public/reservationW220420009.doc const reservationUrl = - `https://p9axztuwd7x8a7.mycht.cn/service-fileServer/DownloadPlanDoc?GRI_SN=${reservationId}&VEI_SN=${login.travelAgencyId}&FileType=1&Test=1`; + `https://p9axztuwd7x8a7.mycht.cn/service-fileServer/DownloadPlanDoc?GRI_SN=${reservationId}&VEI_SN=${login.travelAgencyId}&FileType=1`; const nameCardUrl = - `https://p9axztuwd7x8a7.mycht.cn/service-fileServer/DownloadPlanDoc?GRI_SN=${reservationId}&VEI_SN=${login.travelAgencyId}&FileType=2&Test=1`; + `https://p9axztuwd7x8a7.mycht.cn/service-fileServer/DownloadPlanDoc?GRI_SN=${reservationId}&VEI_SN=${login.travelAgencyId}&FileType=2`; const reservationPreviewUrl = officeWebViewerUrl + encodeURIComponent(reservationUrl); const nameCardPreviewUrl = officeWebViewerUrl + encodeURIComponent(nameCardUrl); diff --git a/src/views/reservation/NameCard.jsx b/src/views/reservation/NameCard.jsx deleted file mode 100644 index dcbb65f..0000000 --- a/src/views/reservation/NameCard.jsx +++ /dev/null @@ -1,29 +0,0 @@ -import { observer } from "mobx-react"; -import { Row, Col, Space, Table, Typography, List, Watermark } from 'antd'; -import DocViewer, { DocViewerRenderers } from "@cyntler/react-doc-viewer"; -import { useStore } from '@/stores/StoreContext.js'; - -const { Title } = Typography; - -function NameCard() { - const { reservationStore } = useStore(); - const docs = [{ uri: "https://www.chinahighlights.com/public/NameCard.doc" }]; - - return ( - - - - ); -} - -export default observer(NameCard); \ No newline at end of file diff --git a/src/views/reservation/Print.jsx b/src/views/reservation/Print.jsx deleted file mode 100644 index 12dff91..0000000 --- a/src/views/reservation/Print.jsx +++ /dev/null @@ -1,28 +0,0 @@ -import { useParams, useNavigate } from "react-router-dom"; -import { useEffect } from "react"; -import { observer } from "mobx-react"; -import { toJS } from "mobx"; -import { Row, Col, Space, Table, Typography, List, Watermark } from "antd"; -import DocViewer, { DocViewerRenderers } from "@cyntler/react-doc-viewer"; -import { useStore } from "../../stores/StoreContext.js"; - -function Print() { - const navigate = useNavigate(); - const { reservationId } = useParams(); - const docs = [{ uri: "https://www.chinahighlights.com/public/reservationW220420009.doc" }, { uri: "https://www.chinahighlights.com/public/NameCard.doc" }]; - - useEffect(() => { - console.info("Detail.useEffect: " + reservationId); - }, [reservationId]); - - return ( - - - - ); -} - -export default observer(Print);