Merge branches 'dev_cxt' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_cxt

public/react/src/App.js

@@ -608,10 +608,10 @@ class App extends Component {
 										}
 									}
 								/>
-								<Route
-									path="/interesse" component={Interestpage}
+								{/*<Route*/}
+								{/*	path="/interesse" component={Interestpage}*/}
 
-								/>
+								{/*/>*/}
 								<Route path="/shixuns/new" component={Newshixuns}>
 								</Route>
 

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

@@ -1294,8 +1294,9 @@ submittojoinclass=(value)=>{
 										<li><a  onClick={(url)=>this.getUser("/courses/new")}>{this.props.user&&this.props.user.main_site===false?"新建课堂":"新建翻转课堂"}</a></li>:""
 									}
 									{shixuntype===true?"":<li><a onClick={(url)=>this.getUser("/shixuns/new")}>新建实训项目</a></li>}
-                  {this.props.Headertop===undefined?"":
-										pathstype===true?"":this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>:""
+                  {this.props.user&&this.props.user.main_site===false?"":this.props.Headertop===undefined?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>}
+                  {this.props.user&&this.props.user.main_site===true?"":this.props.Headertop===undefined?"":
+                    pathstype===true?"":this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>:""
                   }
 									{this.props.user&&this.props.user.main_site===true?<li><a onClick={(url)=>this.getUser("/projects/new","projects")} target="_blank">新建开发项目</a></li>:""}
                 </ul>

public/react/src/modules/tpm/TPMsettings/Shixuninformation.js

@@ -704,9 +704,6 @@ class Shixuninformation extends Component {
         })
       }
     });
-    this.setState({
-      loading: false
-    })
   }
 
   Selectthestudent = (value) => {

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -97,6 +97,7 @@ class Newshixuns extends Component {
     })
     const mdContnet = this.contentMdRef.current.getValue().trim();
     this.props.form.validateFieldsAndScroll((err, values) => {
+      debugger
       if (!err) {
         console.log('Received values of form: ', values);
 
@@ -117,21 +118,20 @@ class Newshixuns extends Component {
             // window.open("/shixuns/"+response.data.shixun_identifier+"/challenges");
           } else {
             this.setState({
-              loading: true
+              loading: false
             })
           }
         }).catch((error) => {
           this.setState({
-            loading: true
+            loading: false
           })
         })
-
-
+      }else{
+        this.setState({
+          loading: false
+        })
       }
     });
-    this.setState({
-      loading: false
-    })
   };
   Selectthestudent = (value) => {
     this.props.form.setFieldsValue({

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -263,7 +263,7 @@ class Challengesjupyter extends Component {
 								""
 								:
 								(
-									is_teacher===true||admin===true||business===true||mysidentity===true?
+								admin===true||business===true||mysidentity===true?
 										<div className="sortinxdirection mt60">
 											<div className="renwuxiangssi sortinxdirection">
 												<div><p className="renwuxiangqdiv">任务详情</p></div>
@@ -306,7 +306,7 @@ class Challengesjupyter extends Component {
 							}
 						</style>
 						{
-								is_teacher===true||admin===true||business===true||mysidentity===true?
+						admin===true||business===true||mysidentity===true?
 									<div className="mt35">
 										<div className="pb47">
 											{

public/react/src/modules/user/usersInfo/InfosPath.js

@@ -168,6 +168,8 @@ class InfosPath extends Component{
 
       </Menu>
     );
+
+    // console.log(this.props.user&&this.props.user.main_site)
     return(
       <div className="educontent">
         <Spin size="large" spinning={isSpin}>
@@ -327,7 +329,10 @@ class InfosPath extends Component{
         <div className="square-list clearfix">
           {/* 295 */}
           {
-            page == 1 && is_current && !category ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:""
+            this.props.user&&this.props.user.main_site===true?page == 1 && is_current && !category ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:"":""
+          }
+          {
+            this.props.user&&this.props.user.main_site===false?this.props.user&&this.props.user.admin===true||this.props.user&&this.props.user.is_teacher===true||this.props.user&&this.props.user.business===true?page == 1 && is_current && !category ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:"":"":""
           }
           {
             (!data || (data && data.subjects.length==0)) && category && <NoneData></NoneData>