From 04d20727ea7ce95e0a05a75568208f53060247e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 4 Nov 2019 14:14:46 +0800
Subject: [PATCH] =?UTF-8?q?qq=E7=99=BB=E5=BD=95start?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/login/LoginDialog.css   |   8 +-
 public/react/src/modules/login/LoginDialog.js | 135 +++---------------
 .../src/modules/login/Otherloginstart.js      |   1 -
 3 files changed, 28 insertions(+), 116 deletions(-)

diff --git a/public/react/src/modules/login/LoginDialog.css b/public/react/src/modules/login/LoginDialog.css
index 9a9373770..37e2f48b6 100644
--- a/public/react/src/modules/login/LoginDialog.css
+++ b/public/react/src/modules/login/LoginDialog.css
@@ -136,12 +136,18 @@
 .startlogin{
     color:#888;
 }
+
 .weixinheight390{
     height: 390px;
 }
+
+.qqheight390{
+    width: 450px;
+    height: 390px;
+}
 #log_reg_content {
     padding: 38px 30px 20px !important;
 }
 .textcenter{
     text-align: center;
-}
\ No newline at end of file
+}
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 6bd6ac41f..6763f0f91 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -7,7 +7,7 @@ import Dialog, {
   DialogContentText,
   DialogTitle,
 } from 'material-ui/Dialog';
-import {notification } from 'antd';
+import {notification,Modal } from 'antd';
 
 import axios from 'axios';
 
@@ -104,8 +104,8 @@ class LoginDialog extends Component {
         MyEduCoderModals:false,
         Phonenumberisnotco:undefined,
         Phonenumberisnotcobool:false,
-				weixinlogin:false
-
+				weixinlogin:false,
+				qqlogin:false
       };
     }
     enter=(num) =>{
@@ -529,14 +529,23 @@ class LoginDialog extends Component {
 			weixinlogin:true
 		})
 	}
+	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}%2fotherloginstart&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`
+	}
 	hideweixinlogin=()=>{
 		this.setState({
-			weixinlogin:false
+			weixinlogin:false,
+			qqlogin:false
 		})
 	}
     render() {
-      let{open,login,speedy,loginValue,regular,isGoing,isGoingValue,disabled,bottonclass,Phonenumberisnotco,
-        dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender,weixinlogin}=this.state;
+      let{qqlogin,login,isGoing,isGoingValue,disabled,bottonclass,Phonenumberisnotco,
+        dialogBox, isRender,weixinlogin}=this.state;
 
         if (isRender === undefined) {
             isRender = false
@@ -659,6 +668,9 @@ class LoginDialog extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./WeChat.png')}  alt="微信登录"/>
 														</a>
+														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
+															{/*<img src={require('./qq.png')}  alt="qq登录"/>*/}
+														{/*</a>*/}
 													</div>
 												</p>:""}
 
@@ -669,7 +681,9 @@ class LoginDialog extends Component {
 													sandbox="allow-scripts allow-same-origin allow-top-navigation"
 													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#wechat_redirect`}></iframe>:""}
-												{weixinlogin===true?<p className="clearfix">
+
+
+												{weixinlogin===true?<p className="clearfix ">
 													<a className={"startlogin color-blue"} onClick={()=>this.hideweixinlogin()}>返回账号登录</a>
 												</p>:""}
                       </div>
@@ -690,110 +704,3 @@ class LoginDialog extends Component {
 
 export default LoginDialog ;
 
-
-// onkeypress="user_login_keypress(event);"
-
-// onkeypress="user_login_keypress(event);"
-
-
-{/* <div className="pr drag_certi_block width100 mt5">
-  <div id="quick-drag" className="drag_slider" style={{color: 'rgb(255, 255, 255)'}}></div>
-  <div className="new-login-error" style={{height: '25px'}}>
-    <p id="passlogin_error_notice" className="color-orange edu-txt-left none" style={{display: 'block'}}></p>
-  </div>
-</div>}
-
-
-
-{/*第三方账号登录*/}
-
-{/* <div className="mt10 edu-txt-center">
-  <p className="color-grey-9">第三方账号登录</p>
-  <div className="mt15">
-    <a href="javascript:void(0)" className="margin15"><img src="/images/educoder/weixin.png" className="radius"/></a>
-    <a href="javascript:void(0)" className="margin15"><img src="/images/educoder/QQ.png" className="radius"/></a>
-    <a href="javascript:void(0)" className="margin15"><img src="/images/educoder/weibo.png" className="radius"/></a>
-  </div>
-</div>}
-
-//
-// {/*<div className="login-panel none" id="login-panel-2" style={{display:speedy==0?'block':'none'}}>*/}
-// {/*<form acceptCharset="UTF-8" action="/login" id="code_login_form" method="post">*/}
-// {/*<div style={{"display":"inline","padding":"0","margin":"0"}}>*/}
-// {/*<input name="utf8" type="hidden" value="✓"></input>*/}
-// {/*<input name="authenticity_token" type="hidden" value="NVLiIlHZfhVBQtO9djnWncJqqdikNQIIxEmOvzK9vNM="></input>*/}
-// {/*</div>*/}
-// {/*<input name="back_url" type="hidden" value={this.back_url}></input>*/}
-// {/*<input*/}
-// {/*type="text"*/}
-// {/*id="pass_name_input"*/}
-// {/*name="username"*/}
-// {/*ref="shortcutText"*/}
-// {/*onInput={this.shortcutIdChange}*/}
-// {/*className="input-100-45 mt20"*/}
-// {/*placeholder="手机号/邮箱号">*/}
-// {/*</input>*/}
-// {/*<div style={{height: '25px'}}>*/}
-// {/*<p className="color-orange edu-txt-left none" id="pass_name_error_notice"*/}
-// {/*style={{display: shortcutnum==0?'block':'none'}}>请输入有效的手机号/邮箱号*/}
-// {/*</p>*/}
-// {/*</div>*/}
-//
-// {/*<div id="wrapper">*/}
-// {/*/!*drag*/ }*/}
-// {/*<div id="quick-drag" className="drag_slider">*/}
-// {/*<div className="drag_bg"></div>*/}
-// {/*<div className="drag_text slidetounlock">*/}
-// {/*请按住滑块，拖动到最右边*/}
-// {/*</div>*/}
-// {/*<div className="handler handler_bg"></div>*/}
-// {/*</div>*/}
-// {/*<div className="new-login-error" style={{height: '25px'}}>*/}
-// {/*<p id="passlogin_error_notice" className="color-orange edu-txt-left none">请先拖动滑块完成验证</p>*/}
-// {/*</div>*/}
-// {/*</div>*/}
-//
-// {/*<p className="clearfix mt5">*/}
-// {/*<input*/}
-// {/*type="text"*/}
-// {/*name="code"*/}
-// {/*id="login_verification_code"*/}
-// {/*className="input-48-45 edu-txt-center fl"*/}
-// {/*ref="authCodeText"*/}
-// {/*onInput={this.authCodeChange}*/}
-// {/*placeholder="请输入验证码">*/}
-// {/*</input>*/}
-// {/*<button className={gaincode} disabled={disabledType}*/}
-// {/*onClick={()=>{this.get_login_verification_code()}} id="get_verification_code">获取验证码</button>*/}
-// {/*</p>*/}
-//
-// {/*<div style={{height: '25px'}}>*/}
-// {/*<p className="color-orange edu-txt-left none" id="send_code_notice">*/}
-// {/*请输入验证码*/}
-// {/*</p>*/}
-// {/*</div>*/}
-//
-// {/*<button className={authCodeclass} disabled={authCodeType} id="code_login_btn">登录</button>*/}
-//
-// {/*<p className="clearfix mt10">*/}
-//
-// {/*<span className="fl">*/}
-// {/*<input type="checkbox"*/}
-// {/*className="mr5 magic-checkbox"*/}
-// {/*id="autolog"*/}
-// {/*checked={isGoing}*/}
-// {/*onChange={this.handleInputChange}*/}
-// {/*value={isGoingValue}*/}
-// {/*name="isGoing"*/}
-// {/*></input>*/}
-// {/*<label htmlFor="autolog" style={{"top":"0px"}}>下次自动登录</label>*/}
-// {/*</span>*/}
-//
-// {/*<span className="fr">*/}
-// {/*<a href="https://www.educoder.net/account/lost_password" className="mr3 color-grey-9">忘记密码</a><em className="vertical-line"></em>*/}
-// {/*<a href="https://www.educoder.net/user_join" target="_blank" className="color-grey-9">注册</a>*/}
-// {/*</span>*/}
-//
-// {/*</p>*/}
-// {/*</form>*/}
-// {/*</div>*/}
diff --git a/public/react/src/modules/login/Otherloginstart.js b/public/react/src/modules/login/Otherloginstart.js
index fc5d46bbc..97e06f9da 100644
--- a/public/react/src/modules/login/Otherloginstart.js
+++ b/public/react/src/modules/login/Otherloginstart.js
@@ -10,7 +10,6 @@ class Otherloginstart extends Component {
 		let query=this.props.location.search;
 		const type = query.split('?code=');
 		const types = type[1].split('&state=');
-		console.log(types)
 		let codeurl = `/auth/wechat/callback.json`
 		axios.get(codeurl,{params:{
 				code:types[0]