diff --git a/src/Layout/tabbar/index.vue b/src/Layout/tabbar/index.vue index 146189a..7259782 100644 --- a/src/Layout/tabbar/index.vue +++ b/src/Layout/tabbar/index.vue @@ -30,7 +30,7 @@
-
+
注册
diff --git a/src/api/race.ts b/src/api/race.ts index 6a741c1..b229674 100644 --- a/src/api/race.ts +++ b/src/api/race.ts @@ -89,9 +89,10 @@ export const getHistoryRaceList = (params: any) => { }) } // 获取学生参加的比赛 -export const getStuRaceList = () => { +export const getStuRaceList = (params:any) => { return request({ url: '/annualcompetitionprojectregistration/annualCompetitionProjectRegistration/list4Stu', + params }) } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 628483c..bebbbba 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -43,8 +43,9 @@ import { onMounted, reactive, ref, toRefs, watch } from 'vue' import { getCode } from '@/api/user' import userStore from '@/store/module/user' import { ElMessage } from 'element-plus' -import { useRouter } from 'vue-router' +import { useRouter,useRoute } from 'vue-router' import RegisTered from './registered.vue' +const route = useRoute() const useUserStore = userStore() const form = ref({ account: '', @@ -91,6 +92,9 @@ onMounted(() => { // setTimeout(() => { // getcodeinfo() // },6000) + if(route.query.registered){ + registered() + } }) const keyDown = (e: any) => { //如果是回车则执行登录方法 diff --git a/src/views/raceInfo/index.vue b/src/views/raceInfo/index.vue index 90cf99e..edeecb3 100644 --- a/src/views/raceInfo/index.vue +++ b/src/views/raceInfo/index.vue @@ -2,7 +2,9 @@
Banner
+
年度比赛列表:
+
([]) -// onMounted(() => { -// setTimeout(() => { -// tableData.push({ -// userId: userModel.userInfo.id, -// realname: userModel.userInfo.realname, -// captain: '1', -// teamSeq: 1, -// }) -// }, 50) -// }) +onMounted(() => { + if(tableData.length === 1) return + setTimeout(() => { + tableData.push({ + userId: userModel.userInfo.id, + realname: userModel.userInfo.realname, + captain: '1', + teamSeq: 1, + }) + }, 50) +}) watch(()=>userModel.userInfo,()=>{ + if(tableData.length === 1) return tableData.push({ userId: userModel.userInfo.id, realname: userModel.userInfo.realname, diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue index 0be7f15..9cb974d 100644 --- a/src/views/registrationGroup/index.vue +++ b/src/views/registrationGroup/index.vue @@ -163,7 +163,7 @@ diff --git a/src/views/userInfo/index.vue b/src/views/userInfo/index.vue index 7ae298a..491cb8e 100644 --- a/src/views/userInfo/index.vue +++ b/src/views/userInfo/index.vue @@ -68,7 +68,7 @@
-
+