Merge remote-tracking branch 'origin/main'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "global-highlights-hub",
   "private": true,
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/views/airticket/Plan.jsx

@@ -564,7 +564,7 @@ const AirticketPlan = props => {
 
 			<Row>
 				<Col md={24} lg={24} xxl={24} style={{ height: "100%" }}>
-					<iframe id="msdoc-iframe-reservation" title="msdoc-iframe-reservation" src={reservationPreviewUrl} style={{ width: "100%", height: "600px" }}></iframe>
+					<iframe id="msdoc-iframe-reservation" title="msdoc-iframe-reservation" src={reservationPreviewUrl+'&v='+Math.random()} style={{ width: "100%", height: "600px" }}></iframe>
 					<Button type="link" target="_blank" href={reservationUrl}>
 						下载
 					</Button>

src/views/reservation/Detail.jsx

@@ -84,14 +84,14 @@ function Detail() {
   const [getReservationDetail, reservationDetail, confirmationList, selectConfirmation, submitConfirmation] =
     useReservationStore((state) =>
       [state.getReservationDetail, state.reservationDetail, state.confirmationList, state.selectConfirmation, state.submitConfirmation])
-
+  const randomString = new Date().getTime()
   const officeWebViewerUrl =
     '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=${travelAgencyId}&token=${loginToken}&FileType=1`;
+    `https://p9axztuwd7x8a7.mycht.cn/service-fileServer/DownloadPlanDoc?GRI_SN=${reservationId}&VEI_SN=${travelAgencyId}&token=${loginToken}&FileType=1&v=${randomString}`
   const nameCardUrl =
-    `https://p9axztuwd7x8a7.mycht.cn/service-fileServer/DownloadPlanDoc?GRI_SN=${reservationId}&VEI_SN=${travelAgencyId}&token=${loginToken}&FileType=2`;
+    `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);