diff --git a/src/api/standardsAssociationApi.js b/src/api/standardsAssociationApi.js index 8a034b1..ba92412 100644 --- a/src/api/standardsAssociationApi.js +++ b/src/api/standardsAssociationApi.js @@ -17,7 +17,7 @@ const previewPdf = (file) => { // return `${process.env.BASE_URL}pdfjs/web/viewer.html?file=` + encodeURIComponent(url) + '&.pdf' 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}` + const fileFullUrl = `${window._CONFIG['memberDomianWebSocketURL']}/sys/common/download/${file.id}?type=view&token=${token}&fullfilename=${file.fileName}` console.log(fileFullUrl, '$$$$$$$$') let url = `${window._CONFIG['onlinePreviewDomainURL']}?url=${encodeURIComponent(fileFullUrl)}` return url diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue index 7df882d..46ee13b 100644 --- a/src/views/standardsAssociation/meeting/MeetingList.vue +++ b/src/views/standardsAssociation/meeting/MeetingList.vue @@ -51,9 +51,10 @@ + @@ -181,7 +182,7 @@ import UploadMeetingCertificateModal from '@views/MessagePage/UploadMeetingCerti import { getAction } from '@api/manage' import JEllipsis from '@comp/jero/JEllipsis' import MeetingDetailModal from '@views/MessagePage/MeetingDetailModal' -import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums } from '@/enums/commonEnum' +import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, MeetingTypeEnums } from '@/enums/commonEnum' import { compareCurrentTime } from '../../../utils/meetingJudgeUtil' @@ -214,7 +215,7 @@ export default { meetingType: { type: Number, required: false, - default: 2 + default: MeetingTypeEnums.standard.index } }, data() { @@ -222,6 +223,7 @@ export default { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums, + MeetingTypeEnums, // 会议分类 全部 0 可报名 1 已报名 2 meetingStatusArr: [ {