diff --git a/src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx b/src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx index bbea1ed2..80fd1f17 100644 --- a/src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx +++ b/src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx @@ -50,7 +50,7 @@ function Setmembers({ Membersshow,setClose,HeaderDetail, StaffDetail,setMembers, }) setTeams(datas) }, []) - + //查找学生 async function getStudents() { @@ -86,23 +86,24 @@ function Setmembers({ Membersshow,setClose,HeaderDetail, StaffDetail,setMembers, setTeachers(data.teachers) } } - //提交数据 + //提交数据 async function submitTeam() { let member_ids: any = []; let teacher_ids: any = []; let gitlink_users:any=[]; Teams && Teams.map((item: any, index: any) => { - if (item.is_teacher) { - teacher_ids.push(item.id) - } else { - member_ids.push(item.id) - } + // if (item.is_teacher) { + // teacher_ids.push(item.id) + // } else { + // member_ids.push(item.id) + // } gitlink_users.push({ login: item.login, lastname:item.lastname, nickname:item.nickname, mail:item.mail, + identity:item.identity, school_name:item.school_name }) }) @@ -224,8 +225,8 @@ function Setmembers({ Membersshow,setClose,HeaderDetail, StaffDetail,setMembers, color: "#D0021B", fontSize: "12px", marginTop: "9px" - }}>战队成员(职业为学生)需为{StaffDetail?.member_staff?.minimum}-{StaffDetail?.member_staff?.maximum}人,现为{StudentNumber}人

} + }}>战队成员(职业为学生)需为{StaffDetail?.member_staff?.minimum}-{StaffDetail?.member_staff?.maximum}人,现为{StudentNumber}人

} ) -} export default Setmembers \ No newline at end of file +} export default Setmembers diff --git a/src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx b/src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx index 5915cc54..1fa3a505 100644 --- a/src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx +++ b/src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx @@ -6,6 +6,7 @@ function Teammember(){ 头像 姓名 手机 + Email 学校/单位 职业 学号 @@ -13,4 +14,4 @@ function Teammember(){ 操作 ) -}export default Teammember \ No newline at end of file +}export default Teammember diff --git a/src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx b/src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx index e5005a03..6eecd3a2 100644 --- a/src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx +++ b/src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx @@ -54,6 +54,7 @@ function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammembe -1 ? teamitem.image_url : (ENV.IMG_SERVER + `/images/` + teamitem.image_url)}`} /> {teamitem && teamitem.name.length > 6 ? teamitem.name.substring(0, 6) + '...' : teamitem.name} {teamitem && teamitem.phone || '- -'} + {teamitem && teamitem.mail || '- -'} {teamitem && teamitem.school_name.length > 6 ? teamitem.school_name.substring(0, 6) + '...' : teamitem.school_name || '- - '} {teamitem && teamitem.identity || '- -'} {teamitem && teamitem.student_id || '- -'} @@ -72,4 +73,4 @@ function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammembe ) -} export default Teammember \ No newline at end of file +} export default Teammember diff --git a/src/utils/env.ts b/src/utils/env.ts index 5da3a8ac..bd4482eb 100755 --- a/src/utils/env.ts +++ b/src/utils/env.ts @@ -54,7 +54,7 @@ export const GlobalConfig: ConfigProps = { preNewBuild: { API_SERVER: 'https://pre-data.educoder.net', // API_SERVER: ((() => { - // let api = 'https://pre-data.educoder.net' + // let api = 'https://pre-data.educoder.net' // const domain = document.domain // let str = document.domain.split(".") // str[0] = str[0] + "-data"; @@ -87,7 +87,7 @@ export const GlobalConfig: ConfigProps = { IMG_SERVER: 'https://ali-cdn.educoder.net', FORGE: "https://code.educoder.net/", QQLoginCB: encodeURIComponent("https://www.educoder.net"), - FORGE_SERVER:"https://gitlink.org.cn" + FORGE_SERVER:"https://www.gitlink.org.cn" }, // test newTest: {