Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/educoder into develop

public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js

@@ -76,6 +76,7 @@ class CompetitionsIndex extends Component{
 										.courses-head{
 												width: 100%;
 												height: 300px;
+									      background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)});
 											  background-color: #081C4B;
 												background-size: cover;
 												background-position: center;
@@ -85,7 +86,7 @@ class CompetitionsIndex extends Component{
 									`
 								}
 							</style>
-							<div className="courses-head pr Competitionshead " style={{"background":`url(${getImageUrl(`images/educoder/competitions/courses.jpg`)})`}}>
+							<div className="courses-head pr Competitionshead ">
 								<div className="edu-txt-center pathNavLine">
 									<div className="inline path-nav"></div>
 								</div>

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

@@ -111,6 +111,22 @@ class CoursesHome extends Component{
 				{...this.state}
 			/>}
         <div className="newMain clearfix">
+					<style>
+						{
+							`
+										.courses-head{
+												width: 100%;
+												height: 300px;
+												background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.course_banner_url)});
+											  background-color: #081C4B;
+												background-size: cover;
+												background-position: center;
+												background-repeat: no-repeat;
+										}
+
+									`
+						}
+					</style>
             <div className="courses-head pr" >
                 <div className="edu-txt-center pathNavLine">
                     <div className="inline path-nav">

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

@@ -1,12 +1,12 @@
-.courses-head{
-    width: 100%;
-    height: 300px;
-    background-image: url(./courses.jpg);
-    background-color: #081C4B;
-    background-size: cover;
-    background-position: center;
-    background-repeat: no-repeat;
-}
+/*.courses-head{*/
+    /*width: 100%;*/
+    /*height: 300px;*/
+    /*background-image: url(./courses.jpg);*/
+    /*background-color: #081C4B;*/
+    /*background-size: cover;*/
+    /*background-position: center;*/
+    /*background-repeat: no-repeat;*/
+/*}*/
 a{
     text-decoration: none;
     color: #05101a;

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

@@ -49,7 +49,9 @@ class Index extends Component{
 										></Route>
 
                     {/*<Route path="/paths/:pathId" exact component = {PathsDetail}  {...this.props} {...this.state}></Route>*/}
-                    <Route exact path="/paths" exact component={ShixunPaths}  {...this.props} {...this.state}></Route>
+										<Route path="/paths" exact
+													 render={(props)=>(<ShixunPaths {...this.props} {...this.state} {...props}/>)}
+										></Route>
                 </Switch>
             </div>
         )

public/react/src/modules/paths/ShixunPathSearch.js

@@ -1,7 +1,8 @@
 import React, { Component } from 'react';
-import PathCard from "./ShixunPathCard.js";
 import axios from 'axios';
 import {Input} from 'antd';
+import {getImageUrl} from 'educoder';
+import PathCard from "./ShixunPathCard";
 import UpgradeModals from '../modals/UpgradeModals';
 import Pagination from '@icedesign/base/lib/pagination';
 import '@icedesign/base/lib/pagination/style.js';
@@ -115,6 +116,8 @@ class ShixunPathSearch extends Component{
 
 	render() {
     let { order,sortList,search,page,total_count,select }=this.state;
+
+    // console.log()
       return (
         <div>
 					{this.state.updata===undefined?"":<UpgradeModals
@@ -127,7 +130,7 @@ class ShixunPathSearch extends Component{
 							.pathImg{
 									width: 100%;
 									height: 300px;
-									background-image: url(${getImageUrl(`images/path/path.png`)});
+									background-image: url(${getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.subject_banner_url===null?`images/path/path.png`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.subject_banner_url)});
 									background-color: #000a4f;
 									/* background-size: cover; */
 									background-position: center;

public/react/src/modules/paths/ShixunPaths.js

@@ -16,7 +16,10 @@ class ShixunPath extends Component{
     return(
       <div>
          <div className="newMain clearfix">
-              <PathSearch></PathSearch>
+              <PathSearch
+								{...this.state}
+								{...this.props}
+							></PathSearch>
           </div>
           
       </div>