diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 8a5a48004..c7bd7d307 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -29,7 +29,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : window.location.search.indexOf('debug=s') != -1 ? 'student' : - window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || '' + window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/public/react/src/common/components/LinkAfterLogin.js b/public/react/src/common/components/LinkAfterLogin.js index d0df08f0a..e7365abba 100644 --- a/public/react/src/common/components/LinkAfterLogin.js +++ b/public/react/src/common/components/LinkAfterLogin.js @@ -8,7 +8,15 @@ class LinkAfterLogin extends Component { } checkAuth = () => { if (this.props.checkIfLogin()) { - this.props.history.push(this.props.to) + if(this.props.checkProfileComplete){ + if(this.props.checkIfProfileCompleted()){ + this.props.history.push(this.props.to) + }else{ + this.props.showProfileCompleteDialog(); + } + }else{ + this.props.history.push(this.props.to) + } } else { this.props.showLoginDialog() } diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index afe7b606a..7e3b2e0e4 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -353,8 +353,8 @@ class CoursesBanner extends Component { {AccountProfiletype===true?this.hideAccountProfile()} - {...this.state} {...this.props} + {...this.state} />:""} diff --git a/public/react/src/modules/moop_cases/CaseList.js b/public/react/src/modules/moop_cases/CaseList.js index 9bbafe98c..626b06eb8 100644 --- a/public/react/src/modules/moop_cases/CaseList.js +++ b/public/react/src/modules/moop_cases/CaseList.js @@ -94,6 +94,7 @@ class CaseList extends Component{ render(){ let { type , search ,libraries , totalCount ,pageSize ,page } = this.state; let { checkIfLogin } = this.props; + return( @@ -101,7 +102,9 @@ class CaseList extends Component{

教学案例 - 发布案例 + 发布案例 {/* 发布案例 */}

diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js index 19894e856..21165ff57 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCards.js +++ b/public/react/src/modules/paths/PathDetail/DetailCards.js @@ -330,8 +330,8 @@ class DetailCards extends Component{
{AccountProfiletype===true?this.hideAccountProfile()} - {...this.state} {...this.props} + {...this.state} />:""} this.hideAccountProfile()} - {...this.state} {...this.props} + {...this.state} />:""} diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 0b4f312e4..229c4bbae 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -310,12 +310,12 @@ export function TPMIndexHOC(WrappedComponent) { hideAccountProfile = () => { this.setState({ - hideAccountProfile: false + AccountProfiletype: false }) } showProfileCompleteDialog = () => { this.setState({ - hideAccountProfile: true + AccountProfiletype: true }) } checkIfProfileCompleted = () => { @@ -344,13 +344,13 @@ export function TPMIndexHOC(WrappedComponent) {
{isRender===true ? this.hideLoginDialog()} - {...this.state} {...this.props} + {...this.state} /> : ""} {AccountProfiletype===true ? this.hideAccountProfile()} - {...this.state} {...this.props} + {...this.state} />:""} {/* 注释掉了1440 影响到了手机屏幕的展示 */} diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index 32d92e22c..980e1d5b2 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -299,8 +299,8 @@ class Challenges extends Component { {AccountProfiletype===true?this.hideAccountProfile()} - {...this.state} {...this.props} + {...this.state} />:""} {loadingContent ?