diff --git a/src/components/SecondHeaderWrapper.jsx b/src/components/SecondHeaderWrapper.jsx index 9a13d91..196ec92 100644 --- a/src/components/SecondHeaderWrapper.jsx +++ b/src/components/SecondHeaderWrapper.jsx @@ -10,8 +10,8 @@ const HeaderWrapper = ({ children, header, loading, backTo, ...props }) => { } = theme.useToken(); return ( <> - - + +
{/* {header} */} @@ -20,7 +20,7 @@ const HeaderWrapper = ({ children, header, loading, backTo, ...props }) => {
- + {children || }
diff --git a/src/views/App.jsx b/src/views/App.jsx index d176c1d..a2710fd 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -98,7 +98,7 @@ function App() { {contextHolder} - +
@@ -159,7 +159,7 @@ function App() {
- + {needToLogin ? <>login... : }
China Highlights International Travel Service Co., LTD, Version: {BUILD_VERSION}
diff --git a/src/views/products/Detail.jsx b/src/views/products/Detail.jsx index d9ea10d..6ff6a2c 100644 --- a/src/views/products/Detail.jsx +++ b/src/views/products/Detail.jsx @@ -43,11 +43,11 @@ function Detail() { backTo={false} header={
setAddProductVisible(true)} />}> <> - + {/* onNodeSelect={handleNodeSelect} */} - + -
+
diff --git a/src/views/products/Detail/ProductInfoForm.jsx b/src/views/products/Detail/ProductInfoForm.jsx index 413fa19..4642e57 100644 --- a/src/views/products/Detail/ProductInfoForm.jsx +++ b/src/views/products/Detail/ProductInfoForm.jsx @@ -400,7 +400,7 @@ const formValuesMapper = (values) => { key: 'lgc_details', transform: (value) => { const valueArr = Object.values(value) - .filter((_v) => !isEmpty(_v)) + .filter((_v) => !isEmpty(_v.lgc)) .map((e) => ({ title: '', ...e, descriptions: e.descriptions || '' })); return valueArr; }, @@ -409,7 +409,7 @@ const formValuesMapper = (values) => { key: 'lgc_details_mapped', transform: (value) => { const valueArr = Object.values(value) - .filter((_v) => !isEmpty(_v)) + .filter((_v) => !isEmpty(_v.lgc)) .map((e) => ({ title: '', ...e, descriptions: e.descriptions || '' })); return valueArr.reduce((r, c) => ({ ...r, [c.lgc]: c }), {}); }, diff --git a/src/views/reservation/Detail.jsx b/src/views/reservation/Detail.jsx index dacde1f..59b99d1 100644 --- a/src/views/reservation/Detail.jsx +++ b/src/views/reservation/Detail.jsx @@ -43,7 +43,7 @@ function Detail() { ]; function detailTextRender(_, confirm) { - const formattedText = confirm.PCI_ConfirmText;//.replace(/\;/g, '\n——————————————————————\n'); + const formattedText = confirm.PCI_ConfirmText; return (
{formattedText} @@ -76,6 +76,8 @@ function Detail() { const [confirmText, setConfirmText] = useState(''); const [newConfirmText, setNewConfirmText] = useState(''); const [dataLoading, setDataLoading] = useState(false); + const [reservationPreviewUrl, setReservationPreviewUrl] = useState(''); + const [nameCardPreviewUrl, setNameCardPreviewUrl] = useState(''); const { notification } = App.useApp(); const { reservationId } = useParams(); @@ -93,9 +95,6 @@ function Detail() { const nameCardUrl = `https://p9axztuwd7x8a7.mycht.cn/service-fileServer/DownloadPlanDoc?GRI_SN=${reservationId}&VEI_SN=${travelAgencyId}&token=${loginToken}&FileType=2&v=${randomString}` - const reservationPreviewUrl = officeWebViewerUrl + encodeURIComponent(reservationUrl); - const nameCardPreviewUrl = officeWebViewerUrl + encodeURIComponent(nameCardUrl); - const showConfirmModal = (confirm) => { setIsModalOpen(true); const formattedText = confirm.PCI_ConfirmText;//.replace(/\;/g, '\n——————————————————————\n'); @@ -118,6 +117,10 @@ function Detail() { useEffect(() => { setDataLoading(true); + + setReservationPreviewUrl(officeWebViewerUrl + encodeURIComponent(reservationUrl)) + setNameCardPreviewUrl(officeWebViewerUrl + encodeURIComponent(nameCardUrl)) + getReservationDetail(reservationId) .catch(ex => { notification.error({