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

app/services/concerns/elasticsearch_able.rb

@@ -22,6 +22,7 @@ module ElasticsearchAble
       fragment_size: EduSetting.get('es_highlight_fragment_size') || 30,
       tag: '<span class="highlight">',
       fields: {
+        name: { type: 'plain' },
         challenge_names: { type: 'plain' },
         challenge_tag_names: { type: 'plain' },
         description: { type: 'plain' },

public/react/src/AppConfig.js

@@ -20,16 +20,16 @@ function locationurl(list){
 
 // TODO 开发期多个身份切换
 let debugType =""
-if (isDev) {
+// if (isDev) {
-  	const _search = window.location.search;
+//   	const _search = window.location.search;
-    let parsed = {};
+//     let parsed = {};
-    if (_search) {
+//     if (_search) {
-      parsed = queryString.parse(_search);
+//       parsed = queryString.parse(_search);
-  	}
+//   	}
-    debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
+//     debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
-        window.location.search.indexOf('debug=s') != -1 ? 'student' :
+//         window.location.search.indexOf('debug=s') != -1 ? 'student' :
-        window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
+//         window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
-}
+// }
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
 
@@ -41,7 +41,7 @@ export function initAxiosInterceptors(props) {
         // proxy = "http://testbdweb.trustie.net"
         // proxy = "http://testbdweb.educoder.net"
         // proxy = "https://testeduplus2.educoder.net"
-        proxy="http://47.96.87.25:48080"
+        proxy="http://47.96.87.25:48080/"
 
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

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

@@ -204,4 +204,8 @@ body>.-task-title {
 .mainheighs{
  height: 100%;
  display: block;
+}
+
+.ml18a{
+    margin-left:18%;
 }

public/stylesheets/educoder/edu-all.css

@@ -11,6 +11,7 @@
     float: left;
     width: 97px;}
 .head-nav{
+    float: left;
     text-align: center;
     height: 60px;
     box-sizing: border-box;