Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

db/migrate/20190906062930_modify_is_test_for_user.rb

@@ -0,0 +1,5 @@
+class ModifyIsTestForUser < ActiveRecord::Migration[5.2]
+  def change
+    change_column :users, :is_test, :integer, :limit => 1
+  end
+end

public/react/src/modules/courses/elearning/Elearning.js

@@ -359,23 +359,23 @@ class Elearning extends Component{
 
 						 {/*简介*/}
 
-								<div className="clearfix pl30 pr30" style={{paddingBottom:"22px"}}>
+								{/*<div className="clearfix pl30 pr30" style={{paddingBottom:"22px"}}>*/}
-									<div style={{textAlign: "left",marginTop:"10px",paddingBottom: "10px"}}>
+								{/*	<div style={{textAlign: "left",marginTop:"10px",paddingBottom: "10px"}}>*/}
-										<span className=" color-dark-21 " style={{textAlign: "center",fontSize:"19px"}}>简介</span>
+								{/*		<span className=" color-dark-21 " style={{textAlign: "center",fontSize:"19px"}}>简介</span>*/}
-									</div>
+								{/*	</div>*/}
-									<div  className="edu-back-white new_li  editormd-html-preview " >
+								{/*	<div  className="edu-back-white new_li  editormd-html-preview " >*/}
-										<p className="markdown-body fonttext "  dangerouslySetInnerHTML={{__html: markdownToHTML(description).replace(/▁/g,"▁▁▁")}}>
+								{/*		<p className="markdown-body fonttext "  dangerouslySetInnerHTML={{__html: markdownToHTML(description).replace(/▁/g,"▁▁▁")}}>*/}
-										</p>
+								{/*		</p>*/}
-									</div>
+								{/*	</div>*/}
 
-								</div>
+								{/*</div>*/}
 
 					</div>
 
 
 					<Spin size="large" spinning={isSpin}  id={"cdiv"}>
 
-						<div className=" clearfix" style={{marginTop:"20px"}}>
+						<div className=" clearfix" style={this.props.isAdmin()===true?{marginTop:"0px"}:{marginTop:"20px"}}>
 							{
 								stages===undefined||stages===JSON.stringify("[]")||stages.length===0?
 									<NoneData></NoneData>