diff --git a/src/api/competition.js b/src/api/competition.js index 3e1b0bec3..1e81796d6 100644 --- a/src/api/competition.js +++ b/src/api/competition.js @@ -72,10 +72,11 @@ export function getIsSignUp(raceId) { } /** 分页查询竞赛报名人员 */ -export function getRaceUserList(raceId) { +export function getRaceUserList(params) { return request({ - url: `/api/race/${raceId}/raceUser`, - method: 'get' + url: `/api/race/${params.raceId}/raceUser`, + method: 'get', + params }); } diff --git a/src/permission.js b/src/permission.js index 3f32cd3f1..53dc0d483 100644 --- a/src/permission.js +++ b/src/permission.js @@ -47,6 +47,10 @@ function getRouteInfo(to) { } else { const whitePage = PermissionParam[current_session] ? PermissionParam[current_session].whitePage : ''; loginPath = whitePage || loginPage; + if (current_session && current_session.startsWith('jsxt') || current_session && current_session.startsWith('refereeJsxt')) { + const raceId = getSessionStorage('raceId'); // 登陆时候保存 竞赛id + loginPath = `${loginPath}?raceId=${raceId}`; + } if (current_session && current_session.startsWith('design')) { removeToken(); } diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index e9046878d..e49695b4d 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,12 +2,11 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - BASE_API = 'https://test.joylink.club/jlcloud'; + // BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 - // BASE_API = 'http://192.168.3.41:9000'; // 张赛 + BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 - // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://b29z135112.zicp.vip'; // BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康 // BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛 diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue index 1a1abbc6e..04dce0c15 100644 --- a/src/views/jsxt/refereeList/index.vue +++ b/src/views/jsxt/refereeList/index.vue @@ -6,7 +6,7 @@