Merge remote-tracking branch 'origin/dev_Ysl' into dev_Ysl

public/react/src/App.js

@@ -233,7 +233,7 @@ const ProjectPackages=Loadable({
 const Messagerouting= Loadable({
 	loader: () => import('./modules/message/js/Messagerouting'),
 	loading: Loading,
-});
+})
 class App extends Component {
 	constructor(props) {
 		super(props)

public/react/src/modules/message/js/MessagePrivate.js

@@ -20,8 +20,8 @@ class MessagePrivate extends Component{
 			isSpin:false,
 			modalsType:false,
 		};
-		// console.log("MessagePrivate");
+		console.log("MessagePrivate");
-	 // console.log(this.props);
+	 console.log(this.props);
 	}
 
 	componentDidMount(){
@@ -91,8 +91,8 @@ class MessagePrivate extends Component{
 	};
 	// 跳转页面
 	smyJump =(i,item)=>{
-		// console.log("跳转页面");
+		console.log("跳转页面");
-		// console.log(i);
+		console.log(i);
 		this.props.Modifyur(i,item);
 	};
 	myCome=(e)=>{

public/react/src/modules/message/js/Messagerouting.js

@@ -43,7 +43,7 @@ class Messagerouting extends Component{
 		// // courstype=courstype.splice('/');
 		// // courstype=courstype[3];
 		// // console.log("45");
-		// console.log(courstype);
+		console.log(courstype);
 		if(courstype==="?tag=1"){
 			this.setState({
 				routing:1,
@@ -78,8 +78,8 @@ class Messagerouting extends Component{
 			if(result===undefined){
 				return
 			}
-			// console.log("消息未读1");
+			console.log("消息未读1");
-			// console.log(result);
+			console.log(result);
 			this.setState({
 				unread_message_count:result.data.unread_message_count,
 				unread_tiding_count:result.data.unread_tiding_count,
@@ -105,8 +105,8 @@ class Messagerouting extends Component{
 
 
 	Message2=(data)=>{
-		// console.log("64");
+		console.log("64");
-		// console.log(data);
+		console.log(data);
 		this.setState({
 			unread_message_count:data.unread_message_count,
 			unread_tiding_count:data.unread_tiding_count,
@@ -115,10 +115,10 @@ class Messagerouting extends Component{
 
 	//跳转到链接
 	Modifyur=(i,item)=>{
-		// console.log("跳转到链接1");
+		console.log("跳转到链接1");
-		// console.log(i);
+		console.log(i);
-		// console.log(item);
+		console.log(item);
-		// console.log("跳转到链接2");
+		console.log("跳转到链接2");
 		if(i<3){
 			this.setState({
 				routing:i,
@@ -135,15 +135,15 @@ class Messagerouting extends Component{
 				routing:i,
 				myysluser:item,
 			});
-			// console.log("22222222222");
+			console.log("22222222222");
 			this.props.history.replace(`/message/${this.props.current_user.user_id}/message_detail`);
 		}
 
 	};
 	render() {
 		let{routing,unread_message_count,unread_tiding_count} =this.state;
-		// console.log(this.props);
+		console.log(this.props);
-		// console.log(routing);
+		console.log(routing);
 		return (
 			<div className="newMain clearfix">
       <div className="educontent mt20 mb80 clearfix">

public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js

@@ -295,7 +295,7 @@ class WriteaprivateletterModal extends Component {
 							{
 								users.map((item,key)=>{
 									return(
-										<p className="clearfix recently_item"  onMouseDown={(c)=>this.Getuserinformation(item)}>
+										<p className="clearfix recently_item"  key={key}  onMouseDown={(c)=>this.Getuserinformation(item)}>
 											<img alt="1?1558048024" className="radius fl mr10 myimgw48 myimgh48"  src={getImageUrl("/images/"+item.image_url)}
 											/>
 											<span className="recently_name">{item.name}</span>

public/react/src/modules/user/usersInfo/Infos.js

@@ -384,11 +384,11 @@ class Infos extends Component{
                       to={`/users/${username}/projects`}>项目</Link>
                   </li>
 
-									<li className={`${moduleName == 'package' ? 'active' : '' }`}>
+									{/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
-										<Link
+										{/*<Link*/}
-											onClick={() => this.setState({moduleName: 'package'})}
+											{/*onClick={() => this.setState({moduleName: 'package'})}*/}
-											to={`/users/${username}/package`}>众包</Link>
+											{/*to={`/users/${username}/package`}>众包</Link>*/}
-									</li>
+									{/*</li>*/}
 
                   {/*{ data && data.identity!="学生" && <li> <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}?type=m_bank`}>题库</a></li>}*/}
                   
@@ -404,11 +404,11 @@ class Infos extends Component{
 
 						{/* 众包 */}
 						{/* http://localhost:3007/courses/1309/homework/9300/setting */}
-						<Route exact path="/users/:username/package"
+						{/*<Route exact path="/users/:username/package"*/}
-									 render={
+									 {/*render={*/}
-										 (props) => (<InfosPackage {...this.props} {...props} {...this.state} />)
+										 {/*(props) => (<InfosPackage {...this.props} {...props} {...this.state} />)*/}
-									 }
+									 {/*}*/}
-						></Route>
+						{/*></Route>*/}
 
             {/* 课堂 */}
             {/* http://localhost:3007/courses/1309/homework/9300/setting */}