m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

Browse Source
dev_oauth
杨树明 5 years ago
parent 162c120d0d d5b4d6eecf
commit 7c5d72d59c
14 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
public/react/src/modules/courses/busyWork/CommonWorkPost.js
Unescape View File

@ -429,7 +429,7 @@ class CommonWorkPost extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
// console.log("到达底部"); // console.log("到达底部");
let{ search,page,limit }=this.state; let{ search,page,limit }=this.state;

9
public/react/src/modules/courses/coursesPublic/PathModal.js
Unescape View File

@ -76,7 +76,8 @@ class PathModal extends Component{
shixunpath:true, shixunpath:true,
shixunmodallist:result.data, shixunmodallist:result.data,
newshixunmodallist:newshixunmodallists, newshixunmodallist:newshixunmodallists,
hometypepvisible:false hometypepvisible:false,
page:page
}) })
} }
@ -126,7 +127,7 @@ class PathModal extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
if(shixunmodallist.subject_list.length===0){ if(shixunmodallist.subject_list.length===0){
return; return;
@ -134,9 +135,7 @@ class PathModal extends Component{
let {Searchvalue,type,page,shixunpathlist}=this.state; let {Searchvalue,type,page,shixunpathlist}=this.state;
let newpage=page+1 let newpage=page+1
this.funshixunpathlist(Searchvalue,type,true,newpage) this.funshixunpathlist(Searchvalue,type,true,newpage)
this.setState({
page:newpage
})
} }
} }

2
public/react/src/modules/courses/coursesPublic/SelectResource.js
Unescape View File

@ -105,7 +105,7 @@ class Selectresource extends Component{
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
//滑动到底判断 //滑动到底判断
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
let newpage=page+1; let newpage=page+1;
let url let url
if(searchtype==="getallfiles"){ if(searchtype==="getallfiles"){

8
public/react/src/modules/courses/coursesPublic/ShixunModal.js
Unescape View File

@ -69,7 +69,8 @@ class ShixunModal extends Component{
this.setState({ this.setState({
shixunmodallist: result.data, shixunmodallist: result.data,
newshixunmodallist: newshixunmodallists, newshixunmodallist: newshixunmodallists,
hometypepvisible: false hometypepvisible: false,
page: page
}) })
} }
@ -105,7 +106,7 @@ class ShixunModal extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1) { if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1) {
if (shixunmodallist.shixun_list.length === 0) { if (shixunmodallist.shixun_list.length === 0) {
return; return;
@ -113,9 +114,6 @@ class ShixunModal extends Component{
let {Searchvalue, type, page} = this.state; let {Searchvalue, type, page} = this.state;
let newpage = page + 1 let newpage = page + 1
this.setupdatalist(Searchvalue, type, true, newpage) this.setupdatalist(Searchvalue, type, true, newpage)
this.setState({
page: newpage
})
} }
} }
} }

2
public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js
Unescape View File

@ -44,7 +44,7 @@ class ShixunModal extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop) let newscrollTop=parseInt(e.currentTarget.scrollTop)
let allclientHeight=e.currentTarget.clientHeight+newscrollTop let allclientHeight=e.currentTarget.clientHeight+newscrollTop
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
let {Searchvalue,type,page}=this.state; let {Searchvalue,type,page}=this.state;
let newpage=page+1 let newpage=page+1

2
public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
Unescape View File

@ -56,7 +56,7 @@ class Ecerciseallbackagain extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
let {page,limit,datalist}=this.state; let {page,limit,datalist}=this.state;
let newpage=page+1; let newpage=page+1;
let newdata=datalist; let newdata=datalist;

2
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
Unescape View File

@ -282,7 +282,7 @@ class GraduationTasksSubmitedit extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
// console.log("到达底部"); // console.log("到达底部");
let{ search,page,limit,workslist}=this.state; let{ search,page,limit,workslist}=this.state;

4
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
Unescape View File

@ -235,7 +235,7 @@ class GraduationTasksSubmitnew extends Component{
limit:15 limit:15
}).then((result)=>{ }).then((result)=>{
if(result.status===200){ if(result){
if(result.data.status!=403){ if(result.data.status!=403){
if(types===1){ if(types===1){
if(result.data.members.length>0){ if(result.data.members.length>0){
@ -273,7 +273,7 @@ class GraduationTasksSubmitnew extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
// console.log("到达底部"); // console.log("到达底部");
let{ search,page,limit }=this.state; let{ search,page,limit }=this.state;

2
public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
Unescape View File

@ -89,7 +89,7 @@ class ShixunWorkModal extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
let {page,limit,group_list}=this.state; let {page,limit,group_list}=this.state;
let newpage=page+1; let newpage=page+1;
let newgroup_list=group_list; let newgroup_list=group_list;

2
public/react/src/modules/message/js/MessagChat.js
Unescape View File

@ -87,7 +87,7 @@ class MessagChat extends Component{
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
//滑动到底判断 //滑动到底判断
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
// console.log("滑动到底判断"); // console.log("滑动到底判断");
let {page}=this.state; let {page}=this.state;
let newpage=page+1 let newpage=page+1

2
public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
Unescape View File

@ -302,7 +302,7 @@ class DetailCardsEditAndAdd extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
if(ChooseShixunList.shixun_list.length===0){ if(ChooseShixunList.shixun_list.length===0){
return return

2
public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
Unescape View File

@ -342,7 +342,7 @@ class DetailCardsEditAndEdit extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
if(ChooseShixunList.shixun_list.length===0){ if(ChooseShixunList.shixun_list.length===0){
return return

4
public/react/src/modules/paths/PathDetail/addCollaborators.js
Unescape View File

@ -130,7 +130,7 @@ class addCollaborators extends Component{
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
// console.log("到达底部"); // console.log("到达底部");
let id=this.props.match.params.pathId; let id=this.props.match.params.pathId;
@ -139,7 +139,7 @@ class addCollaborators extends Component{
let url='/paths/'+id+'/search_members.json?search='+search+"&page="+newpage; let url='/paths/'+id+'/search_members.json?search='+search+"&page="+newpage;
axios.post(url).then((result)=>{ axios.post(url).then((result)=>{
if(result.status==200){ if(result){
let list=result.data.users; let list=result.data.users;
let newlist=partnerList; let newlist=partnerList;
for(var j=0; j<list.length;j++){ for(var j=0; j<list.length;j++){

2
public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
Unescape View File

@ -375,7 +375,7 @@ class Collaborators extends Component {
let newscrollTop=parseInt(e.currentTarget.scrollTop); let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop; let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){ 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 {page,collaboratorList,user_name,school_name,Searchadmin} = this.state;
let newpage=page+1; let newpage=page+1;
let newSearchadmin=Searchadmin let newSearchadmin=Searchadmin

Write Preview
Loading…
Cancel
Save