diff --git a/public/images/course/guide/1-1.png b/public/images/course/guide/1-1.png new file mode 100644 index 000000000..c59467c5d Binary files /dev/null and b/public/images/course/guide/1-1.png differ diff --git a/public/images/course/guide/1-2.png b/public/images/course/guide/1-2.png new file mode 100644 index 000000000..1a4f26f38 Binary files /dev/null and b/public/images/course/guide/1-2.png differ diff --git a/public/images/course/guide/1-3.png b/public/images/course/guide/1-3.png new file mode 100644 index 000000000..f54250747 Binary files /dev/null and b/public/images/course/guide/1-3.png differ diff --git a/public/images/course/guide/1-4.png b/public/images/course/guide/1-4.png new file mode 100644 index 000000000..6ecd3bfb7 Binary files /dev/null and b/public/images/course/guide/1-4.png differ diff --git a/public/images/course/guide/1-5.png b/public/images/course/guide/1-5.png new file mode 100644 index 000000000..c4205496d Binary files /dev/null and b/public/images/course/guide/1-5.png differ diff --git a/public/images/course/guide/1-6.png b/public/images/course/guide/1-6.png new file mode 100644 index 000000000..5d5f76f7f Binary files /dev/null and b/public/images/course/guide/1-6.png differ diff --git a/public/images/course/guide/1-7.png b/public/images/course/guide/1-7.png new file mode 100644 index 000000000..65cadf0c7 Binary files /dev/null and b/public/images/course/guide/1-7.png differ diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 3a1ab9331..363a83187 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -7,6 +7,7 @@ import CoursesListType from '../coursesPublic/CoursesListType'; import Addcourses from '../coursesPublic/Addcourses'; import '../css/Courses.css'; import Modals from "../../modals/Modals"; +import Guide from './CoursesGuide'; import AddStudentModal from '../members/modal/AddStudentModal' import AddTeacherModal from '../members/modal/AddTeacherModal' @@ -43,6 +44,7 @@ class CoursesBanner extends Component { modalsBottomval: "", antIcon:false, coursedata:undefined, + is_guide:false } } componentDidMount() { @@ -323,13 +325,15 @@ class CoursesBanner extends Component { postsettings=()=>{ window.location.href = "/courses/" + this.props.match.params.coursesId + "/settings"; } - render() { - let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon} = this.state; + let { Addcoursestypes, coursedata, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide} = this.state; return (
- + { + is_guide && + } + { coursedata === undefined || coursedata.status===401?
:
diff --git a/public/react/src/modules/courses/coursesDetail/CoursesGuide.js b/public/react/src/modules/courses/coursesDetail/CoursesGuide.js new file mode 100644 index 000000000..b47998d9d --- /dev/null +++ b/public/react/src/modules/courses/coursesDetail/CoursesGuide.js @@ -0,0 +1,44 @@ +import React, {Component} from 'react'; +import '../css/Courses.css'; +import {setImagesUrl} from 'educoder'; + + +class CoursesGuide extends Component { + constructor(props) { + super(props) + this.state={ + step:1 + } + } + render(){ + let {step} = this.state; + return( +
+ +
+ { + step ==1 && +
+

+

+

+ + +

+

+ + + +

+
+ } +
+
+ ) + } +} +export default CoursesGuide; \ No newline at end of file diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css index a5c42cd69..8a84fc402 100644 --- a/public/react/src/modules/courses/css/Courses.css +++ b/public/react/src/modules/courses/css/Courses.css @@ -1520,3 +1520,23 @@ input.ant-input-number-input:focus { border-bottom: 1px solid transparent !important; } + +/* 指引 */ +.guidePanel{ + position: fixed; + top:0px; + left: 0px; + width: 100%; + height: 100%; + background: rgba(0,0,0,0.7); + z-index: 10000; +} +.guideFirstRight{ + position: absolute; + right: -90px; +} +.guideFirstLeft{ + position: absolute; + left: -95px; + top:120px; +} \ No newline at end of file diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js index 4d6c6777b..06523bb38 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js @@ -224,11 +224,11 @@ class GraduateTaskItem extends Component{ {/* {discussMessage.author.name} */} - {discussMessage.commit_count===undefined?"":{discussMessage.commit_count} 已交} - {discussMessage.uncommit_count===undefined?"":{discussMessage.uncommit_count} 未交} + {discussMessage.commit_count===undefined?"":{discussMessage.commit_count} 已交} + {discussMessage.uncommit_count===undefined?"":{discussMessage.uncommit_count} 未交} {/*{discussMessage.replies_count} 3 未评*/} - {discussMessage.status_time} + {discussMessage.status_time} {/* { discussMessage.replies_count != 0 && {discussMessage.replies_count} 回复 } diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js index 4af26d698..e86923cbc 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js +++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js @@ -7,6 +7,7 @@ import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom"; // import "antd/dist/antd.css"; import { getImageUrl, toPath, getUrl } from 'educoder'; +import '../../courses/css/Courses.css' import axios from 'axios';