diff --git a/src/assets/images/competition_banner.png b/src/assets/images/competition_banner.png new file mode 100644 index 000000000..c0fd5e248 Binary files /dev/null and b/src/assets/images/competition_banner.png differ diff --git a/src/assets/images/competition_banner.jpg b/src/assets/images/competition_banner_6.jpg similarity index 100% rename from src/assets/images/competition_banner.jpg rename to src/assets/images/competition_banner_6.jpg diff --git a/src/components/Header/index.tsx b/src/components/Header/index.tsx index a0bf3d8de..86f781f11 100755 --- a/src/components/Header/index.tsx +++ b/src/components/Header/index.tsx @@ -187,11 +187,12 @@ const HeaderComponents: FC = ({ setActiveKey(key) } }) - if (activeKey === -1) { - setDocumentTitle(globalSetting.setting.name) - } else { - setDocumentTitle(globalSetting.setting.navbar[activeKey]?.name || globalSetting.setting.name) - } + // if (activeKey === -1) { + // setDocumentTitle(globalSetting.setting.name) + // } + // else { + // setDocumentTitle(globalSetting.setting.navbar[activeKey]?.name || globalSetting.setting.name) + // } } }, [globalSetting?.setting]) diff --git a/src/models/user/index.ts b/src/models/user/index.ts index c873c6424..c88da4ce7 100755 --- a/src/models/user/index.ts +++ b/src/models/user/index.ts @@ -1,6 +1,6 @@ import { Effect, Reducer, Subscription, history } from 'umi' import { Action } from '@@/plugin-dva/connect' -import { LoginIn, getUserInfo, getNavigationInfo , getZoneList , ForgeLogin , getEducoderUserInfo , ForgeCheckName , ForgeSaveUserInfo , ForgeCheckEmail } from '@/service/user' +import { LoginIn, getUserInfo, getNavigationInfo , getCount , getZoneList , ForgeLogin , getEducoderUserInfo , ForgeCheckName , ForgeSaveUserInfo , ForgeCheckEmail } from '@/service/user' export interface UserModelState { name: string @@ -27,7 +27,8 @@ export interface UserModelType { ForgeCheckName:Effect, ForgeCheckEmail:Effect, ForgeSaveUserInfo:Effect, - ForgeGetZoneList:Effect + ForgeGetZoneList:Effect, + GetCount:Effect } reducers: { save: Reducer @@ -77,6 +78,10 @@ const UserModel: UserModelType = { payload: { showPopLogin: payload.showPopLogin, showClosable: payload.showClosable }, }) }, + *GetCount({ payload }, { call, put }) { + const response = yield call(getCount, { ...payload}) + return response; + }, *ForgeLogin({ payload }, { call, put }) { const { to } = payload const response = yield call(ForgeLogin, { ...payload }) @@ -93,7 +98,7 @@ const UserModel: UserModelType = { }, *getUserInfo({ payload }, { call, put }) { // location.search,,debug:"admin" - const response = yield call(getUserInfo, { ...payload}) + const response = yield call(getUserInfo, { ...payload,debug:"admin"}) localStorage.userInfo = JSON.stringify(response); yield put({ diff --git a/src/pages/Competitions/Entered/index.tsx b/src/pages/Competitions/Entered/index.tsx index b6cef6dfd..3ab4b1dbe 100644 --- a/src/pages/Competitions/Entered/index.tsx +++ b/src/pages/Competitions/Entered/index.tsx @@ -127,8 +127,8 @@ const competitionDetails: FC = ({ }, [identifier]) useEffect(() => { - setDocumentTitle('在线竞赛'); - }); + setDocumentTitle('第七届CCF开源创新大赛'); + },[]); async function selectlist(keyword: any) { let data = await dispatch({ type: 'competitions/getTeamList', diff --git a/src/pages/Competitions/Index/index.tsx b/src/pages/Competitions/Index/index.tsx index f7f4a25ea..81e3edc13 100755 --- a/src/pages/Competitions/Index/index.tsx +++ b/src/pages/Competitions/Index/index.tsx @@ -93,7 +93,7 @@ const competitionsIndexPage: FC = ({ }); }, [competitions.name]); useEffect(() => { - setDocumentTitle('在线竞赛'); + setDocumentTitle('第七届CCF开源创新大赛'); }); async function getHomeNotice() { @@ -187,7 +187,11 @@ const competitionsIndexPage: FC = ({ } function tourl(url: string) { - openNewWindow(url); + let u = url; + if(u.indexOf('www.educoder.net') > -1){ + u = u + `?login=${user?.eduUserInfo?.login}&websiteName=gitlink`; + } + openNewWindow(u); } //创建战队 AddTeam @@ -383,7 +387,7 @@ const competitionsIndexPage: FC = ({ @@ -392,7 +396,7 @@ const competitionsIndexPage: FC = ({ diff --git a/src/pages/document.ejs b/src/pages/document.ejs index a2c0a97c0..d0e7dee08 100755 --- a/src/pages/document.ejs +++ b/src/pages/document.ejs @@ -13,21 +13,8 @@ GitLink - - - -