From 9f3acd65b783f478d00c395da4fbfaa0e2e274ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 6 Nov 2019 12:12:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/common/educoder.js           |  2 +-
 .../courses/coursesPublic/SelectResource.js   |  2 +-
 .../courses/coursesPublic/SelectSetting.js    |  2 +-
 .../courses/coursesPublic/sendResource.js     |  2 +-
 public/react/src/modules/login/LoginDialog.js | 32 +++++-----
 .../modules/user/LoginRegisterComponent.js    | 61 ++++++++++---------
 6 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js
index 73c707c9b..004cd91c0 100644
--- a/public/react/src/common/educoder.js
+++ b/public/react/src/common/educoder.js
@@ -1,4 +1,4 @@
-import { from } from '_array-flatten@2.1.2@array-flatten';
+//import { from } from '_array-flatten@2.1.2@array-flatten';
 
 // export { default as OrderStateUtil } from          '../routes/Order/components/OrderStateUtil';
 
diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js
index edc1fc81b..13c201cd0 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectResource.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js
@@ -421,7 +421,7 @@ class Selectresource extends Component{
 									<Radio style={radioStyle} value={0}>
 										立即发布
 									</Radio>
-									<Tooltip placement="bottom" title={"不支持学生延迟发布"} visible={this.props.isStudent()}>
+									<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""} >
 									<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
 										<span className={"mr5"}>延期发布</span>
 										<DatePicker
diff --git a/public/react/src/modules/courses/coursesPublic/SelectSetting.js b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
index 929a19ffa..ea87e8bb2 100644
--- a/public/react/src/modules/courses/coursesPublic/SelectSetting.js
+++ b/public/react/src/modules/courses/coursesPublic/SelectSetting.js
@@ -529,7 +529,7 @@ class Selectsetting extends Component{
 									<Radio style={radioStyle} value={0}>
 										立即发布
 									</Radio>
-									<Tooltip placement="bottom" title={"不支持学生延迟发布"} visible={this.props.isStudent()}>
+									<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""}>
 										<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
 											<span className={"mr5"}>延期发布</span>
 											<DatePicker
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js
index ba4526c82..a0a62048b 100644
--- a/public/react/src/modules/courses/coursesPublic/sendResource.js
+++ b/public/react/src/modules/courses/coursesPublic/sendResource.js
@@ -398,7 +398,7 @@ class Sendresource extends Component{
 								<Radio style={radioStyle} value={0}>
 									立即发布
 								</Radio>
-								<Tooltip placement="bottom" title={"不支持学生延迟发布"} visible={this.props.isStudent()}>
+								<Tooltip placement="bottom" title={this.props.isStudent()===true?"不支持学生延迟发布":""}>
 								<Radio style={radioStyle} value={1} className={"fl"} disabled={this.props.isStudent()}>
 									<span className={"mr5"}>延期发布</span>
 									<DatePicker
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index 940e70c9a..1fa52670e 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -675,22 +675,24 @@ 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登录"/>
-															</a>
-														</div>
-													</p>}
+												</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登录"/>*/}
+														{/*</a>*/}
+													{/*</div>*/}
+													{/*</p>*/}
 
                         </form>}
 												{weixinlogin===true?<iframe
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 55a42b62d..9a11ac91a 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -1057,26 +1057,26 @@ 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>
-													</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 onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
+															{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
 														{/*</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>*/}
 
 
 
@@ -1237,24 +1237,29 @@ 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>
-													</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 onClick={()=>this.openqqlogin()} className={"ml10"}>*/}
+															{/*<img src={require('./img/qq.png')}  alt="qq登录"/>*/}
 														{/*</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"}
 									frameBorder="0"