diff --git a/pages.config.ts b/pages.config.ts index d98447a..99d313f 100644 --- a/pages.config.ts +++ b/pages.config.ts @@ -35,7 +35,7 @@ export default defineUniPages({ { iconPath: 'static/tabbar/document.svg', selectedIconPath: 'static/tabbar/documentHL.svg', - pagePath: 'pages/fate/fate', + pagePath: 'pages/exam/my', text: '考试', }, ], diff --git a/src/pages.json b/src/pages.json index 77d3069..7c1cdd4 100644 --- a/src/pages.json +++ b/src/pages.json @@ -32,7 +32,7 @@ { "iconPath": "static/tabbar/document.svg", "selectedIconPath": "static/tabbar/documentHL.svg", - "pagePath": "pages/fate/fate", + "pagePath": "pages/exam/my", "text": "考试" } ] @@ -45,6 +45,13 @@ "navigationBarTitleText": "" } }, + { + "path": "pages/exam/my", + "type": "home", + "style": { + "navigationBarTitleText": "" + } + }, { "path": "pages/exam/detail", "type": "home", @@ -86,7 +93,7 @@ "type": "page", "layout": "default", "style": { - "navigationBarTitleText": "红娘" + "navigationBarTitleText": "" } }, { diff --git a/src/pages/exam/my.vue b/src/pages/exam/my.vue new file mode 100644 index 0000000..364ff26 --- /dev/null +++ b/src/pages/exam/my.vue @@ -0,0 +1,282 @@ + + +{ + style: { + navigationBarTitleText: '', + }, +} + + + + + + diff --git a/src/pages/fate/components/MatchmakerRecommend.vue b/src/pages/fate/components/MatchmakerRecommend.vue index 717406c..dacbff1 100644 --- a/src/pages/fate/components/MatchmakerRecommend.vue +++ b/src/pages/fate/components/MatchmakerRecommend.vue @@ -2,7 +2,7 @@ - 红娘推荐 + 红娘推荐111 专业认证 diff --git a/src/pages/fate/fate.vue b/src/pages/fate/fate.vue index d0128f5..79113fe 100644 --- a/src/pages/fate/fate.vue +++ b/src/pages/fate/fate.vue @@ -2,7 +2,7 @@ { layout: 'default', style: { - navigationBarTitleText: '红娘', + navigationBarTitleText: '', }, } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 8b54773..919c5b1 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -162,7 +162,7 @@ const formatExamLocation = ( locationName: string, ) => { const parts = [provinceName, cityName, address, locationName].filter(Boolean) - return parts.join(' ') + return parts.join('') } // 报名考试 diff --git a/src/service/exam/index.ts b/src/service/exam/index.ts index 43fc5d7..5206301 100644 --- a/src/service/exam/index.ts +++ b/src/service/exam/index.ts @@ -15,6 +15,7 @@ export interface ExamItem { estimatedAttendees: string examinersName?: string supervisorsName?: string + status?: number } /** 获取可报名考试列表 */ @@ -25,6 +26,13 @@ export const getCanBookExamListAPI = () => export const getCanBookExamInfoAPI = (id: string) => request.get>('/exam/getCanBookExamInfo', { params: { id } }) +export const getAlreadyBookExamList = (id: string) => + request.get>('/exam/getAlreadyBookExamList', { params: { id } }) + /** 报名接口 */ export const joinExamInfoAPI = (id: string) => request.get>('/exam/joinExamInfo', { params: { id } }) + +/** 获取已报名考试列表 */ +export const getAlreadyBookExamListAPI = () => + request.get>('/exam/getAlreadyBookExamList') diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index cda82d1..b4b5f09 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -5,6 +5,7 @@ interface NavigateToOptions { url: "/pages/index/index" | + "/pages/exam/my" | "/pages/exam/detail" | "/pages/activity/detail" | "/pages/activity/index" | @@ -32,7 +33,7 @@ interface NavigateToOptions { interface RedirectToOptions extends NavigateToOptions {} interface SwitchTabOptions { - url: "/pages/index/index" | "/pages/fate/fate" + url: "/pages/index/index" | "/pages/exam/my" } type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;