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

public/react/src/modules/courses/signin/component/Teacherentry.js

@@ -112,10 +112,24 @@ class Teacherentry extends Component {
 										(
 											this.props.defaultActiveKey === "1" ?
 												<div className="ws100s xaxisreverseorder">
+													{
+														item.attendance_status?
+															(
+																item.attendance_status==="ABSENCE"?
+																	<div className="qiandaobutton xiaoshou" onClick={()=>this.props.Signin(item.mode,item.id,item.attendance_code)}>
+																		签到
+																	</div>
+																	:
+																	item.attendance_status==="NORMAL"?
+																		<div className="qiandaobutton" >
+																			正常签到
+																		</div>
+																		:""
+															)
+												    :
+															""
+													}
 
-													<div className="qiandaobutton xiaoshou" onClick={()=>this.props.Signin(item.mode,item.id,item.attendance_code)}>
-														签到
-													</div>
 												</div>
 												:
 												<div className="ws100s xaxisreverseorder">

public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js

@@ -4,8 +4,9 @@ import axios from 'axios';
 import Teacherentry from "../Teacherentry";
 import NoneDatas from '../NoneDatas';
 import LoadingSpin from '../../../../../common/LoadingSpin';
+import { Modal, Button } from 'antd';
 
-import Listjihe from "../../../../question/component/Listjihe";
+const { confirm } = Modal;
 
 //在线学习
 class Teaccomponent extends Component{
@@ -34,55 +35,78 @@ class Teaccomponent extends Component{
 	}
    //截止
 	thisEnd=(attendance_id)=>{
-		const url = `/weapps/attendances/${attendance_id}/end.json`;
-		var data={
+		let thiss=this
 
-		}
-		axios.post(url, data)
-			.then((result) => {
-				if (result.data.status === 0) {
-					// try {
-					// 	this.props.showNotification(`截止成功`);
-					// }catch (e) {
-					//
-					// }
-				  this.props.getsetdatas();
-				}else{
-					this.props.showNotification(result.data.message);
+		confirm({
+			title: '提示',
+			content: '确认截止此签到吗?',
+			onOk() {
+				const url = `/weapps/attendances/${attendance_id}/end.json`;
+				var data={
 
 				}
-			}).catch((error) => {
-			//console.log(error);
-		})
+				axios.post(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							// try {
+							// 	this.props.showNotification(`截止成功`);
+							// }catch (e) {
+							//
+							// }
+							thiss.props.getsetdatas();
+						}else{
+							thiss.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+					//console.log(error);
+				})
+			},
+			onCancel() {
+
+			},
+		});
+
 	}
    //删除
 	thisdelete=(attendance_id)=>{
-		const url = `/weapps/attendances/${attendance_id}.json`;
-		var data={
-
-		}
-		axios.delete(url, data)
-			.then((result) => {
-				if (result.data.status === 0) {
-					// try {
-					// 	this.props.showNotification(`删除成功`);
-					// }catch (e) {
-					//
-					// }
-
-					this.props.getsetdatas();
-				}else{
-					this.props.showNotification(result.data.message);
+		let thiss=this
+		confirm({
+			title: '提示',
+			content: '确认删除此签到吗?',
+			onOk () {
+				const url = `/weapps/attendances/${attendance_id}.json`;
+				var data={
 
 				}
-			}).catch((error) => {
-			//console.log(error);
-		})
+				axios.delete(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							// try {
+							// 	thiss.props.showNotification(`删除成功`);
+							// }catch (e) {
+							//
+							// }
+
+							thiss.props.getsetdatas();
+						}else{
+							thiss.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+					//console.log(error);
+				})
+			},
+			onCancel() {
+
+			},
+		});
+
 	}
 
   //学生签到
 	Signin=(attendance_mode,attendance_id,code)=>{
-		debugger
+
 		const url = `/weapps/course_member_attendances.json`;
 		var data={
 

public/react/src/modules/courses/signin/teacher/Teachers_signin.js

@@ -111,6 +111,18 @@ class Students_signin extends Component{
 								leave_count:response.data.leave_count,
 								absence_count:response.data.absence_count,
 							})
+							if(response.data.attendances.length===0&&mydata.page!==1){
+								this.setState({
+									page:mydata.page-1,
+									limit:5
+								})
+								let data={
+									key: mydata.key,
+									page:mydata.page-1,
+									limit:5
+								}
+								this.gogetdatas(data);
+							}
 						}
 					 }
 			this.setState({