From b03ce57e355b698c7482e8d1f095c93a39fef4b9 Mon Sep 17 00:00:00 2001 From: fengchenchen Date: Tue, 14 Dec 2021 20:53:35 +0800 Subject: [PATCH] =?UTF-8?q?[update]-=E6=A0=87=E5=8D=8F=E4=BC=9A=E8=AE=AEto?= =?UTF-8?q?ken=E6=8D=A2=E6=88=90=E5=8F=98=E9=87=8F=EF=BC=9B=E6=A0=87?= =?UTF-8?q?=E5=8D=8F=E4=BC=9A=E8=AE=AE=E7=9A=84=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/api_address_config.js | 7 + public/development_address_config.js | 6 +- src/api/standardsAssociationApi.js | 5 +- .../standardsAssociation/JImageUpload.vue | 4 +- src/mixins/RangeDateMixin.js | 3 +- src/utils/memberRequest.js | 4 +- src/views/MessagePage/MeetingDetailModal.vue | 109 ++-- src/views/MessagePage/modules/FileTable.vue | 141 +++++ .../InfoCommunicationMeeting.vue | 17 +- .../standardsAssociation/MemberManagement.vue | 6 +- .../PaymentInfo/CertificateInfo.vue | 4 +- .../PaymentInfo/MemberInfo.vue | 4 +- .../modules/CertificatePaymentInfoModal.vue | 3 +- .../PaymentInfo/modules/PaymentInfoModal.vue | 4 +- .../StandardPublicizingImplementation.vue | 21 +- .../standardsAssociation/TrainingMeeting.vue | 17 +- .../meeting/MeetingList.vue | 485 ++++++++++++++++++ .../VinCertificateModal.vue | 4 +- vue.config.js | 15 +- 19 files changed, 784 insertions(+), 75 deletions(-) create mode 100644 src/views/MessagePage/modules/FileTable.vue create mode 100644 src/views/standardsAssociation/meeting/MeetingList.vue diff --git a/public/api_address_config.js b/public/api_address_config.js index 51df226..18d9b9a 100644 --- a/public/api_address_config.js +++ b/public/api_address_config.js @@ -3,10 +3,17 @@ */ window._CONFIG = {}; window._CONFIG["domianURL"] = "/jero-boot"; // 路由转发 devServer + window._CONFIG["domianWebSocketURL"] = "http://localhost:8080/jero-boot"; // 单点登录地址 window._CONFIG["staticDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/download"; + window._CONFIG["pdfDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/pdf/pdfPreviewIframe"; window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 window._CONFIG["onlinePreviewDomainURL"] = "http://127.0.0.1:8012/onlinePreview"; + +// 路由转发 -会员系统的路由转发前缀 +window._CONFIG["memberURL"] = "/memberApi"; +// 会员系统的静态文件的地址 +window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static"; diff --git a/public/development_address_config.js b/public/development_address_config.js index b609370..611a992 100644 --- a/public/development_address_config.js +++ b/public/development_address_config.js @@ -4,13 +4,13 @@ window._CONFIG = {}; window._CONFIG["domianURL"] = "/jero-boot"; // 路由转发 devServer // websocket连接的地址 -window._CONFIG["domianWebSocketURL"] = "http://localhost:21824/jero-boot"; +window._CONFIG["domianWebSocketURL"] = "http://10.0.10.78:21824/jero-boot"; // 单点登录地址 window._CONFIG["staticDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/download"; window._CONFIG["pdfDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/pdf/pdfPreviewIframe"; window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas"; // 预览文件地址 -window._CONFIG["onlinePreviewDomainURL"] = "http://127.0.0.1:8012/onlinePreview"; +window._CONFIG["onlinePreviewDomainURL"] = "http://10.0.10.78:8012/onlinePreview"; // 会议管理报名二维码地址 window._CONFIG['singUpQRCodeURL'] = 'http://localhost:3000/signupentrance' @@ -19,4 +19,4 @@ window._CONFIG['singUpQRCodeURL'] = 'http://localhost:3000/signupentrance' window._CONFIG["memberURL"] = "/memberApi"; // 会员系统的静态文件的地址 window._CONFIG["memberStaticDomainURL"] = window._CONFIG["memberURL"] + "/sys/common/static"; -window._CONFIG["memberDomianWebSocketURL"] = "http://127.0.0.1:9000/memberApi"; +window._CONFIG["memberDomianWebSocketURL"] = "http://10.0.10.78:9000/memberApi"; diff --git a/src/api/standardsAssociationApi.js b/src/api/standardsAssociationApi.js index 3491a56..f5248c6 100644 --- a/src/api/standardsAssociationApi.js +++ b/src/api/standardsAssociationApi.js @@ -15,9 +15,8 @@ const queryCommonProjectById = (param) => incomeGetAction('/project/payCommonPro const previewPdf = (file) => { // const url = `${window._CONFIG['memberURL']}/sys/common/static/${id}?type=view&${TokenKey}=${Vue.ls.get(ACCESS_TOKEN)}` // return `${process.env.BASE_URL}pdfjs/web/viewer.html?file=` + encodeURIComponent(url) + '&.pdf' - // const token = Vue.ls.get(ACCESS_TOKEN) - // todo 先写死token - const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' + const token = Vue.ls.get(ACCESS_TOKEN) + // const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' const fileFullUrl = `${window._CONFIG['memberDomianWebSocketURL']}/sys/common/download/${file.id}?token=${token}&fullfilename=${file.fileName}` console.log(fileFullUrl, '$$$$$$$$') let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` diff --git a/src/components/standardsAssociation/JImageUpload.vue b/src/components/standardsAssociation/JImageUpload.vue index 2e3da7e..413774e 100644 --- a/src/components/standardsAssociation/JImageUpload.vue +++ b/src/components/standardsAssociation/JImageUpload.vue @@ -113,9 +113,9 @@ export default { } }, created() { - // const token = Vue.ls.get(ACCESS_TOKEN) + const token = Vue.ls.get(ACCESS_TOKEN) //TODO 暂时将token写成固定值，后续再做动态 - const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' + // const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' this.headers = { 'X-Access-Token': token } }, methods: { diff --git a/src/mixins/RangeDateMixin.js b/src/mixins/RangeDateMixin.js index bff0173..8d63d08 100644 --- a/src/mixins/RangeDateMixin.js +++ b/src/mixins/RangeDateMixin.js @@ -22,7 +22,8 @@ export const RangeDateMixin = { } // console.log(endValue.valueOf(),'endValue.valueOf()') if(this.rangeDateFormat.begin === 'YYYY-MM-DD') { - return startValue.valueOf() > endValue.valueOf() + 86400000 + // return startValue.valueOf() > endValue.valueOf() + 86400000 + return startValue.valueOf() > endValue.valueOf() } else { return startValue.valueOf() > endValue.valueOf() } diff --git a/src/utils/memberRequest.js b/src/utils/memberRequest.js index 5d6f0ad..80382fb 100644 --- a/src/utils/memberRequest.js +++ b/src/utils/memberRequest.js @@ -100,9 +100,9 @@ const err = (error) => { // request interceptor service.interceptors.request.use(config => { - // const token = Vue.ls.get(ACCESS_TOKEN) + const token = Vue.ls.get(ACCESS_TOKEN) //TODO 暂时将token写成固定值，后续再做动态 - const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' + // const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2Mzk0NjEyMzcsInVzZXJuYW1lIjoiMGI4ZDQ2YTBiZTI0NGJlZGI5ZDI1Y2Y5ZmQ5OTc3MTcifQ.jKG-mtZ4VHS5BAFGayuwOJgBBzZTiKQc3bkbya2YTNA' if (token) { config.headers[ 'X-Access-Token' ] = token // 让每个请求携带自定义 token 请根据实际情况自行修改 } diff --git a/src/views/MessagePage/MeetingDetailModal.vue b/src/views/MessagePage/MeetingDetailModal.vue index e9cd275..8db8b48 100644 --- a/src/views/MessagePage/MeetingDetailModal.vue +++ b/src/views/MessagePage/MeetingDetailModal.vue @@ -65,6 +65,35 @@ + +
+

开票邮寄信息

+
+ {{showMoreInfo ? '收起': '查看'}} +
+
+ + + 查看物流 + + + + + +
+
+ +
@@ -427,16 +456,18 @@

会议资料

- - - - - - +
- -
+ + +
+

会议纪要

+ +
+ + + - -
-

开票邮寄信息

-
- - - 查看物流 - - - - - -
-
-