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

qq登录end

Browse Source
issues25489
杨树明 6 years ago
parent c4855c6ee2
commit 8e77fa4813
5 changed files with 303 additions and 186 deletions
Show Stats Download Patch File Download Diff File

21
public/react/src/AppConfig.js
Unescape View File

@ -21,16 +21,16 @@ let hashTimeout
// TODO 开发期多个身份切换 // TODO 开发期多个身份切换
let debugType ="" let debugType =""
// if (isDev) { if (isDev) {
// const _search = window.location.search; const _search = window.location.search;
// let parsed = {}; let parsed = {};
// if (_search) { if (_search) {
// parsed = queryString.parse(_search); parsed = queryString.parse(_search);
// } }
// debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
// window.location.search.indexOf('debug=s') != -1 ? 'student' : window.location.search.indexOf('debug=s') != -1 ? 'student' :
// window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
// } }
window._debugType = debugType; window._debugType = debugType;
export function initAxiosInterceptors(props) { export function initAxiosInterceptors(props) {
initOnlineOfflineListener() initOnlineOfflineListener()
@ -46,6 +46,7 @@ export function initAxiosInterceptors(props) {
//proxy="http://47.96.87.25:48080" //proxy="http://47.96.87.25:48080"
proxy="https://pre-newweb.educoder.net" proxy="https://pre-newweb.educoder.net"
proxy="https://test-newweb.educoder.net" proxy="https://test-newweb.educoder.net"
//proxy="http://192.168.2.63:3001"
// 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求； // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；
// 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制 // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制

276
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -4,7 +4,8 @@ import {WordsBtn, ActionBtn} from 'educoder';
import axios from 'axios'; import axios from 'axios';
import { import {
notification, notification,
Spin Spin,
Tabs
} from "antd"; } from "antd";
import '../css/members.css'; import '../css/members.css';
import "../common/formCommon.css"; import "../common/formCommon.css";
@ -22,6 +23,9 @@ import Startshixuntask from "../coursesPublic/Startshixuntask";
import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor"; import TPMMDEditor from "../../tpm/challengesnew/TPMMDEditor";
import DownloadMessageysl from "../../modals/DownloadMessageysl"; import DownloadMessageysl from "../../modals/DownloadMessageysl";
import Modals from "../../modals/Modals"; import Modals from "../../modals/Modals";
const { TabPane } = Tabs;
class ShixunHomeworkPage extends Component { class ShixunHomeworkPage extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
@ -189,6 +193,14 @@ class ShixunHomeworkPage extends Component {
this.props.history.replace(`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`); this.props.history.replace(`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`);
} }
callback=(key)=>{
this.setState({
tab: key,
})
}
render() { render() {
let {tab, teacherdatapage, jobsettingsdatapage} = this.state; let {tab, teacherdatapage, jobsettingsdatapage} = this.state;
@ -196,102 +208,28 @@ class ShixunHomeworkPage extends Component {
// console.log(119) // console.log(119)
// console.log(jobsettingsdatapage); // console.log(jobsettingsdatapage);
document.title=jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name; document.title=jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name;
return (
<div className="newMain clearfix ">
<Modals
modalsType={this.state.ModalsType}
modalsTopval={this.state.Modalstopval}
modalsBottomval={this.state.ModalsBottomval}
modalSave={this.ModalSaves}
modalCancel={this.ModalCancels}
loadtype={false}
>
</Modals>
<div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
<Spin size="large" spinning={this.state.mylistisSpin}>
{
jobsettingsdatapage === undefined?"":
<div className="educontent mb20">
<p className="clearfix mb20 mt10">
<a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<a
className=" btn colorgrey fl hovercolorblue "
href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn className="fl">作业详情</WordsBtn>
</p>
</div>
}
<div className="educontent mb20">
<p className=" fl color-black summaryname" style={{heigth: "33px"}}>
{teacherdatapage === undefined ? "" : teacherdatapage.homework_name}
</p>
<CoursesListType
typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
/>
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>
const operations = <div>
{/*<style>{`*/}
{/*.drop_down_menu li a {*/}
{/*padding: 0px;*/}
{/*font-size: 14px;*/}
{/*}*/}
{/*.drop_down_menu {*/}
{/*width: 93px;*/}
{/*}*/}
{/*.drop_down_menu li {*/}
{/*overflow: visible;*/}
{/*width: 93px;*/}
{/*}*/}
{/*.drop_down_menu, .drop_down_normal {*/}
{/*padding-top: 10px;*/}
{/*padding-bottom: 8px;*/}
{/*}*/}
</div> {/*`}</style>*/}
<div className="edu-back-white ">
<div className="stud-class-set bor-bottom-greyE ">
<div className=" clearfix edu-back-white poll_list">
<a className={parseInt(tab) === 0 ? "active" : ""} onClick={(e) => this.ChangeTab(0)}>作品列表</a>
<a className={parseInt(tab) === 1 ? "active" : ""} onClick={(e) => this.ChangeTab(1)}>作业描述</a>
{this.props.isAdmin() ? {this.props.isAdmin() ?
this.state.code_review === true || jobsettingsdatapage === undefined ? [""] : jobsettingsdatapage.data.homework_status[0] === "未发布" ? "" : <li className="li_line drop_down fr color-blue font-16 ml50">
<a
className={parseInt(tab) === 2 ? "active" : ""}
onClick={(e) => this.ChangeTab(2)}>
代码查重</a> : ""}
{parseInt(tab) === 3?
<style>{this.props.isAdmin()?
`
.poll_list a.active:after {
content: '';
width: 57px;
left: 10px;
bottom: 0px;
height: 2px;
background-color: #4CACFF;
position: absolute;
}
`:""
}</style>
:""}
<a className={parseInt(tab) === 3 ? "active" : ""}
onClick={(e) => this.ChangeTab(3)}
>{this.props.isAdmin()?"设置":"得分规则"}</a>
{/*{this.props.isAdmin() ? <a*/}
{/* className="fr color-blue font-16"*/}
{/* href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*/}
{/*>导出</a> : ""}*/}
<style>{`
.drop_down_menu li a {
padding: 0px;
font-size: 14px;
}
.drop_down_menu {
width: 93px;
}
.drop_down_menu li {
overflow: visible;
width: 93px;
}
.drop_down_menu, .drop_down_normal {
padding-top: 10px;
padding-bottom: 8px;
}
`}</style>
{this.props.isAdmin() ?
<li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding": "0 20px"}}>
导出<i className="iconfont icon-xiajiantou font-12 ml2"></i> 导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
<ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}> <ul className="drop_down_menu" style={{"right": "-0px", "left": "unset", "height": "auto"}}>
{/*<li><a*/} {/*<li><a*/}
@ -305,35 +243,35 @@ class ShixunHomeworkPage extends Component {
</li> : ""} </li> : ""}
{this.props.isAdmin() ? {this.props.isAdmin() ?
teacherdatapage && teacherdatapage.end_immediately === true ? teacherdatapage && teacherdatapage.end_immediately === true ?
<a className="fr color-blue font-16" onClick={(child)=>this.homeworkendss(this.child)}>立即截止</a> <a className="fr color-blue font-16 ml50" onClick={(child)=>this.homeworkendss(this.child)}>立即截止</a>
: "" : ""
: ""} : ""}
{this.props.isAdmin() ? {this.props.isAdmin() ?
teacherdatapage && teacherdatapage.publish_immediately === true ? teacherdatapage && teacherdatapage.publish_immediately === true ?
<a className="fr color-blue font-16" onClick={(child)=>this.homeworkstarts(this.child)}>立即发布</a> <a className="fr color-blue font-16 ml50" onClick={(child)=>this.homeworkstarts(this.child)}>立即发布</a>
: "" : ""
: ""} : ""}
{this.props.isAdmin() ? {this.props.isAdmin() ?
teacherdatapage && teacherdatapage.code_review === true ? teacherdatapage && teacherdatapage.code_review === true ?
<a className="fr color-blue font-16" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a> <a className="fr color-blue font-16 ml50" onClick={(child)=>this.workshowmodels(this.child)}>代码查重</a>
: "" : ""} : "" : ""}
{ {
parseInt(tab)===1? parseInt(tab)===1?
this.props.isAdmin() ? this.props.isAdmin() ?
<a className="fr color-blue font-16" onClick={()=>this.edenwork()}>编辑作业</a> <a className="fr color-blue font-16 ml50" onClick={()=>this.edenwork()}>编辑作业</a>
:"" :""
:"" :""
} }
{this.state.view_report === true ? <Link className="fr color-blue font-16" target={"_blank"} {this.state.view_report === true ? <Link className="fr color-blue font-16 ml50" target={"_blank"}
to={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}> to={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage&&teacherdatapage.work_id}/shixun_work_report`}>
查看实训报告 查看实训报告
</Link> : ""} </Link> : ""}
{ {
teacherdatapage === undefined ? "" teacherdatapage === undefined ? ""
: teacherdatapage.commit_des === null || teacherdatapage.commit_des === undefined ? "" : : teacherdatapage.commit_des === null || teacherdatapage.commit_des === undefined ? "" :
<a className="fr color-blue font-16" <a className="fr color-blue font-16 ml50"
href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a> href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${teacherdatapage === undefined ? "" : teacherdatapage.id}/commitsummary/${this.props.match.params.homeworkid}`}>{teacherdatapage.commit_des}</a>
} }
{teacherdatapage === undefined ? "" : <Startshixuntask {teacherdatapage === undefined ? "" : <Startshixuntask
@ -343,18 +281,144 @@ class ShixunHomeworkPage extends Component {
{this.props.isStudent() ? {this.props.isStudent() ?
( (
teacherdatapage&&teacherdatapage.redo_work===true? teacherdatapage&&teacherdatapage.redo_work===true?
<a className="fr color-blue font-16" onClick={()=>this.Modalcancelss()}>重做</a> <a className="fr color-blue font-16 ml50" onClick={()=>this.Modalcancelss()}>重做</a>
:"" :""
) )
: "" } : "" }
</div>;
return (
<div className="newMain clearfix ">
<Modals
modalsType={this.state.ModalsType}
modalsTopval={this.state.Modalstopval}
modalsBottomval={this.state.ModalsBottomval}
modalSave={this.ModalSaves}
modalCancel={this.ModalCancels}
loadtype={false}
>
</Modals>
<div className={"educontent mt10 mb20"} style={{width: "1200px"}}>
<Spin size="large" spinning={this.state.mylistisSpin}>
{
jobsettingsdatapage === undefined?"":
<div className="educontent mb20">
<p className="clearfix mb20 mt10">
<a className="btn colorgrey fl hovercolorblue " href={this.props.current_user&&this.props.current_user.first_category_url}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.course_name}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<a
className=" btn colorgrey fl hovercolorblue "
href={`/courses/${this.props.match.params.coursesId}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.main === 1 ? "shixun_homeworks" :"shixun_homework"}/${jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_id === undefined ? "" : jobsettingsdatapage.data.category.category_id}`}>{jobsettingsdatapage === undefined ? "" : jobsettingsdatapage.data.category.category_name}</a>
<span className="color-grey-9 fl ml3 mr3">&gt;</span>
<WordsBtn className="fl">作业详情</WordsBtn>
</p>
</div> </div>
}
<div className="educontent mb20">
<p className=" fl color-black summaryname" style={{heigth: "33px"}}>
{teacherdatapage === undefined ? "" : teacherdatapage.homework_name}
</p>
<CoursesListType
typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
/>
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>
</div> </div>
</div>
{parseInt(tab) === 0 ?<Listofworksstudentone triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
{parseInt(tab) === 1 ?<Workquestionandanswer triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)} Showupdateinstructionsboolfalse={(i)=>this.Showupdateinstructionsboolfalse(i)}></Workquestionandanswer>:""} {/*<div className="edu-back-white ">*/}
{parseInt(tab) === 2 ?<ShixunStudentWork triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""} {/*<div className="stud-class-set bor-bottom-greyE ">*/}
{parseInt(tab) === 3 ?<Trainingjobsetting triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""} {/*/!*<div className=" clearfix edu-back-white poll_list">*!/*/}
{/*/!**!/*/}
{/*/!*<a className={parseInt(tab) === 0 ? "active" : ""} onClick={(e) => this.ChangeTab(0)}>作品列表</a>*!/*/}
{/*/!*<a className={parseInt(tab) === 1 ? "active" : ""} onClick={(e) => this.ChangeTab(1)}>作业描述</a>*!/*/}
{/*/!*{this.props.isAdmin() ?*!/*/}
{/*/!*this.state.code_review === true || jobsettingsdatapage === undefined ? [""] : jobsettingsdatapage.data.homework_status[0] === "未发布" ? "" :*!/*/}
{/*/!*<a*!/*/}
{/*/!*className={parseInt(tab) === 2 ? "active" : ""}*!/*/}
{/*/!*onClick={(e) => this.ChangeTab(2)}>*!/*/}
{/*/!*代码查重</a> : ""}*!/*/}
{/*/!*{parseInt(tab) === 3?*!/*/}
{/*/!*<style>{this.props.isAdmin()?*!/*/}
{/*/!*`*!/*/}
{/*/!*.poll_list a.active:after {*!/*/}
{/*/!*content: '';*!/*/}
{/*/!*width: 57px;*!/*/}
{/*/!*left: 10px;*!/*/}
{/*/!*bottom: 0px;*!/*/}
{/*/!*height: 2px;*!/*/}
{/*/!*background-color: #4CACFF;*!/*/}
{/*/!*position: absolute;*!/*/}
{/*/!*}*!/*/}
{/*/!*`:""*!/*/}
{/*/!*}</style>*!/*/}
{/*/!*:""}*!/*/}
{/*/!*<a className={parseInt(tab) === 3 ? "active" : ""}*!/*/}
{/*/!*onClick={(e) => this.ChangeTab(3)}*!/*/}
{/*>{this.props.isAdmin()?"设置":"得分规则"}</a>*/}
{/*/!*{this.props.isAdmin() ? <a*!/*/}
{/*/!* className="fr color-blue font-16"*!/*/}
{/*/!* href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}*!/*/}
{/*/!*>导出</a> : ""}*!/*/}
{/**/}
{/**/}
{/**/}
{/*</div>*/}
{/*</div>*/}
{/*</div>*/}
<style>
{
`
.ant-tabs-bar{
margin:0px;
}
.ant-tabs-nav .ant-tabs-tab{
display: inline-block;
padding: 20px;
font-size: 18px;
text-align: center;
position: relative;
color: #05101a;
}
.ant-tabs-nav-wrap{
background-color: #FFF;
}
.ant-tabs-nav-container{
border-bottom: 1px solid #ebedf0;
}
.ant-tabs-nav-container{
background-color: #FFF;
}
.ant-tabs-extra-content{
margin-top: 10px;
margin-right: 20px;
}
.ant-tabs-top-bar{
background-color: #FFF;
}
`
}
</style>
<Tabs defaultActiveKey="1" animated={false} onChange={this.ChangeTab} tabBarExtraContent={operations}>
<TabPane tab="作品列表" key="1">
<Listofworksstudentone triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>
</TabPane>
<TabPane tab="作业描述" key="2">
<Workquestionandanswer triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)} Showupdateinstructionsboolfalse={(i)=>this.Showupdateinstructionsboolfalse(i)}></Workquestionandanswer>
</TabPane>
<TabPane tab="代码查重" key="3">
<ShixunStudentWork triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>
</TabPane>
<TabPane tab={this.props.isAdmin()?"设置":"得分规则"} key="4">
<Trainingjobsetting triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>
</TabPane>
</Tabs>
</Spin> </Spin>
</div> </div>
</div> </div>

4
public/react/src/modules/login/LoginDialog.js
Unescape View File

@ -534,12 +534,12 @@ class LoginDialog extends Component {
qqlogin:true qqlogin:true
}) })
//window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code` //window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code`
window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2ftest-newweb.educoder.net%2fotherloginqq&response_type=code` window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginqq&response_type=code`
// window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code` // window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code`
} }
openphoneqqlogin=()=>{ openphoneqqlogin=()=>{
window.location.href=`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2ftest-newweb.educoder.net%2fotherloginqq&response_type=code` window.location.href=`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginqq&response_type=code`
} }
hideweixinlogin=()=>{ hideweixinlogin=()=>{

54
public/react/src/modules/user/LoginRegisterComponent.js
Unescape View File

@ -68,6 +68,7 @@ class LoginRegisterComponent extends Component {
registered:undefined, registered:undefined,
Phonenumberisnotcodmms:undefined, Phonenumberisnotcodmms:undefined,
weixinlogin:false, weixinlogin:false,
qqlogin:false
} }
} }
if(props.loginstatus === false){ if(props.loginstatus === false){
@ -106,7 +107,7 @@ class LoginRegisterComponent extends Component {
registered:undefined, registered:undefined,
Phonenumberisnotcodmms:undefined, Phonenumberisnotcodmms:undefined,
weixinlogin:false, weixinlogin:false,
qqlogin:false
} }
} }
} }
@ -892,9 +893,23 @@ class LoginRegisterComponent extends Component {
hideweixinlogin=()=>{ hideweixinlogin=()=>{
this.setState({ this.setState({
weixinlogin:false, weixinlogin:false,
qqlogin:false,
tab:["0"] tab:["0"]
}) })
} }
openqqlogin=()=>{
this.setState({
qqlogin:true
})
//window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code`
window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginqq&response_type=code`
// window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code`
}
openphoneqqlogin=()=>{
window.location.href=`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginqq&response_type=code`
}
render() { render() {
const { const {
// 登录 // 登录
@ -1040,12 +1055,31 @@ class LoginRegisterComponent extends Component {
<a onClick={()=>this.openweixinlogin()}> <a onClick={()=>this.openweixinlogin()}>
<img src={require('./img/WeChat.png')} alt="微信登录"/> <img src={require('./img/WeChat.png')} alt="微信登录"/>
</a> </a>
<a onClick={()=>this.openqqlogin()} className={"ml10"}>
<img src={require('./img/qq.png')} alt="qq登录"/>
</a>
</div> </div>
</p>:""} </p>:<p className="clearfix mb10 textcenter">
<span className={"startlogin"}>———————— 快速登录 ————————</span>
<div className={"mt10"}>
{/*<a onClick={()=>this.openweixinlogin()}>*/}
{/*<img src={require('./WeChat.png')} alt="微信登录"/>*/}
{/*</a>*/}
<a onClick={()=>this.openphoneqqlogin()}>
<img src={require('./img/qq.png')} alt="qq登录"/>
</a>
</div>
</p>}
</div> </div>
} }
{ {
weixinlogin===false&&parseInt(tab[0])==1 && weixinlogin===false&&parseInt(tab[0])==1 &&
<div style={{width: '340px'}}> <div style={{width: '340px'}}>
@ -1201,8 +1235,22 @@ class LoginRegisterComponent extends Component {
<a onClick={()=>this.openweixinlogin()}> <a onClick={()=>this.openweixinlogin()}>
<img src={require('./img/WeChat.png')} alt="微信登录"/> <img src={require('./img/WeChat.png')} alt="微信登录"/>
</a> </a>
<a onClick={()=>this.openqqlogin()} className={"ml10"}>
<img src={require('./img/qq.png')} alt="qq登录"/>
</a>
</div> </div>
</p>:""} </p>:<p className="clearfix mb10 textcenter">
<span className={"startlogin"}>———————— 快速登录 ————————</span>
<div className={"mt10"}>
{/*<a onClick={()=>this.openweixinlogin()}>*/}
{/*<img src={require('./WeChat.png')} alt="微信登录"/>*/}
{/*</a>*/}
<a onClick={()=>this.openphoneqqlogin()}>
<img src={require('./img/qq.png')} alt="qq登录"/>
</a>
</div>
</p>}
</div> </div>
} }
{weixinlogin===true?<iframe {weixinlogin===true?<iframe

116
public/react/src/modules/user/account/AccountBinding.js
Unescape View File

@ -137,6 +137,10 @@ class AccountSecure extends Component {
font-size: 40px !important; font-size: 40px !important;
color: #4eaf2b; color: #4eaf2b;
} }
.qqlogo{
font-size: 40px !important;
color: #29a1e6;
}
.lineheight60{ .lineheight60{
line-height: 60px; line-height: 60px;
@ -205,62 +209,62 @@ class AccountSecure extends Component {
</div> </div>
{/*<div className="flexTable">*/} <div className="flexTable">
{/*<div className="flexTable">*/} <div className="flexTable">
{/*</div>*/} </div>
{/*<div className="flexTable">*/} <div className="flexTable">
{/*<div className="flexRow">*/} <div className="flexRow">
{/*<div className="name">*/} <div className="name">
{/*<i className={"iconfont icon-weixin2 weixinlogo mr10"}></i>*/} <i className={"iconfont icon-qq qqlogo mr10"}></i>
{/*<span className={"color-ooo"}>QQ</span>*/} <span className={"color-ooo"}>QQ</span>
{/*</div>*/} </div>
{/*<div className="description lineheight60">*/} <div className="description lineheight60">
{/*{basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0?"":<span className={"color-grey-9 ml80"}>{basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users[0].nickname}</span>}*/} {basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0?"":<span className={"color-grey-9 ml80"}>{basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users[0].nickname}</span>}
{/*</div>*/} </div>
{/*<div className="status pt19">*/} <div className="status pt19">
{/*<WordsBtn style={basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0?"blue":"colorgrey9"} className={basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0?"borderBottom":""}*/} <WordsBtn style={basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0?"blue":"colorgrey9"} className={basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0?"borderBottom":""}
{/*onClick={*/} onClick={
{/*basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0 ?() => this.showModal("wechat"):() => this.undologin("wechat",basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users[0].id)*/} basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0 ?() => this.showModal("wechat"):() => this.undologin("wechat",basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users[0].id)
{/*}*/} }
{/*>{basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0 ?"绑定":"解绑"}</WordsBtn>*/} >{basicInfo===undefined||JSON.stringify(basicInfo) == "{}"?"":basicInfo&&basicInfo.open_users.length===0 ?"绑定":"解绑"}</WordsBtn>
{/*</div>*/} </div>
{/*</div>*/} </div>
{/*</div>*/} </div>
{/*<style>*/} <style>
{/*{*/} {
{/*`*/} `
{/*.ml70{*/} .ml70{
{/*margin-left: 70px;*/} margin-left: 70px;
{/*}*/} }
{/*`*/} `
{/*}*/} }
{/*</style>*/} </style>
{/*<Modal*/} <Modal
{/*closable={false}*/} closable={false}
{/*footer={null}*/} footer={null}
{/*visible={this.state.visible}*/} visible={this.state.visible}
{/*onOk={this.handleOk}*/} onOk={this.handleOk}
{/*onCancel={this.handleCancel}*/} onCancel={this.handleCancel}
{/*>*/} >
{/*<div>*/} <div>
{/*<iframe*/} <iframe
{/*className={"weixinheight390 ml70"}*/} className={"weixinheight390 ml70"}
{/*frameBorder="0"*/} frameBorder="0"
{/*sandbox="allow-scripts allow-same-origin allow-top-navigation"*/} sandbox="allow-scripts allow-same-origin allow-top-navigation"
{/*scrolling="no"*/} scrolling="no"
{/*src={`https://open.weixin.qq.com/connect/qrconnect?appid=wx6b119e2d829c13fa&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginstart&response_type=code&scope=snsapi_login&state=account#wechat_redirect`}></iframe>*/} src={`https://open.weixin.qq.com/connect/qrconnect?appid=wx6b119e2d829c13fa&redirect_uri=https%3a%2f%2f${window.location.host}%2fotherloginstart&response_type=code&scope=snsapi_login&state=account#wechat_redirect`}></iframe>
{/*<p className="clearfix pagemancenter">*/} <p className="clearfix pagemancenter">
{/*<a className={"startlogin color-blue"} onClick={()=>this.handleCancel()}>取消</a>*/} <a className={"startlogin color-blue"} onClick={()=>this.handleCancel()}>取消</a>
{/*</p>*/} </p>
{/*</div>*/} </div>
{/*</Modal>*/} </Modal>
{/*</div>*/} </div>
</Form> </Form>
</div> </div>
<div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div> <div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>

Write Preview
Loading…
Cancel
Save