Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js

@@ -285,7 +285,7 @@ class GraduationTasksSubmitedit extends Component{
 
       let{ search,page,limit,workslist}=this.state;
 
-      let newpage=page+2
+      let newpage=page+1
 
       this.searchList(search,newpage,limit,workslist.task_id,1)
 

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js

@@ -271,20 +271,27 @@ class GraduationTasksSubmitnew extends Component{
 
 
   contentViewScroll=(e)=>{
-    //滑动到底判断
+
+
+		//滑动到底判断
+		const {memberslist} = this.state;
 		let newscrollTop=parseInt(e.currentTarget.scrollTop);
 		let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
-
 		if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1||e.currentTarget.scrollHeight-allclientHeight===-1){
-      // console.log("到达底部");
 
-     let{ search,page,limit }=this.state;
+			if(memberslist.length===0){
+				return;
+			}else{
+				let{ search,page,limit }=this.state;
 
-       let newpage=page+2
+				let newpage=page+1
+
+				this.searchList(search,newpage,limit,1)
+
+			}
+		}
 
-      this.searchList(search,newpage,limit,1)
 
-    }
 
   }
 

public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js

@@ -992,7 +992,7 @@ class GraduationTaskssettingapp extends Component{
                 }
                 {/*内容*/}
                 {task_type===2?<div className="stud-class-set bor-bottom-greyE pd20 edu-back-white pl30" >
-                    <div className={"xingrequired font-16 color-dark h20 mb20"}>分组设置 <span className={"font-14 color-grey-c"}>（提交作品时需要关联同组成员，组内成员作品共享）</span></div>
+                    <div className={"xingrequired font-16 color-dark h20 mb20"}>分组设置 <span className={"font-14 color-grey-c"}></span></div>
                     <div className={"mb30 h20 ml40"}>
                       <Input className={numtype===true?"noticeTip mr20":"mr20"} style={{ width:"100px" }} value={minnum}  onInput={this.setminnum}  disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true}/>
                       <span className="mr20">~</span>