Merge remote-tracking branch 'origin/master'

public/react/src/modules/courses/members/teacherList.js

@@ -37,7 +37,7 @@ function buildColumns(that) {
     dataIndex: 'name',
     key: 'index',
     render: (content, item, index) => {
-      return <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1}　</a>
+      return item.isApply == true ? '' : <a href="javascript:;">{(that.state.page - 1) * 20 + index + 1 - that.application_list.length}　</a>
     }
   }
   // ,{
@@ -546,6 +546,7 @@ class studentsList extends Component{
     const combineArray = teachers.slice(0)
     if (page == 1) {
       this.state.application_list && this.state.application_list.slice(0).reverse().forEach(item => {
+        item.isApply = true
         combineArray.unshift(item)
       })
     }

public/react/src/modules/user/Interestpage.js

@@ -2,6 +2,7 @@ import React, {Component} from 'react';
 
 
 import {Button} from 'antd';
+import {broadcastChannelPostMessage} from 'educoder';
 import axios from 'axios';
 import './common.css'
 import mytc from './img/mytc.png';
@@ -17,6 +18,7 @@ import ysj from './img/ysj.png';
 import yunwei from './img/yunwei.png';
 import rgzn from './img/rgzn.png';
 import qita from './img/qita.png';
+
 //父组件 EducoderLogin.js
 class InterestpageComponent extends Component {
 	constructor(props) {
@@ -65,12 +67,14 @@ class InterestpageComponent extends Component {
 		})
 
 	}
+
+
 	//跳转然后登入
-	Jumptotheinterestpage=(username,password)=>{
+	Jumptotheinterestpage=()=>{
 		var url = "/accounts/login.json";
 		axios.post(url, {
-			login: username,
+			login: this.props.login,
-			password: password,
+			password: this.props.password,
 		}).then((response) => {
 			if (response === undefined) {
 				return
@@ -79,6 +83,7 @@ class InterestpageComponent extends Component {
 				if (response.data.status === 402) {
 					window.location.href = response.data.url;
 				} else {
+					broadcastChannelPostMessage('refreshPage')
 					this.setState({
 						isRender: false
 					})