Merge branches 'dev_aliyun' and 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/Index.js

@@ -18,7 +18,7 @@ const ListPageIndex = Loadable({
 
 //课堂首页
 const CoursesHome = Loadable({
-    loader: () => import('./coursesHome/coursesHome'),
+    loader: () => import('./coursesHome/CoursesHome'),
     loading:Loading,
 })
 

public/react/src/modules/courses/coursesHome/CoursesHome.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import {getImageUrl} from 'educoder';
-import CoursesHomeCard from "./coursesHomeCard.js"
+import CoursesHomeCard from "./CoursesHomeCard.js"
 import axios from 'axios';
 import {Input,Tooltip} from 'antd';
 import UpgradeModals from '../../modals/UpgradeModals';
@@ -10,7 +10,7 @@ import '@icedesign/base/lib/pagination/style.js';
 
 
 const Search = Input.Search;
-class coursesHome extends Component{
+class CoursesHome extends Component{
   constructor(props) {
     super(props)
     this.state = {
@@ -160,7 +160,7 @@ class coursesHome extends Component{
     )
   }
 }
-export default coursesHome;
+export default CoursesHome;
 
 
 //                {/*<Pagination showQuickJumper current={page} pageSize={16} total={coursesHomelist.courses_count} onChange={this.onChange} />*/}

public/react/src/modules/courses/coursesHome/CoursesHomeCard.js

@@ -4,7 +4,7 @@ import { BrowserRouter as Router, Route, Link } from "react-router-dom";
 import {Tooltip,Spin,Alert} from 'antd';
 import ShowSpin from '../../../common/ShowSpin';
 
-class coursesHomeCard extends Component{
+class CoursesHomeCard extends Component{
   constructor(props) {
     super(props)
   }
@@ -134,5 +134,5 @@ class coursesHomeCard extends Component{
           )
         }
       }
-export default coursesHomeCard;
+export default CoursesHomeCard;
 

public/react/src/modules/courses/coursesPublic/ShixunModal.js

@@ -29,11 +29,13 @@ class ShixunModal extends Component{
 
 		axios.get(url).then((result)=>{
 			if(result.status===200){
-				this.setState({
-					shixunmodallist:result.data,
-					hometypepvisible:false,
-					newshixunmodallist:result.data.shixun_list,
-				})
+				if(result.data.message===undefined){
+					this.setState({
+						shixunmodallist:result.data,
+						hometypepvisible:false,
+						newshixunmodallist:result.data.shixun_list,
+					})
+				}
 			}
 		}).catch((error)=>{
 			console.log(error);
@@ -59,18 +61,18 @@ class ShixunModal extends Component{
 			}
 		}).then((result)=>{
 			if(result.status===200){
+				if(result.data.message===undefined){
+					let shixun_list = result.data.shixun_list;
+					for (var i = 0; i < shixun_list.length; i++) {
+						newshixunmodallists.push(shixun_list[i])
+					}
+					this.setState({
+						shixunmodallist: result.data,
+						newshixunmodallist: newshixunmodallists,
+						hometypepvisible: false
+					})
 
-				let  shixun_list=result.data.shixun_list;
-				for(var i=0; i<shixun_list.length;i++){
-					newshixunmodallists.push(shixun_list[i])
 				}
-				this.setState({
-					shixunmodallist:result.data,
-					newshixunmodallist:newshixunmodallists,
-					hometypepvisible:false
-				})
-
-
 			}
 
 		}).catch((error)=>{