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

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
sso
cxt 5 years ago
parent f820ec62f6 ad99a3c594
commit 7067a72824
10 changed files with 62 additions and 21 deletions
Show Stats Download Patch File Download Diff File

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

@ -66,12 +66,19 @@ const EducoderLogin = Loadable({
loading: Loading,
})
//微信登录
const Otherlogin=Loadable({
loader: () => import('./modules/login/Otherlogin'),
loading: Loading,
})
//微信登录
const Loginqq=Loadable({
loader: () => import('./modules/login/Loginqq'),
loading: Loading,
})
const Otherloginstart=Loadable({
loader: () => import('./modules/login/Otherloginstart'),
@ -632,6 +639,10 @@ class App extends Component {
<Route
path="/otherlogin" component={Otherlogin}
/>
<Route
path="/loginqq" component={Loginqq}
/>
<Route path="/users/:username"
render={
(props) => {

4
public/react/src/modules/login/Otherloginold.js → public/react/src/modules/login/Loginqq.js
Unescape View File

@ -50,7 +50,7 @@ var newContainer={
paddingTop: "40px",
}
class Otherlogin extends Component {
class Loginqq extends Component {
constructor(props) {
super(props);
this.state={
@ -289,4 +289,4 @@ class Otherlogin extends Component {
}
export default Otherlogin;
export default Loginqq;

5
public/react/src/modules/login/Otherlogin.css
Unescape View File

@ -46,4 +46,9 @@
justify-content: center;
width: 100%;
margin-top: 25px;
}
.weixinmarauto{
width: 24%;
margin: 0 auto;
}

2
public/react/src/modules/login/Otherlogin.js
Unescape View File

@ -244,7 +244,7 @@ class Otherlogin extends Component {
placeholder="输入密码，注意区分大小写"
></Input.Password>
</Content>
{this.state.logintypes==="username"?<span className={"color-red ml50"}>请填写账号</span>:this.state.logintypes==="password"?<span className={"color-red ml50"}>请填写密码</span>:""}
{this.state.logintypes==="username"?<span className={"color-red ml50 weixinmarauto"}>请填写账号</span>:this.state.logintypes==="password"?<span className={"color-red ml50 weixinmarauto"}>请填写密码</span>:""}
<Footer className={"weixinfooter mt30"}>
<Button className="login_btn font-16 wechattiyan" type="primary" style={{height:"46px"}} onClick={() => this.postwechatlogin(false,this.state.login,this.state.password)}
size={"large"}>绑定</Button>

2
public/react/src/modules/login/Otherloginqq.js
Unescape View File

@ -20,7 +20,7 @@ class Otherloginqq extends Component {
if(result){
if(result.data.status===0){
if(result.data.new_user===true){
window.location.href=`https://${decodeURIComponent(typeshref[1])}/otherlogin?type=qq`;
window.location.href=`https://${decodeURIComponent(typeshref[1])}/loginqq?type=qq`;
}else{
// this.getinfo()
if(typeshref[0]==="account"){

11
public/react/src/modules/login/Otherloginstart.js
Unescape View File

@ -14,6 +14,11 @@ class Otherloginstart extends Component {
const types = type[1].split('&state=');
const typeshref = types[1].split(',');
if(typeshref[1]==="test-newweb.educoder.net"){
window.location.href=`https://${typeshref[1]}/otherloginstart?code=${types[0]}&state=null,""`;
}else if(typeshref[1]==="pre-newweb.educoder.net"){
window.location.href=`https://${typeshref[1]}/otherloginstart?code=${types[0]}&state=null,""`;
}
let codeurl = `/auth/wechat/callback.json`
axios.get(codeurl,{params:{
code:types[0]
@ -21,13 +26,13 @@ class Otherloginstart extends Component {
if(result){
if(result.data.status===0){
if(result.data.new_user===true){
window.location.href=`https://${typeshref[1]}/otherlogin?type=wechat`;
this.props.history.replace(`/otherlogin?type=wechat`);
}else{
// this.getinfo()
if(typeshref[0]==="account"){
window.location.href=`https://${typeshref[1]}/account/binding`;
this.props.history.replace(`/account/binding`);
}else{
window.location.href=`https://${typeshref[1]}`;
this.props.history.replace(`/`);
}
}

11
public/react/src/modules/paths/PathDetail/sendPanel.js
Unescape View File

@ -168,11 +168,7 @@ class sendPanel extends Component{
let{sentShixunPath,sendToCourseList,Modalstype,Modalstopval,Modalsbottomval,cardsModalcancel,cardsModalsave}= this.state;
return(
<div>
<style>{`
body{
overflow:hidden!important;
}
`}</style>
<Modals
modalsType={Modalstype}
modalsTopval={Modalstopval}
@ -201,6 +197,11 @@ class sendPanel extends Component{
destroyOnClose={true}
>
<div className="newupload_conbox">
<style>{`
body{
overflow:hidden!important;
}
`}</style>
<div className="mb20"
// onMouseLeave={this.closeList}
>

12
public/react/src/modules/tpm/challengesnew/TpmQuestionEdit.js
Unescape View File

@ -1,6 +1,6 @@
import React, {Component} from 'react';
import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip} from 'antd';
import {Input, Select, Radio,Button, Badge, message, Modal,Tooltip} from 'antd';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
@ -183,7 +183,7 @@ export default class TpmQuestionEdit extends Component {
/>
{/*<a className="white-btn orange-btn fl mt1 use_scope-btn ml20 mt5 mr20"*/}
{/*onClick={this.clickshixunsanswerskill}>+ 添加</a>*/}
<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能
<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能（回车添加标签）
<span className=" color-orange ml20" style={{display:this.props.challenge_tagtype===true?"inline-block":"none"}} id="stage_name_notice">
<i className="fa fa-exclamation-circle mr3"></i>必填项
</span>
@ -193,8 +193,12 @@ export default class TpmQuestionEdit extends Component {
{
this.props.shixunsskillanswerlist.length === 0 ? "" : this.props.shixunsskillanswerlist.map((itme, key) => {
return (
<li className="task_tag_span" key={key}><span>{itme}</span>
<a onClick={() =>this.props.delshixunssnswerllist(key)}>×</a>
<li className="fl ml10 mr10" key={key}>
<Badge className={"tpmpointer"} count={"x"} onClick={()=>this.props.delshixunssnswerllist(key)}>
<Button type="primary" ghost className={"Permanentban "}>
{itme}
</Button>
</Badge>
</li>
)
})

18
public/react/src/modules/tpm/challengesnew/TpmQuestionNew.js
Unescape View File

@ -1,11 +1,13 @@
import React, {Component} from 'react';
import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip} from 'antd';
import {Input, Select, Radio, Checkbox, Popconfirm, Button, Badge,Tooltip} from 'antd';
import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
import './css/newquestion.css';
const Option = Select.Option;
const RadioGroup = Radio.Group;
@ -138,7 +140,7 @@ export default class TpmQuestionNew extends Component {
// onMouseLeave={this.onshixunsmarkss}
>
<span className="fl mr30 color-orange pt10">*</span>
<Select style={{width: 120}} className="winput-240-40 fl"
id="challenge_score"
onChange={(e)=>this.props.onshixunsansweSelect(e)}
@ -176,7 +178,7 @@ export default class TpmQuestionNew extends Component {
/>
{/*<a className="white-btn orange-btn fl mt1 use_scope-btn ml20 mt5 mr20"*/}
{/*onClick={this.clickshixunsanswerskill}>+ 添加</a>*/}
<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能
<div className="ml15 color-grey-9 mt5">学员答题正确将获得技能，否则不能获得技能（回车添加标签）
<span className=" color-orange ml20" style={{display:this.props.challenge_tagtype===true?"inline-block":"none"}} id="stage_name_notice">
<i className="fa fa-exclamation-circle mr3"></i>必填项
</span>
@ -186,8 +188,14 @@ export default class TpmQuestionNew extends Component {
{
this.props.shixunsskillanswerlist.length === 0 ? "" : this.props.shixunsskillanswerlist.map((itme, key) => {
return (
<li className="task_tag_span" key={key}><span>{itme}</span>
<a onClick={()=>this.props.delshixunssnswerllist(key)}>×</a>
<li className="fl ml10 mr10" key={key}>
<Badge className={"tpmpointer"} count={"x"} onClick={()=>this.props.delshixunssnswerllist(key)}>
<Button type="primary" ghost className={"Permanentban "}>
{itme}
</Button>
</Badge>
</li>
)
})

7
public/react/src/modules/tpm/challengesnew/css/newquestion.css
Unescape View File

@ -0,0 +1,7 @@
.tpmpointer{
cursor: pointer;
}
.Permanentban{
color:#5091FF !important;
border-color: #5091FF !important;
}
Write Preview
Loading…
Cancel
Save