请选择要加入的团队
@@ -517,7 +531,11 @@ export default { checkedMembers: [], chooses: [], lastType: 1, - playingStages: [] + playingStages: [], + peopleSignupVisible: false, + peopleSignupForm: { + registrationInvitationCode: '' + }, }; }, computed: { @@ -623,7 +641,7 @@ export default { const stages = form.competitionStage if (stages) { this.playingStages = [] - stages.forEach(e => { + form.competitionRegistration && stages.forEach(e => { if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) this.playingStages.push(e) }) let endText = '' @@ -689,7 +707,7 @@ export default { this.$post(`${this.api.entryInformation}?competitionId=${this.id}`).then(res => { const info = res.entryInformation // 如果是队长，并且没有指导老师，默认添加一个空的 - if (!info.team.captain && !info.teamInstructors.length) info.teamInstructors.push(JSON.parse(JSON.stringify(this.originIns))) + if (info.team && !info.team.captain && !info.teamInstructors.length) info.teamInstructors.push(JSON.parse(JSON.stringify(this.originIns))) if (info.personalDetail) { info.team = {} info.teamDetail = [] @@ -717,18 +735,22 @@ export default { }) // 设置定时器，阶段比赛结束后公布成绩，到时间后调本接口 const now = Date.now() - this.form.competitionStage.map(e => { + this.form.competitionStage && this.form.competitionStage.map(e => { // 如果公布成绩详情勾选的是 if (!e.resultsDetails) { + console.log(44, endTime - now < 86400000) + const endTime = new Date(e.endTime).getTime() + e.resultAnnouncementTime * 3600000 // 阶段结束时间+成绩公布时间（成绩公布时间单位是小时，所以要转化为毫秒） if (now > endTime) { // 如果到了公布时间 info.stages.find(n => n.stageId == e.stageId).showDetail = 1 - } else { // 没有到公布时间，则加定时器，到点后调用 + } else if (endTime - now < 86400000) { // 没有到公布时间，则加定时器，到点后调用 this.timerList.push(setTimeout(this.getInfo, endTime - now)) } } }) this.info = info + console.log("🚀 ~ file: index.vue:752 ~ this.$post ~ info", info) + }).catch(err => {}); }, // 编辑保存 @@ -1037,7 +1059,18 @@ export default { this.$router.push(`/record/show?reportId=${row.reportId}`) }, - // 报名提交 + // 个人报名提交 + peopleSignupSubmit() { + this.$post(this.api.addCompetitionRegistration, { + competitionId: this.id, + registrationInvitationCode: this.peopleSignupForm.registrationInvitationCode + }).then(res => { + this.peopleSignupVisible = false + this.getData() + this.$message.success('报名成功') + }).catch(res => {}) + }, + // 团队报名提交 enterSubmit() { const form = this.enterForm if (!form.teamId) return util.errorMsg('请选择团队') @@ -1127,7 +1160,8 @@ export default { if (util.local.get(Setting.tokenKey)) { const { competitionType } = form.completeCompetitionSetup if (status == 4) { // 进入比赛 - if (this.curStage && this.curStage.count) return // 参加过比赛不让参加 + // 参加过比赛不让参加 + if (this.curStage && this.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！') if (form.competitionRegistration.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛 // 团队赛，则判断是否为参赛人员 if (competitionType) { @@ -1146,12 +1180,17 @@ export default { if (competitionType) { this.enterVisible = true } else { // 个人赛报名 - this.$post(this.api.addCompetitionRegistration, { - competitionId: this.id - }).then(res => { - this.getData() - this.$message.success('报名成功') - }).catch(res => {}) + if (form.completeCompetitionSetup.isNeedCode) { + this.peopleSignupForm.registrationInvitationCode = '' + this.peopleSignupVisible = true + } else { + this.$post(this.api.addCompetitionRegistration, { + competitionId: this.id + }).then(res => { + this.getData() + this.$message.success('报名成功') + }).catch(res => {}) + } } } else if (status == 1) { // 已报名，点击取消报名 diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue index 7e9df80..996b7df 100644 --- a/src/pages/match/list/index.vue +++ b/src/pages/match/list/index.vue @@ -100,7 +100,7 @@
-
+
选择竞赛
@@ -140,6 +140,17 @@
+ 请选择要加入的团队
@@ -296,7 +307,12 @@ export default { }, curItem: { setup: {} - } + }, + peopleSignupVisible: false, + peopleSignupForm: { + registrationInvitationCode: '' + }, + curRow: {} }; }, computed: { @@ -344,11 +360,11 @@ export default { records.forEach((n, k) => { n.invitationCode = n.setup.invitationCode // 比赛范围 - const list = n.competitionRangeRespList + const list = n.contestRangeRespList if (list) { const range = [] list.map(e => { - range.push(e.type ? (e.provinceName || e.cityName) : e.schoolName) // type 1：省市，0：学校 + range.push(e.type ? (e.cityName || e.provinceName) : e.schoolName) // type 1：省市，0：学校 }) n.ranges = `${n.range}（${range.join('，')}）` } else { @@ -394,7 +410,8 @@ export default { const stages = item.competitionStageList if (stages) { item.playingStages = [] - stages.forEach(e => { + // 报了名才算作可以进入的阶段 + item.whetherToSignUp === 0 && stages.forEach(e => { if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) item.playingStages.push(e) }) for (const i in stages) { @@ -516,8 +533,18 @@ export default { this.getData(); }, - - // 报名提交 + // 个人报名提交 + peopleSignupSubmit() { + this.$post(this.api.addCompetitionRegistration, { + competitionId: this.curRow.id, + registrationInvitationCode: this.peopleSignupForm.registrationInvitationCode + }).then(res => { + this.peopleSignupVisible = false + this.getData() + this.$message.success('报名成功') + }).catch(res => {}) + }, + // 团队报名提交 enterSubmit() { const form = this.enterForm if (!form.teamId) return util.errorMsg('请选择团队') @@ -565,6 +592,7 @@ export default { util.successMsg('报名成功！') }).catch(res => {}) }, + stageClick(e) {}, // 选择要进入的阶段 chooseStage(e, item) { item.curStage = e @@ -594,7 +622,8 @@ export default { if (util.local.get(Setting.tokenKey)) { this.curItem = item if (status == 4) { // 进入比赛 - if (item.curStage.count) return // 参加过比赛不让参加 + // 参加过比赛不让参加 + if (item.curStage.count) return util.errorMsg('您已经参加过该阶段竞赛！') if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛 // 团队赛，则判断是否为参赛人员 if (competitionType) { @@ -620,12 +649,18 @@ export default { } this.enterVisible = true } else { // 个人赛报名 - this.$post(this.api.addCompetitionRegistration, { - competitionId: id - }).then(res => { - this.getData() - this.$message.success('报名成功') - }).catch(res => {}) + if (item.setup.isNeedCode) { + this.curRow = item + this.peopleSignupForm.registrationInvitationCode = '' + this.peopleSignupVisible = true + } else { + this.$post(this.api.addCompetitionRegistration, { + competitionId: id + }).then(res => { + this.getData() + this.$message.success('报名成功') + }).catch(res => {}) + } } } else if (status == 1) { // 已报名，点击取消报名 @@ -920,8 +955,8 @@ export default { } .cover { img { - width: 298px; - height: 190px; + width: 275px; + height: 175px; border-radius: 6px; } } @@ -929,7 +964,7 @@ export default { .info { margin-left: 16px; .title { - margin-bottom: 5px; + margin-bottom: 10px; font-size: 20px; font-weight: 500; color: #0B1D30; diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue index 7d7c5e7..aea8968 100644 --- a/src/pages/record/show/index.vue +++ b/src/pages/record/show/index.vue @@ -153,7 +153,7 @@
实验总结与体会
-
+