Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

# Conflicts:
#	public/react/src/modules/login/Trialapplicationysl.js

public/react/src/App.js

@@ -16,6 +16,7 @@ import '@icedesign/base/index.scss';
 import LoginDialog from './modules/login/LoginDialog'
 import Notcompletedysl from './modules/user/Notcompletedysl'
 import Trialapplicationysl from './modules/login/Trialapplicationysl'
+import Trialapplicationreview from './modules/user/Trialapplicationreview'
 import Trialapplication from './modules/login/Trialapplication'
 
 import NotFoundPage from './NotFoundPage'
@@ -268,6 +269,7 @@ class App extends Component {
 					<LoginDialog {...this.props} {...this.state}></LoginDialog>
 					<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
 					<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
+					<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
 					{/*{*/}
 					{/*	isRender === true?*/}
 					{/*		<LoginDialog></LoginDialog> : ""*/}

public/react/src/modules/user/Trialapplicationreview.js

@@ -0,0 +1,65 @@
+import React, { Component } from 'react';
+import {getImageUrl} from 'educoder';
+import { Modal} from 'antd';
+import axios from 'axios';
+import './common.css'
+//您的试用申请正在审核中，请耐心等待
+class Trialapplicationreview extends Component {
+
+	constructor(props) {
+		super(props);
+		this.state={
+			modalsType:false,
+		}
+
+	}
+
+	componentDidMount() {
+		axios.interceptors.response.use((response) => {
+			if (response != undefined)
+				if (response && response.data.status === 408) {
+					this.setState({
+						modalsType: true
+					})
+
+				}
+			return response;
+		}, (error) => {
+			//TODO 这里如果样式变了会出现css不加载的情况
+
+		});
+	}
+
+
+		setDownload=()=>{
+		//立即联系
+		this.setState({
+			modalsType:false
+		})
+
+	}
+
+
+	render() {
+
+		return(
+			<Modal
+				keyboard={false}
+				closable={false}
+				footer={null}
+				destroyOnClose={true}
+				title="提示"
+				centered={true}
+				visible={this.state.modalsType===undefined?false:this.state.modalsType}
+				width="530px"
+			>
+				<div className="educouddiv tabeltext-alignleft">
+					<div className={"tabeltext-alignleft mb20"}><p>您的试用申请正在审核中，请耐心等待</p></div>
+					<a className="task-btn task-btn-orange bth100" onClick={()=>this.setDownload()}>知道啦</a>
+				</div>
+			</Modal>
+		)
+	}
+}
+
+export default Trialapplicationreview;