diff --git a/src/api/index.js b/src/api/index.js index 79e972d..2099b3b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -103,6 +103,8 @@ export default { editCompetitionTeam: `competition/competition/team/editCompetitionTeam`, promptRemoval: `competition/competition/team/promptRemoval`, checkPhoneOrEmailExist: `users/users/userInfo/checkPhoneOrEmailExist`, + cancelParticipant: `competition/competition/teamParticipant/cancelParticipant`, + enquireAboutSchoolStudents: `users/users/userAccount/enquireAboutSchoolStudents`, frontDeskOverallRanking: `${host1}competition/competition/rank/frontDeskOverallRanking`, frontOfficeCompetitionRanking: `${host1}competition/competition/rank/frontOfficeCompetitionRanking`, stageGradeManagementList: `${host1}competition/competition/performance/stageGradeManagementList`, diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue index 6246ffe..2f5003b 100644 --- a/src/layouts/home/index.vue +++ b/src/layouts/home/index.vue @@ -30,7 +30,7 @@
- 知道了 + 知道了
@@ -120,13 +120,19 @@ export default { util.local.get(Setting.tokenKey) && this.$get(this.api.logNotification, { platformId: Setting.platformId }).then(({ notification }) => { - this.SET_LOG() // 把查看日志状态设置为true if (notification) { this.logVisible = true // 返回true，则显示日志弹框 this.getLog() + } else { + this.SET_LOG() // 把查看日志状态设置为true } }).catch(res => {}) }, + // 关闭日志弹框 + closeLog() { + this.logVisible = false + this.SET_LOG() // 把查看日志状态设置为true + }, // 长时间未操作,自动退出登录 autoLogout() { let lastTime = new Date().getTime(); diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue index 78f3827..10bef34 100644 --- a/src/pages/account/login/index.vue +++ b/src/pages/account/login/index.vue @@ -148,34 +148,37 @@ - - + + - - - - + + + + - +
- - {{ phoneBtnText }} + + {{ phoneBtnText }}
- + + + + - 申请 + 申请 取消 @@ -274,11 +277,13 @@ export default { infos: [], accountVisible: false, + formEnable: true, accountForm: { schoolId: '', account: '', code: '', password: '', + rePassword: '', phone: '', userName: '', workNumber: '', @@ -290,6 +295,7 @@ export default { workNumber: [{ required: true, validator: workNumberPass, trigger: "blur" }], phone: [{ required: true, validator: phonePass, trigger: "blur" }], password: [{ required: true, message: "请输入密码", trigger: "blur" }], + rePassword: [{ required: true, message: "请再次输入密码", trigger: "blur" }], code: [{ required: true, message: "请输入验证码", trigger: "blur" }] }, buyVisible: false @@ -524,6 +530,16 @@ export default { toAccount() { this.accountVisible = true }, + // 学号输入完回调。学校和学号都输入完后，调这个接口查询是否有存在的学生，如果没有，才能继续输入，如果有，不让添加 + workNumberChange() { + const form = this.accountForm + form.schoolId && form.workNumber && this.$get(`${this.api.enquireAboutSchoolStudents}?schoolId=${form.schoolId}&workNumber=${form.workNumber}&applyFor=1`).then(({ account }) => { + if (account) this.form = account + this.formEnable = !!account + }).catch(res => { + this.formEnable = true + }) + }, // 学校选择回调 schoolChange(schoolId) { this.$get(this.api.getCustomerBySchoolId, { @@ -533,7 +549,6 @@ export default { this.accountVisible = false this.buyVisible = true } - // util.successMsg(message) }).catch(res => {}) }, // 发送验证码 @@ -541,7 +556,7 @@ export default { const { phone } = this.accountForm // 校验用户手机号是否存在 phone && this.$get(`${this.api.checkPhoneOrEmailExist}?phone=${phone}&type=1&email=`).then(res => { - if (res) return util.errorMsg('手机号重复，请重新输入！') + if (res) return util.errorMsg('手机号已存在，请更换手机号！') if (!this.verifyPhone(phone)) return false this.$post(`${this.api.sendPhoneVerificationCode}?phoneOrEmail=${phone}&loginOrBind=1&platform=${Setting.platformId}`).then(({ message }) => { util.successMsg(message) @@ -554,11 +569,12 @@ export default { this.$refs.accountForm.validate(valid => { if (valid) { const form = this.accountForm + if (form.password !== form.rePassword) return util.errorMsg('两次输入的密码不一致，请重新输入！') // 平台id-端id-schoolId-workNumber组成账号 form.account = `${Setting.platformId}-1-${form.schoolId}-${form.workNumber}` - this.$post(this.api.studentAccountApplication, form).then(({ status, data, message }) => { + this.$post(this.api.studentAccountApplication, form).then(res => { this.accountVisible = false - util.successMsg(message) + util.successMsg('账号申请已提交，需管理员审核，请10分钟后再登录') }).catch(res => {}) } }) @@ -570,6 +586,7 @@ export default { account: '', code: '', password: '', + rePassword: '', phone: '', userName: '', workNumber: '', diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index 05cf654..e3911c3 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -461,6 +461,7 @@ export default { util.cookies.set("stopTime", this.curRow.stopTime) util.cookies.set("systemId", curriculumId); util.cookies.set('fromManager', '', -1) + util.cookies.set('competitionId', '', -1) let href = '' if (curriculumId == 11){ href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`; diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue index db39e49..c49a712 100644 --- a/src/pages/match/details/index.vue +++ b/src/pages/match/details/index.vue @@ -5,7 +5,7 @@
-
+
@@ -14,7 +14,7 @@ 距离{{ endList[status] }}还有 {{ end }}

- {{ statusList[status] }} + {{ statusList[status] }}
@@ -25,10 +25,10 @@
竞赛信息
-