+
console.log(value)}
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index 402032c65..2c9dd5bd3 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/public/react/src/modules/user/usersInfo/Infos.js
@@ -253,22 +253,34 @@ class Infos extends Component{
{
data && is_current == false && data.identity =="学生" ? "" : {data && data.identity}
}
-
+
-
+
-
+
-
+
@@ -276,7 +288,9 @@ class Infos extends Component{
{/* */}
{
data && data.college_identifier &&
-
+
From 04f9948acc61360fa010013481e6e6661734d097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 14:24:10 +0800
Subject: [PATCH 04/16] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/user/usersInfo/InfosProject.js | 382 +++++++++---------
1 file changed, 191 insertions(+), 191 deletions(-)
diff --git a/public/react/src/modules/user/usersInfo/InfosProject.js b/public/react/src/modules/user/usersInfo/InfosProject.js
index cfd2bc443..33eac0e6b 100644
--- a/public/react/src/modules/user/usersInfo/InfosProject.js
+++ b/public/react/src/modules/user/usersInfo/InfosProject.js
@@ -1,192 +1,192 @@
-import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip,Pagination,Spin} from 'antd';
-import axios from 'axios';
-import NoneData from '../../courses/coursesPublic/NoneData'
-import {getImageUrl} from 'educoder';
-import "./usersInfo.css"
-import Create from './publicCreatNew'
-
-class InfosProject extends Component{
- constructor(props){
- super(props);
- this.state={
- category:undefined,
- status:undefined,
- page:1,
- per_page:16,
-
- totalCount:undefined,
- data:undefined,
- isSpin:false
- }
- }
-
- componentDidMount=()=>{
- this.setState({
- isSpin:true
- })
- let{category,status,page}=this.state;
- this.getCourses(category,status,page);
- }
-
- getCourses=(category,status,page)=>{
- let url=`/users/${this.props.match.params.username}/projects.json`;
- axios.get((url),{params:{
- category,
- status,
- page,
- per_page:this.props.is_current && category && page ==1?17:16
- }}).then((result)=>{
- if(result){
- this.setState({
- totalCount:result.data.count,
- data:result.data,
- isSpin:false
- })
- }
- }).catch((error)=>{
- console.log(error);
- })
- }
-
- //切换种类
- changeCategory=(cate)=>{
- this.setState({
- category:cate,
- page:1,
- isSpin:true
- })
- let{status}=this.state;
- this.getCourses(cate,status,1);
- }
- //切换状态
- changeStatus=(status)=>{
- this.setState({
- status:status,
- page:1,
- isSpin:true
- })
- let{category}=this.state;
- this.getCourses(category,status,1);
- }
- //切换页数
- changePage=(page)=>{
- this.setState({
- page,
- isSpin:true
- })
- let{category,status}=this.state;
- this.getCourses(category,status,page);
- }
-
- // 进入项目
- turnToCourses=(url,flag)=>{
- if(flag){
- this.props.history.push(url);
- }
- }
-
- render(){
- let{
- category,
- status,
- page,
- data,
- totalCount,
- isSpin
- } = this.state;
- let isStudent = this.props.isStudent();
- let is_current=this.props.is_current;
- return(
-
-
-
-
- )
- }
-}
+import React, { Component } from 'react';
+import { SnackbarHOC } from 'educoder';
+import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
+import {Tooltip,Pagination,Spin} from 'antd';
+import axios from 'axios';
+import NoneData from '../../courses/coursesPublic/NoneData'
+import {getImageUrl} from 'educoder';
+import "./usersInfo.css"
+import Create from './publicCreatNew'
+
+class InfosProject extends Component{
+ constructor(props){
+ super(props);
+ this.state={
+ category:undefined,
+ status:undefined,
+ page:1,
+ per_page:16,
+
+ totalCount:undefined,
+ data:undefined,
+ isSpin:false
+ }
+ }
+
+ componentDidMount=()=>{
+ this.setState({
+ isSpin:true
+ })
+ let{category,status,page}=this.state;
+ this.getCourses(category,status,page);
+ }
+
+ getCourses=(category,status,page)=>{
+ let url=`/users/${this.props.match.params.username}/projects.json`;
+ axios.get((url),{params:{
+ category,
+ status,
+ page,
+ per_page:this.props.is_current && category && page ==1?17:16
+ }}).then((result)=>{
+ if(result){
+ this.setState({
+ totalCount:result.data.count,
+ data:result.data,
+ isSpin:false
+ })
+ }
+ }).catch((error)=>{
+ console.log(error);
+ })
+ }
+
+ //切换种类
+ changeCategory=(cate)=>{
+ this.setState({
+ category:cate,
+ page:1,
+ isSpin:true
+ })
+ let{status}=this.state;
+ this.getCourses(cate,status,1);
+ }
+ //切换状态
+ changeStatus=(status)=>{
+ this.setState({
+ status:status,
+ page:1,
+ isSpin:true
+ })
+ let{category}=this.state;
+ this.getCourses(category,status,1);
+ }
+ //切换页数
+ changePage=(page)=>{
+ this.setState({
+ page,
+ isSpin:true
+ })
+ let{category,status}=this.state;
+ this.getCourses(category,status,page);
+ }
+
+ // 进入项目
+ turnToCourses=(url,flag)=>{
+ if(flag){
+ this.props.history.push(url);
+ }
+ }
+
+ render(){
+ let{
+ category,
+ status,
+ page,
+ data,
+ totalCount,
+ isSpin
+ } = this.state;
+ let isStudent = this.props.isStudent();
+ let is_current=this.props.is_current;
+ return(
+
- this.changeCategory()}>全部
- this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
- this.changeCategory("study")}>{is_current ? "我":"TA"}学习的
-
- {
- is_current &&
-
- }
- - 共参与{totalCount}个{category?category=="manage"?"发布":"学习":"项目"} - 时间最新 -
-
- {
- !isStudent && page == 1 && !category && is_current &&
-
- {
- totalCount > 15 &&
- this.turnToCourses(`${this.props.Headertop && this.props.Headertop.old_url}/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer"}}>
- {
- item.is_public==1 &&
-
-
-
- 公开
-
- }
- {
- item.can_visited ==false?
-
- )
- })
- }
-
- ![]({getImageUrl("/images/educoder/icon/lockclose.svg")})
-
:""
- }
-
- 非成员不能访问
-
- })
-
- - {item.name} -
-{item.owner.real_name}
-{item.owner.school_name}
-
-
-
- {
- item.members_count> 0 &&
-
- {item.members_count}
- }
- {
- item.issues_count> 0 &&
-
- {item.issues_count}
- }
- {
- item.changesets_count> 0 &&
-
- {item.changesets_count}
- }
-
-
-
-
- }
-
+
+
+
+ )
+ }
+}
export default InfosProject;
\ No newline at end of file
From 7a73f04bf17e3cd315c339a8f2b260f7524129a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 14:30:57 +0800
Subject: [PATCH 05/16] Merge branch 'master' of
https://bdgit.educoder.net/Hjqreturn/educoder
# Conflicts:
# public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
---
public/react/src/modules/tpm/NewHeader.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 0cb776245..2f1195644 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -702,7 +702,9 @@ submittojoinclass=(value)=>{
{/**/}
-
+ this.changeCategory()}>全部
+ this.changeCategory("manage")}>{is_current ? "我":"TA"}管理的
+ this.changeCategory("study")}>{is_current ? "我":"TA"}学习的
+
+ {
+ is_current &&
+
+ }
+ + 共参与{totalCount}个{category?category=="manage"?"发布":"学习":"项目"} + 时间最新 +
+
+ {
+ !isStudent && page == 1 && !category && is_current &&
+
+ {
+ totalCount > 15 &&
+ this.turnToCourses(`/projects/${item.id}`,item.can_visited)} style={{"cursor": "pointer"}}>
+ {
+ item.is_public==1 &&
+
+
+
+ 公开
+
+ }
+ {
+ item.can_visited ==false?
+
+ )
+ })
+ }
+
+
+
:""
+ }
+
+ 非成员不能访问
+
+
+
+ + {item.name} +
+{item.owner.real_name}
+{item.owner.school_name}
+
+
+
+ {
+ item.members_count> 0 &&
+
+ {item.members_count}
+ }
+ {
+ item.issues_count> 0 &&
+
+ {item.issues_count}
+ }
+ {
+ item.changesets_count> 0 &&
+
+ {item.changesets_count}
+ }
+
+
+
+
+ }
+
+
console.log(value)}
@@ -792,7 +794,7 @@ submittojoinclass=(value)=>{
{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":新建课堂 }
新建实训
新建实践课程
- 新建项目
+ 新建项目
From b6c33a7256de78f9519749025dc714b0b816b4af Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 20 Jul 2019 14:39:04 +0800
Subject: [PATCH 07/16] 8
---
public/react/src/modules/page/taskList/TaskList.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/page/taskList/TaskList.css b/public/react/src/modules/page/taskList/TaskList.css
index b8899ddc1..46dfd5076 100644
--- a/public/react/src/modules/page/taskList/TaskList.css
+++ b/public/react/src/modules/page/taskList/TaskList.css
@@ -26,7 +26,7 @@
height: 22px;
width: 0px;
position: absolute;
- top: 13px;
+ top: 8px;
}
#all_task_index .grades {
From 359333e8ab5cb83b1aaaf47dca5e0688655bc3df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 20 Jul 2019 14:49:59 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.js | 2 +
public/react/src/AppConfig.js | 4 +-
.../src/common/components/Notcompleted.js | 1 -
.../src/common/components/SetAppModel.js | 8 +-
.../src/modules/login/Trialapplicationysl.js | 722 ++++++++++++++++++
public/react/src/modules/tpm/NewHeader.js | 4 +-
.../react/src/modules/user/Notcompletedysl.js | 70 ++
7 files changed, 799 insertions(+), 12 deletions(-)
create mode 100644 public/react/src/modules/login/Trialapplicationysl.js
create mode 100644 public/react/src/modules/user/Notcompletedysl.js
diff --git a/public/react/src/App.js b/public/react/src/App.js
index b7658450a..28a7e977e 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -14,6 +14,7 @@ import '@icedesign/base/dist/ICEDesignBase.css';
import '@icedesign/base/index.scss';
import LoginDialog from './modules/login/LoginDialog'
+import Notcompletedysl from './modules/user/Notcompletedysl'
import Trialapplication from './modules/login/Trialapplication'
import NotFoundPage from './NotFoundPage'
@@ -264,6 +265,7 @@ class App extends Component {
-
From 881d777a846dc8ddb1c90eb0231ec0ff05bbfb7f Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 20 Jul 2019 14:38:54 +0800
Subject: [PATCH 06/16] !!
---
public/react/src/modules/page/main/CodeEvaluateView.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/page/main/CodeEvaluateView.js b/public/react/src/modules/page/main/CodeEvaluateView.js
index 16932b818..a121a53d5 100644
--- a/public/react/src/modules/page/main/CodeEvaluateView.js
+++ b/public/react/src/modules/page/main/CodeEvaluateView.js
@@ -184,9 +184,9 @@ class CodeEvaluateView extends Component {
{ headIconClass && }
{ _headLockIconClass && }
- { item.ts_mem && 消耗内存{item.ts_mem}MB }
- { item.ts_mem && item.ts_time && }
- { item.ts_time && 代码执行时长：{item.ts_time}秒 }
+ { !!item.ts_mem && 消耗内存{item.ts_mem}MB }
+ { !!item.ts_mem && !!item.ts_time && }
+ { !!item.ts_time && 代码执行时长：{item.ts_time}秒 }
diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js
new file mode 100644
index 000000000..ec7bebcda
--- /dev/null
+++ b/public/react/src/modules/login/Trialapplicationysl.js
@@ -0,0 +1,722 @@
+import React, {Component} from 'react';
+import {Redirect} from 'react-router';
+import Dialog, {
+ DialogActions,
+ DialogContent,
+ DialogContentText,
+ DialogTitle,
+} from 'material-ui/Dialog';
+import axios from 'axios';
+
+import {broadcastChannelPostMessage} from 'educoder'
+import {Tabs, Input, Checkbox, Button, notification, Menu} from 'antd';
+
+
+//试用申请
+class Trialapplicationysl extends Component {
+ // isRender控制弹出窗口显示
+ constructor(props) {
+ super(props)
+ this.state = {
+ props: props,
+ login: "",
+ Phonenumberisnotcocodes: undefined,
+ codes: "",
+ reason: "",
+ Phonenumberisnotcoreason: undefined,
+ isRenders: false,
+ seconds: 60,
+ getverificationcodes: true,
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: false,
+ readonlyInput: true,
+ user_phone_binded: props.user_phone_binded,
+ showTrial: false,
+ user: undefined,
+ borredss:"bor-reds",
+ borredssz:"bor-reds fl mr5",
+ }
+ //user_phone_binded 判断是否手机号验证
+ // console.log("Trialapplication");
+ // console.log(props);
+ }
+
+ Cancel = () => {
+ this.props.Cancel()
+ }
+
+ componentWillReceiveProps(nextProps) {
+ // console.log("46");
+ // console.log(nextProps);
+ // console.log(this.props);
+ if (nextProps.user != this.props.user) {
+ // console.log("50");
+ // console.log(nextProps.user);
+ if (nextProps.user !== undefined) {
+ // console.log("53");
+ // console.log(nextProps.user);
+ this.setState({
+ user_phone_binded: nextProps.user.user_phone_binded,
+ })
+ }
+
+
+ }
+
+
+ }
+
+
+ //初始化数据
+ componentDidMount() {
+ // console.log("53");
+ //
+ // console.log(this.props.isRenders);
+
+ if (this.props.isRenders != undefined) {
+ this.setState({
+ isRenders: this.props.isRenders
+ })
+ }
+ if (this.props.showTrial != undefined) {
+ // 判断是否返回主页的参数
+ this.setState({
+ showTrial: this.props.showTrial
+ })
+
+ }
+ axios.interceptors.response.use((response) => {
+ if (response != undefined)
+ if (response && response.data.status === 407) {
+ this.setState({
+ isRenders: true
+ })
+ }
+ return response;
+ }, (error) => {
+ //TODO 这里如果样式变了会出现css不加载的情况
+
+ });
+
+ }
+
+ //获取登入
+ loginInputonChange = (e) => {
+ // console.log(e.target.value);
+ this.setState({
+ login: e.target.value,
+ })
+
+
+ }
+ //获取申请理由
+ loginInputonChanges = (e) => {
+ // console.log(e.target.value);
+ this.setState({
+ reason: e.target.value,
+ Phonenumberisnotcoreason: undefined,
+ })
+
+
+ }
+ //获取code
+ codesonChange = (e) => {
+ this.setState({
+ codes: e.target.value,
+ Phonenumberisnotcocodes: undefined,
+ })
+ }
+
+ openNotification = (messge) => {
+ notification.open({
+ message: "提示",
+ description:
+ messge,
+ onClick: () => {
+ console.log('Notification Clicked!');
+ },
+ });
+ };
+ //倒计时
+ getverificationcode = () => {
+ if (this.state.Phonenumberisnotcobool === false) {
+ if (this.state.login.length === 0) {
+ this.setState({
+ Phonenumberisnotco: "请输入正确的手机号或邮箱",
+ })
+ return
+ } else {
+ this.setState({
+ Phonenumberisnotco: "请输入正确的手机号或邮箱",
+ })
+ }
+ return;
+ }
+ if (this.state.getverificationcodes === true) {
+ this.setState({
+ getverificationcodes: undefined,
+ })
+ let timer = setInterval(() => {
+ this.setState((preState) => ({
+ seconds: preState.seconds - 1,
+ }), () => {
+ if (this.state.seconds == 0) {
+ clearInterval(timer);
+ this.setState({
+ getverificationcodes: false,
+ seconds: 60,
+ })
+ }
+ });
+ }, 1000)
+ this.SMSverification();
+ } else {
+ this.setState({
+ getverificationcodes: undefined,
+ })
+ let timer = setInterval(() => {
+ this.setState((preState) => ({
+ seconds: preState.seconds - 1,
+ }), () => {
+ if (this.state.seconds == 0) {
+ clearInterval(timer);
+ this.setState({
+ getverificationcodes: false,
+ seconds: 60,
+
+ })
+ }
+ });
+ }, 1000)
+ this.SMSverification();
+ }
+ }
+
+ //短信验证
+ SMSverification = () => {
+ var url = `/accounts/get_verification_code.json`;
+ axios.get((url), {
+ params: {
+ login: this.state.login,
+ type: 3,
+ }
+ }).then((result) => {
+ //验证有问题{"status":1,"message":"success"}
+ // console.log(result);
+
+
+ }).catch((error) => {
+ console.log(error);
+
+ })
+ }
+
+ handleDialogClose() {
+ if (this.state.showTrial === false) {
+ this.setState({
+ isRenders: false
+ })
+ this.Cancel();
+ window.location.href = "/";
+ } else {
+ this.setState({
+ isRenders: false
+ })
+ this.Cancel();
+ }
+
+ }
+
+ postregistered = () => {
+ //提交按钮
+ if (this.state.user_phone_binded === false) {
+
+ if (this.state.Phonenumberisnotcobool === false) {
+ var iphones = "";
+ if (this.state.Phonenumberisnotco === undefined || this.state.Phonenumberisnotco === null || this.state.Phonenumberisnotco === "") {
+ iphones = "请输入手机号";
+ } else {
+ iphones = this.state.Phonenumberisnotco;
+ }
+
+ this.setState({
+ Phonenumberisnotco: iphones,
+ })
+
+ return;
+ }
+ if (this.state.codes.length === 0) {
+ this.setState({
+ Phonenumberisnotcocodes: "请输入验证码",
+ })
+ return;
+ }
+
+ }
+
+ if (this.state.reason.length === 0) {
+ this.setState({
+ Phonenumberisnotcoreason: "请输入推荐人信息或申请理由",
+ })
+ return;
+ }
+
+ var thiss = this;
+ var url = "/users/trial_apply.json";
+ axios.post(url, {
+ phone: this.state.login,
+ code: this.state.codes,
+ reason: this.state.reason,
+ }).then((result) => {
+ // console.log(result);
+ // this.onTabChange("1");
+ if(result !== undefined){
+ this.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
+ // if (this.state.showTrial === false) {
+ window.location.href = "/";
+ this.setState({
+ isRenders: false
+ })
+ this.Cancel();
+ // } else {
+ // this.setState({
+ // isRenders: false
+ // })
+ // this.Cancel();
+ //
+ // }
+ }
+ }).catch((error) => {
+
+ })
+
+
+ }
+ inputOnBlur = (e) => {
+ this.isCorrectname(e.target.value);
+ // this.Emailphonenumberverification(e.target.value, id);
+ }
+ isCorrectname = (value) => {
+ console.log(value.length);
+ if (value.length === 0) {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: false,
+ })
+ return;
+ }
+ // var telephone = $("#telephoneAdd.tianjia_phone").val();
+ var regph = /^[1][3,4,5,6,7,8][0-9]{9}$/;
+ // var email = $("#add_email.tianjia_email").val();
+ var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
+
+ // [1]手机号开头必须是1 [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
+ var stringdata = undefined;
+ if (!regph.test(value)) {
+ stringdata = "手机号格式不正确";
+ this.setState({
+ Phonenumberisnotco: stringdata,
+ Phonenumberisnotcobool: false,
+ })
+ } else {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: true,
+ })
+ return
+ }
+
+ if (!regemail.test(value)) {
+ if ((value.indexOf("@") != -1) === true) {
+ stringdata = "邮箱格式不正确";
+ } else {
+ stringdata = "手机号格式不正确";
+
+ }
+ this.setState({
+ Phonenumberisnotco: stringdata,
+ Phonenumberisnotcobool: false,
+ })
+
+ // this.Emailphonenumberverification(value)
+ return
+ } else {
+ this.setState({
+ Phonenumberisnotco: undefined,
+ Phonenumberisnotcobool: true,
+ })
+ return
+ }
+ }
+ //邮箱手机号验证
+ Emailphonenumberverification = (value) => {
+ var url = `/accounts/valid_email_and_phone.json`;
+ axios.get((url), {
+ params: {
+ login: value,
+ type: 2,
+ }
+ }).then((result) => {
+ //验证有问题{"status":1,"message":"success"}
+ // console.log(result);
+
+
+ }).catch((error) => {
+ console.log(error);
+ // this.setState({
+ // login:"",
+ // logins:"",
+ // })
+ })
+ }
+
+ //执行view
+ render() {
+ let {login, codes, reason, isRenders, user_phone_binded,borredss,borredssz, Phonenumberisnotco, getverificationcodes, Phonenumberisnotcocodes, Phonenumberisnotcoreason, seconds} = this.state;
+ // console.log("Trialapplication22222222");
+ // console.log(this.props);
+
+ return (
+ this.cancelModulationModels()} >
+ this.cancelModulationModels()} >
- {this.state.chekicmessage}
+ {this.state.chekicmessage}
+ {
+ isRenders === false ? "" :
+
+
+
+
+ )
+
+
+ }
+
+
+}
+
+export default Trialapplicationysl;
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index c672caa84..a4790ea6d 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -18,7 +18,7 @@ import Addcourses from '../courses/coursesPublic/Addcourses';
import LoginDialog from '../login/LoginDialog';
-import Trialapplication from '../login/Trialapplication'
+import Trialapplicationysl from '../login/Trialapplicationysl'
import 'antd/lib/modal/style/index.css';
@@ -629,7 +629,7 @@ submittojoinclass=(value)=>{
{/* />*/}
{/* :""*/}
{/*}*/}
-
+
+
+
+
+
+
+
+ }
+
取消
确定
diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js
index e052ed1e3..eb1627e83 100644
--- a/public/react/src/modules/courses/new/CoursesNew.js
+++ b/public/react/src/modules/courses/new/CoursesNew.js
@@ -257,7 +257,13 @@ class CoursesNew extends Component {
}
goback = () => {
- window.history.go(-1)
+
+ if(this.props.match.params.coursesId===undefined){
+ this.props.history.push("/courses");
+ }else{
+ this.props.history.push(`/courses/${this.props.match.params.coursesId}`);
+ }
+ // window.history.go(-1)
}
onCheckAllChange = (e) => {
diff --git a/public/react/src/modules/home/shixunsHome.js b/public/react/src/modules/home/shixunsHome.js
index 780691e6c..5400368ec 100644
--- a/public/react/src/modules/home/shixunsHome.js
+++ b/public/react/src/modules/home/shixunsHome.js
@@ -361,7 +361,7 @@ class ShixunsHome extends Component {
![]({getImageUrl("images/educoder/huangguan-two.png")})
- {item.name}
+ {item.username}
)
@@ -375,7 +375,7 @@ class ShixunsHome extends Component {
![]({getImageUrl("images/educoder/huangguan.png")})
- {item.name}
+ {item.username}
)
@@ -389,7 +389,7 @@ class ShixunsHome extends Component {
![]({getImageUrl("images/educoder/huangguan-three.png")})
- {item.name}
+ {item.username}
)
@@ -405,7 +405,7 @@ class ShixunsHome extends Component {
- {item.name}
+ {item.username}
)
@@ -437,7 +437,7 @@ class ShixunsHome extends Component {
- {item.name}
+ {item.username}
)
@@ -451,7 +451,7 @@ class ShixunsHome extends Component {
- {item.name}
+ {item.username}
)
@@ -465,7 +465,7 @@ class ShixunsHome extends Component {
- {item.name}
+ {item.username}
)
@@ -481,7 +481,7 @@ class ShixunsHome extends Component {
- {item.name}
+ {item.username}
)
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index c9404a792..68113f133 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -39,7 +39,7 @@ class TPMBanner extends Component {
this.state={
Forkvisible: false,
Senttothetype:false,
- Senttothevcalue:1,
+ Senttothevcalue:undefined,
courses_count:1,
course_list:[],
pagenum:1,
@@ -62,6 +62,7 @@ class TPMBanner extends Component {
isIE:false,
Forkvisibletype: false,
isSpin:false,
+ Senttothevcaluetype:false
}
}
@@ -233,12 +234,21 @@ class TPMBanner extends Component {
});
}
sendeSenttothevcalue=()=>{
+
let {Senttothevcalue}=this.state;
+
+ if(Senttothevcalue===undefined){
+ this.setState({
+ Senttothevcaluetype:true
+ })
+ return
+ }
let id = this.props.match.params.shixunId;
let url="/shixuns/" + id +"/send_to_course.json";
axios.post(url,{
course_id:Senttothevcalue
}).then((response) => {
+
this.props.showSnackbar(response.data.message);
this.setState({
Senttothetype:false,
@@ -466,6 +476,7 @@ class TPMBanner extends Component {
shixunsreplace,
hidestartshixunsreplacevalue,
Forkvisibletype,
+ Senttothevcaluetype,
isIE} = this.state;
let {shixunsDetails, shixunId, star_info, star_infos} = this.props;
let challengeBtnTipText = '';
@@ -839,7 +850,7 @@ class TPMBanner extends Component {
/>
-
12?"cdefault mb20":"cdefault mb50"}>
+
diff --git a/public/react/src/modules/tpm/TPMIndex.css b/public/react/src/modules/tpm/TPMIndex.css
index 655f58637..94d7cb0d7 100644
--- a/public/react/src/modules/tpm/TPMIndex.css
+++ b/public/react/src/modules/tpm/TPMIndex.css
@@ -191,4 +191,10 @@ body>.-task-title {
.HeaderSearch .ant-input-search .ant-input-suffix{
background: transparent !important;
+}
+
+.roundedRectangles{
+ position: absolute;
+ top: 10px;
+ right: -22px;
}
\ No newline at end of file
From c30810a19f572ca75e40608d974872e18c8b141c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 20 Jul 2019 16:06:43 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/user/FindPasswordComponent.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index f1e36bbbe..fef1e75ac 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -505,7 +505,7 @@ class LoginRegisterComponent extends Component {
// height: 346px;
return (
- 12?"cdefault ":"cdefault "}>
-
-
+ {this.state.Senttothevcaluetype===true?
12 ? "block" : "none"}}
showQuickJumper defaultCurrent={1} current={pages} pageSize={12}
total={courses_count} onChange={this.onChangesendeSenttothe}/>
From e76a2e6b79d6bc0cee1859a75061a8bc6eabb0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 20 Jul 2019 15:42:34 +0800
Subject: [PATCH 13/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/NewHeader.js | 7 +++++++
public/react/src/search/SearchPage.js | 6 ++++--
public/react/src/search/searchc.css | 5 +++++
3 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index c404aa8d5..e251ecabe 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -562,7 +562,13 @@ submittojoinclass=(value)=>{
cancelModulationModels = () => {
this.setState({isRenders: false})
}
+ inputjoinclassvalue=(e)=>{
+ this.setState({
+ tojoinclasstitle:e.target.value
+ })
+
+ }
render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
const {match ,} = this.props;
@@ -609,6 +615,7 @@ submittojoinclass=(value)=>{
// rolearr:["",""],
// console.log("618");
// console.log(user_phone_binded);
+
return (
:"")
:
- (teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+ (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
this.props.isNotMember()===false?
请选择你要发送的课堂
:""}
+
diff --git a/public/react/src/search/SearchPage.js b/public/react/src/search/SearchPage.js
index 990700983..2b5f3cbee 100644
--- a/public/react/src/search/SearchPage.js
+++ b/public/react/src/search/SearchPage.js
@@ -228,8 +228,10 @@ class SearchPage extends Component{
-
- 主讲：{item.author_name}{item.author_school_name} 任务:{item.challenges_count===undefined?0:item.challenges_count} 学习人数:{item.study_count===undefined?0:item.study_count}
+
diff --git a/public/react/src/search/searchc.css b/public/react/src/search/searchc.css
index c73680ecb..4b31e7c5d 100644
--- a/public/react/src/search/searchc.css
+++ b/public/react/src/search/searchc.css
@@ -126,4 +126,9 @@
.ziticor{
color: #777777;
font-size: 13px;
+}
+.foohter{
+ margin-top: 20px;
+ display: flex;
+ flex-direction:row;
}
\ No newline at end of file
From 2fe390a87542339ff132fcb8d23a16e515953454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 20 Jul 2019 16:01:10 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../shixunHomework/Listofworksstudentone.js | 22 +++++++++++++++----
.../shixunHomework/ShixunHomeworkPage.js | 2 +-
.../src/modules/user/FindPasswordComponent.js | 2 +-
public/react/src/modules/user/common.css | 6 +++++
4 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index a63db222c..bdd3a7de2 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -899,9 +899,23 @@ class Listofworksstudentone extends Component {
},
],
}
- //
+ console.log("902");
+ console.log("902");
+ console.log(this.props);
+
}
+ componentDidCatch(error, info){
+ console.log("-----------------------------905错误信息");
+ console.log(error);
+ console.log(info);
+ }
+ componentWillReceiveProps(nextProps) {
+ console.log("+++++++++913");
+ console.log("+++++++++915");
+ console.log("+++++++++916");
+ console.log(nextProps);
+ }
componentDidMount() {
console.log("componentDidMount");
if(this.props.isAdmin() === true){
@@ -2337,7 +2351,7 @@ class Listofworksstudentone extends Component {
(this.props.isNotMember()===false?
+
主讲：{item.author_name}
+ {item.author_school_name}
任务:{item.challenges_count===undefined?0:item.challenges_count}
+ 学习人数:{item.study_count===undefined?0:item.study_count}
计算成绩
:""):
- teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+ teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
(this.props.isNotMember()===false?
计算成绩
:"")
@@ -2628,7 +2642,7 @@ class Listofworksstudentone extends Component {
计算成绩
@@ -2793,7 +2807,7 @@ class Listofworksstudentone extends Component {
(this.props.isNotMember()===false?
计算成绩
:""):
- teacherdata&&teacherdata.homework_status[0]!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+ teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
(this.props.isNotMember()===false?
计算成绩
:"")
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index 03d69d61c..aa2e32c49 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -24,7 +24,7 @@ class ShixunHomeworkPage extends Component {
super(props);
// this.answerMdRef = React.createRef();
this.state = {
- tab: ["0"],
+ tab: 0,
jobsettingsdata: undefined,
teacherdata: undefined,
code_review: false,
diff --git a/public/react/src/modules/user/FindPasswordComponent.js b/public/react/src/modules/user/FindPasswordComponent.js
index d87bb6a4a..f1e36bbbe 100644
--- a/public/react/src/modules/user/FindPasswordComponent.js
+++ b/public/react/src/modules/user/FindPasswordComponent.js
@@ -537,7 +537,7 @@ class LoginRegisterComponent extends Component {
`}
-
+
7i5*ItXH}O~epQUU@HhV58rh1Hvd($Uc{~fs`t{WtAox?*xd!!y}DOtA`$57
zLY|)^QYobCBD`;Yr82JGz!@)1cQ*z
z!_W{i5J0S~ToGY^e4O2hiAqE@{{u?X1RqfE4-ODpTgdr&7#@aj7_q*NY;5GXwUtBQ
z)G&Bv+iaUAztw#}LwrviVMS9fBDu5#jsq<%2+KkNMRPMOEFk;(5Xq#LCpS7u{q!_n
z+Sa7-)NP@?@QOwQd_d*ESt3Dxb(Ok-0n!^A)P_QYdwMt+
z8{=?tQX5pj$F_~*0sU2^QcweFQGi+Ct@c34W?2xAmvR`1P_Qgc;&FaC4ld9%I7mZ#
zJF-|Lv$Mm=+FGRw1Ca<1EsLXgT(?8HHi}*!O8BITCRi+uwpRke7flH{;0QPd&VX94
z+LUwUb4nTYu8gYXGp@gT|J(vBK7jYWaaXz^;VbamyT1m!5Rkpir19Uq4!94r0-u4`
zq7+=!)^$KNiDG)P`&*_;$V)&8_kcG7rmJNCikZJnpcOq`ZNy>#0000
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index c404aa8d5..6f3a7d4c2 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -676,9 +676,12 @@ submittojoinclass=(value)=>{
{/*教学案例 */}
- 在线竞赛
+
+ 在线竞赛
+ 
+
教学案例
- 众包社区
+ 众包创新
交流问答
{
// onSearch={value => console.log(value)}
onPressEnter={this.onKeywordSearchKeyDown}
- style={{ width: 295 }}
+ style={{ width: 300 }}
/>
@@ -736,11 +739,11 @@ submittojoinclass=(value)=>{
<%= link_to '注册', user_join_path, :className => "ml5" %>
*/}
{ user===undefined?
-
+
this.educoderlogin()} className="mr5 color-white">登录
注册
- :user.login===""?
+ :user.login===""?
this.educoderlogin()} className="mr5 color-white">登录
注册
@@ -773,7 +776,7 @@ submittojoinclass=(value)=>{
}
{/*href="https://www.educoder.net/login"*/}
- { user===undefined?"":user.login===""?"":
找回密码
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index 5453647aa..f88bde127 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -32,6 +32,12 @@
align-items: center;
flex-direction: column;
}
+.login_sectionysl{
+ width: 100%;
+ display:flex;
+ align-items: center;
+ flex-direction: column;
+}
.loginInput {
width: 100%;
margin-bottom: 16px;
From bb1f8dccaaa109978042fda577aa840a0217ba57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 16:02:50 +0800
Subject: [PATCH 15/16] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/images/educoder/roundedRectangle.png | Bin 0 -> 720 bytes
public/react/src/AppConfig.js | 31 +++++++-------------
public/react/src/modules/tpm/NewHeader.js | 19 +++++++-----
public/react/src/modules/tpm/TPMIndex.css | 6 ++++
4 files changed, 28 insertions(+), 28 deletions(-)
create mode 100755 public/images/educoder/roundedRectangle.png
diff --git a/public/images/educoder/roundedRectangle.png b/public/images/educoder/roundedRectangle.png
new file mode 100755
index 0000000000000000000000000000000000000000..0d2d0b0dcdb359def884705254f050d1fbdcb3fb
GIT binary patch
literal 720
zcmV;>0x$iEP)
+
+
-
+
}
+
{ user===undefined?"":user.login===""?"": {
-
+
this.StudyMakeMoney()}
@@ -538,7 +538,7 @@ class LoginRegisterComponent extends Component {
-
+
找回密码