From b378c7f5092f4083a6cedebd4ff0f6fe2e8b2202 Mon Sep 17 00:00:00 2001 From: JayChou Date: Wed, 16 Oct 2024 10:08:51 +0800 Subject: [PATCH] =?UTF-8?q?10.16=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/race.ts | 7 + src/views/competition/index.vue | 668 +++++++------ src/views/login/index.vue | 4 +- src/views/login/registered.vue | 6 +- src/views/projectName/index.vue | 1 + src/views/raceInfo/index.vue | 6 + src/views/registrationGroup/index.vue | 1095 +++++++++++---------- src/views/registrationPersonage/index.vue | 904 ++++++++--------- src/views/userInfo/index.vue | 57 +- vite.config.ts | 1 + 10 files changed, 1406 insertions(+), 1343 deletions(-) diff --git a/src/api/race.ts b/src/api/race.ts index c4bbf3d..822b537 100644 --- a/src/api/race.ts +++ b/src/api/race.ts @@ -21,6 +21,13 @@ export const getRaceList = (params: any) => { params, }) } +// 获取年度比赛详情 +export const getYearRaceInfo = (params: any) => { + return request({ + url: '/annualcomp/annualComp/findndbswxq', + params, + }) +} // 获取比赛详细信息 export const getRaceInfo = (params: any) => { return request({ diff --git a/src/views/competition/index.vue b/src/views/competition/index.vue index c0b7aa7..b06b86a 100644 --- a/src/views/competition/index.vue +++ b/src/views/competition/index.vue @@ -1,368 +1,396 @@ \ No newline at end of file + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 9c774f4..f809b26 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -87,7 +87,9 @@ const submit = async () => { } onMounted(() => { window.addEventListener('keydown', keyDown) - + // setTimeout(() => { + // getcodeinfo() + // },6000) }) const keyDown = (e: any) => { //如果是回车则执行登录方法 diff --git a/src/views/login/registered.vue b/src/views/login/registered.vue index 3029f2d..d59837e 100644 --- a/src/views/login/registered.vue +++ b/src/views/login/registered.vue @@ -56,6 +56,7 @@ placeholder="密码" v-model="form.password" :prefix-icon="Lock" + type="password" > @@ -63,6 +64,8 @@ placeholder="确认密码" v-model="form.confirmPassword" :prefix-icon="Lock" + type="password" + > @@ -159,7 +162,7 @@ const ragistered = async () => { } } if (!(form.password === form.confirmPassword)) { - ElMessage.warning(`两次密码不同`) + return ElMessage.warning(`两次密码不同`) } console.log(form) let data = { @@ -179,6 +182,7 @@ const ragistered = async () => { $emits('backLogin') }else{ ElMessage.warning(res.message) + getcodeinfo() } console.log(res) } diff --git a/src/views/projectName/index.vue b/src/views/projectName/index.vue index 312437e..8869e8a 100644 --- a/src/views/projectName/index.vue +++ b/src/views/projectName/index.vue @@ -122,6 +122,7 @@ getData(); font-size: 18px; color: #666666; text-indent: 2em; + min-height: 500px; } .foot { diff --git a/src/views/raceInfo/index.vue b/src/views/raceInfo/index.vue index 50f8336..3b0edf7 100644 --- a/src/views/raceInfo/index.vue +++ b/src/views/raceInfo/index.vue @@ -241,6 +241,12 @@ getHistoryRaceListEvent() font-weight: 600; color: #333333; margin-top: 10px; + line-height: 20px; + height: 60px; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; + overflow: hidden; } .time { font-size: 14px; diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue index 3f4c2ca..8e3357a 100644 --- a/src/views/registrationGroup/index.vue +++ b/src/views/registrationGroup/index.vue @@ -1,621 +1,662 @@ \ No newline at end of file + diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue index 159fc55..c243928 100644 --- a/src/views/registrationPersonage/index.vue +++ b/src/views/registrationPersonage/index.vue @@ -1,118 +1,116 @@ \ No newline at end of file + diff --git a/src/views/userInfo/index.vue b/src/views/userInfo/index.vue index 0df0370..e26e9b1 100644 --- a/src/views/userInfo/index.vue +++ b/src/views/userInfo/index.vue @@ -7,62 +7,7 @@
-
- - -
当前参加的比赛
-
-
-
2023年度
-
-
河南省大学生创新创业大赛
- -
-
-
-
-
比赛年度
-
2024年度
-
比赛名称
-
河南省大学生创新创业大赛
-
-
开始报名时间:
-
2323.6.1 18:00
-
-
-
开始截至时间:
-
2323.6.1 18:00
-
-
-
-
-
- - -
项目信息
-
-
-

红色之旅赛道

-
-
-
-
项目名称
-
红色之旅赛道
-
要求人数
-
1人
-
-
开始报名时间:
-
2323.6.1 18:00
-
-
-
开始截至时间:
-
2323.6.1 18:00
-
-
-
-
-
-
+