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

public/react/src/modules/courses/coursesPublic/OneSelfOrderModal.js

@@ -51,20 +51,21 @@ class OneSelfOrderModal extends Component{
 						let course_groups = this.props.course_groups;
 
 						course_groups.map((item, key) => {
+							console.log(item)
 							if (item.end_time === null) {
 								// if(this.props.starttimesend===undefined){
 								// 	item.end_time = moment(moment(handleDateString(this.props.staytime)).add(1, 'week')).format("YYYY-MM-DD HH:mm");
 								// }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");
+								newarr.push(item)
+							} else {
 								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)
 							}
 						})
@@ -108,14 +109,15 @@ class OneSelfOrderModal extends Component{
 						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");
+								newarr.push(item)
+							}else{
 								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)
 							}
 						})
 						this.setState({
@@ -399,7 +401,7 @@ class OneSelfOrderModal extends Component{
 										{/*{this.props.starttime}</span>*/}
 									{this.props.modaltype===undefined||this.props.modaltype===2?	<span className={"font-14 color979797"}>
 									{/*{this.props.endtime}*/}
-								  <span className={"mr10"}>截止时间</span>
+								  <span className={"mr10"}>截止时间1</span>
 									<DatePicker
 										dropdownClassName="hideDisable"
 										showTime={{ format: 'HH:mm' }}
@@ -444,7 +446,7 @@ class OneSelfOrderModal extends Component{
 							|| this.props.usingCheckBeforePost ?"":<div className="clearfix edu-txt-center lineh-40 F4FAFF">
 								<li style={{ width: '100%',padding: "0px 10px"}} className={"mb10"}>
 									<span style={{"float":"left","color":"#05101A"}} className="task-hide color-grey-name color-grey-9">分班名称</span>
-									<span style={{"float":"right","color":"#05101A","margin-right": "145px"}} className="task-hide color-grey-name color-grey-9">截止时间</span>
+									<span style={{"float":"right","color":"#05101A","margin-right": "145px"}} className="task-hide color-grey-name color-grey-9">截止时间2</span>
 								</li>
 							</div>}
 							{this.props.modaltype===undefined||this.props.modaltype===2

public/react/src/modules/courses/poll/PollDetailTabFirst.js

@@ -60,8 +60,11 @@ class PollDetailTabFirst extends Component{
     })
   }
   searchInfo=()=>{
-		let {order, search, commit_status, poll_group_id, page, order_type} = this.state
+		let {order, search, commit_status, poll_group_id, page, order_type} = this.state;
-		this.getTableList(order, search, commit_status, poll_group_id, page, order_type);
+		this.setState({
+      page:1
+    })
+		this.getTableList(order, search, commit_status, poll_group_id, 1, order_type);
   }
 
   // 获取接口数据