From e3f8262cff2196248e50845277ace982958bdd0d Mon Sep 17 00:00:00 2001 From: YCC Date: Wed, 4 Sep 2024 15:44:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9A=8F=E6=9C=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/airticket/Plan.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/airticket/Plan.jsx b/src/views/airticket/Plan.jsx index 601ea1a..0088f94 100644 --- a/src/views/airticket/Plan.jsx +++ b/src/views/airticket/Plan.jsx @@ -564,7 +564,7 @@ const AirticketPlan = props => { - + From 3a63b11b3d1053d7ce47f7500ba65bc4e177ca10 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Wed, 4 Sep 2024 15:50:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E9=A2=84=E8=A7=88=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=A2=9E=E5=8A=A0=E9=9A=8F=E6=9C=BA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/reservation/Detail.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/reservation/Detail.jsx b/src/views/reservation/Detail.jsx index e482676..dacde1f 100644 --- a/src/views/reservation/Detail.jsx +++ b/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); From 4951196018d873eedabe18dfc10857a45f910dd1 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Wed, 4 Sep 2024 15:52:10 +0800 Subject: [PATCH 3/3] 2.0.0-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3504ef0..c7f3b7a 100644 --- a/package.json +++ b/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",