diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 4f12bce66..c96ba7abd 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -1011,7 +1011,7 @@ class Fileslists extends Component{
                     :"":""}
 
                   {this.props.isAdmin()?<li className="li_line drop_down">
-                    移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                    移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 
                     <style>
                       { `
diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js
index 421faf93b..d30cf6223 100644
--- a/public/react/src/modules/courses/boards/index.js
+++ b/public/react/src/modules/courses/boards/index.js
@@ -387,7 +387,7 @@ class Boards extends Component{
                 { coursedata && !!coursedata.course_public && <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onSetToOpen}>设为公开</a></li> }
 
                 <li className="li_line drop_down">
-                  移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                   <ul className="drop_down_menu"
                       style={{"right":"0px","left":"unset", maxHeight: '318px', overflowY: 'auto',  minWidth: '200px'}}>
                     { boards && boards.length > 10 && <p className="drop_down_search">
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index e45d016bb..1b3812724 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -442,16 +442,17 @@ class CommonWorkList extends Component{
     if (val === ""||val===undefined) {
       this.setState({
         search: undefined,
-        searchtypes:false
+        searchtypes:false,
+        page:1
       })
     }else{
       this.setState({
         searchtypes:true,
-        loadingstate:true
+        loadingstate:true,
+        page:1
       })
     }
-
-    this.fetchList()
+    this.fetchList(1)
   }
   onSearchValueInput = (e) => {
     if (e.target.value === ""||e.target.value===undefined) {
@@ -482,8 +483,9 @@ class CommonWorkList extends Component{
     this.fetchList()
   }
 
-	_getRequestParams() {
-		const {search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work, b_order} = this.state
+	_getRequestParams(pages) {
+		let {search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work, b_order} = this.state
+    page=pages?pages:page
     return {
       page,
       search,
@@ -500,7 +502,7 @@ class CommonWorkList extends Component{
   fetchData = () => {
     this.fetchList()
   }
-  fetchList = () => {
+  fetchList = (page) => {
 			if(this.state.comwbool===true){
 				console.log('arg_course_group2');
 				console.log(this.state.arg_course_group);
@@ -515,7 +517,7 @@ class CommonWorkList extends Component{
     let courseId=this.props.match.params.coursesId;
 
     const url = `/homework_commons/${workId}/works_list.json`
-    let params = this._getRequestParams()
+    let params = this._getRequestParams(page)
     axios.post(url, params).then((response)=> {
       if (response.data) {
         this.setState({
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index aa3ab2310..b76d76b95 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -582,7 +582,7 @@ class commonWork extends Component{
                   onClick={this.addToBank}
                 >加入题库</a></li>:""}
                 <li className="li_line drop_down">
-                  移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                   <ul className="drop_down_menu"
                       style={{"right":"0px","left":"unset", maxHeight: '318px', overflowY: 'auto',  minWidth: '200px'}}>
                     { course_module && course_module.length > 10 && <p className="drop_down_search">
diff --git a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
index c51b9a813..56eaab65a 100644
--- a/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
+++ b/public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js
@@ -49,6 +49,7 @@ class OneSelfOrderModal extends Component{
 						let arr = this.props.course_groups.map(item => item.id);
 						let newarr = [];
 						let course_groups = this.props.course_groups;
+
 						course_groups.map((item, key) => {
 							if (item.end_time === null) {
 								// if(this.props.starttimesend===undefined){
@@ -56,7 +57,12 @@ class OneSelfOrderModal extends Component{
 								// }else{
 								// 	item.end_time = moment(handleDateString(this.props.starttimesend)).format("YYYY-MM-DD HH:mm");
 								// }
-								item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
+								if(this.props.starttimesend){
+									item.end_time = moment(moment(handleDateString(this.props.starttimesend))).format("YYYY-MM-DD HH:mm");
+								}else{
+									item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
+								}
+
 								newarr.push(item)
 							} else {
 								newarr.push(item)
@@ -101,7 +107,12 @@ class OneSelfOrderModal extends Component{
 						let course_groups=this.props.course_groups;
 						course_groups.map((item,key)=>{
 							if(item.end_time===null){
-								item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
+								// item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
+								if(this.props.starttimesend){
+									item.end_time = moment(moment(handleDateString(this.props.starttimesend))).format("YYYY-MM-DD HH:mm");
+								}else{
+									item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
+								}
 								newarr.push(item)
 							}else{
 								newarr.push(item)
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 76c113891..6c1877926 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -860,7 +860,7 @@ class studentsList extends Component{
               <div className="studentList_operation_ul">
                 {/* {isAdmin && <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>} */}
                 {isAdmin && !isStudentPage && <li className="drop_down">
-                  移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                   <ul className="drop_down_menu" style={{"right":"0px","left":"unset", width: '200px', maxHeight: '324px', overflowY: 'auto'}}>
                     {
                       course_groups && course_groups.length > 9 ?
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index f9d059669..f58cdfee8 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -1256,7 +1256,7 @@ class ShixunHomework extends Component{
                 </li>
                 <li className="li_line drop_down"  onMouseEnter={this.updadatalist}>
                   {/*onClick={()=>this.selectBlank(4)}*/}
-                  移动到...<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+                  移动到目录<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                 <ul className="drop_down_menu"  style={{"right":"0px","left":"unset", maxHeight: '318px', overflowY: 'auto',  minWidth: '200px'}}>
                   { course_modules&&course_modules.homework_category.length > 10 && <p className="drop_down_search">
                     <Input placeholder="搜索" value={this.state.dirSearchValue} onChange={(e) => {this.setState({dirSearchValue: e.target.value})}}/>