m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
dev_forum
杨树明 6 years ago
parent 05a22b7e9c 765af2c66e
commit 3eb9008d88
4 changed files with 1489 additions and 1416 deletions
Show Stats Download Patch File Download Diff File

3
public/react/src/App.js
Unescape View File

@ -241,6 +241,7 @@ class App extends Component {
render() { render() {
// let {isRenders} = this.state; // let {isRenders} = this.state;
return ( return (
<LocaleProvider locale={zhCN}> <LocaleProvider locale={zhCN}>
@ -254,7 +255,7 @@ class App extends Component {
{/*{*/} {/*{*/}
{/* isRenders === true?*/} {/* isRenders === true?*/}
<Trialapplication></Trialapplication> {/*<Trialapplication></Trialapplication>*/}
{/*:""*/} {/*:""*/}
{/*}*/} {/*}*/}

5
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -1558,8 +1558,9 @@ class GraduationTaskssettinglist extends Component{
return( return(
<span key={key}> <span key={key}>
{item==="提交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>提交作品</a>:""} {item==="提交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>提交作品</a>:""}
{item==="修改作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/edit"}>修改作品</a>:""} {item==="补交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>补交作品</a>:""}
{item==="查看作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/edit"}>查看作品</a> :""} {item==="修改作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+taskslistdata.work_id+"/works/edit"}>修改作品</a>:""}
{item==="查看作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+taskslistdata.work_id+"/works/edit"}>查看作品</a> :""}
{item==="创建项目"?<a className={"fr color-blue font-16"} href={'/projects/new'}>创建项目</a>:""} {item==="创建项目"?<a className={"fr color-blue font-16"} href={'/projects/new'}>创建项目</a>:""}
{item==="关联项目"?<a className={"fr color-blue font-16"} onClick={this.AssociationItems}>关联项目</a>:""} {item==="关联项目"?<a className={"fr color-blue font-16"} onClick={this.AssociationItems}>关联项目</a>:""}
{item==="取消关联"?<a className={"fr color-blue font-16"} onClick={this.cannelAssociation}>取消关联</a>:""} {item==="取消关联"?<a className={"fr color-blue font-16"} onClick={this.cannelAssociation}>取消关联</a>:""}

149
public/react/src/modules/login/Trialapplication.js
Unescape View File

@ -30,12 +30,17 @@ class Trialapplication extends Component {
Phonenumberisnotco: undefined, Phonenumberisnotco: undefined,
Phonenumberisnotcobool: false, Phonenumberisnotcobool: false,
readonlyInput: true, readonlyInput: true,
user_phone_binded: false,
showTrial: false,
} }
// //user_phone_binded 判断是否手机号验证
console.log("Trialapplication"); console.log("Trialapplication");
console.log(props); console.log(props);
} }
Cancel = () => {
this.props.Cancel()
}
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
@ -45,15 +50,25 @@ class Trialapplication extends Component {
// console.log("componentWillReceiveProps"); // console.log("componentWillReceiveProps");
// console.log(nextProps); // console.log(nextProps);
} }
//初始化数据 //初始化数据
componentDidMount() { componentDidMount() {
// console.log("53");
// console.log(this.props.isRenders);
if (this.props.isRenders != undefined) { if (this.props.isRenders != undefined) {
this.setState({ this.setState({
isRenders: this.props.isRenders isRenders: this.props.isRenders
}) })
} }
if (this.props.showTrial != undefined) {
// 判断是否返回主页的参数
this.setState({
showTrial: this.props.showTrial
})
}
axios.interceptors.response.use((response) => { axios.interceptors.response.use((response) => {
if (response != undefined) if (response != undefined)
if (response && response.data.status === 407) { if (response && response.data.status === 407) {
@ -63,28 +78,22 @@ class Trialapplication extends Component {
} }
return response; return response;
}, (error) => { }, (error) => {
// // if (error.response && error.response.data.error === '401 Unauthorized') {
// // this.back_url = window.location.href;
// // this.setState({
// // isRender: true
// // })
// // // TODO 这里如果样式变了会出现css不加载的情况 // // // TODO 这里如果样式变了会出现css不加载的情况
// // const $ = window.$;
// // const isCssLoaded = window.getComputedStyle($('.log_nav li.active')[0], null)
// // .getPropertyValue('border-bottom')
// // == "2px solid rgb(69, 155, 229)"
// // if (!isCssLoaded) {
// // const isPort3007 = window.location.port == 3007;
// // let _url_origin = isPort3007 ? 'http://localhost:3000' : ''
// //
// // $('head').append( $('<link rel="stylesheet" type="text/css" />')
// // .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css`) );
// // $('head').append( $('<link rel="stylesheet" type="text/css" />')
// // .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css`) );
// // }
// // }
// // return Promise.reject(error);
}); });
// console.log("89");
try {
// console.log(this.state.props.user && this.state.props.user.user_phone_binded);
if (this.state.props.user !== undefined) {
this.setState({
user_phone_binded: this.state.props.user.user_phone_binded,
})
}
} catch (e) {
console.log(e);
}
} }
//获取登入 //获取登入
@ -199,31 +208,38 @@ class Trialapplication extends Component {
} }
handleDialogClose() { handleDialogClose() {
if (this.state.showTrial === false) {
this.setState({ this.setState({
isRenders: false isRenders: false
}) })
this.Cancel();
window.location.href = "/"; window.location.href = "/";
} else {
this.setState({
isRenders: false
})
this.Cancel();
}
} }
postregistered = () => { postregistered = () => {
//提交按钮 //提交按钮
debugger
if (this.state.user_phone_binded === false) {
if (this.state.Phonenumberisnotcobool === false) { if (this.state.Phonenumberisnotcobool === false) {
// if (this.state.login.length === 0) { var iphones = "";
// this.setState({ if (this.state.Phonenumberisnotco === undefined || this.state.Phonenumberisnotco === null || this.state.Phonenumberisnotco === "") {
// Phonenumberisnotco: "请输入手机号或邮箱", iphones = "请输入手机号";
// }) } else {
// console.log("postregistered"); iphones = this.state.Phonenumberisnotco;
// console.log("123456"); }
//
// return
// } else {
this.setState({ this.setState({
Phonenumberisnotco: this.state.Phonenumberisnotco, Phonenumberisnotco: iphones,
}) })
// console.log("postregistered");
// console.log("1234567");
//
// }
return; return;
} }
if (this.state.codes.length === 0) { if (this.state.codes.length === 0) {
@ -232,6 +248,9 @@ class Trialapplication extends Component {
}) })
return; return;
} }
}
if (this.state.reason.length === 0) { if (this.state.reason.length === 0) {
this.setState({ this.setState({
Phonenumberisnotcoreason: "请输入推荐人信息或申请理由", Phonenumberisnotcoreason: "请输入推荐人信息或申请理由",
@ -239,7 +258,7 @@ class Trialapplication extends Component {
return; return;
} }
var thiss = this;
var url = "/users/trial_apply.json"; var url = "/users/trial_apply.json";
axios.post(url, { axios.post(url, {
phone: this.state.login, phone: this.state.login,
@ -249,7 +268,21 @@ class Trialapplication extends Component {
// console.log(result); // console.log(result);
try { try {
// this.onTabChange("1"); // this.onTabChange("1");
thiss.props.showNotification(`试用申请已提交，我们将尽快完成审核`);
if (thiss.state.showTrial === false) {
window.location.href = "/"; window.location.href = "/";
thiss.setState({
isRenders: false
})
thiss.Cancel();
} else {
thiss.setState({
isRenders: false
})
thiss.Cancel();
}
} catch (e) { } catch (e) {
} }
@ -339,9 +372,10 @@ class Trialapplication extends Component {
//执行view //执行view
render() { render() {
let {login, codes, reason, isRenders, Phonenumberisnotco, getverificationcodes,Phonenumberisnotcocodes,Phonenumberisnotcoreason, seconds} = this.state; let {login, codes, reason, isRenders, user_phone_binded, Phonenumberisnotco, getverificationcodes, Phonenumberisnotcocodes, Phonenumberisnotcoreason, seconds} = this.state;
// console.log("Trialapplication22222222"); // console.log("Trialapplication22222222");
// console.log(this.props); // console.log(this.props);
return ( return (
<div> <div>
{ {
@ -516,7 +550,21 @@ class Trialapplication extends Component {
<i className="iconfont icon-shanchudiao"></i> <i className="iconfont icon-shanchudiao"></i>
</div> </div>
<div className={"login_register_content"} style={{"border-radius": "15px", "width": "560px"}}> <div className={"login_register_content"} style={{"border-radius": "15px", "width": "560px"}}>
<div className={"login_register_content"} style={{
<div className={"login_register_content"} style={
user_phone_binded === true ?
{
"width": "560px", "height": "304px",
"border-radius": "15px",
"background": " #FFFFff",
"text-align": "center",
// "position": "absolute",
"left": " 0px",
"box-sizing": "border-box",
"padding": "10px",
}
:
{
"width": "560px", "height": "390px", "width": "560px", "height": "390px",
"border-radius": "15px", "border-radius": "15px",
"background": " #FFFFff", "background": " #FFFFff",
@ -525,7 +573,9 @@ class Trialapplication extends Component {
"left": " 0px", "left": " 0px",
"box-sizing": "border-box", "box-sizing": "border-box",
"padding": "10px", "padding": "10px",
}}> }
}
>
<ul> <ul>
<span style={{ <span style={{
"padding": "20px", "padding": "20px",
@ -544,6 +594,9 @@ class Trialapplication extends Component {
<div> <div>
<span style={{"color": "#4D4D4D"}}>管理员审核批准后，即可继续访问网站</span> <span style={{"color": "#4D4D4D"}}>管理员审核批准后，即可继续访问网站</span>
</div> </div>
{
user_phone_binded === true ? "" :
<div style={{ <div style={{
"margin-top": "15px", "padding-left": "50px", "margin-top": "15px", "padding-left": "50px",
"padding-right": "50px" "padding-right": "50px"
@ -562,11 +615,15 @@ class Trialapplication extends Component {
: <div className="mt5 mb5" style={{height: "20px"}}></div> : <div className="mt5 mb5" style={{height: "20px"}}></div>
} }
</div> </div>
}
{
user_phone_binded === true ? "" :
<div style={{"display": "flex", "justify-content": "center"}}> <div style={{"display": "flex", "justify-content": "center"}}>
<Input className="fl mr5" name="codes" type="text" autoComplete="off" readonly <Input className="fl mr5" name="codes" type="text" autoComplete="off"
readonly
onfocus="this.removeAttribute('readonly')" style={{ onfocus="this.removeAttribute('readonly')" style={{
"width": "316px", "width": "316px",
"height": "38px", "height": "38px",
@ -591,7 +648,8 @@ class Trialapplication extends Component {
"text-align": "center", "text-align": "center",
"height": "38px", "height": "38px",
}} type="primary" }} type="primary"
onClick={() => this.getverificationcode()} size={"large"}>验证码</Button> onClick={() => this.getverificationcode()}
size={"large"}>验证码</Button>
: :
<Button className="fl ml5 " style={{ <Button className="fl ml5 " style={{
"background": "#4cacff!important", "background": "#4cacff!important",
@ -599,9 +657,13 @@ class Trialapplication extends Component {
"text-align": "center", "text-align": "center",
"height": "38px", "height": "38px",
}} type="primary" }} type="primary"
onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button> onClick={() => this.getverificationcode()}
size={"large"}>重新发送</Button>
} }
</div> </div>
}
{ {
Phonenumberisnotcocodes && Phonenumberisnotcocodes != "" ? Phonenumberisnotcocodes && Phonenumberisnotcocodes != "" ?
<p className="color-red mt2 mb2" style={{width: " 100%", height: "23px"}}> <p className="color-red mt2 mb2" style={{width: " 100%", height: "23px"}}>
@ -637,6 +699,8 @@ class Trialapplication extends Component {
</div> </div>
</div> </div>
</Dialog> </Dialog>
@ -646,7 +710,6 @@ class Trialapplication extends Component {
</div> </div>
) )

38
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -170,6 +170,7 @@ class NewHeader extends Component {
submitapplications:false, submitapplications:false,
isRender:false, isRender:false,
isRenders:false, isRenders:false,
showTrial:false,
user:undefined, user:undefined,
} }
} }
@ -511,13 +512,18 @@ submittojoinclass=(value)=>{
} }
} }
trialapplications =()=>{ // trialapplications =()=>{
this.setState({ // console.log("点击了")
isRenders: true, // this.setState({
}) // isRenders: true,
} // showTrial:true,
// })
// }
// 关闭
cancelModulationModels = () => {
this.setState({isRenders: false})
}
render() { render() {
const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。 const isLogin = true; // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
@ -537,8 +543,8 @@ submittojoinclass=(value)=>{
submitapplications, submitapplications,
submitapplicationsvalue, submitapplicationsvalue,
user, user,
isRenders,
isRender, isRender,
isRenders,
}=this.state; }=this.state;
/* /*
用户名称 用户头像url 用户名称 用户头像url
@ -575,14 +581,16 @@ submittojoinclass=(value)=>{
/> />
{/* :""*/} {/* :""*/}
{/*}*/} {/*}*/}
<Trialapplication></Trialapplication>
{ {/*{*/}
isRenders&&isRenders===true? {/* isRenders&&isRenders===true?*/}
<Trialapplication {/* <Trialapplication*/}
{...this.state} {/* {...this.state}*/}
/> {/* Cancel={() => this.cancelModulationModels()}*/}
:"" {/* />*/}
} {/* :""*/}
{/*}*/}
<div className="educontent clearfix"> <div className="educontent clearfix">
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/} {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
@ -713,7 +721,7 @@ submittojoinclass=(value)=>{
<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.my_project_url}>我的项目</a></li> <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.my_project_url}>我的项目</a></li>
<li><a href={this.props.Headertop===undefined?"":this.props.Headertop.account_manager_url}>账号管理</a></li> <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.account_manager_url}>账号管理</a></li>
{/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/} {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li> {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
<li className="bor-top-greyE"> <li className="bor-top-greyE">
{/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.logout_url}>退出</a>*/} {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.logout_url}>退出</a>*/}
{/*<a onClick={()=>this.educoderlogin()}>退出</a>*/} {/*<a onClick={()=>this.educoderlogin()}>退出</a>*/}

Write Preview
Loading…
Cancel
Save