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

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

@@ -685,7 +685,9 @@ submittojoinclass=(value)=>{
 							{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
               <li className="">
 								<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
-								<img className="roundedRectangles" src="./roundedRectangle.png" />
+								<img className="roundedRectangles"
+										 src={require('./roundedRectangle.png')}
+								/>
               </li>
 							<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.moop_cases_url}>教学案例</a></li>
 							<li className=""><a href={this.props.Headertop===undefined?"":this.props.Headertop.crowdsourcing_url}>众包创新</a></li>

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

@@ -225,24 +225,32 @@ class Infos extends Component{
                 <div className="inline">
                   <div className="fl headtab">
                     <span>{is_current ? "我":"TA"}的经验值</span>
-                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}>{data && data.experience}</a>
+                    <a
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_experience`}
+										>{data && data.experience}</a>
                   </div>
                   <em className="v-h-line fl"></em>
                   <div className="fl headtab">
                     <span>{is_current ? "我":"TA"}的金币</span>
-                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`} id="user_code">{data && data.grade}</a>
+                    <a
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_grade`}
+											id="user_code">{data && data.grade}</a>
                   </div>
                   <div className="headphoto mt14">
                     <img alt="头像" id="user_avatar_show" nhname="avatar_image" src={data && `${getImageUrl('images/'+data.avatar_url)}`}/>
                   </div>
                   <div className="fl headtab">
                     <span>{is_current ? "我":"TA"}的粉丝</span>
-                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`} id="user_h_fan_count">{data && data.fan_count}</a>
+                    <a
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_fanslist`}
+											id="user_h_fan_count">{data && data.fan_count}</a>
                   </div>
                   <em className="v-h-line fl"></em>
                   <div className="fl headtab">
                     <span>{is_current ? "我":"TA"}的关注</span>
-                    <a href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}>{data && data.follow_count}</a>
+                    <a
+											// href={`${this.props.Headertop && this.props.Headertop.old_url}/users/${username}/user_watchlist`}
+										>{data && data.follow_count}</a>
                   </div>
                   <span className="clearfix"></span>
                   <span className="myName">{data && data.name}</span>