diff --git a/src/components/detailPage/MeetingList.vue b/src/components/detailPage/MeetingList.vue index f234bfc..ae8afb5 100644 --- a/src/components/detailPage/MeetingList.vue +++ b/src/components/detailPage/MeetingList.vue @@ -37,7 +37,8 @@ -
+
+
+
报名
@@ -589,6 +590,8 @@ import { getSingUpUserInfo } from '@api/incomePaymentsApi' import JImageUpload from '@comp/jero/JImageUpload' import '@/assets/less/TableExpand.less' import SignStep from './modules/SignStep' +import { MeetingSignUpTypeEnums } from '../../enums/commonEnum' +import { compareCurrentTime } from '../../utils/meetingJudgeUtil' const columns = [ { @@ -657,6 +660,7 @@ export default { }, data() { return { + MeetingSignUpTypeEnums, title: '会议详情', width: 800, visible: false, @@ -801,15 +805,7 @@ export default { /* * 当前时间是否超过会议报名时间 * */ - compareCurrentTime(time) { - let date = new Date() - let compareTime = new Date(time) - if (date.getTime() > compareTime.getTime()) { - return true - } else { - return false - } - }, + compareCurrentTime, /* * 通过会议id获取会议性情 * */ diff --git a/src/views/meetingActivity/MeetingActivity.vue b/src/views/meetingActivity/MeetingActivity.vue index 9ac6b10..e02b967 100644 --- a/src/views/meetingActivity/MeetingActivity.vue +++ b/src/views/meetingActivity/MeetingActivity.vue @@ -117,7 +117,7 @@ - 报名 @@ -205,8 +205,8 @@ 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} from '@/enums/commonEnum' - +import {SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums} from '@/enums/commonEnum' +import { compareCurrentTime } from '../../utils/meetingJudgeUtil' export default { name: 'MeetingActivity', @@ -222,6 +222,7 @@ export default { return { SignUpStatusEnum, MeetingStatusEnums, + MeetingSignUpTypeEnums, // 会议分类 全部 0 可报名 1 已报名 2 meetingStatusArr: [ { @@ -296,6 +297,7 @@ export default { this.initData(1) }, methods: { + compareCurrentTime, /* * 会议分类筛选 * */ diff --git a/src/views/standardsAssociation/meeting/MeetingList.vue b/src/views/standardsAssociation/meeting/MeetingList.vue index bef51b5..c5b7a17 100644 --- a/src/views/standardsAssociation/meeting/MeetingList.vue +++ b/src/views/standardsAssociation/meeting/MeetingList.vue @@ -111,7 +111,7 @@ && item.signUpStatus !== SignUpStatusEnum.pendingSignIn.index" > - 报名 @@ -168,7 +168,7 @@
- + @@ -182,7 +182,8 @@ 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 } from '@/enums/commonEnum' +import { SignUpStatusEnum, MeetingStatusEnums, MeetingSignUpTypeEnums } from '@/enums/commonEnum' +import { compareCurrentTime } from '../../../utils/meetingJudgeUtil' export default { @@ -221,6 +222,7 @@ export default { return { SignUpStatusEnum, MeetingStatusEnums, + MeetingSignUpTypeEnums, // 会议分类 全部 0 可报名 1 已报名 2 meetingStatusArr: [ { @@ -287,6 +289,7 @@ export default { this.initData(1) }, methods: { + compareCurrentTime, /* * 会议分类筛选 * */