From c64deb1dbafb1ca871f608c79c5f8eca1305dbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 23 Sep 2019 17:54:59 +0800 Subject: [PATCH 1/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 --- public/react/src/modules/paths/PathDetail/DetailTop.js | 2 +- .../react/src/modules/paths/PathDetail/PathDetailIndex.js | 5 ++++- public/react/src/modules/user/usersInfo/InfosBanner.js | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/paths/PathDetail/DetailTop.js b/public/react/src/modules/paths/PathDetail/DetailTop.js index acd851eb9..9b85f6498 100644 --- a/public/react/src/modules/paths/PathDetail/DetailTop.js +++ b/public/react/src/modules/paths/PathDetail/DetailTop.js @@ -372,7 +372,7 @@ class DetailTop extends Component{ return( -
40?"subhead mb100":"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb120":detailInfoList.name.length>40?"subhead mb100":"subhead mb80"}> +
40?"subhead mb100":"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb120":detailInfoList.name.length>40?"subhead mb100":"subhead mb80"}> {AccountProfiletype===true?this.hideAccountProfile()} {...this.props} diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js index f4ddc75ef..09f776302 100644 --- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js +++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js @@ -621,7 +621,10 @@ class PathDetailIndex extends Component{ {/*}*/}

-

{item.school}{item.identity}

+

+ {item.school} + {/*{item.identity}*/} +

diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js index f83264c9d..a3b834493 100644 --- a/public/react/src/modules/user/usersInfo/InfosBanner.js +++ b/public/react/src/modules/user/usersInfo/InfosBanner.js @@ -43,10 +43,10 @@ class InfosBanner extends Component{

{data && data.name} - { - data && is_current == false && data.identity =="学生" ? "" : - - } + {/*{*/} + {/*data && is_current == false && data.identity =="学生" ? "" : */} + {/**/} + {/*}*/}

From 06cde99cd609154f0eb568149e7afc4cfd3eb7a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 23 Sep 2019 17:58:30 +0800 Subject: [PATCH 2/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 --- .../react/src/modules/paths/PathDetail/PathDetailIndex.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js index 09f776302..b0f64abde 100644 --- a/public/react/src/modules/paths/PathDetail/PathDetailIndex.js +++ b/public/react/src/modules/paths/PathDetail/PathDetailIndex.js @@ -648,7 +648,9 @@ class PathDetailIndex extends Component{ }

-

{item.school}{item.identity}

+

{item.school} + {/*{item.identity}*/} +

{ detailInfoList===undefined?"":detailInfoList.allow_add_member===true?
@@ -677,7 +679,9 @@ class PathDetailIndex extends Component{ {/*}*/}

-

{item.school}{item.identity}

+

{item.school} + {/*{item.identity}*/} +

From afd45c2512e5907075ad2b840eeb42ca25b20638 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 24 Sep 2019 09:55: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 --- .../courses/graduation/tasks/GraduationTaskssetting.js | 6 +++--- public/react/src/modules/courses/graduation/tasks/index.js | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js index d4dec92ce..a7f886d78 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js @@ -537,7 +537,7 @@ class GraduationTaskssettingapp extends Component{ if(moment(end_time)<=moment(publish_time)){ this.setState({ endTimetypes:true, - endTimetypesval:"截止时间不能早于发布时间" + endTimetypesval:"截止时间必须晚于发布时间" }) return }else{ @@ -549,13 +549,13 @@ class GraduationTaskssettingapp extends Component{ if(moment(latetime)<=moment(publish_time)){ this.setState({ latetimetype:true, - latetimetypeval:"结束时间不能早于发布时间" + latetimetypeval:"结束时间必须晚于发布时间" }) return }else if(moment(latetime)<=moment(end_time)){ this.setState({ latetimetype:true, - latetimetypeval:"结束时间不能早于截止时间" + latetimetypeval:"结束时间必须晚于截止时间" }) return }else{ diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index ed52d5cbc..ae764cc95 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -88,7 +88,7 @@ class GraduationTasks extends Component{ savedelete=()=>{ this.setState({ - Modalstype:false, + Modalstype:false, }) let {checkAllValue,checkBoxValues,search,page,order} = this.state; // let all_check; @@ -107,9 +107,10 @@ class GraduationTasks extends Component{ if (response.data.status == 0) { // {"status":1,"message":"删除成功"} this.fetchAll(search,page,order) + this.props.showNotification(response.data.message); this.setState({ - Modalstype:true, - Modalstopval:response.data.message, + // Modalstype:true, + // Modalstopval:response.data.message, ModalsBottomval:"", ModalSave:this.cancelmodel, Loadtype:true,