From 5954570d57d2c217b0fccb58c8b9b986601565cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 20 Jul 2019 16:25:02 +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/App.js | 2 ++
public/react/src/modules/login/Trialapplicationysl.js | 2 +-
public/react/src/modules/tpm/NewHeader.js | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/public/react/src/App.js b/public/react/src/App.js
index 28a7e977e..110a46963 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -15,6 +15,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 Trialapplication from './modules/login/Trialapplication'
import NotFoundPage from './NotFoundPage'
@@ -266,6 +267,7 @@ class App extends Component {
<MuiThemeProvider theme={theme}>
<LoginDialog {...this.props} {...this.state}></LoginDialog>
<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
+ <Trialapplicationysl {...this.props} {...this.state}></Trialapplicationysl>
{/*{*/}
{/* isRender === true?*/}
{/* <LoginDialog></LoginDialog> : ""*/}
diff --git a/public/react/src/modules/login/Trialapplicationysl.js b/public/react/src/modules/login/Trialapplicationysl.js
index ec7bebcda..18875efa8 100644
--- a/public/react/src/modules/login/Trialapplicationysl.js
+++ b/public/react/src/modules/login/Trialapplicationysl.js
@@ -42,7 +42,7 @@ class Trialapplicationysl extends Component {
}
Cancel = () => {
- this.props.Cancel()
+ // this.props.Cancel()
}
componentWillReceiveProps(nextProps) {
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index fccfb06d6..0692dd9b6 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -636,7 +636,7 @@ submittojoinclass=(value)=>{
{/* />*/}
{/* :""*/}
{/*}*/}
- <Trialapplicationysl {...this.state} {...this.props} Cancel={() => this.cancelModulationModels()} ></Trialapplicationysl>
+ {/*<Trialapplicationysl {...this.state} {...this.props} Cancel={() => this.cancelModulationModels()} ></Trialapplicationysl>*/}
<div className="educontent clearfix">
{/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
<a href="/">