Merge remote-tracking branch 'origin/master'

public/react/public/css/css_min_all.css

@@ -1799,6 +1799,11 @@ ol.linenums{margin-top:0;margin-bottom:0}li.L1,li.L3,li.L5,li.L7,li.L9{backgroun
 .page--body {
 	margin-top: 54px;
 }
+#myshixun_top {
+    display: flex;
+    height: 54px;
+}
+
 .yslflexhome {
     display: flex;
     flex-direction: row;

public/react/src/modules/page/Header.js

@@ -96,13 +96,13 @@ class Header extends Component {
 							*/}
 					</div>
 
-					<div className="-header-right clearfix">
+					{(grade || grade == 0) && <div className="-header-right clearfix">
 					    {/*<img src="/images/task/coin.png" className="fl" width="30" height="30" alt=""/>*/}
 					    <span style={{width:'20px', height:'20px', background:'#FFD633', borderRadius: '10px', marginTop: '3px' }} className="fl"></span>
 					    <span className="ml5 color-white fl" id="user_grade">
 					    	<a href={`${user.user_url}/user_grade`} target="_blank">{ grade === 0 ? grade : (grade || '')}</a>
 					    </span>
-					</div>
+					</div>}
 
 
 					

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

@@ -1316,13 +1316,19 @@ export default class TPMsettings extends Component {
                         // onMouseEnter={operateauthority?this.bigopen:""}
                         onSelect={operateauthority?this.bigopens:""}
                         // open={opers}
+
+                        showSearch
+                        optionFilterProp="children"
+                        filterOption={(input, option) =>
+                          option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                        }
 								>
 
                   {
                     settingsData === undefined ? "" : settingsData.shixun.main_type.map((item, key) => {
 
                       return(
-                        <Option value={item.id} key={key} title={item.description}>{item.type_name}</Option>
+                        <Option value={item.id} key={key} title={item.description} >{item.type_name}</Option>
                       )
                     })
                   }

public/react/src/modules/tpm/challengesnew/TPManswer2.js

@@ -174,6 +174,9 @@ export default class TPManswer extends Component {
                 if (response.data.message) {
                     this.props.showSnackbar(response.data.message);
                 }
+                if (response.data.status == 1) {
+                    $("html").animate({ scrollTop: 0 })
+                }
             }
 
         }).catch((error) => {

public/react/src/modules/tpm/challengesnew/TPMchallengesnew.js

@@ -58,7 +58,7 @@ export default class TPMchallengesnew extends Component {
             marktype:false,
             editPracticesendtype:false,
             CreatePracticesendtype:false,
-					  exec_time:undefined
+					  exec_time:20
         }
     }
 
@@ -230,6 +230,8 @@ export default class TPMchallengesnew extends Component {
         }).then((response) => {
             this.props.showSnackbar(response.data.messages);
             if (response.data.status === 1) {
+    			$("html").animate({ scrollTop: 0 })
+
                 this.setState({
                     setopen: true,
                     tab2url: "/shixuns/" + id + "/challenges/"+response.data.challenge_id+"/tab=2",

public/react/src/modules/tpm/challengesnew/TPMevaluation.js

@@ -930,7 +930,7 @@ export default class TPMevaluation extends Component {
                                     <span className="top-black-trangleft"></span>
                                     <div className="padding20 invitecontent clearfix">
                                         <p className="font-12 edu-txt-left">
-                                            图片：处理或输出图片类型的任务，请选题此项<br/>
+                                            图片：处理或输出图片类型的任务，请选填此项<br/>
                                             可以通过设置图片路径和学员答案文件路径，展示代码对应的图片效果<br/><br/>
                                             apk/exe：写可执行文件的任务，请选填此项<br/>
                                             可以通过设置学员答案文件路径，展示二维码以供扫码下载<br/><br/>