diff --git a/package.json b/package.json index 617acb1..b9e0626 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "dependencies": { "@ant-design/icons": "^5.5.1", "@react-pdf/renderer": "^3.4.0", - "antd": "^5.17.2", + "antd": "^5.25.2", "dayjs": "^1.11.13", "docx": "^8.5.0", "file-saver": "^2.0.5", @@ -22,11 +22,11 @@ "i18next-http-backend": "^2.5.2", "react": "^18.3.1", "react-dom": "^18.3.1", + "react-router-dom": "^6.30.1", "react-i18next": "^14.1.2", - "react-router-dom": "^6.10.0", "react-to-pdf": "^1.0.1", "xlsx": "https://cdn.sheetjs.com/xlsx-0.18.11/xlsx-0.18.11.tgz", - "zustand": "^4.5.2" + "zustand": "^4.5.7" }, "devDependencies": { "@types/react": "^18.0.28", diff --git a/public/favicon.ico b/public/favicon.ico index 0518613..0b5db2f 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/highlights_travel_600_550.png b/src/assets/highlights_travel_600_550.png new file mode 100644 index 0000000..10fb454 Binary files /dev/null and b/src/assets/highlights_travel_600_550.png differ diff --git a/src/assets/logo-gh.png b/src/assets/logo-gh.png deleted file mode 100644 index 3bd48d3..0000000 Binary files a/src/assets/logo-gh.png and /dev/null differ diff --git a/src/main.jsx b/src/main.jsx index 4c8c50c..7a3310c 100644 --- a/src/main.jsx +++ b/src/main.jsx @@ -61,14 +61,19 @@ const initRouter = async () => { { path: 'account/profile', element: }, { path: 'account/management', element: }, { path: 'account/role-list', element: }, + // { path: 'reservation/newest', element: }, { path: 'reservation/:reservationId', element: }, + // { path: 'feedback', element: }, { path: 'feedback/:GRI_SN/:CII_SN/:RefNo', element: }, { path: 'feedback/:GRI_SN/:RefNo', element: }, + // { path: 'report', element: }, + // { path: 'notice', element: }, { path: 'notice/:CCP_BLID', element: }, + // { path: 'invoice',element:}, { path: 'invoice/detail/:GMDSN/:GSN',element:}, { path: 'invoice/history/:GMDSN/:GSN',element:}, @@ -78,20 +83,18 @@ const initRouter = async () => { { path: 'airticket/plan/:coli_sn/:gri_sn',element:}, { path: 'airticket/invoice',element:}, { path: 'airticket/invoicepaid',element:}, - + // { path: 'trainticket',element: }, { path: 'trainticket/plan/:coli_sn/:gri_sn',element:}, { path: 'trainticket/invoice',element:}, { path: 'trainticket/invoicepaid',element:}, - + // { path: "products",element: }, { path: "products/:travel_agency_id/:use_year/:audit_state/audit",element:}, - { path: "products/:travel_agency_id/:use_year/:audit_state/edit",element:}, - { path: "products/audit",element:}, - { path: "products/edit",element:}, + // ] }, { diff --git a/src/views/App.jsx b/src/views/App.jsx index a2710fd..63d27fb 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -3,7 +3,7 @@ import { useEffect, useState } from 'react' import { Layout, Menu, ConfigProvider, theme, Dropdown, message, FloatButton, Space, Row, Col, Badge, App as AntApp } from 'antd' import { DownOutlined } from '@ant-design/icons' import 'antd/dist/reset.css' -import AppLogo from '@/assets/logo-gh.png' +import AppLogo from '@/assets/highlights_travel_600_550.png' import { isEmpty } from '@/utils/commons' import { useTranslation } from 'react-i18next' import zhLocale from 'antd/locale/zh_CN' @@ -103,7 +103,7 @@ function App() { - App logo + App logo + Global Highlights Hub
+ ) } diff --git a/src/views/Standlone.jsx b/src/views/Standlone.jsx index fe3848d..142824e 100644 --- a/src/views/Standlone.jsx +++ b/src/views/Standlone.jsx @@ -1,7 +1,7 @@ import { Outlet } from "react-router-dom"; import { Layout, ConfigProvider, theme, Row, Col, App as AntApp } from "antd"; import "antd/dist/reset.css"; -import AppLogo from "@/assets/logo-gh.png"; +import AppLogo from "@/assets/highlights_travel_600_550.png"; import { useThemeContext } from "@/stores/ThemeContext"; import { BUILD_VERSION } from "@/config"; @@ -20,9 +20,8 @@ function Standlone() { }}> -
- App logo -

Global Highlights Hub

+
+ App logo
diff --git a/src/views/products/Detail/ProductInfoQuotation.jsx b/src/views/products/Detail/ProductInfoQuotation.jsx index 798ae30..db79f31 100644 --- a/src/views/products/Detail/ProductInfoQuotation.jsx +++ b/src/views/products/Detail/ProductInfoQuotation.jsx @@ -140,6 +140,8 @@ const ProductInfoQuotation = ({ editable, ...props }) => { const [isQuotationModalOpen, setQuotationModalOpen] = useState(false) const [isBatchSetupModalOpen, setBatchSetupModalOpen] = useState(false) + const [groupSizeUnlimit, setGroupSizeUnlimit] = useState(false) + const [groupMaxUnlimit, setGroupMaxUnlimit] = useState(false) const { modal, notification } = App.useApp() const [quotationForm] = Form.useForm() const [batchSetupForm] = Form.useForm() @@ -446,6 +448,18 @@ const ProductInfoQuotation = ({ editable, ...props }) => { 每团 + { + if (e.target.checked) { + quotationForm.setFieldValue('group_size_min', 0) + quotationForm.setFieldValue('group_size_max', 1000) + setGroupSizeUnlimit(true) + + } else { + quotationForm.setFieldValue('group_size_min', 1) + if (!groupMaxUnlimit) quotationForm.setFieldValue('group_size_max', 999) + setGroupSizeUnlimit(false) + } + }}>不分人等(0~1000) { }, ]} > - + + + { + if (e.target.checked) { + quotationForm.setFieldValue('group_size_max', 1000) + setGroupMaxUnlimit(true) + } else { + quotationForm.setFieldValue('group_size_max', 999) + setGroupMaxUnlimit(false) + } + }}>不限(1000) { }, ]} > - +