From 8bdd7b151d4c53220abf27885d7128e210bbc380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 1 Aug 2019 09:16:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.js | 4 +-
.../PackageIndex/PackageConcent.js | 2 +-
.../projectPackages/ProjectPackageIndex.js | 46 +++++++++----------
public/react/src/modules/tpm/NewHeader.js | 2 +-
.../tpm/challengesnew/TPMevaluation.js | 4 +-
.../react/src/modules/user/usersInfo/Infos.js | 20 ++++----
6 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/public/react/src/App.js b/public/react/src/App.js
index 895016ff7..2b0f23ade 100644
--- a/public/react/src/App.js
+++ b/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}/>
diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
index 1a2ba1723..e729ac462 100644
--- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
+++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js
@@ -311,7 +311,7 @@ class PackageConcent extends Component {
<div className=" item-group item-other-deadline">
<span className=" item-group-icon mr10"><i className="fa fa-clock-o"></i></span>
- <span className=" item-group-text">{moment(item.deadline_at).endOf('day').fromNow()}竞标截止</span>
+ <span className=" item-group-text">{item.deadline_at}竞标截止</span>
</div>
<div className=" item-group item-other-bidding ml0">
diff --git a/public/react/src/modules/projectPackages/ProjectPackageIndex.js b/public/react/src/modules/projectPackages/ProjectPackageIndex.js
index 2b8bba2bb..097e012e0 100644
--- a/public/react/src/modules/projectPackages/ProjectPackageIndex.js
+++ b/public/react/src/modules/projectPackages/ProjectPackageIndex.js
@@ -43,29 +43,29 @@ class ProjectPackageIndex extends Component {
<Switch>
{/*众包首页*/}
- {/*<Route path="/crowdsourcing/:id/edit"*/}
- {/*render={*/}
- {/*(props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)*/}
- {/*}*/}
- {/*></Route>*/}
-
- {/*<Route path="/crowdsourcing/new"*/}
- {/*render={*/}
- {/*(props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)*/}
- {/*}*/}
- {/*></Route>*/}
-
- {/*<Route path="/crowdsourcing/:id"*/}
- {/*render={*/}
- {/*(props) => (<PackageIndexNEITaskDetails {...this.props} {...props} {...this.state} />)*/}
- {/*}*/}
- {/*></Route>*/}
-
- {/*<Route path="/crowdsourcing"*/}
- {/*render={*/}
- {/*(props) => (<PackageIndex {...this.props} {...props} {...this.state} />)*/}
- {/*}*/}
- {/*></Route>*/}
+ <Route path="/crowdsourcing/:id/edit"
+ render={
+ (props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)
+ }
+ ></Route>
+
+ <Route path="/crowdsourcing/new"
+ render={
+ (props) => (<PackageIndexNewandEdit {...this.props} {...props} {...this.state} />)
+ }
+ ></Route>
+
+ <Route path="/crowdsourcing/:id"
+ render={
+ (props) => (<PackageIndexNEITaskDetails {...this.props} {...props} {...this.state} />)
+ }
+ ></Route>
+
+ <Route path="/crowdsourcing"
+ render={
+ (props) => (<PackageIndex {...this.props} {...props} {...this.state} />)
+ }
+ ></Route>
</Switch>
</div>
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 537489f8f..da44b0397 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -815,7 +815,7 @@ submittojoinclass=(value)=>{
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训</Link></li>
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的项目</Link></li>
- {/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
+ <li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>
<li><a href={`/account/profile`}>账号管理</a></li>
{/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
{/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 9beab2b5b..6cd0b9977 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/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={6}>mp4</Option>*/}
+ <Option value={5}>mp3</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"
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index 31fef9070..5286c5797 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/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' : '' }`}>*/}
- {/*<Link*/}
- {/*onClick={() => this.setState({moduleName: 'package'})}*/}
- {/*to={`/users/${username}/package`}>众包</Link>*/}
- {/*</li>*/}
+ <li className={`${moduleName == 'package' ? 'active' : '' }`}>
+ <Link
+ onClick={() => this.setState({moduleName: 'package'})}
+ to={`/users/${username}/package`}>众包</Link>
+ </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"*/}
- {/*render={*/}
- {/*(props) => (<InfosPackage {...this.props} {...props} {...this.state} />)*/}
- {/*}*/}
- {/*></Route>*/}
+ <Route exact path="/users/:username/package"
+ render={
+ (props) => (<InfosPackage {...this.props} {...props} {...this.state} />)
+ }
+ ></Route>
{/* 课堂 */}
{/* http://localhost:3007/courses/1309/homework/9300/setting */}