diff --git a/src/pages/Competitions/Entered/Enteredmodel/DownStudents.tsx b/src/pages/Competitions/Entered/Enteredmodel/DownStudents.tsx index 7395b1b9c..3af59f6ed 100644 --- a/src/pages/Competitions/Entered/Enteredmodel/DownStudents.tsx +++ b/src/pages/Competitions/Entered/Enteredmodel/DownStudents.tsx @@ -30,7 +30,8 @@ function DownStudent({students,setTeams,Teams,HeaderDetail}:DownStudent){ // console.log('students',Teams,item); // return let students=Teams; - students.push(item); + let temp = {...item,temporary:true}//temporary临时添加还未保存的队员不显示设为队长按钮 + students.push(temp); setTeams(students) }}> diff --git a/src/pages/Competitions/Entered/Enteredmodel/DownTeacher.tsx b/src/pages/Competitions/Entered/Enteredmodel/DownTeacher.tsx index 9652de46a..1c2c282b5 100644 --- a/src/pages/Competitions/Entered/Enteredmodel/DownTeacher.tsx +++ b/src/pages/Competitions/Entered/Enteredmodel/DownTeacher.tsx @@ -28,7 +28,8 @@ function Downteacher({teachers,setTeams,Teams,HeaderDetail}:Downteacher){ return } let teachers=Teams; - teachers.push(item); + let temp = {...item,temporary:true}//temporary临时添加还未保存的队员不显示设为队长按钮 + teachers.push(temp); setTeams(teachers) }}> diff --git a/src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx b/src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx index 80fd1f170..7e2c06b85 100644 --- a/src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx +++ b/src/pages/Competitions/Entered/Enteredmodel/SetmembersModel.tsx @@ -159,7 +159,7 @@ function Setmembers({ Membersshow,setClose,HeaderDetail, StaffDetail,setMembers, setClose() //selectlist(''); }} - width={900} + width={950} >

添加教师

diff --git a/src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx b/src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx index 1fa3a505a..ce2376c42 100644 --- a/src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx +++ b/src/pages/Competitions/Entered/Enteredmodel/TeammemberTItle.tsx @@ -3,8 +3,8 @@ import styles from '../index.less' function Teammember(){ return(
- 头像 - 姓名 + 头像 + 姓名 手机 Email 学校/单位 diff --git a/src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx b/src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx index 6eecd3a26..a0868ac5a 100644 --- a/src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx +++ b/src/pages/Competitions/Entered/Enteredmodel/Teammembers.tsx @@ -13,6 +13,8 @@ interface Teammember { } function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammember) { + console.log("valueTeams:",Teams); + const menuitem = () => ( { setleader(); @@ -51,11 +53,11 @@ function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammembe return (
- -1 ? teamitem.image_url : (ENV.IMG_SERVER + `/images/` + teamitem.image_url)}`} /> - {teamitem && teamitem.name.length > 6 ? teamitem.name.substring(0, 6) + '...' : teamitem.name} + -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.school_name && teamitem.school_name.length > 6 ? teamitem.school_name.substring(0, 6) + '...' : teamitem.school_name || '- - '} {teamitem && teamitem.identity || '- -'} {teamitem && teamitem.student_id || '- -'} @@ -67,8 +69,8 @@ function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammembe } */} -
- {/* setleader()}>{teamitem && teamitem.role === "leader" || teamitem && teamitem.creator ? '' : '设为队长'} */} +
+ {!teamitem?.temporary && setleader()}>{teamitem && teamitem.role === "leader" || teamitem && teamitem.creator ? '' : '设为队长'} } deleteitem()} className={` ${styles.deleteitem}`}>{teamitem && teamitem.role === "leader" || teamitem && teamitem.creator ? '' : '删除'}
diff --git a/src/utils/fetch.ts b/src/utils/fetch.ts index 7886ffe49..ba9cb91d5 100755 --- a/src/utils/fetch.ts +++ b/src/utils/fetch.ts @@ -126,8 +126,8 @@ export default function request(url: string, option: any, flag?: boolean) { let newOptions = { ...defaultOptions, ...options } let eduHeader = { - 'X-Edu-Signature':'47ceb295f3bf94da0b47e4876b7bbd59', - 'X-Edu-Timestamp':'1724744339707', + 'X-Edu-Signature':'b7e4aa591dc0b95429dbce0f138d8df4', + 'X-Edu-Timestamp':'1726643948398', 'X-Edu-Type':'pc', }