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

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>
+                          <div className={"wechatcenter mt10"}>己的课堂和实训课程哦</div>
-                            <a onClick={this.hide}>Close</a>
+                          <div className={"wechatcenter mt15"}>   <Button  type="primary" >我知道了</Button></div>
                        </pre>
                     }
                     trigger="click"

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){
-          if (response.data.shixun.scope_partment.length > 0) {
+            if (response.data.shixun&&response.data.shixun.scope_partment.length > 0) {
               this.setState({
                 scopetype: true
               })
             }
         }
+
         this.setState({
           data: response.data
         })