From 686e6f8a5e0400b7866406be1eb02c7ef058c590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sun, 1 Sep 2019 22:35:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E9=80=A0=E6=88=90=E7=9A=84=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/busyWork/CommonWorkPost.js | 2 +- public/react/src/modules/courses/coursesPublic/PathModal.js | 2 +- .../react/src/modules/courses/coursesPublic/SelectResource.js | 2 +- public/react/src/modules/courses/coursesPublic/ShixunModal.js | 2 +- .../src/modules/courses/coursesPublic/modal/ShixunModal2.js | 2 +- .../react/src/modules/courses/exercise/Ecerciseallbackagain.js | 2 +- .../courses/graduation/tasks/GraduationTasksSubmitedit.js | 2 +- .../courses/graduation/tasks/GraduationTasksSubmitnew.js | 2 +- .../courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js | 2 +- public/react/src/modules/message/js/MessagChat.js | 2 +- .../react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js | 2 +- .../src/modules/paths/PathDetail/DetailCardsEditAndEdit.js | 2 +- public/react/src/modules/paths/PathDetail/addCollaborators.js | 2 +- .../src/modules/tpm/shixunchild/Collaborators/Collaborators.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index 664fefd2c..edd7c7feb 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -429,7 +429,7 @@ class CommonWorkPost extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ // console.log("到达底部"); let{ search,page,limit }=this.state; diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js index b6b37559d..ec575aae8 100644 --- a/public/react/src/modules/courses/coursesPublic/PathModal.js +++ b/public/react/src/modules/courses/coursesPublic/PathModal.js @@ -126,7 +126,7 @@ class PathModal extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ if(shixunmodallist.subject_list.length===0){ return; diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js index 47ec9ac47..58edbc0b9 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectResource.js +++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js @@ -105,7 +105,7 @@ class Selectresource extends Component{ let allclientHeight=e.currentTarget.clientHeight+newscrollTop; //滑动到底判断 - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ let newpage=page+1; let url if(searchtype==="getallfiles"){ diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index a38b3f6e9..1e1cd4cdb 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -105,7 +105,7 @@ class ShixunModal extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1) { + if(e.currentTarget.scrollHeight-allclientHeight>=0) { if (shixunmodallist.shixun_list.length === 0) { return; diff --git a/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js b/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js index 5331ac014..8625fe26b 100644 --- a/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js +++ b/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js @@ -44,7 +44,7 @@ class ShixunModal extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop) let allclientHeight=e.currentTarget.clientHeight+newscrollTop - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ let {Searchvalue,type,page}=this.state; let newpage=page+1 diff --git a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js index 8aa6af17b..47cfbe3d1 100644 --- a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js +++ b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js @@ -56,7 +56,7 @@ class Ecerciseallbackagain extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ let {page,limit,datalist}=this.state; let newpage=page+1; let newdata=datalist; diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 070ca8b6d..717a8d7fb 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -282,7 +282,7 @@ class GraduationTasksSubmitedit extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ // console.log("到达底部"); let{ search,page,limit,workslist}=this.state; diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index e73c1872b..5f0bd236b 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -273,7 +273,7 @@ class GraduationTasksSubmitnew extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ // console.log("到达底部"); let{ search,page,limit }=this.state; diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js index daa0868a8..6657e65f9 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js @@ -89,7 +89,7 @@ class ShixunWorkModal extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ let {page,limit,group_list}=this.state; let newpage=page+1; let newgroup_list=group_list; diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index bd87ad90f..8e81c1797 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -87,7 +87,7 @@ class MessagChat extends Component{ let allclientHeight=e.currentTarget.clientHeight+newscrollTop; //滑动到底判断 - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ // console.log("滑动到底判断"); let {page}=this.state; let newpage=page+1 diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js index 9ed079957..288dda1f8 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js @@ -302,7 +302,7 @@ class DetailCardsEditAndAdd extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ if(ChooseShixunList.shixun_list.length===0){ return diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js index c7ca9538b..129a5ad08 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js @@ -342,7 +342,7 @@ class DetailCardsEditAndEdit extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ if(ChooseShixunList.shixun_list.length===0){ return diff --git a/public/react/src/modules/paths/PathDetail/addCollaborators.js b/public/react/src/modules/paths/PathDetail/addCollaborators.js index 646ea5ead..a6067b94d 100644 --- a/public/react/src/modules/paths/PathDetail/addCollaborators.js +++ b/public/react/src/modules/paths/PathDetail/addCollaborators.js @@ -130,7 +130,7 @@ class addCollaborators extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ // console.log("到达底部"); let id=this.props.match.params.pathId; diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js index 9fbb2d716..533723f5c 100644 --- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js +++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js @@ -375,7 +375,7 @@ class Collaborators extends Component { let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ + if(e.currentTarget.scrollHeight-allclientHeight>=0){ let {page,collaboratorList,user_name,school_name,Searchadmin} = this.state; let newpage=page+1; let newSearchadmin=Searchadmin From 931b99af8fb66ac499cef94190bffd248207d162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sun, 1 Sep 2019 23:00:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=A9=E6=94=BE?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E9=80=A0=E6=88=90=E7=9A=84=E5=BD=B1=E5=93=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/busyWork/CommonWorkPost.js | 2 +- public/react/src/modules/courses/coursesPublic/PathModal.js | 2 +- .../react/src/modules/courses/coursesPublic/SelectResource.js | 2 +- public/react/src/modules/courses/coursesPublic/ShixunModal.js | 2 +- .../src/modules/courses/coursesPublic/modal/ShixunModal2.js | 2 +- .../react/src/modules/courses/exercise/Ecerciseallbackagain.js | 2 +- .../courses/graduation/tasks/GraduationTasksSubmitedit.js | 2 +- .../courses/graduation/tasks/GraduationTasksSubmitnew.js | 2 +- .../courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js | 2 +- public/react/src/modules/message/js/MessagChat.js | 2 +- .../react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js | 2 +- .../src/modules/paths/PathDetail/DetailCardsEditAndEdit.js | 2 +- public/react/src/modules/paths/PathDetail/addCollaborators.js | 2 +- .../src/modules/tpm/shixunchild/Collaborators/Collaborators.js | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/courses/busyWork/CommonWorkPost.js b/public/react/src/modules/courses/busyWork/CommonWorkPost.js index edd7c7feb..fec3f02a1 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkPost.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkPost.js @@ -429,7 +429,7 @@ class CommonWorkPost extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ // console.log("到达底部"); let{ search,page,limit }=this.state; diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js index ec575aae8..a982e3870 100644 --- a/public/react/src/modules/courses/coursesPublic/PathModal.js +++ b/public/react/src/modules/courses/coursesPublic/PathModal.js @@ -126,7 +126,7 @@ class PathModal extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ if(shixunmodallist.subject_list.length===0){ return; diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js index 58edbc0b9..c323d1bae 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectResource.js +++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js @@ -105,7 +105,7 @@ class Selectresource extends Component{ let allclientHeight=e.currentTarget.clientHeight+newscrollTop; //滑动到底判断 - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ let newpage=page+1; let url if(searchtype==="getallfiles"){ diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index 1e1cd4cdb..e5c0edcf8 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -105,7 +105,7 @@ class ShixunModal extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0) { + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1) { if (shixunmodallist.shixun_list.length === 0) { return; diff --git a/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js b/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js index 8625fe26b..98c23e153 100644 --- a/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js +++ b/public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js @@ -44,7 +44,7 @@ class ShixunModal extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop) let allclientHeight=e.currentTarget.clientHeight+newscrollTop - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ let {Searchvalue,type,page}=this.state; let newpage=page+1 diff --git a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js index 47cfbe3d1..0deddfacf 100644 --- a/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js +++ b/public/react/src/modules/courses/exercise/Ecerciseallbackagain.js @@ -56,7 +56,7 @@ class Ecerciseallbackagain extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ let {page,limit,datalist}=this.state; let newpage=page+1; let newdata=datalist; diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js index 717a8d7fb..b603e375d 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js @@ -282,7 +282,7 @@ class GraduationTasksSubmitedit extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ // console.log("到达底部"); let{ search,page,limit,workslist}=this.state; diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index 5f0bd236b..f406f48b1 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -273,7 +273,7 @@ class GraduationTasksSubmitnew extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ // console.log("到达底部"); let{ search,page,limit }=this.state; diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js index 6657e65f9..ec245c29b 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js @@ -89,7 +89,7 @@ class ShixunWorkModal extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ let {page,limit,group_list}=this.state; let newpage=page+1; let newgroup_list=group_list; diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 8e81c1797..34494a256 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -87,7 +87,7 @@ class MessagChat extends Component{ let allclientHeight=e.currentTarget.clientHeight+newscrollTop; //滑动到底判断 - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ // console.log("滑动到底判断"); let {page}=this.state; let newpage=page+1 diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js index 288dda1f8..d1bf6e1f0 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js @@ -302,7 +302,7 @@ class DetailCardsEditAndAdd extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ if(ChooseShixunList.shixun_list.length===0){ return diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js index 129a5ad08..e98132252 100644 --- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js +++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js @@ -342,7 +342,7 @@ class DetailCardsEditAndEdit extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ if(ChooseShixunList.shixun_list.length===0){ return diff --git a/public/react/src/modules/paths/PathDetail/addCollaborators.js b/public/react/src/modules/paths/PathDetail/addCollaborators.js index a6067b94d..7a31b8775 100644 --- a/public/react/src/modules/paths/PathDetail/addCollaborators.js +++ b/public/react/src/modules/paths/PathDetail/addCollaborators.js @@ -130,7 +130,7 @@ class addCollaborators extends Component{ let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ // console.log("到达底部"); let id=this.props.match.params.pathId; diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js index 533723f5c..0212b4ba4 100644 --- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js +++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js @@ -375,7 +375,7 @@ class Collaborators extends Component { let newscrollTop=parseInt(e.currentTarget.scrollTop); let allclientHeight=e.currentTarget.clientHeight+newscrollTop; - if(e.currentTarget.scrollHeight-allclientHeight>=0){ + if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){ let {page,collaboratorList,user_name,school_name,Searchadmin} = this.state; let newpage=page+1; let newSearchadmin=Searchadmin From d5b4d6eecf9454042038c3d79f4d449889f6b023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sun, 1 Sep 2019 23:15:35 +0800 Subject: [PATCH 3/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 --- .../react/src/modules/courses/coursesPublic/PathModal.js | 7 +++---- .../react/src/modules/courses/coursesPublic/ShixunModal.js | 6 ++---- .../courses/graduation/tasks/GraduationTasksSubmitnew.js | 2 +- .../react/src/modules/paths/PathDetail/addCollaborators.js | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/PathModal.js b/public/react/src/modules/courses/coursesPublic/PathModal.js index a982e3870..9d79899aa 100644 --- a/public/react/src/modules/courses/coursesPublic/PathModal.js +++ b/public/react/src/modules/courses/coursesPublic/PathModal.js @@ -76,7 +76,8 @@ class PathModal extends Component{ shixunpath:true, shixunmodallist:result.data, newshixunmodallist:newshixunmodallists, - hometypepvisible:false + hometypepvisible:false, + page:page }) } @@ -134,9 +135,7 @@ class PathModal extends Component{ let {Searchvalue,type,page,shixunpathlist}=this.state; let newpage=page+1 this.funshixunpathlist(Searchvalue,type,true,newpage) - this.setState({ - page:newpage - }) + } } diff --git a/public/react/src/modules/courses/coursesPublic/ShixunModal.js b/public/react/src/modules/courses/coursesPublic/ShixunModal.js index e5c0edcf8..3a3e20041 100644 --- a/public/react/src/modules/courses/coursesPublic/ShixunModal.js +++ b/public/react/src/modules/courses/coursesPublic/ShixunModal.js @@ -69,7 +69,8 @@ class ShixunModal extends Component{ this.setState({ shixunmodallist: result.data, newshixunmodallist: newshixunmodallists, - hometypepvisible: false + hometypepvisible: false, + page: page }) } @@ -113,9 +114,6 @@ class ShixunModal extends Component{ let {Searchvalue, type, page} = this.state; let newpage = page + 1 this.setupdatalist(Searchvalue, type, true, newpage) - this.setState({ - page: newpage - }) } } } diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js index f406f48b1..ed2731c61 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js @@ -235,7 +235,7 @@ class GraduationTasksSubmitnew extends Component{ limit:15 }).then((result)=>{ - if(result.status===200){ + if(result){ if(result.data.status!=403){ if(types===1){ if(result.data.members.length>0){ diff --git a/public/react/src/modules/paths/PathDetail/addCollaborators.js b/public/react/src/modules/paths/PathDetail/addCollaborators.js index 7a31b8775..7323e23d0 100644 --- a/public/react/src/modules/paths/PathDetail/addCollaborators.js +++ b/public/react/src/modules/paths/PathDetail/addCollaborators.js @@ -139,7 +139,7 @@ class addCollaborators extends Component{ let url='/paths/'+id+'/search_members.json?search='+search+"&page="+newpage; axios.post(url).then((result)=>{ - if(result.status==200){ + if(result){ let list=result.data.users; let newlist=partnerList; for(var j=0; j