diff --git a/src/assets/images/competition_banner.jpg b/src/assets/images/competition_banner.jpg index bf6cc5ce4..f82f5316d 100644 Binary files a/src/assets/images/competition_banner.jpg and b/src/assets/images/competition_banner.jpg differ diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index 2cf463795..3cd57a307 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -8,6 +8,7 @@ import { delCookie, trackEvent, trackEventCustom } from '@/utils/util'; import moment from 'moment'; import { connect, Loading, GlobalSettingModelState, UserModelState, Dispatch, useLocation } from 'umi'; import { getCourseParam } from '@/components/Header'; +import { handleProfleCompletedModal } from '@/utils/verifyLogin'; import ENV from '@/utils/env'; import { Base64 } from 'js-base64'; import { setCookie } from '@/utils/util'; @@ -59,38 +60,33 @@ const SimpleLayouts: FC = ({ loading, globalSetting, children, user, }; useEffect(()=>{ - delCookie("logintrustie"); if(user?.userInfo?.profile_completed){ getEducoderUserInfo(); } },[user?.userInfo]) const getEducoderUserInfo=async()=>{ - if(user?.userInfo?.profile_completed){ - delCookie("logintrustie"); - var res = await dispatch({ + delCookie("logintrustie"); + var res = await dispatch({ type:"user/getEducoderUserInfo", payload:{ - websiteName: "gitlink" , - openkey: Base64.encode("05e9081ede2e7425db064df44b5fb1897234f44f922443b89597d17b60dc8f3e"), - sign:"cdf0f69b4d5b4293f7914cc1f1f31742", - login: user?.userInfo?.login, - lastname:user?.userInfo?.real_name, - nickname:user?.userInfo?.nickname, - mail:user?.userInfo?.email, - school_name:user?.userInfo?.custom_department, - phone:user?.userInfo?.phone + websiteName: "gitlink" , + openkey: Base64.encode("05e9081ede2e7425db064df44b5fb1897234f44f922443b89597d17b60dc8f3e"), + sign:"cdf0f69b4d5b4293f7914cc1f1f31742", + login: user?.userInfo?.login, + lastname:user?.userInfo?.real_name, + nickname:user?.userInfo?.nickname, + mail:user?.userInfo?.email, + school_name:user?.userInfo?.custom_department, + phone:user?.userInfo?.phone + } + }) + if(res && res.token){ + setCookie("logintrustie",res.token,1); } - }) - if(res && res.token){ - setCookie("logintrustie",res.token,1); - } - // setCookie("logintrustie","7e43fe5f1f10a8a78728fabc1d03c6a827e21f7e",1); } - } useEffect(() => { - delCookie("logintrustie"); getData(); }, [location.pathname]) diff --git a/src/models/user/index.ts b/src/models/user/index.ts index 4d5e22745..dc14a5889 100755 --- a/src/models/user/index.ts +++ b/src/models/user/index.ts @@ -7,7 +7,7 @@ export interface UserModelState { showPopLogin: boolean loading: boolean userInfo?: any - eduUserInfo?:any, + eduUserInfo?:any navigationInfo: any actionTabs: { key: string; params: any ,phone:string}; showClosable: boolean diff --git a/src/pages/Competitions/Detail/index.tsx b/src/pages/Competitions/Detail/index.tsx index 25b09efa6..ff1577b9f 100644 --- a/src/pages/Competitions/Detail/index.tsx +++ b/src/pages/Competitions/Detail/index.tsx @@ -30,6 +30,7 @@ import Entrance from './Entrance' import QR from './mCode.png'; import JoinTeam from '../Entered/Enteredmodel/JoinModel' import AddteamsModel from '../Entered/Enteredmodel/Addteams'; +import InitGitLink from './components/InitGitLink' import PhoneModal from '../components/PhoneModal' import env from '@/utils/env'; import ClaModal from '../components/ClaModal'; @@ -82,6 +83,7 @@ const competitionDetails: FC = ({ const [showmake,setshowmake]=useState(false); const [entrance,setentrance]=useState(false) + const [ subGitlinkShow , setSubGitlinkShow ] =useState(false); const [isshowmodal,setisshowmodal]=useState(false); @@ -94,16 +96,21 @@ const competitionDetails: FC = ({ const [visible,setVisible]=useState(false); const loction = useLocation(); - const see = useRef(null) - useEffect(() => { - - if (identifier) { - init(); - //调用默认加载第一条数据 - } - setDocumentTitle('竞赛') - }, [identifier]) + const see = useRef(null); + useEffect(()=>{ + if(user?.userInfo?.is_new){ + setSubGitlinkShow(true); + } + },[user?.userInfo]) + + useEffect(() => { + if (identifier) { + setTimeout(() => { + init(); + }, 200); + } + }, [identifier]) async function init() { setStaffDetail(await dispatch({ @@ -212,6 +219,10 @@ const competitionDetails: FC = ({ if (!handleVerify(dispatch)) { return; } + if(HeaderDetail.teacher_need_phone||HeaderDetail.member_need_phone){ + setshowphone(true) + return + } let data =await dispatch({ type: 'competitions/GetKylinId', @@ -227,11 +238,6 @@ const competitionDetails: FC = ({ setVisible(true); return; } - }else{ - if(HeaderDetail.teacher_need_phone||HeaderDetail.member_need_phone){ - setshowphone(true) - return - } } @@ -520,6 +526,7 @@ async function JoinTeams(name: any) { return (
+ setSubGitlinkShow(false)}/> 在线竞赛 {HeaderDetail.name}{HeaderDetail.sub_title ? '-' + HeaderDetail.sub_title : null} diff --git a/src/pages/Competitions/Entered/Assembly/Assembly.tsx b/src/pages/Competitions/Entered/Assembly/Assembly.tsx index c9bac70e4..0e1773b76 100644 --- a/src/pages/Competitions/Entered/Assembly/Assembly.tsx +++ b/src/pages/Competitions/Entered/Assembly/Assembly.tsx @@ -13,7 +13,7 @@ function Assembly({ setIsAddmodel, setJoin, HeaderDetail, user, dispatch }: asse return (
{/*

在线竞赛平台

*/} -

欢迎报名参加本项赛事！头歌全面支持各类竞赛的在线运行管理，

+

欢迎报名参加本项赛事！平台全面支持各类竞赛的在线运行管理，

大数据、人工智能、各类芯片架构等竞赛任务均可在线运行、部署和评测。

{ @@ -40,10 +40,10 @@ function Assembly({ setIsAddmodel, setJoin, HeaderDetail, user, dispatch }: asse setIsAddmodel(true) }} className={styles.createteams}>创建战队
-
+ {/*

作品指导张老师微信

-
+
*/}
) } export default Assembly; diff --git a/src/pages/Competitions/Entered/backgroundimg.png b/src/pages/Competitions/Entered/backgroundimg.png index b670bb06c..c845f0050 100644 Binary files a/src/pages/Competitions/Entered/backgroundimg.png and b/src/pages/Competitions/Entered/backgroundimg.png differ diff --git a/src/pages/Competitions/Entered/index.tsx b/src/pages/Competitions/Entered/index.tsx index 77714d254..b6cef6dfd 100644 --- a/src/pages/Competitions/Entered/index.tsx +++ b/src/pages/Competitions/Entered/index.tsx @@ -120,7 +120,9 @@ const competitionDetails: FC = ({ } } if (identifier) { - init(); + setTimeout(() => { + init(); + }, 200); } }, [identifier]) diff --git a/src/pages/Competitions/Index/index.tsx b/src/pages/Competitions/Index/index.tsx index fafcccc95..749c2cc4c 100755 --- a/src/pages/Competitions/Index/index.tsx +++ b/src/pages/Competitions/Index/index.tsx @@ -319,6 +319,11 @@ const competitionsIndexPage: FC = ({ if (!handleVerify(dispatch)) { return; } + if(item.teacher_need_phone||item.member_need_phone){ + event.stopPropagation(); + setshowphone(true) + return + } let data =await dispatch({ type: 'competitions/GetKylinId', @@ -335,12 +340,6 @@ const competitionsIndexPage: FC = ({ setVisible(true); return; } - }else{ - if(item.teacher_need_phone||item.member_need_phone){ - event.stopPropagation(); - setshowphone(true) - return - } } if (item.external_url) { @@ -374,7 +373,7 @@ const competitionsIndexPage: FC = ({ return (