Merge remote-tracking branch 'origin/master'

.gitignore

@@ -31,6 +31,7 @@
 /.idea/*
 
 # Ignore react node_modules
+/public/react/.cache
 /public/react/build
 /public/react/build/
 /public/react/node_modules/

public/react/scripts/build.js

@@ -193,7 +193,7 @@ function generateNewIndexJsp() {
     }
     const newVersion = '1.1.1'
     let cdnHost = 'https://shixun.educoder.net'
-    cdnHost = 'https://cdn-testeduplus2.educoder.net'
+    cdnHost = 'http://cdn.educoder.net'
     cdnHost = ''
     var result = data.replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
         .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)

public/react/src/modules/courses/members/studentsList.js

@@ -499,7 +499,7 @@ class studentsList extends Component{
     const { course_group_name, invite_code } = this.state;
 
     const courseId = this.props.match.params.coursesId    
-    let exportUrl = `/api/courses/${courseId}/export_member_scores_excel.xlsx?`
+    let exportUrl = `/courses/${courseId}/export_member_scores_excel.xlsx?`
     const params = {}
     if (course_group_id) {
       params.group_id = course_group_id

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

@@ -19,13 +19,13 @@ class NewFooter extends Component {
       <div className="newFooter edu-txt-center newContainers">
         <div className="inner-footer_con">
           <div className="footercon">
-            <div className="inline mt40 mb5">
+            {/* <div className="inline mt40 mb5">
               <a href="/" className="fl" style={{height:'70px'}}>
                 <img alt="高校智能化教学与实训平台" src={getImageUrl(`images/educoder/headNavLogo.png?1526520218`)} width="70px">
                 </img>
               </a>
               <span className="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span>
-            </div>
+            </div> */}
             <ul className="clearfix inner-footernav">
               <li><a href="/" className="fl" target="_blank">网站首页</a></li>
               <li><a href={this.props.Footerdown===undefined?"":this.props.Footerdown.about_us} className="fl" target="_blank">关于我们</a></li>

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

@@ -270,9 +270,6 @@ class NewHeader extends Component {
       console.log(error);
     })
   }
-  onKeywordSearch = () => {
-    header_search(this)
-  }
   
   hideAddcoursestypes=()=>{
     this.setState({

public/react/src/modules/tpm/TPMIndex.css

@@ -54,10 +54,7 @@ body>.-task-title {
     margin-top:0px;
 }
 /*Main START*/
-.newMain {
-	/* 330̫<30><CCAB><EFBFBD>ˣ<EFBFBD>*/
-	padding-bottom: 240px !important;
-}
+
 
 .newContainer{
   background: #fafafa!important;

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

@@ -35,11 +35,11 @@ if (!window['indexHOCLoaded']) {
       .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1525440977`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440977`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440978`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440978`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')

public/stylesheets/educoder/edu-all.css

@@ -55,6 +55,8 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .search-content a{display: inline-block;width:100%;height: 30px;line-height: 30px;padding:0px 20px;box-sizing: border-box;text-align: left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
 /*底部*/
 .newFooter{ position: absolute; bottom: 0; width: 100%; height: 235px;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;}
+/* 去掉了logo */
+.newFooter{ height: 110px; }
 .footercon{border-bottom:1px solid #47494d;}
 .inner-footernav{width: 560px;margin: 0px auto}
 .inner-footernav li{float: left;height: 50px;width: 80px;text-align: center}

public/stylesheets/educoder/edu-main.css

@@ -170,6 +170,7 @@ input::-ms-clear{display:none;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
 .newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/
+.newMain{ padding-bottom: 120px !important; }
 
 /*高度*/
 .height-100{height: 100%;}