From 978c9a456d1d77943c975384b5af6c679693e06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 21 Nov 2019 09:12:41 +0800 Subject: [PATCH 01/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/courses/members/studentsList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js index ac0f81356..1f15303f7 100644 --- a/public/react/src/modules/courses/members/studentsList.js +++ b/public/react/src/modules/courses/members/studentsList.js @@ -749,7 +749,7 @@ class studentsList extends Component{ {invite_code} -
成员可以通过邀请码主动加入课堂
+
成员可以通过邀请码主动加入分班
点击立刻复制邀请码
}> From 39916bb9f0926ce01e5cb8ab07eeab6ba2e9cd9c Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 21 Nov 2019 10:06:38 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=85=8B=E9=9A=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/gits_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/gits_controller.rb b/app/controllers/gits_controller.rb index 850458e65..bbb0e293e 100644 --- a/app/controllers/gits_controller.rb +++ b/app/controllers/gits_controller.rb @@ -69,7 +69,7 @@ class GitsController < ApplicationController else uid_logger_error("shixun is not exist") # result = false - result = false # 为了测试跳出 + result = true # 为了测试跳出 end end end From 4a8bb8ef9d6053f2d7c7a3ed22fa30e103f4a0c5 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 21 Nov 2019 10:48:25 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E5=AE=9E=E5=90=8D=E3=80=81=E8=81=8C?= =?UTF-8?q?=E4=B8=9A=E8=AE=A4=E8=AF=81=E5=BC=B9=E6=A1=86=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/user/modal/RealNameCertificationModal.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/react/src/modules/user/modal/RealNameCertificationModal.js b/public/react/src/modules/user/modal/RealNameCertificationModal.js index 52fcfa405..1ef3ec405 100644 --- a/public/react/src/modules/user/modal/RealNameCertificationModal.js +++ b/public/react/src/modules/user/modal/RealNameCertificationModal.js @@ -534,6 +534,8 @@ class RealNameCertificationModal extends Component{ 5.我们会确保你所提供的信息均处于严格的保密状态，不会泄露；

6.如存在恶意乱填写姓名，证件号，及上传与实名认证证件无关图片者，一经发现将冻结EduCoder账号。 +

+ 7.提交实名认证后系统会自动将状态改为已认证，你将可以开始体验平台需要实名认证的功能。

:
@@ -551,6 +553,9 @@ class RealNameCertificationModal extends Component{

6.如存在恶意乱填写姓名，学号，及上传与职业证件无关图片者，一经发现将冻结EduCoder账号。

+

+ 7.非老师身份提交职业认证后系统会自动将状态改为已认证，你将可以开始体验平台需要职业认证的功能。 +

} > From de4ad7ce08658feb1700dd505c7513e294c73f32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 21 Nov 2019 11:08:16 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E9=BB=91=E5=AE=A2=E6=9D=BE=E9=9C=80?= =?UTF-8?q?=E6=B1=82=E8=B0=83=E6=95=B4=20=E8=AF=BE=E5=A0=82=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=94=A8=E6=88=B7=E6=8F=90=E7=A4=BA=E4=BD=93?= =?UTF-8?q?=E9=AA=8C=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesDetail/CoursesBanner.js | 36 ++++++++++++++----- .../shixunreport/ConclusionEvaluation.js | 14 ++++++-- .../src/modules/osshackathon/Osshackathon.css | 2 -- .../src/modules/osshackathon/Osshackathon.js | 1 + .../react/src/modules/user/AccountProfile.js | 29 ++++++++------- 5 files changed, 56 insertions(+), 26 deletions(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index 503c73a10..bf1ac2bc0 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -130,16 +130,29 @@ class CoursesBanner extends Component { axios.get(url,{params: dataqueryss }).then((result) => { - if( result!=undefined){ - let data = result.data; - this.setState({ - coursedata: data, - excellent:data.excellent, - }) - this.props.ispostexcellenttype(data.excellent) + debugger + if(result.data.status===-2){ + this.setState({ + AccountProfiletype:true, + content:result.data.message, + okText:"立即认证", + cannelText:"稍后认证", + okHref:`/account/certification`, + Accounturltype:true + }) }else{ - this.onloadupdatabanner() + if( result!=undefined){ + let data = result.data; + this.setState({ + coursedata: data, + excellent:data.excellent, + }) + this.props.ispostexcellenttype(data.excellent) + }else{ + this.onloadupdatabanner() + } } + }) }; foo=(url)=> { @@ -452,7 +465,12 @@ class CoursesBanner extends Component { hideAccountProfile=()=>{ this.setState({ - AccountProfiletype:false + AccountProfiletype:false, + content:undefined, + okText:undefined, + okHref:undefined, + cannelText:undefined, + Accounturltype:undefined }) }; ysljoinmodalCancel=()=>{ diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js index 5430b9e8c..e9771157c 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js @@ -1,6 +1,6 @@ import React, {Component} from "react"; import {WordsBtn} from 'educoder'; -import {Table,Tooltip,} from "antd"; +import {Table,Tooltip} from "antd"; import {Link,Switch,Route,Redirect} from 'react-router-dom'; class ConclusionEvaluation extends Component { @@ -23,10 +23,18 @@ class ConclusionEvaluation extends Component { dataIndex: 'type', key: 'type', render: (text, record) => ( - {record.type} + + 按照总分的百分比评价，而不是分值
+ [90,100]优秀
+ [70,90]良好
+ [60,70]及格
+ [0,60]不及格
+ + }> {record.type} ), }, { - title: '获得经验值', + title:获得经验值, dataIndex: 'empirical', key: 'empirical', render: (text, record) => ( diff --git a/public/react/src/modules/osshackathon/Osshackathon.css b/public/react/src/modules/osshackathon/Osshackathon.css index 679f4afb0..227bd1150 100644 --- a/public/react/src/modules/osshackathon/Osshackathon.css +++ b/public/react/src/modules/osshackathon/Osshackathon.css @@ -37,11 +37,9 @@ } .OsshackathonCardtitle{ - height:24px; font-size:24px; font-weight:400; color:rgba(5,16,26,1); - line-height:24px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/public/react/src/modules/osshackathon/Osshackathon.js b/public/react/src/modules/osshackathon/Osshackathon.js index 7edc18d63..c48b4b656 100644 --- a/public/react/src/modules/osshackathon/Osshackathon.js +++ b/public/react/src/modules/osshackathon/Osshackathon.js @@ -357,6 +357,7 @@ class Osshackathon extends Component { + 报名人数：{item.hack_users_count} {item.entry_info===true?:} diff --git a/public/react/src/modules/user/AccountProfile.js b/public/react/src/modules/user/AccountProfile.js index ea8d20b8a..1774a9fd5 100644 --- a/public/react/src/modules/user/AccountProfile.js +++ b/public/react/src/modules/user/AccountProfile.js @@ -31,18 +31,23 @@ class AccountProfile extends Component { } - gotoback=()=>{ - if(this.props.AccountProfiletype!=undefined){ - this.setState({ - AccountProfiletype:false - }) - this.props.hideAccountProfile() - }else{ + gotoback=(type)=>{ + if(type===true){ window.location.href="/"; - this.setState({ - AccountProfiletype:false - }) + }else{ + if(this.props.AccountProfiletype!=undefined){ + this.setState({ + AccountProfiletype:false + }) + this.props.hideAccountProfile() + }else{ + window.location.href="/"; + this.setState({ + AccountProfiletype:false + }) + } } + } @@ -52,7 +57,7 @@ okText: '立即完成', okHref: '/account/certification' */ render() { - const { content, okText, okHref } = this.props; + const { content, okText, okHref,cannelText,Accounturltype} = this.props; return(

{content || '您需要去完善您的个人资料，才能使用此功能'}

- this.gotoback()}>稍后完善 + this.gotoback(Accounturltype)}>{cannelText ||'稍后完善'} {okText || '立即完善'}
From a911945a4c1223da4e4338b5db82754e6fcabd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 21 Nov 2019 14:08:18 +0800 Subject: [PATCH 05/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 --- .../shixunreport/ConclusionEvaluation.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js index e9771157c..8d678f335 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js +++ b/public/react/src/modules/courses/shixunHomework/shixunreport/ConclusionEvaluation.js @@ -23,18 +23,10 @@ class ConclusionEvaluation extends Component { dataIndex: 'type', key: 'type', render: (text, record) => ( - - 按照总分的百分比评价，而不是分值
- [90,100]优秀
- [70,90]良好
- [60,70]及格
- [0,60]不及格
- - }> {record.type} + {record.type} ), }, { - title:获得经验值, + title:'获得经验值', dataIndex: 'empirical', key: 'empirical', render: (text, record) => ( From c52c756b81ec62ef84e3642d9b656b14a332ef65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 21 Nov 2019 16:27:49 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E9=BB=91=E5=AE=A2=E6=9D=BE=E6=9D=83?= =?UTF-8?q?=E9=99=90=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/osshackathon/Osshackathon.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/osshackathon/Osshackathon.js b/public/react/src/modules/osshackathon/Osshackathon.js index c48b4b656..67c81381c 100644 --- a/public/react/src/modules/osshackathon/Osshackathon.js +++ b/public/react/src/modules/osshackathon/Osshackathon.js @@ -119,14 +119,11 @@ class Osshackathon extends Component { } //判断是否绑定邮箱 - if(this.props.user.email===null){ - this.props.showhideAccountPhoneemailDialog() - return - } - if(this.props.user.phone===null){ + if(this.props.user.email===null&&this.props.user.phone===null){ this.props.showhideAccountPhoneemailDialog() return } + this.props.confirm({ content: `是否确认报名?`, onOk: () => { From 5f072638e55ae573f04ad1d32b46230054f8fe32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 21 Nov 2019 16:52:25 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/statistics/Statistics.js | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index bb1ed9a09..412c7acbe 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -73,27 +73,30 @@ class Statistics extends Component{ } getDynamiclistdatas=(group_ids)=>{ - - let courseId=this.props.match.params.coursesId; - let url=`/courses/${courseId}/act_score.json`; - let data={ - group_ids:group_ids, - } - axios.get(url,{params: - data - }).then((result) => { - if (result) { + let {activeKey}=this.state; + if(activeKey==='2') { + let courseId = this.props.match.params.coursesId; + let url = `/courses/${courseId}/act_score.json`; + let data = { + group_ids: group_ids, + } + axios.get(url, { + params: + data + }).then((result) => { + if (result) { + this.setState({ + course_members: result.data.course_members, + bomisSpin: false + }) + } + }).catch((error) => { + console.log(error); this.setState({ - course_members:result.data.course_members, - bomisSpin:false + bomisSpin: false, }) - } - }).catch((error) => { - console.log(error); - this.setState({ - bomisSpin:false, }) - }) + } } getwork_scoredata=(page,group_ids,sort)=>{ From 55ab938e5497dd0fcd8a8339e128f17224712e9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 21 Nov 2019 17:14:25 +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 --- .../courses/coursesDetail/CoursesBanner.js | 1 - .../modules/courses/statistics/Statistics.js | 17 ++++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index bf1ac2bc0..e880fbea9 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -130,7 +130,6 @@ class CoursesBanner extends Component { axios.get(url,{params: dataqueryss }).then((result) => { - debugger if(result.data.status===-2){ this.setState({ AccountProfiletype:true, diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index 412c7acbe..00a47a81d 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -72,9 +72,8 @@ class Statistics extends Component{ }) } - getDynamiclistdatas=(group_ids)=>{ - let {activeKey}=this.state; - if(activeKey==='2') { + getDynamiclistdatas=(group_ids,key)=>{ + if(key==='2') { let courseId = this.props.match.params.coursesId; let url = `/courses/${courseId}/act_score.json`; let data = { @@ -99,8 +98,8 @@ class Statistics extends Component{ } } - getwork_scoredata=(page,group_ids,sort)=>{ - let {activeKey}=this.state; + getwork_scoredata=(page,group_ids,sort,key)=>{ + this.setState({ page:page, sort:sort, @@ -108,7 +107,7 @@ class Statistics extends Component{ bomisSpin:true, }) - if(activeKey==='1'){ + if(key==='1'||key===undefined){ let courseId=this.props.match.params.coursesId; let url=`/courses/${courseId}/work_score.json`; let data={ @@ -144,10 +143,10 @@ class Statistics extends Component{ if(key==="1"){ let {page,group_ids,sort}=this.state; // this.getdatas() - this.getwork_scoredata(page,group_ids,sort) - }else{ + this.getwork_scoredata(page,group_ids,sort,key) + }else if(key==="2"){ let{group_ids}=this.state; - this.getDynamiclistdatas(group_ids) + this.getDynamiclistdatas(group_ids,key) } this.setState({ activeKey:key From 049bd864ad4ae7ae05e52d5ddd23f8431dbcf906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 21 Nov 2019 18:13:31 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AF=BE=E5=A0=82?= =?UTF-8?q?=E8=AE=A4=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 2 + .../courses/coursesDetail/CoursesBanner.js | 16 ++--- .../src/modules/user/Accountnewprofile.js | 69 +++++++++++++++++++ 3 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 public/react/src/modules/user/Accountnewprofile.js diff --git a/public/react/src/App.js b/public/react/src/App.js index 6b4ba7399..fedd0a3cd 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -20,6 +20,7 @@ import Trialapplicationysl from './modules/login/Trialapplicationysl'; import Trialapplicationreview from './modules/user/Trialapplicationreview'; import Addcourses from "./modules/courses/coursesPublic/Addcourses"; import AccountProfile from "./modules/user/AccountProfile"; +import Accountnewprofile from './modules/user/Accountnewprofile'; import Trialapplication from './modules/login/Trialapplication'; import Certifiedprofessional from './modules/modals/Certifiedprofessional'; import NotFoundPage from './NotFoundPage' @@ -466,6 +467,7 @@ class App extends Component { + this.Modifyloginvalue()}> diff --git a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js index e880fbea9..5f3704a33 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesBanner.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesBanner.js @@ -131,14 +131,14 @@ class CoursesBanner extends Component { dataqueryss }).then((result) => { if(result.data.status===-2){ - this.setState({ - AccountProfiletype:true, - content:result.data.message, - okText:"立即认证", - cannelText:"稍后认证", - okHref:`/account/certification`, - Accounturltype:true - }) + // this.setState({ + // AccountProfiletype:true, + // content:result.data.message, + // okText:"立即认证", + // cannelText:"稍后认证", + // okHref:`/account/certification`, + // Accounturltype:true + // }) }else{ if( result!=undefined){ let data = result.data; diff --git a/public/react/src/modules/user/Accountnewprofile.js b/public/react/src/modules/user/Accountnewprofile.js new file mode 100644 index 000000000..c8f81d340 --- /dev/null +++ b/public/react/src/modules/user/Accountnewprofile.js @@ -0,0 +1,69 @@ +import React, { Component } from 'react'; +import {getImageUrl} from 'educoder'; +import {Modal} from 'antd'; +import axios from 'axios'; +class Accountnewprofile extends Component { + constructor(props) { + super(props); + this.state = { + newAccountProfiletype:false + } + } + componentDidMount() { + axios.interceptors.response.use((response) => { + if(response!=undefined) + if (response&&response.data.status === 411) { + this.setState({ + newAccountProfiletype:true, + content:response.data.message, + okText:"立即认证", + cannelText:"稍后认证", + okHref:`/account/certification`, + }) + } + return response; + }, (error) => { + + }); + } + + gotoback=()=>{ + window.location.href="/"; + this.setState({ + newAccountProfiletype:false + }) + } + + + + /** + content: '您需要去完成您的职业认证，才能使用此功能', + okText: '立即完成', + okHref: '/account/certification' + */ + render() { + const { content, okText, okHref,cannelText} = this.state; + return( + + + + ) + } +} + +export default Accountnewprofile; \ No newline at end of file From 9ffd3a4f1a2371c5a6dff181958a559880f48ce8 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Thu, 21 Nov 2019 18:44:12 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/user/account/common.css | 35 +++++++++++++++++++ .../user/modal/RealNameCertificationModal.js | 6 ++-- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/user/account/common.css b/public/react/src/modules/user/account/common.css index c0da6f6c7..e3bdb24fd 100644 --- a/public/react/src/modules/user/account/common.css +++ b/public/react/src/modules/user/account/common.css @@ -80,4 +80,39 @@ button.ant-btn.ant-btn-primary.grayBtn { } .courseNormalForm input { height: 40px; +} +.autoModal .ant-modal-body{ + height: auto; + overflow-y: auto; +} + +@media screen and (max-height: 765px) { + .autoModal .ant-modal-body { + height: 670px; + overflow-y: auto; + } +} +@media screen and (max-height: 735px) { + .autoModal .ant-modal-body { + height: 600px; + overflow-y: auto; + } +} +@media screen and (max-height: 635px) { + .autoModal .ant-modal-body { + height: 500px; + overflow-y: auto; + } +} +@media screen and (max-height: 566px) { + .autoModal .ant-modal-body { + height: 465px; + overflow-y: auto; + } +} +@media screen and (max-height: 472px) { + .autoModal .ant-modal-body { + height: 360px; + overflow-y: auto; + } } \ No newline at end of file diff --git a/public/react/src/modules/user/modal/RealNameCertificationModal.js b/public/react/src/modules/user/modal/RealNameCertificationModal.js index 1ef3ec405..2d37c4449 100644 --- a/public/react/src/modules/user/modal/RealNameCertificationModal.js +++ b/public/react/src/modules/user/modal/RealNameCertificationModal.js @@ -516,7 +516,7 @@ class RealNameCertificationModal extends Component{ {...this.state} onOk={this.onOk} okText="保存" - className="applyForModal certificationModal courseNormalForm" + className="applyForModal certificationModal courseNormalForm autoModal" width="660px" bottomRender={ certification && certification == 1? @@ -535,7 +535,7 @@ class RealNameCertificationModal extends Component{

6.如存在恶意乱填写姓名，证件号，及上传与实名认证证件无关图片者，一经发现将冻结EduCoder账号。

- 7.提交实名认证后系统会自动将状态改为已认证，你将可以开始体验平台需要实名认证的功能。 + 7.提交实名认证后系统会自动将状态改为已认证，你将可以体验平台需要实名认证的功能；如果在认证后的使用过程中未通过审核，你将不能继续体验需要认证的功能。

:
@@ -554,7 +554,7 @@ class RealNameCertificationModal extends Component{ 6.如存在恶意乱填写姓名，学号，及上传与职业证件无关图片者，一经发现将冻结EduCoder账号。

- 7.非老师身份提交职业认证后系统会自动将状态改为已认证，你将可以开始体验平台需要职业认证的功能。 + 7.非老师身份提交职业认证后系统会自动将状态改为已认证，你将可以体验平台需要职业认证的功能；如果在认证后的使用过程中未通过审核，你将不能继续体验需要认证的功能。

} From 9650c2e086a6b54ae01148e5c2584c2b9ae5dc80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Thu, 21 Nov 2019 19:19:50 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../educoder/index/subject/subject0.jpg | Bin 18922 -> 57758 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/images/educoder/index/subject/subject0.jpg b/public/images/educoder/index/subject/subject0.jpg index fe81e407b4c5f428ed396c156cb7a49297fb08f1..08278bef54b16c6b7d6b9578e62566a508b52027 100644 GIT binary patch literal 57758 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 ZYe=A`&>NshoRP&3ky19n@ge@r{0~7nv;P19 literal 18922 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 z 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 Date: Thu, 21 Nov 2019 19:39:42 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E8=B0=83=E6=95=B4x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 1 + public/react/src/modules/login/LoginDialog.js | 1 + public/react/src/modules/user/AccountProfile.js | 1 + public/react/src/modules/user/Accountnewprofile.js | 2 ++ 4 files changed, 5 insertions(+) diff --git a/public/react/src/App.js b/public/react/src/App.js index fedd0a3cd..75eb03aad 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -349,6 +349,7 @@ class App extends Component { }); } componentDidMount() { + document.title = "loading..."; this.disableVideoContextMenu(); // force an update if the URL changes history.listen(() => { diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index a4e9c0c4f..af0b7ed1e 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -386,6 +386,7 @@ class LoginDialog extends Component { axios.interceptors.response.use((response) => { if(response!=undefined) if (response&&response.data.status === 401) { + document.title = "提示"; this.setState({ isRender: true }) diff --git a/public/react/src/modules/user/AccountProfile.js b/public/react/src/modules/user/AccountProfile.js index 1774a9fd5..ed8f94fcd 100644 --- a/public/react/src/modules/user/AccountProfile.js +++ b/public/react/src/modules/user/AccountProfile.js @@ -19,6 +19,7 @@ class AccountProfile extends Component { axios.interceptors.response.use((response) => { if (response != undefined) if (response && response.data.status === 402) { + document.title = "提示"; this.setState({ AccountProfiletype: true }) diff --git a/public/react/src/modules/user/Accountnewprofile.js b/public/react/src/modules/user/Accountnewprofile.js index c8f81d340..ee8039857 100644 --- a/public/react/src/modules/user/Accountnewprofile.js +++ b/public/react/src/modules/user/Accountnewprofile.js @@ -10,9 +10,11 @@ class Accountnewprofile extends Component { } } componentDidMount() { + axios.interceptors.response.use((response) => { if(response!=undefined) if (response&&response.data.status === 411) { + document.title = "提示"; this.setState({ newAccountProfiletype:true, content:response.data.message, From 3fb77abb5b14c4c4be7695cae4257a58f0cc75f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 22 Nov 2019 09:45:29 +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 --- .../react/src/modules/courses/coursesPublic/Newshixunmodel.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css index 82e46d489..e80556bb0 100644 --- a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css +++ b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css @@ -5,6 +5,7 @@ .newshixunheadersear{ display: flex; justify-content: center; + margin: 0 auto; } .packinput .ant-input{ height: 55px; From 92670dd1e46bd4e298757555e6ecf6b793678392 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 22 Nov 2019 09:51:50 +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 --- .../src/modules/courses/coursesPublic/NewShixunModel.js | 2 +- .../src/modules/courses/coursesPublic/Newshixunmodel.css | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js index 5fe9c8aa0..99a8ad232 100644 --- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js +++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js @@ -616,7 +616,7 @@ class NewShixunModel extends Component{ } - {shixun_list===undefined||shixuns_count===undefined?"":shixun_list.length===0||shixuns_count===0?"":shixuns_count>15?
+ {shixun_list===undefined||shixuns_count===undefined?"":shixun_list.length===0||shixuns_count===0?"":shixuns_count>15?
Date: Fri, 22 Nov 2019 09:59:01 +0800 Subject: [PATCH 15/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/AccountPhoneemail.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/AccountPhoneemail.js b/public/react/src/modules/user/AccountPhoneemail.js index cab70205d..a589d780a 100644 --- a/public/react/src/modules/user/AccountPhoneemail.js +++ b/public/react/src/modules/user/AccountPhoneemail.js @@ -65,7 +65,7 @@ class AccountPhoneemail extends Component { width="530px" >
-

您需要完成手机号码和邮箱的绑定，才能使用此功能

+

您需要完成手机号码或者邮箱的绑定，才能使用此功能

this.gotoback()}>稍后绑定 {'立即绑定'} From 15702cfabd58aab9c1fdc082373f029b512ef46a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 22 Nov 2019 14:13:44 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E8=AF=84=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/comments/_discuss.json.jbuilder | 1 - config/routes.rb | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/views/comments/_discuss.json.jbuilder b/app/views/comments/_discuss.json.jbuilder index 63bebc5a7..e9f983a47 100644 --- a/app/views/comments/_discuss.json.jbuilder +++ b/app/views/comments/_discuss.json.jbuilder @@ -1,7 +1,6 @@ json.id discuss.id json.content content_safe(discuss.content) json.time time_from_now(discuss.created_at) -json.position discuss.position json.hack_id discuss.dis_id # 主贴和回复有一些不同点 if discuss.parent_id diff --git a/config/routes.rb b/config/routes.rb index 81c419a7e..3d6d31b87 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -45,7 +45,7 @@ Rails.application.routes.draw do get :result end resources :comments do - + post :reply end end