Merge branches 'dev_Ysl' and 'dev_Ysm' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

public/react/src/App.js

@@ -294,8 +294,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/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">

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/NewHeader.js

@@ -825,7 +825,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>*/}

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"

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' : '' }`}>*/}
+									<li className={`${moduleName == 'package' ? 'active' : '' }`}>
-										{/*<Link*/}
+										<Link
-											{/*onClick={() => this.setState({moduleName: 'package'})}*/}
+											onClick={() => this.setState({moduleName: 'package'})}
-											{/*to={`/users/${username}/package`}>众包</Link>*/}
+											to={`/users/${username}/package`}>众包</Link>
-									{/*</li>*/}
+									</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"*/}
+						<Route exact path="/users/:username/package"
-									 {/*render={*/}
+									 render={
-										 {/*(props) => (<InfosPackage {...this.props} {...props} {...this.state} />)*/}
+										 (props) => (<InfosPackage {...this.props} {...props} {...this.state} />)
-									 {/*}*/}
+									 }
-						{/*></Route>*/}
+						></Route>
 
             {/* 课堂 */}
             {/* http://localhost:3007/courses/1309/homework/9300/setting */}