From c0a2de6b13962fcabb2527d31e774eb0067095e9 Mon Sep 17 00:00:00 2001
From: xiaoxiaoqiong <xxqfamous@gmail.com>
Date: Wed, 13 Jul 2022 18:23:39 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E7=AB=9E=E8=B5=9B=E6=8A=A5=E5=90=8D?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=94=A8=E6=88=B7=E5=A2=9E=E5=8A=A0mail?=
 =?UTF-8?q?=E5=92=8C=E8=BA=AB=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Entered/Enteredmodel/SetmembersModel.tsx  | 19 ++++++++++---------
 .../Entered/Enteredmodel/TeammemberTItle.tsx  |  3 ++-
 .../Entered/Enteredmodel/Teammembers.tsx      |  3 ++-
 src/utils/env.ts                              |  4 ++--
 4 files changed, 16 insertions(+), 13 deletions(-)

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}人</p>} 
+									}}>战队成员(职业为学生)需为{StaffDetail?.member_staff?.minimum}-{StaffDetail?.member_staff?.maximum}人,现为{StudentNumber}人</p>}
             </div>
         </Modal>
     )
-} 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(){
             <span className={styles.flex1}>头像</span>
             <span className={styles.flex1}>姓名</span>
             <span className={styles.flex2}>手机</span>
+            <span className={styles.flex2}>Email</span>
             <span className={styles.flex2}>学校/单位</span>
             <span className={styles.flex1}>职业</span>
             <span className={styles.flex2}>学号</span>
@@ -13,4 +14,4 @@ function Teammember(){
             <span className={styles.flex2} style={{textAlign:'center'}}>操作</span>
         </div>
     )
-}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
             <span className={styles.flex1}><img className={styles.loaderimg} src={`${teamitem.image_url?.indexOf("http") > -1 ? teamitem.image_url : (ENV.IMG_SERVER + `/images/` + teamitem.image_url)}`} /></span>
             <span className={styles.flex1}>{teamitem && teamitem.name.length > 6 ? teamitem.name.substring(0, 6) + '...' : teamitem.name}</span>
             <span className={styles.flex2}>{teamitem && teamitem.phone || '- -'}</span>
+            <span className={styles.flex2}>{teamitem && teamitem.mail || '- -'}</span>
             <span className={styles.flex2}>{teamitem && teamitem.school_name.length > 6 ? teamitem.school_name.substring(0, 6) + '...' : teamitem.school_name || '- - '}</span>
             <span className={styles.flex1}>{teamitem && teamitem.identity || '- -'}</span>
             <span className={`${styles.flex2} ${styles.task_hide}`}>{teamitem && teamitem.student_id || '- -'}</span>
@@ -72,4 +73,4 @@ function Teammember({ teamitem, index, setTeams, Teams, setLoaderid }: Teammembe
             </div>
         </div>
     )
-} 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: {