From 58115f8daeb7104e506a5794897a0dad29811ff5 Mon Sep 17 00:00:00 2001 From: caishi Date: Wed, 1 Sep 2021 10:25:12 +0800 Subject: [PATCH] box --- src/forge/Component/ProfileModal/Index.jsx | 16 +++++++++++++++ src/forge/Component/ProfileModal/Index.scss | 0 src/forge/Head/Header.js | 4 +++- src/modules/tpm/TPMIndexHOC.js | 22 ++++++++++++++++----- 4 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 src/forge/Component/ProfileModal/Index.jsx create mode 100644 src/forge/Component/ProfileModal/Index.scss diff --git a/src/forge/Component/ProfileModal/Index.jsx b/src/forge/Component/ProfileModal/Index.jsx new file mode 100644 index 00000000..fe3d6b7f --- /dev/null +++ b/src/forge/Component/ProfileModal/Index.jsx @@ -0,0 +1,16 @@ +import React from 'react'; +import { Modal } from 'antd'; + +import './Index.scss'; + +function ProfileModal({visible}) { + return( + +

您目前的个人资料不完整,需要补充资料以进行后续操作。是否前往补充个人信息?

+
+ ) +} +export default ProfileModal; \ No newline at end of file diff --git a/src/forge/Component/ProfileModal/Index.scss b/src/forge/Component/ProfileModal/Index.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index 628c3f3f..db0869ae 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -224,6 +224,7 @@ class NewHeader extends Component { } addMenu=(list)=>{ + console.log(this.props); return( list && list.length >0 &&
@@ -231,7 +232,8 @@ class NewHeader extends Component { { list.map((item,key)=>{ return( - (item.name !=="加入课堂" && item.name !=="加入开发项目") && {item.name} + (item.name !=="加入课堂" && item.name !=="加入开发项目") && + {item.name} ) }) } diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js index fb49e7be..51ea6b20 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,31 @@ 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 (
+ {isRender === true ? this.hideLoginDialog()} {...this.props} {...this.state} /> : ""} -
+