diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js index f83b525ee..d93c30d75 100644 --- a/public/react/src/modules/courses/Resource/index.js +++ b/public/react/src/modules/courses/Resource/index.js @@ -950,7 +950,7 @@ class Fileslists extends Component{
diff --git a/public/react/src/modules/courses/coursesPublic/sendResource.js b/public/react/src/modules/courses/coursesPublic/sendResource.js index 8443061dd..e6460246d 100644 --- a/public/react/src/modules/courses/coursesPublic/sendResource.js +++ b/public/react/src/modules/courses/coursesPublic/sendResource.js @@ -467,7 +467,7 @@ class Sendresource extends Component{ {/*)*/} {/*})}*/} - {newfileListtype===true?

请先上传资源

:""} + {newfileListtype===true&&this.state.fileListtype===false?

请先上传资源

:""}

12?"cdefault ":"cdefault "}> -
+
    { diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js index df376e4e5..6078f7d6d 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`}>项目 - {/*
  • */} - {/* this.setState({moduleName: 'package'})}*/} - {/*to={`/users/${username}/package`}>众包*/} - {/*
  • */} +
  • + this.setState({moduleName: 'package'})} + to={`/users/${username}/package`}>众包 +
  • {/*{ data && data.identity!="学生" &&
  • 题库
  • }*/} @@ -404,11 +404,11 @@ class Infos extends Component{ {/* 众包 */} {/* http://localhost:3007/courses/1309/homework/9300/setting */} - {/* ()*/} - {/*}*/} - {/*>*/} + () + } + > {/* 课堂 */} {/* http://localhost:3007/courses/1309/homework/9300/setting */} diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index bef2bf366..36175295b 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/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); + }); + this.cancelProject; + } render(){ let{ category, @@ -127,6 +159,13 @@ class InfosPackage extends Component{ // console.log(data) return(
    + {/*提示*/} +
  • this.changeCategory()}>全部
  • @@ -160,21 +199,27 @@ class InfosPackage extends Component{ {/*type: "bidden"*/} - {data===undefined?:data.project_packages.length===0?:data.project_packages.map((item,key)=>{ return(
    -
    +
    +
    图片
    +
    +
    + {item.bidden_status==="pending"?竞标中:""} + {item.bidden_status==="bidding_won"?已中标:""} + {item.bidden_status==="bidding_lost"?未中标:""}
    +
    {item.min_price===null?"":¥{item.min_price}} @@ -205,6 +250,28 @@ class InfosPackage extends Component{
    + + {category=="manage"?item.operation.can_edit===true&&item.operation.can_delete===true? + :"":""} + + {category=="manage"?item.operation.can_edit===true&&item.operation.can_delete===false? +
    + + + +
    :"":""} + +
    )})} diff --git a/public/react/src/modules/user/usersInfo/usersInfo.css b/public/react/src/modules/user/usersInfo/usersInfo.css index 3485f6d16..25cfd6e21 100644 --- a/public/react/src/modules/user/usersInfo/usersInfo.css +++ b/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; } \ No newline at end of file