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

public/react/src/modules/forums/MemoDetail.js

@@ -189,7 +189,7 @@ class MemoDetail extends Component {
         let filesize = item.filesize
         
         attachments.push(
-          <div className="color-grey df" key={index}>
+          <div className="color-grey df" key={index} style={{ lineHeight: '17px'}}>
             <a className="color-grey ">
               <i className="font-14 color-green iconfont icon-fujian mr8" aria-hidden="true"></i>
             </a>

public/react/src/modules/home/shixunsHome.js

@@ -116,7 +116,7 @@ class ShixunsHome extends Component {
          }
 
         return (
-            <div className="newMain clearfix   backFAFAFA">
+            <div className="newMain clearfix   backFAFAFA shixunsHome">
 							{this.state.updata===undefined?"":<UpgradeModals
 								{...this.state}
 							/>}
@@ -128,6 +128,9 @@ class ShixunsHome extends Component {
 													<style>
 														{
 															`
+                                                            .shixunsHome .educontent {
+                                                                width: 1223px;
+                                                            }
 															.banners{
 															overflow: hidden;
 															}

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

@@ -650,8 +650,8 @@ submittojoinclass=(value)=>{
 
 				{isRender===true?<LoginDialog
                Modifyloginvalue={()=>this.Modifyloginvalue()}
-                  {...this.state}
                   {...this.props}
+                  {...this.state}
               />:""}
 
 				{AccountProfiletype===true?<AccountProfile

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

@@ -101,7 +101,7 @@ function md_elocalStorage(editor,mdu,id){
 
 
 function create_editorMD(id, width, high, placeholder, imageUrl, callback, initValue, 
-        onchange, watch, { noStorage, showNullButton }, that) {
+        onchange, watch, { noStorage, showNullButton, emoji }, that) {
     // 还是出现了setting只有一份，被共用的问题
     
     var editorName = window.editormd(id, {
@@ -115,7 +115,7 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV
         syncScrolling: "single",
         tex: true,
         tocm: true,
-        emoji: true,
+        emoji: !!emoji ,
         taskList: true,
         codeFold: true,
         searchReplace: true,
@@ -266,7 +266,8 @@ export default class TPMMDEditor extends Component {
             window[__editorName.id+'_'] = __editorName;
         }, initValue, this.onEditorChange,this.props.watch, {
             noStorage: this.props.noStorage,
-            showNullButton: this.props.showNullButton
+            showNullButton: this.props.showNullButton,
+            emoji: this.props.emoji
         }, this);
         
     }

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

@@ -194,7 +194,8 @@ export default class TPMquestion extends Component {
 												})
 										  	// this.contentMdRef.current.setValue(response.data.task_pass || '')
                         if(response.data.chooses.length===0){
-                            this.questionadd()
+                            // 新建选择题时，没法切回 ‘本关任务’ tab
+                            // this.questionadd()
                         }
 
                         this.shixunsautoHeight()