From 55667b923821b0ac0c9ccba47cf1580c28716f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 12 Nov 2019 09:55:12 +0800
Subject: [PATCH] =?UTF-8?q?QQ=E7=99=BB=E5=BD=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/login/LoginDialog.js | 30 +++++-----
 .../modules/user/LoginRegisterComponent.js    | 56 +++++++++----------
 .../modules/user/account/AccountBinding.js    |  2 -
 3 files changed, 43 insertions(+), 45 deletions(-)

diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 73e2e8afe..9a347a279 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -720,23 +720,23 @@ 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>*/}
+														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
+															<img src={require('./qq.png')}  alt="qq登录"/>
+														</a>
 													</div>
-												</p>:""}
-													{/*<p className="clearfix mt20">*/}
-
-														{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
-														{/*<div className={"mt10"}>*/}
-															{/*/!*<a onClick={()=>this.openweixinlogin()}>*!/*/}
-															{/*/!*<img src={require('./WeChat.png')}  alt="微信登录"/>*!/*/}
-															{/*/!*</a>*!/*/}
-															{/*<a onClick={()=>this.openphoneqqlogin()} className={"ml10"}>*/}
-																{/*<img src={require('./qq.png')}  alt="qq登录"/>*/}
+												</p>:<p className="clearfix mt20">
+
+														<span className={"startlogin"}>————————  快速登录  ————————</span>
+														<div className={"mt10"}>
+															{/*<a onClick={()=>this.openweixinlogin()}>*/}
+															{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
 															{/*</a>*/}
-														{/*</div>*/}
-													{/*</p>*/}
+															<a onClick={()=>this.openphoneqqlogin()} className={"ml10"}>
+																<img src={require('./qq.png')}  alt="qq登录"/>
+															</a>
+														</div>
+													</p>}
+
 
 
                         </form>}
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index c48e29618..01188bdd1 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -1085,24 +1085,24 @@ class LoginRegisterComponent extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
 														</a>
-														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
-															{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
+														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
+															<img src={require('./img/qq.png')}  alt="qq登录"/>
+														</a>
+													</div>
+												</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>:	""}
+												</p>}
                       </div>
                   }
-								{/*<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>*/}
+
 
 
                   {
@@ -1260,27 +1260,27 @@ class LoginRegisterComponent extends Component {
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
 														</a>
-														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
-															{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
+														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
+															<img src={require('./img/qq.png')}  alt="qq登录"/>
+														</a>
+													</div>
+												</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>:	""
+												</p>
 												}
                       </div>
                   }
 
 
-								{/*<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>*/}
+
 
 								{weixinlogin===true?<iframe
 									className={"weixinheight390 mt20"}
diff --git a/public/react/src/modules/user/account/AccountBinding.js b/public/react/src/modules/user/account/AccountBinding.js
index 829eb3299..05fe59482 100644
--- a/public/react/src/modules/user/account/AccountBinding.js
+++ b/public/react/src/modules/user/account/AccountBinding.js
@@ -242,7 +242,6 @@ class AccountSecure extends Component {
 					<Form>
 
 						{list.map((item,key)=>{
-							if(item.en_type!="qq"){
 									return(
 										<div className="flexTable" key={key}>
 											<div className="flexTable">
@@ -271,7 +270,6 @@ class AccountSecure extends Component {
 											</div>
 										</div>
 									)
-								}
 							})
 						}