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

public/react/src/modules/competition/personal/PersonalCompetititem.js

@@ -310,12 +310,21 @@ class PersonalCompetititem extends React.Component {
 														lineHeight: "39px",
 													}}>战队详情</a>
 												</div>
-												<div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(item.id, false)}>
+												<div className="regitemimgs555"
-													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
+														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
+														 onClick={() => this.props.Exittheteamshow(item.id, true)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
 												</div>
-												<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
+												<div className="regitemimgs6"
+														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
+														 onClick={() => this.props.Createateamedit(item)}>
 													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
 												</div>
+												<div className="regitemimgs6"
+														 style={item.manage_permission === true ? {display: "none"} : {display: "block"}}
+														 onClick={() => this.props.Exittheteamshow(item.id, false)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
+												</div>
 
 											</div>
 											:
@@ -325,12 +334,21 @@ class PersonalCompetititem extends React.Component {
 													 }}
 											>
 
-												<div className="regitemimgs5" onClick={() => this.props.Exittheteamshow(item.id, false)}>
+												<div className="regitemimgs5"
-													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
+														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
+														 onClick={() => this.props.Exittheteamshow(item.id, true)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
 												</div>
-												<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
+												<div className="regitemimgs6"
+														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
+														 onClick={() => this.props.Createateamedit(item)}>
 													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
 												</div>
+												<div className="regitemimgs6"
+														 style={item.manage_permission === true ? {display: "none"} : {display: "block"}}
+														 onClick={() => this.props.Exittheteamshow(item.id, false)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
+												</div>
 
 											</div>
 
@@ -350,12 +368,21 @@ class PersonalCompetititem extends React.Component {
 														lineHeight: "39px",
 													}}>战队详情</a>
 												</div>
-												<div className="regitemimgs555" onClick={() => this.props.Exittheteamshow(item.id, false)}>
+												<div className="regitemimgs555"
-													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
+														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
+														 onClick={() => this.props.Exittheteamshow(item.id, true)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
 												</div>
-												<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
+												<div className="regitemimgs6"
+														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
+														 onClick={() => this.props.Createateamedit(item)}>
 													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
 												</div>
+												<div className="regitemimgs6"
+														 style={item.manage_permission === true ? {display: "none"} : {display: "block"}}
+														 onClick={() => this.props.Exittheteamshow(item.id, false)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
+												</div>
 											</div>
 											:
 											<div className="regitemimgs444 "
@@ -363,12 +390,21 @@ class PersonalCompetititem extends React.Component {
 														 marginLeft: "32px",
 													 }}
 											>
-												<div className="regitemimgs5" onClick={() => this.props.Exittheteamshow(item.id, false)}>
+												<div className="regitemimgs5"
-													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>删除战队</p>
+														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
+														 onClick={() => this.props.Exittheteamshow(item.id, true)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, true)}>删除战队</p>
 												</div>
-												<div className="regitemimgs6" onClick={() => this.props.Createateamedit(item)}>
+												<div className="regitemimgs6"
+														 style={item.manage_permission === true ? {display: "block"} : {display: "none"}}
+														 onClick={() => this.props.Createateamedit(item)}>
 													<p onClick={() => this.props.Createateamedit(item)}>编辑战队</p>
 												</div>
+												<div className="regitemimgs6"
+														 style={item.manage_permission === true ? {display: "none"} : {display: "block"}}
+														 onClick={() => this.props.Exittheteamshow(item.id, false)}>
+													<p onClick={() => this.props.Exittheteamshow(item.id, false)}>退出战队</p>
+												</div>
 											</div>
 									)
 									: