Merge remote-tracking branch 'origin/main'

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 (
       <div className='whitespace-pre-line'>
       {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({