调整

public/react/src/modules/login/Trialapplication.js

@@ -32,6 +32,7 @@ class Trialapplication extends Component {
 			readonlyInput: true,
 			user_phone_binded: false,
 			showTrial: false,
+			user: undefined,
 		}
 		//user_phone_binded  判断是否手机号验证
 		// console.log("Trialapplication");
@@ -43,15 +44,32 @@ class Trialapplication extends Component {
 	}
 
 	componentWillReceiveProps(nextProps) {
+		// console.log("46");
+		// console.log(nextProps);
+		// console.log(this.props);
+		if (nextProps.user != this.props.user) {
+			// console.log("50");
+			// console.log(nextProps.user);
+			if (nextProps.user !== undefined) {
+				// console.log("53");
+				// console.log(nextProps.user);
+				this.setState({
+					user_phone_binded: nextProps.user.user_phone_binded,
+				})
+			}
 
 
 		}
 
+
+	}
+
+
 	//初始化数据
 	componentDidMount() {
-		console.log("53");
+		// console.log("53");
-
+		//
-		console.log(this.props.isRenders);
+		// console.log(this.props.isRenders);
 
 		if (this.props.isRenders != undefined) {
 			this.setState({
@@ -77,21 +95,6 @@ class Trialapplication extends Component {
 			//TODO 这里如果样式变了会出现css不加载的情况
 
 		});
-		console.log(this.props.isRenders);
-		console.log("89");
-		console.log(this.state.props.user_phone_binded );
-		try {
-			if (this.state.props.user_phone_binded !== undefined) {
-				console.log(this.state.props.user_phone_binded);
-				this.setState({
-					user_phone_binded: this.state.props.user_phone_binded,
-				})
-			}
-
-		} catch (e) {
-			console.log(e);
-
-		}
 
 	}
 
@@ -384,80 +387,77 @@ class Trialapplication extends Component {
 							<style>
 								{
 									`
-//                         .dialogBox{
+												.dialogBox2{
-//     height: 370px;
-// }
-.dialogBox2{
 														height: 420px;
-}
+												}
-#DialogIDysl{
+												#DialogIDysl{
 														z-index: 20000;
-}
+												}
-#DialogIDysl .dialogBox {
+												#DialogIDysl .dialogBox {
 														width: 560px;
-}
+												}
-.MuiPaper-elevation24-45{
+												.MuiPaper-elevation24-45{
 														box-shadow:none !important;
-}
+												}
-.MuiPaper-root-19{
+												.MuiPaper-root-19{
 														/* background:none !important; */
-}
+												}
-.MuiDialog-paper-9{
+												.MuiDialog-paper-9{
 														overflow-y:hidden !important;
-}
+												}
-#log_reg_content{
+												#log_reg_content{
 														top: 0px !important;
-}
+												}
-#log_reg_content{
+												#log_reg_content{
 														width:400px !important;
 														border-radius:40px !important;
 														box-shadow:4px 8px 12px rgba(76,76,76,0.3);
-}
+												}
-.log_nav li{
+												.log_nav li{
 														height:17px;
 														font-size:18px;
 														font-family:NotoSansHans-Regular;
 														color:rgba(25,0,0,1);
 														line-height: 0px;
-}
+												}
-.vertical-line{
+												.vertical-line{
 														margin-left:10px;
 														margin-right:10px;
-}
+												}
-#DialogIDysl div  {
+												#DialogIDysl div  {
 														overflow-y:visible !important;
 														box-shadow:none !important;
 														border-radius:15px !important;
-}
+												}
-#wrapper{
+												#wrapper{
 														position: relative;
 														top: 3px;
 														left: 0px;
 														margin-bottom: 17px;
-}
+												}
 												
-.slidetounlock{
+												.slidetounlock{
 														font-size: 12px;
 														background:-webkit-gradient(linear,left top,right top,color-stop(0,#4d4d4d),color-stop(.4,#4d4d4d),color-stop(.5,#fff),color-stop(.6,#4d4d4d),color-stop(1,#4d4d4d));
 														-webkit-background-clip:text;
 														-webkit-text-fill-color:transparent;
 														-webkit-animation:slidetounlock 3s infinite;
 														-webkit-text-size-adjust:none
-}
+												}
-@-webkit-keyframes slidetounlock{0%{background-position:-200px 0} 100%{background-position:200px 0}}
+												@-webkit-keyframes slidetounlock{0%{background-position:-200px 0} 100%{background-position:200px 0}}
 												
-.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}
+												.handler_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTEyNTVEMURGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTEyNTVEMUNGMkVFMTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo2MTc5NzNmZS02OTQxLTQyOTYtYTIwNi02NDI2YTNkOWU5YmUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+YiRG4AAAALFJREFUeNpi/P//PwMlgImBQkA9A+bOnfsIiBOxKcInh+yCaCDuByoswaIOpxwjciACFegBqZ1AvBSIS5OTk/8TkmNEjwWgQiUgtQuIjwAxUF3yX3xyGIEIFLwHpKyAWB+I1xGSwxULIGf9A7mQkBwTlhBXAFLHgPgqEAcTkmNCU6AL9d8WII4HOvk3ITkWJAXWUMlOoGQHmsE45ViQ2KuBuASoYC4Wf+OUYxz6mQkgwAAN9mIrUReCXgAAAABJRU5ErkJggg==") no-repeat center;}
-.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}
+												.handler_ok_bg{ background: #fff url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3hpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NTc3MiwgMjAxNC8wMS8xMy0xOTo0NDowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo0ZDhlNWY5My05NmI0LTRlNWQtOGFjYi03ZTY4OGYyMTU2ZTYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDlBRDI3NjVGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDlBRDI3NjRGMkQ2MTFFNEI5NDBCMjQ2M0ExMDQ1OUYiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTQgKE1hY2ludG9zaCkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDphNWEzMWNhMC1hYmViLTQxNWEtYTEwZS04Y2U5NzRlN2Q4YTEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NGQ4ZTVmOTMtOTZiNC00ZTVkLThhY2ItN2U2ODhmMjE1NmU2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+k+sHwwAAASZJREFUeNpi/P//PwMyKD8uZw+kUoDYEYgloMIvgHg/EM/ptHx0EFk9I8wAoEZ+IDUPiIMY8IN1QJwENOgj3ACo5gNAbMBAHLgAxA4gQ5igAnNJ0MwAVTsX7IKyY7L2UNuJAf+AmAmJ78AEDTBiwGYg5gbifCSxFCZoaBMCy4A4GOjnH0D6DpK4IxNSVIHAfSDOAeLraJrjgJp/AwPbHMhejiQnwYRmUzNQ4VQgDQqXK0ia/0I17wJiPmQNTNBEAgMlQIWiQA2vgWw7QppBekGxsAjIiEUSBNnsBDWEAY9mEFgMMgBk00E0iZtA7AHEctDQ58MRuA6wlLgGFMoMpIG1QFeGwAIxGZo8GUhIysmwQGSAZgwHaEZhICIzOaBkJkqyM0CAAQDGx279Jf50AAAAAABJRU5ErkJggg==") no-repeat center;}
 												
-#drag{
+												#drag{
 														position: relative;
 														background-color: #e8e8e8;
 														width: 340px;
 														height: 34px;
 														line-height: 34px;
 														text-align: center;
-}
+												}
-#drag .handler{
+												#drag .handler{
 														position: absolute;
 														top: 0px;
 														left: 0px;
@@ -465,14 +465,14 @@ class Trialapplication extends Component {
 														height: 32px;
 														/*border: 1px solid #ccc;*/
 														cursor: move;
-}
+												}
 												
-#drag .drag_bg{
+												#drag .drag_bg{
 														background-color: #7ac23c;
 														height: 34px;
 														width: 0px;
-}
+												}
-#drag .drag_text{
+												#drag .drag_text{
 														position: absolute;
 														top: 0px;
 														width: 340px;
@@ -483,21 +483,21 @@ class Trialapplication extends Component {
 														-o-user-select:none;
 														-ms-user-select:none;
 														font-size: 12px;
-}
+												}
-#drag{
+												#drag{
 														overflow: hidden !important;
-}
+												}
 												
 												
 												
-#closeIcon{
+												#closeIcon{
 														position: absolute;
 														top: -30px;
 														right: -27px;
 														z-index: 100000;
-}
+												}
 												
-.bluebutton{
+												.bluebutton{
 														width: 100%;
 														text-align: center;
 														color: #FFFFff!important;
@@ -508,8 +508,8 @@ class Trialapplication extends Component {
 														border-radius: 4px;
 														letter-spacing: 2px;
 														cursor: pointer;
-}
+												}
-.ant-input {
+												.ant-input {
 														font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
 														-webkit-box-sizing: border-box;
 														box-sizing: border-box;
@@ -531,7 +531,7 @@ class Trialapplication extends Component {
 														-webkit-transition: all .3s;
 														-o-transition: all .3s;
 														transition: all .3s;
-}
+												}
                         `
 								}
 							</style>

public/react/src/modules/tpm/NewHeader.js

@@ -170,7 +170,6 @@ class NewHeader extends Component {
       submitapplications:false,
       isRender:false,
       isRenders:false,
-      user_phone_binded:false,
       showTrial:false,
     }
     // console.log("176")
@@ -209,18 +208,18 @@ class NewHeader extends Component {
   }
 
   componentDidUpdate = (prevProps) => {
-    if(prevProps.user!=this.props.user){
+    // if(prevProps.user!=this.props.user){
-      // console.log("216")
+    //   // console.log("216")
-      // console.log(prevProps.user);
+    //   // console.log(prevProps.user);
-      // console.log(this.props.user);
+    //   // console.log(this.props.user);
-      if(this.props.user !== undefined){
+    //   if(this.props.user !== undefined){
-        this.setState({
+    //     this.setState({
-              user_phone_binded :this.props.user.user_phone_binded,
+    //           user_phone_binded :this.props.user.user_phone_binded,
-            })
+    //         })
-      }
+    //   }
-
+    //
-
+    //
-    }
+    // }
   }
   componentWillReceiveProps(newProps, oldProps) {
     this.setState({
@@ -581,7 +580,6 @@ submittojoinclass=(value)=>{
       user,
       isRender,
       isRenders,
-      user_phone_binded,
     }=this.state;
     /*
         用户名称  用户头像url
@@ -627,7 +625,7 @@ submittojoinclass=(value)=>{
         {/*      />*/}
         {/*      :""*/}
         {/*}*/}
-        <Trialapplication  {...this.state} user_phone_binded={user_phone_binded} ></Trialapplication>
+        <Trialapplication  {...this.state}  ></Trialapplication>
         <div className="educontent clearfix">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
           <a href="/">