From 8ca24111bdda68096bc4a5c485f8fb0883ec6ce6 Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Fri, 24 Dec 2021 09:26:45 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=E3=80=91=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=85=92=E5=BA=97=E4=BF=A1=E6=81=AF=20=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8B=E8=BD=BD=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0type=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/jero/PreviewFile.vue          |  7 ++--
 src/views/MessagePage/MeetingDetailModal.vue | 35 ++++++++++++++++++--
 src/views/MessagePage/modules/FileTable.vue  |  6 ++--
 3 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/components/jero/PreviewFile.vue b/src/components/jero/PreviewFile.vue
index 1d931d0..48e871c 100644
--- a/src/components/jero/PreviewFile.vue
+++ b/src/components/jero/PreviewFile.vue
@@ -97,14 +97,15 @@ export default {
       console.log(file)
       if(this.isMeetingDataBool){
         // 会议资料更换了接口
-        downloadFile(`sys/common/userDownload/${file.id}`, file.name)
+        downloadFile(`sys/common/userDownload/${file.id}?type=download`, file.name)
+        // downloadFile('/meeting/payMeeting/userDownload/{+'file.id'+}/{+'meetingId+}')
       }else {
-        downloadFile(`sys/common/download/${file.id}`, file.name)
+        downloadFile(`sys/common/download/${file.id}?type=download`, file.name)
       }
     },
     handlePreview(file) {
       if (file && file.id) {
-        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}&type=view`
         let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         window.open(url)
diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue
index 1b51a9f..6f8b398 100644
--- a/src/views/MessagePage/MeetingDetailModal.vue
+++ b/src/views/MessagePage/MeetingDetailModal.vue
@@ -41,6 +41,24 @@
             <span><j-ellipsis :value="model.directorName" :length="20"></j-ellipsis></span>
           </a-col>
         </a-row>
+        <a-row  :gutter="24" class="flex-col">
+          <a-col :span="12">
+            <label>酒店名称：</label><span>{{ model.hotelName }}</span>
+          </a-col>
+          <a-col :span="12">
+            <label>酒店地址：</label><span>{{ model.hotelAddress }}</span>
+          </a-col>
+        </a-row>
+
+        <a-row :gutter="24"  class="flex-col">
+          <a-col>
+            <label class="label">酒店联系人及手机号：</label>
+            <span class="content"
+                  v-for="(item,index) of model.hotelContactsList"
+                  :key="index">
+          {{ item.hotelContacts + ':' + item.hotelContactsPhone + ' ' }}</span>
+          </a-col>
+        </a-row>
         <a-row :gutter="24" class="flex-col">
           <a-col :span="12">
             <label>报名截止时间：</label>
@@ -522,12 +540,11 @@
 
         </template>
       </section>
-
-      <div v-if="model.meetingSignUpType+'' === '1' ">
+      <div v-if=" (model.meetingSignUpType+'' === '1' && !compareCurrentTime(model.registerDeadline)) ">
         <a-button type="primary" @click="goSignUpPage" >报名 </a-button>
       </div>
     </a-spin>
-    <!--报名信息end-->
+    <!--报名信息end-->ArriveAndInvoivingList
     <!--会议资料begin-->
     <section class="base-info">
       <h3 class="title">会议资料</h3>
@@ -782,6 +799,18 @@ export default {
       window.open(`https://www.kuaidi100.com/chaxun?com=${com}&nu=${record.postNo}`)
     },
     /*
+    * 当前时间是否超过会议报名时间
+    * */
+    compareCurrentTime(time) {
+      let date = new Date()
+      let compareTime = new Date(time)
+      if (date.getTime() > compareTime.getTime()) {
+        return true
+      } else {
+        return false
+      }
+    },
+    /*
     * 通过会议id获取会议性情
     * */
     queryMeetingInfoById(id) {
diff --git a/src/views/MessagePage/modules/FileTable.vue b/src/views/MessagePage/modules/FileTable.vue
index 921d46e..5aa401d 100644
--- a/src/views/MessagePage/modules/FileTable.vue
+++ b/src/views/MessagePage/modules/FileTable.vue
@@ -129,14 +129,14 @@ export default {
       console.log(file)
       if(this.hasLimitBool){
         // 会议资料更换了接口
-        downloadFile(`/meeting/payMeeting/userDownload/${file.id}/${this.meetingId}`, file.name)
+        downloadFile(`/meeting/payMeeting/userDownload/${file.id}/${this.meetingId}?type=download`, file.name)
       }else {
-        downloadFile(`sys/common/download/${file.id}`, file.name)
+        downloadFile(`sys/common/download/?type=download${file.id}`, file.name)
       }
     },
     handlePreview(file) {
       if (file && file.id) {
-        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}`
+        const fileFullUrl = `${window._CONFIG['domianWebSocketURL']}/sys/common/download/${file.id}?token=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}&type=view`
         let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         // let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}`
         window.open(url)