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

public/react/src/modules/courses/exercise/question/shixunAnswer.js

@@ -135,8 +135,8 @@ class shixunAnswer extends Component{
     let url=`/exercise_questions/${this.props.questionType.question_id}/adjust_score.json`
     
     const list = Object.assign({}, this.state.dataCopy[key])
-    console.log("111111111111111111111111");
-    console.log(this.props);
+    // console.log("111111111111111111111111");
+    // console.log(this.props);
     // 调分值为0，且和第一次的数据相同则不修改
     if(parseInt(e.target.value)==parseInt(list.my_score)){
       return;

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

@@ -459,6 +459,11 @@ class CoursesNew extends Component {
                                             width: 280px;
    																				  margin-left: 10px;
                                         }
+
+                                       .construction .ant-select-selection__placeholder, .ant-select-search__field__placeholder {
+                                           line-height: 28px;
+																					 z-index: 2000;
+                                        }
                                     `}
                                 </style>
 

public/react/src/modules/courses/poll/Poll.js

@@ -464,7 +464,7 @@ class Poll extends Component{
       modalsBottomval,
       loadtype
     }=this.state;
-    console.log(this.props);
+    // console.log(this.props);
     let {child}=this.props;
     let {coursesId,Id}=this.props.match.params
     const isAdmin = this.props.isAdmin()

public/react/src/modules/courses/poll/PollDetailIndex.js

@@ -34,7 +34,7 @@ class PollDetailIndex extends Component{
 	}
 
 	getPollInfo=()=>{
-		console.log(this.props);
+		// console.log(this.props);
 		let pollId=this.props.match.params.pollId;
 		let url=`/polls/${pollId}/common_header.json`
 		axios.get(url).then((result)=>{

public/react/src/modules/tpm/component/TPMNav.js

@@ -42,7 +42,7 @@ class TPMNav extends Component {
 		        	className={`${match.url.indexOf('ranking_list') != -1 ? 'active' : ''} fl`}>排行榜</Link>
 				{/* target="_blank"*/}
                 <a
-                    href={`/shixuns/${shixunId}/settings`} className="fr"
+                    href={`/shixuns/${shixunId}/settings`} className="edu-default-btn edu-blueline-btn ml20 fr"
                     style={{display: this.props.identity >4||this.props.identity===undefined ? "none" : 'block'}}
                 >配置</a>
 	      	</div>

public/react/src/modules/user/account/AccountNav.js

@@ -14,7 +14,7 @@ class AccountNav extends Component {
   }
     render() {
       let { basicInfo } = this.props
-      console.log(this.props);
+      // console.log(this.props);
       const path = window.location.pathname
       const isBasic = path.indexOf('profile') != -1 || path == "/account"
       const isCertification = path.indexOf('certification') != -1