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

public/react/public/index.html

@@ -148,20 +148,30 @@
     <!-- 在tpi js里加载这3个脚本 -->
     <script>
       (function() { // Scoping function to avoid globals
-        var _url_origins='';
+	    var href = location.href;
         if(window.location.port === "3007"){
-            _url_origins="https://newweb.educoder.net";
+            if (href.indexOf('/tasks/') != -1) {
+                document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>');
+                // build.js中会将这个url附加一个前缀 react/build
+                document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
+                document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
+            } else if (href.indexOf('/paths/') != -1) {
+                document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
+
+            }
+        }else{
+            if (href.indexOf('/tasks/') != -1) {
+                document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>');
+                // build.js中会将这个url附加一个前缀 react/build
+                document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
+                document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
+            } else if (href.indexOf('/paths/') != -1) {
+                document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
+
+            }
         }
-        var href = location.href;
-          if (href.indexOf('/tasks/') != -1) {
-            document.write('<script type="text/javascript" src=_url_origins+"/assets/kindeditor/kindeditor.js"><\/script>');
-            // build.js中会将这个url附加一个前缀 react/build
-            document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
-            document.write('<script type="text/javascript" src=_url_origins+"/javascripts/educoder/edu_application.js"><\/script>');
-          } else if (href.indexOf('/paths/') != -1) {
-            document.write('<script type="text/javascript" src=_url_origins+"/javascripts/educoder/edu_application.js"><\/script>');
-
-          }
+
+
       })();
     </script>
     <!-- <script type="text/javascript" src="https://testeduplus2.educoder.net/assets/kindeditor/kindeditor.js"></script>

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

@@ -40,8 +40,8 @@ class coursesHomeCard extends Component{
                               className="mt80 mb25"/>
                               <p className="font-14 color-white">非成员不能访问</p>
                           </div>
-                           <a href={item.first_category_url} className="square-img" >
-											    	{/*<a href={`/courses/${item.id}/students`} className="square-img" >*/}
+                           {/*<a href={item.first_category_url} className="square-img" >*/}
+											    	<a href={`/courses/${item.id}/students`} className="square-img" >
 														 {/*target="_blank"*/}
                              {
                                item.is_public===1&&item.id===1309?

public/react/src/modules/courses/new/CoursesNew.js

@@ -351,8 +351,8 @@ class CoursesNew extends Component {
     render() {
         let {datatime} = this.state;
         const {getFieldDecorator} = this.props.form;
-        const options = this.state.searchlist.map(d => <Option key={d.name}>{d.name}</Option>);
-        const optionschool  = this.state.searchlistscholl.map(z => <Option key={z}>{z}</Option>);
+        const options = this.state.searchlist.map(d => <Option key={d.name} value={d.name}>{d.name}</Option>);
+        const optionschool  = this.state.searchlistscholl.map(z => <Option key={z} value={z}>{z}</Option>);
         // console.log(this.props.current_user.user_school)
         return (
             <React.Fragment>

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

@@ -342,7 +342,7 @@ class Infos extends Component{
                       to={`/users/${username}/projects`}>项目</Link>
                   </li>
                  
-                  { data && data.identity!="学生" && <li> <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}?type=m_bank`}>题库</a></li>}
+                  {/*{ data && data.identity!="学生" && <li> <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}?type=m_bank`}>题库</a></li>}*/}
                   
                 </div>
               </div>