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

public/react/src/App.js

@@ -292,8 +292,8 @@ class App extends Component {
 					<Router>
 						<Switch>
 
-							{/*众包创新*/}
+							{/*/!*众包创新*!/*/}
-							<Route path={"/crowdsourcing"} component={ProjectPackages}/>
+							{/*<Route path={"/crowdsourcing"} component={ProjectPackages}/>*/}
 							{/*认证*/}
 							<Route path="/account" component={AccountPage}/>
 

public/react/src/modules/projectPackages/ProjectPackageIndex.js

@@ -43,29 +43,29 @@ class ProjectPackageIndex extends Component {
 				<Switch>
 					{/*众包首页*/}
 
-					<Route path="/crowdsourcing/:id/edit"
+					{/*<Route path="/crowdsourcing/:id/edit"*/}
-								 render={
+								 {/*render={*/}
-									 (props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)
+									 {/*(props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)*/}
-								 }
+								 {/*}*/}
-					></Route>
+					{/*></Route>*/}
-
+
-					<Route path="/crowdsourcing/new"
+					{/*<Route path="/crowdsourcing/new"*/}
-								 render={
+								 {/*render={*/}
-									 (props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)
+									 {/*(props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)*/}
-								 }
+								 {/*}*/}
-					></Route>
+					{/*></Route>*/}
-
+
-					<Route path="/crowdsourcing/:id"
+					{/*<Route path="/crowdsourcing/:id"*/}
-								 render={
+								 {/*render={*/}
-									 (props) => (<PackageIndexNEITaskDetails {...this.props} {...props} {...this.state} />)
+									 {/*(props) => (<PackageIndexNEITaskDetails {...this.props} {...props} {...this.state} />)*/}
-								 }
+								 {/*}*/}
-					></Route>
+					{/*></Route>*/}
-
+
-					<Route path="/crowdsourcing"
+					{/*<Route path="/crowdsourcing"*/}
-								 render={
+								 {/*render={*/}
-									 (props) => (<PackageIndex {...this.props} {...props} {...this.state} />)
+									 {/*(props) => (<PackageIndex {...this.props} {...props} {...this.state} />)*/}
-								 }
+								 {/*}*/}
-					></Route>
+					{/*></Route>*/}
 				</Switch>
 
 			</div>

public/react/src/modules/tpm/challengesnew/TPMevaluation.js

@@ -951,8 +951,8 @@ export default class TPMevaluation extends Component {
 									<Option value={2}>apk/exe</Option>
 									<Option value={3}>txt</Option>
 									<Option value={4}>html</Option>
-									<Option value={5}>mp3</Option>
+									{/*<Option value={5}>mp3</Option>*/}
-									<Option value={6}>mp4</Option>
+									{/*<Option value={6}>mp4</Option>*/}
 								</Select>
 								<a className="ml10" onClick={()=>this.showrepositoryurltip(1)}><img src={getImageUrl("images/educoder/problem.png")}/></a>
 								<div className="invite-tip clearfix repository_url_tippostion" style={{display:showrepositoryurltiptype===true?"block":"none"}} id="repository_url_tip"