From 10609006227d6ddb34dc03de6271693b26617eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sun, 13 Oct 2019 12:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=20=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/login/LoginDialog.js | 36 +++++++++++++++++--
 .../modules/paths/PathDetail/DetailCards.js   | 13 +++----
 public/react/src/modules/tpm/TPMBanner.js     |  2 +-
 .../src/modules/tpm/TPMFork/TPMForklist.js    |  2 +-
 .../src/modules/tpm/shixuns/ShixunCard.js     |  2 +-
 .../modules/user/LoginRegisterComponent.js    | 28 ++++++++++++---
 6 files changed, 66 insertions(+), 17 deletions(-)

diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index b15518a4f..3f5afd845 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -349,8 +349,25 @@ class LoginDialog extends Component {
       // console.log(nextProps.isRender);
 
     }
-
+		IsPC=()=>{
+			var userAgentInfo = navigator.userAgent;
+			var Agents = ["Android", "iPhone",
+				"SymbianOS", "Windows Phone",
+				"iPad", "iPod"];
+			var flag = true;
+			for (var v = 0; v < Agents.length; v++) {
+				if (userAgentInfo.indexOf(Agents[v]) > 0) {
+					flag = false;
+					break;
+				}
+			}
+			return flag;
+		}
     componentDidMount() {
+		  	let flag = this.IsPC(); //true为PC端，false为手机端
+				this.setState({
+					isphone:flag
+				})
 
         if(this.props.isRender!=undefined){
             this.setState({
@@ -536,6 +553,19 @@ class LoginDialog extends Component {
           modalsType={this.state.MyEduCoderModals}
           setNotcompleteds={()=>{this.setNotcompleteds()}}
         />
+
+				{this.state.isphone===false?<style>
+					{
+						`
+						  #DialogID .dialogBox {
+									width: 405px !important;
+							}
+							.dialogBox {
+									height: 290px !important;
+							}
+						`
+					}
+				</style>:""}
 				{isRender===true?
             <div className={dialogBox}>
                   <div id="closeIcon" onClick={()=>{this.handleDialogClose()}}>
@@ -622,7 +652,7 @@ class LoginDialog extends Component {
 
                           </p>
 
-												<p className="clearfix mt20">
+													{this.state.isphone===true?<p className="clearfix mt20">
 
 													<span className={"startlogin"}>————————  快速登录  ————————</span>
 													<div className={"mt10"}>
@@ -630,7 +660,7 @@ class LoginDialog extends Component {
 															<img src={require('./WeChat.png')}  alt="微信登录"/>
 														</a>
 													</div>
-												</p>
+												</p>:""}
 
                         </form>}
 												{weixinlogin===true?<iframe
diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js
index 2c4020d9a..6bc972a03 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCards.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCards.js
@@ -199,12 +199,13 @@ class DetailCards extends Component{
 		  this.props.showLoginDialog()
 			return
 		}
-		// if(this.props.checkIfProfileCompleted()===false){
-		// 	this.setState({
-		// 		AccountProfiletype:true
-		// 	})
-		// 	return
-		// }
+
+		if(this.props.checkIfProfileCompleted()===false){
+		  this.props.showProfileCompleteDialog()
+			return
+		}
+
+
 		// if(this.props.checkIfProfessionalCertification()===false){
 		// 	this.props.showProfileCompleteDialog()
 		// 	return
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index a67038c36..b660001c6 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -586,7 +586,7 @@ class TPMBanner extends Component {
 			  const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 		const MyRate = ({ defaultValue, ...rest }) => {
 			let myValue = defaultValue;
-			console.log(myValue-Math.floor(myValue))
+			// console.log(myValue-Math.floor(myValue))
 			// if (myValue < Math.ceil(myValue)) {
 			// 	myValue = Math.floor(myValue) + 0.5;
 			// }
diff --git a/public/react/src/modules/tpm/TPMFork/TPMForklist.js b/public/react/src/modules/tpm/TPMFork/TPMForklist.js
index 8cb5d2378..59d9d23b8 100644
--- a/public/react/src/modules/tpm/TPMFork/TPMForklist.js
+++ b/public/react/src/modules/tpm/TPMFork/TPMForklist.js
@@ -90,7 +90,7 @@ export default class TPMFork_listComponent extends Component {
 
 		const MyRate = ({ defaultValue, ...rest }) => {
 			let myValue = defaultValue;
-			console.log(myValue-Math.floor(myValue))
+			// console.log(myValue-Math.floor(myValue))
 			// if (myValue < Math.ceil(myValue)) {
 			// 	myValue = Math.floor(myValue) + 0.5;
 			// }
diff --git a/public/react/src/modules/tpm/shixuns/ShixunCard.js b/public/react/src/modules/tpm/shixuns/ShixunCard.js
index 021185cc8..d08af8bed 100644
--- a/public/react/src/modules/tpm/shixuns/ShixunCard.js
+++ b/public/react/src/modules/tpm/shixuns/ShixunCard.js
@@ -48,7 +48,7 @@ class ShixunCard extends Component {
     let {middleshixundata, pagination, typepvisible, pages, totalcount} = this.props;
 		const MyRate = ({ defaultValue, ...rest }) => {
 			let myValue = defaultValue;
-			console.log(myValue-Math.floor(myValue))
+			// console.log(myValue-Math.floor(myValue))
 			// if (myValue < Math.ceil(myValue)) {
 			// 	myValue = Math.floor(myValue) + 0.5;
 			// }
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 978682e0b..52e0d6869 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -130,7 +130,25 @@ class LoginRegisterComponent extends Component {
     changeType = () => {
         this.setState({classpass: 'password'});
     }
+	IsPC=()=>{
+		var userAgentInfo = navigator.userAgent;
+		var Agents = ["Android", "iPhone",
+			"SymbianOS", "Windows Phone",
+			"iPad", "iPod"];
+		var flag = true;
+		for (var v = 0; v < Agents.length; v++) {
+			if (userAgentInfo.indexOf(Agents[v]) > 0) {
+				flag = false;
+				break;
+			}
+		}
+		return flag;
+	}
     componentDidMount = () => {
+			let flag = this.IsPC(); //true为PC端，false为手机端
+			this.setState({
+				isphone:flag
+			})
         // console.log("componentDidUpdate");
         // console.log(this.props);
         let pcipns=this.IsPC();
@@ -1015,15 +1033,15 @@ class LoginRegisterComponent extends Component {
 
                           <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}
                                   size={"large"}>登录</Button>
-												<p className="clearfix mb10 textcenter">
+												{this.state.isphone===true?<p className="clearfix mb10 textcenter">
 
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
+												<span className={"startlogin"}>————————  快速登录  ————————</span>
 													<div className={"mt10"}>
 														<a onClick={()=>this.openweixinlogin()}>
 															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
 														</a>
 													</div>
-												</p>
+												</p>:""}
                       </div>
                   }
 
@@ -1176,7 +1194,7 @@ class LoginRegisterComponent extends Component {
                           <Button className=" font-16 mb20" type="primary" style={{height:"46px", width: "100%",marginTop:"26px"}} onClick={() => this.postregistered()}
                                   size={"large"}>注册</Button>
 
-												<p className="clearfix mb10 textcenter">
+												{this.state.isphone===true?<p className="clearfix mb10 textcenter">
 
 													<span className={"startlogin"}>————————  快速登录  ————————</span>
 													<div className={"mt10"}>
@@ -1184,7 +1202,7 @@ class LoginRegisterComponent extends Component {
 															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
 														</a>
 													</div>
-												</p>
+												</p>:""}
                       </div>
                   }
 								{weixinlogin===true?<iframe