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

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css

@@ -357,4 +357,21 @@
     font-size: 16px;
     color: rgba(119,119,119,1);
 
+}
+
+.youranklist{
+    background: rgba(226,241,255,1);
+    line-height: 50px;
+    text-align: center;
+    padding-left: 20px;
+}
+
+.ranknames{
+    font-size: 16px;
+    color: rgba(62,62,62,1);
+}
+
+.ranknameslast{
+    font-size:16px;
+    color:rgba(12,158,254,1);
 }

public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js

@@ -226,7 +226,40 @@ class CompetitionContents extends Component{
 					})}
 
 				</Row>
+				{chartdata===undefined?"":chartdata.user_ranks.length===0?"":<div className={"youranklist"}>
+					<style>
+						{
+							`
+							.ant-col-4 {
+										width: 19%;
+								}
+							`
+						}
+
+					</style>
+					{chartdata.user_ranks.map((item,key)=>{
 
+					return(
+						<Row type="flex" key={key}>
+							<Col span={4} order={1}>
+								<span className={"ranknames"}>您当前排名:{item.rank}</span>
+							</Col>
+							<Col span={4} order={2}>
+								{item.user_name}
+							</Col>
+							<Col span={4} order={3}>
+								{item.team_name}
+							</Col>
+							<Col span={4} order={4}>
+								{item.cost_time}
+							</Col>
+							<Col span={4} order={5}>
+								<span className={"ranknameslast"}>{item.score}</span>
+							</Col>
+						</Row>
+						)
+					})}
+				</div>}
 				<Row className={"mt80 mb80"}>
 					{chartdata===undefined?"":chartdata.teams.length===0?"":<Table className="Competitiontransparent" columns={columns} dataSource={data} showHeader={false} pagination={false}/>}
 				</Row>

public/react/src/modules/tpm/shixunchild/Repository/Repository.js

@@ -31,7 +31,9 @@ function jsCopy(){
 class Repository extends Component {
   constructor(props) {
     super(props);
+    this.state={
 
+		}
   }
   componentDidMount() {
   }
@@ -41,7 +43,8 @@ class Repository extends Component {
 
   }
   render() {
-    let { match, author, git_url, lastest_commit, trees, commits,repositoryLoading, pathArray , TPMRightSectionData } = this.props;
+    let { match, author, git_url, lastest_commit,repositoryLoading, commits,trees,pathArray , TPMRightSectionData } = this.props;
+
     if (!author) {
       author = {}
     }
@@ -174,9 +177,9 @@ class Repository extends Component {
               </style>
               {/* 用户、最近提交时间 */}
               {
-                trees === undefined || trees === null ? <NoneData></NoneData>:
+                trees === undefined || trees === null ||trees.length===0? <NoneData></NoneData>:
                   <div>
-                    <div className="edu-back-skyblue padding10-20 clearfix">
+										{commits===undefined?"":commits===null||commits.length===0?"":<div className="edu-back-skyblue padding10-20 clearfix">
                       <img alt={author.name} className="radius fl mr10"
                            height="30"
                            src={getImageUrl(`images/`+commits[0].author.image_url)}
@@ -193,7 +196,7 @@ class Repository extends Component {
                         <i className="iconfont icon-tijiaojilu font-18 fl mr5"></i>
                         <span className="fl mt2">提交记录</span>
                       </a>
-                    </div>
+                    </div>}
 
                     <div className="padding20" style={{minHeight: '372px'}}>
                       <div className="bor-grey-e">
@@ -201,7 +204,7 @@ class Repository extends Component {
                         <RepositoryDirectories {...this.props}></RepositoryDirectories>
 
                         <div className="versionFileList">
-                          {trees.map((item, index) => {
+                          { trees === undefined ?"": trees === null || trees.length===0?"":trees.map((item, index) => {
                             return (
                               <li id={`file${index}`} key={index} className=" file padding5-10">
                                                 <span style={{marginLeft: '0px'}} className="task-hide">