From 76838c0ea52083eb6ab918fb0a80ee9bd0ecfb09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 13 Dec 2019 14:26:17 +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/modules/tpm/TPMBanner.js           |  6 +++---
 .../src/modules/tpm/TPMsettings/TPMsettings.js      | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 74016634f..b43d86640 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -951,10 +951,10 @@ class TPMBanner extends Component {
                 {shixunsDetails.shixun_status === 0 && this.props.identity < 5 ?
                   <Popover
                     content={
-                       <pre>
+                       <pre className={"pd20"}>
                           <div>您编辑完成后，可以马上使用到自</div>
-                            <div>己的课堂和实训课程哦</div>
-                            <a onClick={this.hide}>Close</a>
+                          <div className={"wechatcenter mt10"}>己的课堂和实训课程哦</div>
+                          <div className={"wechatcenter mt15"}>   <Button  type="primary" >我知道了</Button></div>
                        </pre>
                     }
                     trigger="click"
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 8e7b0b93a..12a6c4a70 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -41,13 +41,14 @@ export default class TPMsettings extends Component {
     axios.get(Url).then((response) => {
       // alert(response.data.shixun.choice_standard_scripts)
       if (response.status === 200) {
-        if (response.data.shixun.scope_partment) {
-          if (response.data.shixun.scope_partment.length > 0) {
-            this.setState({
-              scopetype: true
-            })
-          }
+        if(response.data){
+            if (response.data.shixun&&response.data.shixun.scope_partment.length > 0) {
+              this.setState({
+                scopetype: true
+              })
+            }
         }
+
         this.setState({
           data: response.data
         })