调整

public/react/src/modules/courses/coursesPublic/sendResource.js

@@ -467,7 +467,7 @@ class Sendresource extends Component{
 							{/*)*/}
 						{/*})}*/}
 
-            {newfileListtype===true?<p className={"color-red"}>请先上传资源</p>:""}
+            {newfileListtype===true&&this.state.fileListtype===false?<p className={"color-red"}>请先上传资源</p>:""}
 
             <p className={"winth540"}>
               <style>{`

public/react/src/modules/courses/new/CoursesNew.js

@@ -143,6 +143,7 @@ class CoursesNew extends Component {
     handleSubmit = (e) => {
 
         e.preventDefault();
+			  let first_category_url=this.props.current_user.first_category_url;
         let coursesId = this.props.match.params.coursesId;
         let {is_public,datatime} = this.state
         // console.log(is_public)
@@ -201,7 +202,8 @@ class CoursesNew extends Component {
                     ).then((response) => {
                             // debugger
                         if (response.data.status === 0) {
-													this.goback()
+													// this.goback()
+													this.props.history.push(first_category_url);
                         }
                     }).catch((error) => {
                         console.log(error)
@@ -244,7 +246,8 @@ class CoursesNew extends Component {
                         }
                     ).then((response) => {
                         if (response.status === 200) {
-													this.goback()
+													// this.goback
+													this.props.history.push(response.data.first_category_url);
                         }
                     }).catch((error) => {
                         console.log(error)

public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js

@@ -270,7 +270,7 @@ class PackageConcent extends Component {
 										</p>
 									</div>
 
-									<Spin size="large" spinning={this.state.isSpin}>
+									<Spin size="large" className="educontent project-packages-list" spinning={this.state.isSpin}>
 									{project_packages&&project_packages.map((item,key)=>{
 										return(
 											<div className="educontent project-packages-list mb30" key={key}>
@@ -338,6 +338,7 @@ class PackageConcent extends Component {
 										)
 									})}
 									</Spin>
+
 									{project_packages&&project_packages.length===0?<div className="edu-back-white">
 										<div className="edu-tab-con-box clearfix edu-txt-center">
 											<img className="edu-nodata-img mb20" src="https://www.educoder.net/images/educoder/nodata.png" />

public/react/src/modules/tpm/TPMBanner.js

@@ -874,9 +874,17 @@ class TPMBanner extends Component {
                                     style={{width: '100%'}}
                                 />
                             </div>
+													<style>
+														  {`
+																.edu-h270{
+																	 height:270px;
+																	  overflow-y: auto;
+																}
+															`}
+													</style>
 
                             <div id="search_course_list" className={courses_count > 12?"cdefault ":"cdefault "}>
-                                <div className="clearfix mb5 edu-bg-light-blue edu-h315">
+                                <div className="clearfix mb20 edu-bg-light-blue edu-h270">
                                     <ul>
                                         <RadioGroup onChange={this.onChangeSenttothevcalue} value={Senttothevcalue}>
                                             {

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 */}

public/react/src/modules/user/usersInfo/InfosPackage.js

@@ -4,7 +4,8 @@ import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
 import {Tooltip,Menu,Pagination,Spin} from 'antd';
 import axios from 'axios';
 import {getImageUrl} from 'educoder';
-import NoneData from '../../courses/coursesPublic/NoneData'
+import Modals from '../../modals/Modals';
+import NoneData from '../../courses/coursesPublic/NoneData';
 import "./usersInfo.css"
 import moment from 'moment';
 let categorylist=[
@@ -113,6 +114,37 @@ class InfosPackage extends Component{
 		}
 	}
 
+
+	delectprojectModal=(id)=>{
+			this.setState({
+				Modalstype: true,
+				Modalstopval: '是否确认删除?',
+				ModalSave: () => this.delectproject(id),
+				ModalCancel: this.cancelProject
+			})
+	}
+
+	cancelProject=()=>{
+		this.setState({
+			Modalstype: false,
+		})
+	}
+
+	delectproject=(id)=>{
+
+		let {cate,status}=this.state;
+		let url=`/project_packages/${id}.json`
+
+		axios.delete(url).then((response) => {
+				if (response.data.status == 0) {
+					this.getCourses(cate,status,1);
+				}
+			})
+			.catch(function (error) {
+				console.log(error);
+			});
+
+	}
 	render(){
 		let{
 			category,
@@ -127,6 +159,13 @@ class InfosPackage extends Component{
 		// console.log(data)
 		return(
 			<div className="educontent mb50">
+				{/*提示*/}
+				<Modals
+					modalsType={this.state.Modalstype}
+					modalsTopval={this.state.Modalstopval}
+					modalCancel={this.state.ModalCancel}
+					modalSave={this.state.ModalSave}
+				/>
 				<Spin size="large" spinning={isSpin}>
 					<div className="white-panel edu-back-white pt25 pb25 clearfix ">
 						<li className={category ? "" : "active"}><a onClick={()=>this.changeCategory()}>全部</a></li>
@@ -160,21 +199,27 @@ class InfosPackage extends Component{
 
 					{/*type: "bidden"*/}
 
-
 					{data===undefined?<NoneData></NoneData>:data.project_packages.length===0?<NoneData></NoneData>:data.project_packages.map((item,key)=>{
 					return(
 						<div className="educontent project-packages-list" key={key}>
-							<div className="project-package-item  project-package-11">
+							<div className="project-package-item with-operator project-package-11">
+
 								<div className="item-image">
 									<img alt="图片" src={`/images/educoder/project_packages/${setcategorylist(item.category_name)}.png`} />
 								</div>
+
 								<div className="item-body">
 									<div className="item-head">
 										<div className="item-head-title" title={item.title}>
 											<a href={`/crowdsourcing/${item.id}`}>{item.title}</a>
 										</div>
+
 										<div className="item-head-tags">
+											{item.bidden_status==="pending"?<span className="pending">竞标中</span>:""}
+											{item.bidden_status==="bidding_won"?<span className="bidding_won">已中标</span>:""}
+											{item.bidden_status==="bidding_lost"?<span className="bidding_lost">未中标</span>:""}
 										</div>
+
 										<div className="item-head-blank"></div>
 										<div className="item-head-price mtf15">
 											{item.min_price===null?"":<span>￥{item.min_price}</span>}
@@ -205,6 +250,28 @@ class InfosPackage extends Component{
 										</div>
 									</div>
 								</div>
+
+								{category=="manage"?item.operation.can_edit===true&&item.operation.can_delete===true?
+								<div className="item-operator none">
+
+									<a href={`/crowdsourcing/${item.id}/edit`} title="编辑">
+										<i className="fa fa-pencil"></i>
+									</a>
+
+									<a className="delete-project-package-btn" onClick={()=>this.delectprojectModal(item.id)} data-id="10" title="删除">
+										<i className="fa fa-trash-o"></i>
+									</a>
+
+								</div>:"":""}
+
+								{category=="manage"?item.operation.can_edit===true?
+									<div className="item-operator none">
+										<a href={`/crowdsourcing/${item.id}/edit`} title="编辑">
+											<i className="fa fa-pencil"></i>
+										</a>
+									</div>:"":""}
+
+
 							</div>
 						</div>
 					)})}

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -94,4 +94,29 @@
 
 .mtf15{
     margin-top:-15px;
+}
+
+.project-package-item.with-operator .item-operator {
+    width: 0;
+    transition: width .2s;
+    -moz-transition: width .2s; /* Firefox 4 */
+    -webkit-transition: width .2s; /* Safari 和 Chrome */
+    -o-transition: width .2s; /* Opera */
+}
+.project-package-item.with-operator:hover .item-operator {
+    margin: -20px -20px -20px 20px;
+    padding: 20px 0;
+    width: 100px;
+    display: flex;
+    justify-content: space-around;
+    flex-direction: column;
+    align-items: center;
+    background: #f0f0f0;
+}
+.project-package-item.with-operator .item-operator a {
+    display: none;
+}
+.project-package-item.with-operator:hover .item-operator a {
+    display: block;
+    font-size: 20px;
 }