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

public/react/src/modules/courses/graduation/topics/index.js

@@ -352,8 +352,8 @@ onBoardsNew=()=>{
               (<React.Fragment>
                 {/* 参考普通作业 - 题库选用 */}
                 {/* <WordsBtn style="blue" className="mr30" onClick={()=>this.useFromBank()}>题库选用</WordsBtn> 正式版没有，先隐藏*/}
+                < a href={`/api/courses/${this.props.match.params.coursesId}/graduation_topics/export.xlsx`} className={"fl color-blue mr30 font-16"}>导出</a>
                 <p className="fl"><UseBank {...this.props} {...this.state} object_type={"gtopic"} useBankSuccess={this.useBankSuccess}></UseBank></p>
-                < a href={`/api/courses/${this.props.match.params.coursesId}/graduation_topics/export.xlsx`} className={"color-blue mr20 font-16"}>导出</a>
                 <WordsBtn style="blue" className="font-16" onClick={()=>this.onBoardsNew()}>新建</WordsBtn>
               </React.Fragment>):""
             }

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

@@ -187,56 +187,6 @@ class PollDetailTabForth extends Component{
 	}
 	UnifiedSetting=()=>{
 		let { unit_e_tip , unit_p_tip , publish_time , end_time ,course_group }=this.state
-		// 如果两个时间都没有填写或者只选择了截止时间则先保存设置然后弹出立即发布弹框
-		// if ( !publish_time ){
-		//   if(moment(end_time,dataformat)<=moment()){
-		//     this.setState({
-		//       unit_e_tip:"截止时间不能小于当前时间"
-		//     })
-		//   }else{
-		//     this.setState({
-		//       unit_e_tip:""
-		//     })
-
-		//     let list=[];
-		//     let pollId=this.props.match.params.pollId;
-		//     let coursesId=this.props.match.params.coursesId;
-		//     let url=`/courses/${coursesId}/polls/publish_modal.json`;
-		//     axios.get(url,{
-		//       params:{
-		//         check_ids:[pollId]
-		//       }
-		//     }).then((response) => {
-		//       if(response.data.course_info){
-		//         for(var i=0;i<response.data.course_info.length;i++){
-		//           list.push({
-		//             id:response.data.course_info[i].course_group_id,
-		//             name:response.data.course_info[i].course_group_name,
-		//           })
-		//         }
-		//         this.setState({
-		//           modalname:"立即发布",
-		//           modaltype:list.length > 0 ? 1 : 2,
-		//           visible:true,
-		//           Topval:"本操作只对“未发布”的对象生效",
-		//           Botvalleft:"暂不发布",
-		//           Botval:"则通过后续手动设置，定时发布",
-		//           starttime:"发布时间："+this.props.getNowFormatDates(1),
-		//           endtime:"截止时间：" + moment(end_time  || this.props.getNowFormatDates(2)).format(dataformat),
-		//           Cancelname:"暂不发布",
-		//           Savesname:"立即发布",
-		//           Cancel:this.homeworkhide,
-		//           Saves:this.homeworkstartend,
-		//           publishCourse:list,
-		//           publish_time:this.props.getNowFormatDates(1)
-		//         })
-		//       }
-		//     }).catch((error)=>{
-		//       console.log(error);
-		//     })
-
-		//   }
-		// }
 		if( this.state.un_change_unified == false){
 			if ( !publish_time ){
 				this.setState({
@@ -275,16 +225,16 @@ class PollDetailTabForth extends Component{
 					unit_e_tip:""
 				})
 			}
-			this.commitSetting((result)=>{
-				if(result.status==200){
-					this.props.showNotification(`${result.data.message}`);
-					this.getSettingInfo();
-					this.setState({
-						flagPageEdit:false
-					})
-				}
-			})
 		}
+		this.commitSetting((result)=>{
+			if(result.status==200){
+				this.props.showNotification(`${result.data.message}`);
+				this.getSettingInfo();
+				this.setState({
+					flagPageEdit:false
+				})
+			}
+		})
 	}
 
 	// 非统一设置提交

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

@@ -60,7 +60,7 @@ class PollListItem extends Component{
             }
             {
               item.polls_status ==1 && item.publish_time ==null && item.created_at &&
-              <span className="mr20 fl mt3">创建于{moment(item.created_at).format(dataformat)}</span>
+              <span className="mr20 fl mt3">创建于{moment(item.created_at).fromNow()}</span>
             }
             {
               item.polls_status ==1 && item.publish_time !=null &&