diff --git a/src/forge/Component/EducoderAccount.jsx b/src/forge/Component/EducoderAccount.jsx index f5f4fb6d2..5f5e5ca81 100644 --- a/src/forge/Component/EducoderAccount.jsx +++ b/src/forge/Component/EducoderAccount.jsx @@ -1,5 +1,5 @@ import React , {forwardRef, useEffect} from 'react'; -import { Modal , Form , Input , Button } from 'antd'; +import { Modal , Form , Input , Button , message} from 'antd'; import './EAccount.scss'; import axios from 'axios'; diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index 3af73ade7..76c7ecd65 100644 --- a/src/modules/tpm/TPMIndexHOC.js +++ b/src/modules/tpm/TPMIndexHOC.js @@ -2,7 +2,7 @@ import React from 'react'; import Header from '../../forge/Head/Header' import NewFooter from '../../forge/Head/Footer'; import axios from 'axios'; -import { Spin } from 'antd'; +import { Spin , message } from 'antd'; import './TPMIndex.css'; import LoginDialog from '../login/LoginDialog'; import EducoderAccount from '../../forge/Component/EducoderAccount'; @@ -170,7 +170,7 @@ export function TPMIndexHOC(WrappedComponent) { completeProfile:response.data.profile_completed }) if(response.data && response.data.login){ - if(response.data.need_edit_info){ + if(!response.data.has_gitea_user){ this.setState({ giteaVisible:true, email:response.data.email @@ -252,7 +252,16 @@ export function TPMIndexHOC(WrappedComponent) { login={current_user && current_user.login} hideSystemNotice={this.hideSystemNotice} /> - + { + message.info('未填邮箱及密码,当前功能禁止使用'); + }} + current_user={current_user} + /> {this.setState({showCP:false})}}