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

dev_tj
杨树明 5 years ago
commit e2c424142f

@ -7,6 +7,18 @@
<!-- width=device-width, initial-scale=1 , shrink-to-fit=no -->
<!-- <meta name="viewport" content=""> -->
<meta name=”Keywords” Content=”EduCoder,信息技术实践教学,精品课程网,慕课MOOC″>
<meta name=”Keywords” Content=”实践课程,项目实战,java实训,python实战,人工智能技术,后端开发学习,移动开发入门″>
<meta name=”Keywords” Content=”翻转课堂,高效课堂创建,教学模式″>
<meta name=”Keywords” Content=”实训项目,python教程,C语言入门,java书,php后端开发,app前端开发,数据库技术″>
<meta name=”Keywords” Content=”在线竞赛,计算机应用大赛,编程大赛,大学生计算机设计大赛,全国高校绿色计算机大赛″>
<meta name=”Description” Content=”EduCoder是信息技术类实践教学平台。EduCoder涵盖了计算机、大数据、云计算、人工智能、软件工程、物联网等专业课程。超10000个实训案例及22000个技能评测点建立学、练、评、测一体化实验环境。”>
<meta name=”Description” Content=”EduCoder实践课程旨在于通过企业级实战实训案例帮助众多程序员提升各项业务能力。解决学生、学员、企业员工等程序设计能力、算法设计能力、问题求解能力、应用开发能力、系统运维能力等。”>
<meta name=”Description” Content=”EduCoder翻转课堂教学模式颠覆了传统教学模式让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生使学生可个性化化学学生的学习主体得到了彰显。”>
<meta name=”Description” Content=”EduCoder实训项目为单个知识点关卡实践训练帮助学生巩固单一弱点强化学习。 >
<meta name=”Description” Content=”EduCoder实践教学平台各类大赛为进一步提高各类学生综合运用高级语言程序设计能力培养创新意识和实践探索精神发掘优秀软件人才。 >
<meta name="theme-color" content="#000000">
<!--<meta http-equiv="cache-control" content="no-cache,no-store, must-revalidate" />-->
<!--<meta http-equiv="pragma" content="no-cache" />-->

@ -667,6 +667,8 @@ class MemoDetail extends Component {
}
// --------------------------------------------------------------------------------------------帖子獎勵 END
showCommentInput = () => {
debugger
if (window.__useKindEditor === true) {
this.refs.editor.showEditor();
} else {
@ -843,7 +845,7 @@ class MemoDetail extends Component {
</div>
:
<div className="memoMore">
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论</div>
<div className="writeCommentBtn" onClick={this.showCommentInput}>写评论1</div>
</div>}
</div>

@ -25,16 +25,16 @@ class MemoDetailKEEditor extends Component {
showEditor() {
// $("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
// if (this.keEditor) {
// const FF = !(window.mozInnerScreenX == null);
// if (FF) {
// this.keEditor.focus()
// } else {
// this.keEditor.edit.win.document.body.focus()
// }
// }
// });
$("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
if (this.keEditor) {
const FF = !(window.mozInnerScreenX == null);
if (FF) {
this.keEditor.focus()
} else {
this.keEditor.edit.win.document.body.focus()
}
}
});
}
render() {

@ -75,6 +75,11 @@ class MemoDetailMDEditor extends Component {
}
onCommit = () => {
if(this.props.checkIfProfileCompleted()===false){
this.props.showhideAccountPhoneemailDialog()
return
}
const content = this.commentMDEditor.getValue();
// this.props.showError ==
if (this.props.showError == true) {
@ -108,13 +113,13 @@ class MemoDetailMDEditor extends Component {
}
showEditor() {
// $("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
// if (this.commentMDEditor) {
// this.commentMDEditor.cm.focus()
// } else {
// this.onMockInputClick()
// }
// });
$("html, body").animate({ scrollTop: $('.commentInput:visible').offset().top - 100 }, 1000, () => {
if (this.commentMDEditor) {
this.commentMDEditor.cm.focus()
} else {
this.onMockInputClick()
}
});
}
close = () => {
this.setState({isInited: false})

@ -96,13 +96,13 @@ class MemoDetailMDEditortwo extends Component {
}
showEditor() {
// $("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
// if (this.commentMDEditor) {
// this.commentMDEditor.cm.focus()
// } else {
// $('#commentInput input')[0].click()
// }
// });
$("html, body").animate({ scrollTop: $('#commentInput').offset().top - 100 }, 1000, () => {
if (this.commentMDEditor) {
this.commentMDEditor.cm.focus()
} else {
$('#commentInput input')[0].click()
}
});
}
onMockInputClick = () => {
this.setState({isInited: true})

@ -194,13 +194,13 @@ class Trialapplication extends Component {
//短信验证
SMSverification = () => {
let logins=this.state.login;
var url = `/accounts/get_verification_code.json`;
axios.get((url), {
params: {
login: this.state.login,
type: 3,
smscode:setmiyah(this.state.logins)
smscode:setmiyah(logins)
}
}).then((result) => {
//验证有问题{"status":1,"message":"success"}

@ -210,12 +210,13 @@ class Trialapplicationysl extends Component {
//短信验证
SMSverification = () => {
let logins=this.state.login;
var url = `/accounts/get_verification_code.json`;
axios.get((url), {
params: {
login: this.state.login,
type: 3,
smscode:setmiyah(this.state.logins)
smscode:setmiyah(logins)
}
}).then((result) => {
//验证有问题{"status":1,"message":"success"}

@ -166,6 +166,27 @@ export function TPMIndexHOC(WrappedComponent) {
document.title="翻转课堂";
}
// if(this.props.match.path==="/"){
// document.title="EduCoder-IT实践教学平台_信息技术类精品课程网_大学生MOOC平台";
// }else if(this.props.match.path==="/403"){
// document.title="你没有权限访问";
// }else if(this.props.match.path==="/nopage"){
// document.title="没有找到该页面";
// }else if(this.props.match.path==="/shixuns"){
// document.title="EduCoder-IT实践教学平台_信息技术类精品课程网_大学生MOOC平台";
// }else if(this.props.match.path==="/paths"){
// document.title="实践课程_项目实战开发_web前端开发实训_web后端开发实战_人工智能技术-EduCoder";
// }else if(this.props.match.path==="/courses"){
// document.title="实训项目_php后端开发_app前端开发_java_python实训_C语言入门课程-EduCoder";
// }else if(this.props.match.path==="/competitions"){
// document.title="在线竞赛_计算机应用大赛_编程大赛_大学生设计大赛_全国高校绿色计算大赛-EduCoder";
// }else if(this.props.match.path==="/moop_cases"){
// document.title="教学案例-EduCoder";
// }else if(this.props.match.path==="/forums"){
// document.title="交流问答-EduCoder";
// }else if(this.props.match.path==="/forums"){
// document.title="交流问答-EduCoder";
// }
$.ajaxSetup({
cache: true

@ -157,12 +157,13 @@ class LoginRegisterComponent extends Component {
}
//短信验证
SMSverification = () => {
let logins=this.state.login;
var url = `/accounts/get_verification_code.json`;
axios.get((url), {
params: {
login: this.state.login,
type: 2,
smscode:setmiyah(this.state.logins)
smscode:setmiyah(logins)
}
}).then((result) => {
//验证有问题{"status":1,"message":"success"}

@ -608,12 +608,13 @@ class LoginRegisterComponent extends Component {
};
//短信验证
SMSverification = () => {
let logins=this.state.login;
var url = `/accounts/get_verification_code.json`;
axios.get((url), {
params: {
login: this.state.logins,
type: 1,
smscode:setmiyah(this.state.logins)
smscode:setmiyah(logins)
}
}).then((result) => {
//验证有问题{"status":1,"message":"success"}

@ -20,11 +20,14 @@
justify-content: center;
}
.packinput .ant-input-group-addon{
border: 1px solid #4cacff!important;
}
.packinput .ant-input-group-addon .ant-btn{
width:137px !important;
font-size: 18px;
height: 53px;
background:rgba(76,172,255,1);
border-color: #4cacff !important;
}
.tabtitle{

Loading…
Cancel
Save