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

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"}>
+														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
-															<img src={require('./qq.png')}  alt="qq登录"/>
+															{/*<img src={require('./qq.png')}  alt="qq登录"/>*/}
-														</a>
+														{/*</a>*/}
 													</div>
-												</p>:<p className="clearfix mt20">
+												</p>:""}
-
+													{/*<p className="clearfix mt20">*/}
-														<span className={"startlogin"}>————————  快速登录  ————————</span>
+
-														<div className={"mt10"}>
+														{/*<span className={"startlogin"}>————————  快速登录  ————————</span>*/}
-															{/*<a onClick={()=>this.openweixinlogin()}>*/}
+														{/*<div className={"mt10"}>*/}
-															{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
+															{/*/!*<a onClick={()=>this.openweixinlogin()}>*!/*/}
+															{/*/!*<img src={require('./WeChat.png')}  alt="微信登录"/>*!/*/}
+															{/*/!*</a>*!/*/}
+															{/*<a onClick={()=>this.openphoneqqlogin()} className={"ml10"}>*/}
+																{/*<img src={require('./qq.png')}  alt="qq登录"/>*/}
 															{/*</a>*/}
-															<a onClick={()=>this.openphoneqqlogin()} className={"ml10"}>
+														{/*</div>*/}
-																<img src={require('./qq.png')}  alt="qq登录"/>
+													{/*</p>*/}
-															</a>
-														</div>
-													</p>}
-
 
 
                         </form>}

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"}>
+														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
+															{/*<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"}>
+														{/*<a onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
+															{/*<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"}

public/react/src/modules/user/account/AccountBinding.js

@@ -242,6 +242,7 @@ class AccountSecure extends Component {
 					<Form>
 
 						{list.map((item,key)=>{
+							if(item.en_type!="qq"){
 									return(
 										<div className="flexTable" key={key}>
 											<div className="flexTable">
@@ -270,7 +271,7 @@ class AccountSecure extends Component {
 											</div>
 										</div>
 									)
-
+								}
 							})
 						}