From 64149719a5f78ad93ecec56024dd7cf1c3f8dc7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 25 Sep 2019 18:08:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/Resource/Fileslistitem.js | 20 +++++----- .../modules/courses/boards/BoardsListItem.js | 20 +++++----- .../courses/busyWork/CommonWorkItem.js | 20 +++++----- .../courses/exercise/ExerciseListItem.js | 20 +++++----- .../graduation/tasks/GraduateTaskItem.js | 20 +++++----- .../graduation/topics/GraduateTopicItem.js | 22 +++++----- .../src/modules/courses/poll/PollListItem.js | 20 +++++----- .../shixunHomework/ShixunhomeWorkItem.js | 20 +++++----- .../modules/paths/PathDetail/DetailCards.js | 20 +++++----- .../src/modules/paths/PathDetail/DetailTop.js | 40 +++++++++---------- public/react/src/modules/tpm/TPMBanner.js | 38 +++++++++--------- .../tpm/shixunchild/Challenges/Challenges.js | 12 +++--- 12 files changed, 136 insertions(+), 136 deletions(-) diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index 109403a3a..fe0794a18 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -32,16 +32,16 @@ class Fileslistitem extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } if(list.is_history_file===false){ // this.props.DownloadFileA(list.title,list.url) diff --git a/public/react/src/modules/courses/boards/BoardsListItem.js b/public/react/src/modules/courses/boards/BoardsListItem.js index a7d6a37e3..a833f4c39 100644 --- a/public/react/src/modules/courses/boards/BoardsListItem.js +++ b/public/react/src/modules/courses/boards/BoardsListItem.js @@ -14,16 +14,16 @@ class BoardsListItem extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } const isAdminOrStudent = this.props.isAdminOrStudent(); if (!isAdminOrStudent && discussMessage.is_public == false) { diff --git a/public/react/src/modules/courses/busyWork/CommonWorkItem.js b/public/react/src/modules/courses/busyWork/CommonWorkItem.js index 1a25dde62..0aebad415 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkItem.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkItem.js @@ -21,16 +21,16 @@ class CommonWorkItem extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } const isStudent = this.props.isStudent() if (isStudent) { diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js index e8277a438..479c9710a 100644 --- a/public/react/src/modules/courses/exercise/ExerciseListItem.js +++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js @@ -58,16 +58,16 @@ class ExerciseListItem extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } this.props.history.push(url); } diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index 40dc3792a..8ed9bb5ea 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -140,16 +140,16 @@ class GraduateTaskItem extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } this.props.history.push(url); } diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js index fc9b00c23..2027cfb3a 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js @@ -17,19 +17,19 @@ class GraduateTopicItem extends Component{ toDetailPage=(topicId)=>{ if(this.props.checkIfLogin()===false){ - this.props.showLoginDialog("iscancel") - return - } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() + this.props.showLoginDialog() return } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } let courseId=this.props.match.params.coursesId; this.props.history.push(`/courses/${courseId}/graduation_topics/${topicId}/detail`); diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js index ae79b8afb..b4c2f108e 100644 --- a/public/react/src/modules/courses/poll/PollListItem.js +++ b/public/react/src/modules/courses/poll/PollListItem.js @@ -21,16 +21,16 @@ class PollListItem extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } this.props.history.push(url); } diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index be49ad00a..74692dcb8 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -150,16 +150,16 @@ class ShixunhomeWorkItem extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } this.props.history.push(url); diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js index 9910b7f7b..d459694ef 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCards.js +++ b/public/react/src/modules/paths/PathDetail/DetailCards.js @@ -199,16 +199,16 @@ class DetailCards extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } let url = "/shixuns/" + id + "/shixun_exec.json"; diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index bc5e7e0d6..bf8c46e8f 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -248,16 +248,16 @@ class DetailTop extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } this.setState({ @@ -272,16 +272,16 @@ class DetailTop extends Component{ this.props.showLoginDialog() return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - if(this.props.checkIfProfessionalCertification()===false){ - this.props.showProfileCompleteDialog() - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.props.showProfileCompleteDialog() + // return + // } this.setState({ Modalstype:true, diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index 515f71f7f..1a16e43d6 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -168,19 +168,19 @@ class TPMBanner extends Component { return } - if(this.props.checkIfProfileCompleted()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } - - if(this.props.checkIfProfessionalCertification()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } + // if(this.props.checkIfProfileCompleted()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } + // + // if(this.props.checkIfProfessionalCertification()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } let id = this.props.match.params.shixunId; let url="/shixuns/" + id +"/search_user_courses.json"; this.setState({ @@ -405,12 +405,12 @@ class TPMBanner extends Component { return } - if(this.props.checkIfProfessionalCertification()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } let {shixunsDetails} = this.props if( shixunsDetails.shixun_status>1){ diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index c48a7b427..c956736a0 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -234,12 +234,12 @@ class Challenges extends Component { return } - if(this.props.checkIfProfessionalCertification()===false){ - this.setState({ - AccountProfiletype:true - }) - return - } + // if(this.props.checkIfProfessionalCertification()===false){ + // this.setState({ + // AccountProfiletype:true + // }) + // return + // } let { ChallengesDataList } = this.state;