From 6e47803988303b1a8c98ce141a680af11e753024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 5 Jul 2019 16:59:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/Listofworks.js | 2 +- .../courses/shixunHomework/Listofworksstudentone.js | 2 +- public/react/src/modules/login/LoginDialog.js | 11 +++++++---- public/react/src/modules/tpm/NewHeader.js | 1 + 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 09516a5f9..37ad51216 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -1515,7 +1515,7 @@ class Listofworks extends Component { typelist={teacherdata === undefined ? [""] : teacherdata.homework_status} /> 返回 + href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id===undefined?"": jobsettingsdata.data.category.category_id}`}>返回 实训详情 diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index ed87ecc0d..4e9cb3e00 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1005,7 +1005,7 @@ class Listofworksstudentone extends Component { > {jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name} + to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_id === undefined ? "" : jobsettingsdata.data.category.category_id}`}>{jobsettingsdata === undefined ? "" : jobsettingsdata.data.category.category_name} > 作业详情

diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 9bcd35a1d..36a9530b9 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -317,10 +317,13 @@ class LoginDialog extends Component { }); } handleDialogClose() { - this.setState({ - isRender: false - }) - // window.location.href="/"; + if(this.props.match.path==="/"){ + this.setState({ + isRender: false + }) + }else{ + window.location.href="/"; + } } loginEDU=()=>{ diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 251f608ca..e31603f3c 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -613,6 +613,7 @@ submittojoinclass=(value)=>{ {/* isRender&& isRender === true?*/} {/* :""*/} {/*}*/} From d9ed04f79922a0688779d09142d01c2b98a7d447 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 5 Jul 2019 17:01:37 +0800 Subject: [PATCH 2/3] b --- public/react/config/webpack.config.prod.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js index 0d5ef2747..0abd707af 100644 --- a/public/react/config/webpack.config.prod.js +++ b/public/react/config/webpack.config.prod.js @@ -58,8 +58,8 @@ module.exports = { bail: true, // We generate sourcemaps in production. This is slow but gives good results. // You can exclude the *.map files from the build during deployment. - devtool: shouldUseSourceMap ? 'nosources-source-map' : false, //正式版 - //devtool: shouldUseSourceMap ? 'source-map' : false,//测试版 + // devtool: shouldUseSourceMap ? 'nosources-source-map' : false, //正式版 + devtool: shouldUseSourceMap ? 'source-map' : false,//测试版 // In production, we only want to load the polyfills and the app code. entry: [require.resolve('./polyfills'), paths.appIndexJs], output: { From b99cc427810f1158397a299ae0b751025160951b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 5 Jul 2019 17:20:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/Resource/Fileslistitem.js | 8 ++------ .../src/modules/courses/exercise/ExerciseListItem.js | 6 ++---- .../courses/graduation/tasks/GraduateTaskItem.js | 7 ++----- .../courses/graduation/topics/GraduateTopicItem.js | 10 ++++++---- .../courses/shixunHomework/ShixunhomeWorkItem.js | 6 ++---- 5 files changed, 14 insertions(+), 23 deletions(-) diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js index a2f57a8e1..404214dfc 100644 --- a/public/react/src/modules/courses/Resource/Fileslistitem.js +++ b/public/react/src/modules/courses/Resource/Fileslistitem.js @@ -215,13 +215,9 @@ class Fileslistitem extends Component{ } { - this.props.isNotMember ? discussMessage.is_lock === true ? + this.props.isNotMember ? {discussMessage.title} - : - {discussMessage.title} :"" + :"" } diff --git a/public/react/src/modules/courses/exercise/ExerciseListItem.js b/public/react/src/modules/courses/exercise/ExerciseListItem.js index f11509fc8..8ffd16937 100644 --- a/public/react/src/modules/courses/exercise/ExerciseListItem.js +++ b/public/react/src/modules/courses/exercise/ExerciseListItem.js @@ -107,11 +107,9 @@ class ExerciseListItem extends Component{ } { - this.props.isNotMember()? item.lock_status === 0 ? + this.props.isNotMember()? {item.exercise_name} - : - - {item.exercise_name}:"" + :"" } { diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index f66874330..10ce65436 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -229,12 +229,9 @@ class GraduateTaskItem extends Component{ } { - this.props.isNotMember?this.props.discussMessage.private_icon===true? + this.props.isNotMember? {discussMessage.name} - : - {discussMessage.name}:"" + :"" } diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js index c5130d299..9f61e69d4 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js @@ -70,15 +70,17 @@ class GraduateTopicItem extends Component{ `}
{ - isNotMember && discussMessage.private_icon===true ? - {discussMessage.name}: - this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name} + isNotMember? + {discussMessage.name}:"" + } { isStudent? this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:"" } - + { + isAdmin? this.toDetailPage(`${discussMessage.id}`)} className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}:"" + } { discussMessage.private_icon===true? diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index d6c96182b..06f22c87e 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -304,11 +304,9 @@ class ShixunhomeWorkItem extends Component{ } { - this.props.isNotMember?this.props.discussMessage.private_icon===true? + this.props.isNotMember? {discussMessage.name} - : - {discussMessage.name}:"" + : "" }