@@ -57,7 +58,7 @@ function Team(props){
{
checkIfLogin() &&
- 新建组织
+ {props.history.push('/organize/new')}}>新建组织
}
排序
diff --git a/src/forge/users/watch_users.js b/src/forge/users/watch_users.js
index fe8a7926..76a6e8e6 100644
--- a/src/forge/users/watch_users.js
+++ b/src/forge/users/watch_users.js
@@ -4,9 +4,13 @@ class WatcherUsers extends Component {
render() {
const {user, current_user , fetchUser } = this.props;
return (
-
- {user && user.login && }
-
+ user && user.login &&
+
);
}
}
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index fb49e7be..b9215568 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -6,6 +6,7 @@ import { Spin } from 'antd';
import './TPMIndex.css';
import LoginDialog from '../login/LoginDialog';
import EducoderAccount from '../../forge/Component/EducoderAccount';
+import ProfileModal from '../../forge/Component/ProfileModal/Index';
export function TPMIndexHOC(WrappedComponent) {
return class II extends React.Component {
@@ -24,7 +25,9 @@ export function TPMIndexHOC(WrappedComponent) {
isloginCancel: undefined,
mygetHelmetapi: null,
giteaVisible:false,
- email:undefined
+ email:undefined,
+ completeProfile:false,
+ showCP:false
}
}
@@ -151,7 +154,8 @@ export function TPMIndexHOC(WrappedComponent) {
if (response && response.data) {
this.initCommonState(response.data)
this.setState({
- tpmLoading: false
+ tpmLoading: false,
+ completeProfile:response.data.profile_completed
})
if (this.props.match.path === "/" && response.data.login) {
this.props.history.push(`/${response.data.login}`);
@@ -204,23 +208,35 @@ export function TPMIndexHOC(WrappedComponent) {
}).catch(error=>{})
}
+ showCompeleteDialog=()=>{
+ this.setState({
+ showCP:true
+ })
+ }
+
render() {
- let { isRender , current_user , giteaVisible , email } = this.state;
+ let { isRender , current_user , giteaVisible , email , completeProfile , showCP } = this.state;
const common = {
showLoginDialog: this.showLoginDialog,
checkIfLogin: this.checkIfLogin,
- resetUserInfo:this.fetchUsers
+ resetUserInfo:this.fetchUsers,
+ showCompeleteDialog:this.showCompeleteDialog
};
return (
+ {this.setState({showCP:false})}}
+ history={this.props.history}
+ />
{isRender === true ? this.hideLoginDialog()}
{...this.props}
{...this.state}
/> : ""}
-
+