From 6294ab5f48c099a32d98ef7bf6e19903a77ddbf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 10:34:23 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesPublic/sendResource.js | 2 +- .../src/modules/courses/new/CoursesNew.js | 7 +- .../PackageIndex/PackageConcent.js | 3 +- public/react/src/modules/tpm/TPMBanner.js | 10 ++- .../react/src/modules/user/usersInfo/Infos.js | 20 ++--- .../modules/user/usersInfo/InfosPackage.js | 73 ++++++++++++++++++- .../src/modules/user/usersInfo/usersInfo.css | 25 +++++++ 7 files changed, 122 insertions(+), 18 deletions(-) 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..7c243faef 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); + }); + + } 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? +
    + + + +
    :"":""} + +
    )})} 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 From 1897c7d7c169d89964b60d03849ad90739ca18e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 11:08:00 +0800 Subject: [PATCH 2/9] =?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/modules/message/js/Leftdialogue.js | 2 +- public/react/src/modules/message/js/MessagChat.js | 2 +- public/react/src/modules/message/js/MessagSub.js | 2 +- public/react/src/modules/message/js/MessagePrivate.js | 2 +- public/react/src/modules/message/js/Messagerouting.js | 2 +- public/react/src/modules/message/js/Rightdialogue.js | 2 +- .../modules/message/messagemodal/WriteaprivateletterModal.js | 4 ++-- public/react/src/modules/user/usersInfo/InfosPackage.js | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index 2e586aa40..aa7b0782b 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -46,7 +46,7 @@ class Leftdialogue extends Component{ { this.props.objeysl&&this.props.objeysl.sender.image_url ? 头像:"" + src={getImageUrl("images/" + this.props.objeysl.sender.image_url)} />:"" }
    diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 377f3cd3a..e7c6dc147 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -639,7 +639,7 @@ class MessagChat extends Component{ return(
    this.Clickedontheuser(item.target)}>
    - +

    diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js index 88e339b20..091d3ee06 100644 --- a/public/react/src/modules/message/js/MessagSub.js +++ b/public/react/src/modules/message/js/MessagSub.js @@ -121,7 +121,7 @@ class MessagSub extends Component{ return(

    - this.myCome(item)} src={getImageUrl("/images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/> + this.myCome(item)} src={getImageUrl("images/"+item.trigger_user.image_url)} className="radius mr10 fl myimgw48 myimgh48"/>

    this.myCome(item)}>{item.trigger_user.name} diff --git a/public/react/src/modules/message/js/MessagePrivate.js b/public/react/src/modules/message/js/MessagePrivate.js index fa5531c80..4e2197d3b 100644 --- a/public/react/src/modules/message/js/MessagePrivate.js +++ b/public/react/src/modules/message/js/MessagePrivate.js @@ -135,7 +135,7 @@ class MessagePrivate extends Component{

    this.smyJump(3,item.target.id)}> this.myCome(item)}> - this.myCome(item)} src={getImageUrl("/images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/> + this.myCome(item)} src={getImageUrl("images/"+item.target.image_url)} className="radius myimgw48 myimgh48"/>

    diff --git a/public/react/src/modules/message/js/Messagerouting.js b/public/react/src/modules/message/js/Messagerouting.js index 2c649c23c..2e75fe624 100644 --- a/public/react/src/modules/message/js/Messagerouting.js +++ b/public/react/src/modules/message/js/Messagerouting.js @@ -160,7 +160,7 @@ class Messagerouting extends Component{ { this.props.current_user!== undefined? - + :"" } diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index d177e7c4f..c33b9d7cf 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -46,7 +46,7 @@ class Rightdialogue extends Component{ this.myCome(this.props.objeysl.sender)}> {this.props.objeysl&&this.props.objeysl.sender.image_url ? 头像:"" + src={getImageUrl("images/" + this.props.objeysl.sender.image_url)}/>:"" }

    diff --git a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js index a89614745..dfa27ba9a 100644 --- a/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js +++ b/public/react/src/modules/message/messagemodal/WriteaprivateletterModal.js @@ -283,7 +283,7 @@ class WriteaprivateletterModal extends Component { onFocus={this.myonFocus} onChange={this.setdatafunsval} suffix={ - this.search_message_person()}/> + this.search_message_person()}/> } />
    @@ -296,7 +296,7 @@ class WriteaprivateletterModal extends Component { users.map((item,key)=>{ return(

    this.Getuserinformation(item)}> - 1?1558048024 {item.name}

    diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index 7c243faef..272c827f4 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -264,7 +264,7 @@ class InfosPackage extends Component{
    :"":""} - {category=="manage"?item.operation.can_edit===true? + {category=="manage"?item.operation.can_edit===true&&item.operation.can_delete===false?
    From af6bcfdf2b3ef15f671542351c8a88ace789ffa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 12:48:49 +0800 Subject: [PATCH 3/9] b --- public/react/src/modules/courses/Resource/index.js | 2 +- .../react/src/modules/courses/graduation/tasks/index.js | 2 +- .../react/src/modules/courses/graduation/topics/index.js | 6 +++--- .../src/modules/courses/shixunHomework/shixunHomework.js | 2 +- public/react/src/modules/message/js/Leftdialogue.js | 6 ++++-- public/react/src/modules/message/js/MessagChat.js | 9 ++++++--- public/react/src/modules/message/js/Rightdialogue.js | 6 ++++-- 7 files changed, 20 insertions(+), 13 deletions(-) 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/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js index 08639b521..80dceb562 100644 --- a/public/react/src/modules/courses/graduation/tasks/index.js +++ b/public/react/src/modules/courses/graduation/tasks/index.js @@ -767,7 +767,7 @@ class GraduationTasks extends Component{
    diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js index 84b500716..6587ed0c6 100644 --- a/public/react/src/modules/courses/graduation/topics/index.js +++ b/public/react/src/modules/courses/graduation/topics/index.js @@ -28,7 +28,7 @@ class Boards extends Component{ checkAllValue: false, checkBoxValues: [], data:[], - topicList: [], + topicList: undefined, course_public:1, page:1, totalCount:undefined, @@ -412,7 +412,7 @@ onBoardsNew=()=>{ } onPressEnter={this.onPressEnter} searchPlaceholder={"请输入名称进行搜索"} - showSearchInput={topicList.length >= pageSize} + showSearchInput={topicList&&topicList.length >= pageSize} > { @@ -475,7 +475,7 @@ onBoardsNew=()=>{ >
    - ):() + ):(topicList && topicList.length===0?:
    ) } { diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index 61133acd2..48c988114 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -1205,7 +1205,7 @@ class ShixunHomework extends Component{
    diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index aa7b0782b..5523ec615 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -5,7 +5,7 @@ import { } from "antd"; import axios from 'axios'; import moment from 'moment'; -import {getImageUrl,markdownToHTML} from 'educoder'; +import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder'; import "../css/messagemy.css" import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; //私信页面 @@ -51,7 +51,9 @@ class Leftdialogue extends Component{
    -
    + + +
    diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index e7c6dc147..315da2166 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -575,12 +575,12 @@ class MessagChat extends Component{ } { parseInt(item.sender_id)===parseInt(this.props.match.params.userid)? - this.DELETEsetreplyfun(user_id,id)}> + this.DELETEsetreplyfun(user_id,id)}> {/*自己的*/} - :this.DELETEsetreplyfun(user_id,id)}> + :this.DELETEsetreplyfun(user_id,id)}> {/*他人的*/} @@ -650,7 +650,10 @@ class MessagChat extends Component{ {moment(item.send_time).fromNow()}

    -

    + + +

    +

    diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index c33b9d7cf..d53a8a435 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -5,7 +5,7 @@ import { } from "antd"; import axios from 'axios'; import moment from 'moment'; -import {getImageUrl,markdownToHTML} from 'educoder'; +import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder'; import "../css/messagemy.css" import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal'; //私信页面 @@ -51,7 +51,9 @@ class Rightdialogue extends Component{
    -
    + + +
    this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除 From fe96a49cde60ef4edb9639fedb855666aa0df6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 13:02:23 +0800 Subject: [PATCH 4/9] b --- public/react/src/modules/message/js/Leftdialogue.js | 4 ++-- public/react/src/modules/message/js/MessagChat.js | 4 ++-- public/react/src/modules/message/js/Rightdialogue.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/message/js/Leftdialogue.js b/public/react/src/modules/message/js/Leftdialogue.js index 5523ec615..b16746c70 100644 --- a/public/react/src/modules/message/js/Leftdialogue.js +++ b/public/react/src/modules/message/js/Leftdialogue.js @@ -51,9 +51,9 @@ class Leftdialogue extends Component{
    - + -
    +
    diff --git a/public/react/src/modules/message/js/MessagChat.js b/public/react/src/modules/message/js/MessagChat.js index 315da2166..612a87f2b 100644 --- a/public/react/src/modules/message/js/MessagChat.js +++ b/public/react/src/modules/message/js/MessagChat.js @@ -575,12 +575,12 @@ class MessagChat extends Component{ } { parseInt(item.sender_id)===parseInt(this.props.match.params.userid)? - this.DELETEsetreplyfun(user_id,id)}> + this.DELETEsetreplyfun(user_id,id)}> {/*自己的*/} - :this.DELETEsetreplyfun(user_id,id)}> + :this.DELETEsetreplyfun(user_id,id)}> {/*他人的*/} diff --git a/public/react/src/modules/message/js/Rightdialogue.js b/public/react/src/modules/message/js/Rightdialogue.js index d53a8a435..04c5f966d 100644 --- a/public/react/src/modules/message/js/Rightdialogue.js +++ b/public/react/src/modules/message/js/Rightdialogue.js @@ -51,9 +51,9 @@ class Rightdialogue extends Component{
    - + -
    +
    this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除 From e523282877aa004a9a46ecd216ca6595e4b4df6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:38:43 +0800 Subject: [PATCH 5/9] =?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/AppConfig.js | 20 ++++++------ public/react/src/modules/login/LoginDialog.js | 32 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index 97cfa8eeb..d97c7a223 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -20,16 +20,16 @@ function locationurl(list){ // TODO 开发期多个身份切换 let debugType ="" -if (isDev) { - const _search = window.location.search; - let parsed = {}; - if (_search) { - parsed = queryString.parse(_search); - } - debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : - window.location.search.indexOf('debug=s') != -1 ? 'student' : - window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' -} +// if (isDev) { +// const _search = window.location.search; +// let parsed = {}; +// if (_search) { +// parsed = queryString.parse(_search); +// } +// debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : +// window.location.search.indexOf('debug=s') != -1 ? 'student' : +// window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' +// } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 58cd9b7fb..3bc77c52e 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -398,23 +398,23 @@ class LoginDialog extends Component { }); } handleDialogClose = () => { - // if(this.props.match===undefined){ - // window.location.href="/"; - // }else if(this.props.match.path==="/"){ - // this.setState({ - // isRender: false - // }) - // }else{ - // window.location.href="/"; - // } - this.setState({ - isRender: false - }) - try { - this.props.Modifyloginvalue(); - }catch (e) { - + + if(this.props.match===undefined){ + window.location.href="/"; + }else{ + this.setState({ + isRender: false + }) + this.props.Modifyloginvalue(); } + // this.setState({ + // isRender: false + // }) + // try { + // this.props.Modifyloginvalue(); + // }catch (e) { + // + // } } loginEDU=()=>{ From ab8cd784f6dc91d470f2c648cd2a7d36e850efdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:39:09 +0800 Subject: [PATCH 6/9] =?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/AppConfig.js | 20 +++++++++---------- public/react/src/modules/login/LoginDialog.js | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index d97c7a223..97cfa8eeb 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -20,16 +20,16 @@ function locationurl(list){ // TODO 开发期多个身份切换 let debugType ="" -// if (isDev) { -// const _search = window.location.search; -// let parsed = {}; -// if (_search) { -// parsed = queryString.parse(_search); -// } -// debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : -// window.location.search.indexOf('debug=s') != -1 ? 'student' : -// window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' -// } +if (isDev) { + const _search = window.location.search; + let parsed = {}; + if (_search) { + parsed = queryString.parse(_search); + } + debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' : + window.location.search.indexOf('debug=s') != -1 ? 'student' : + window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin' +} window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 3bc77c52e..f4f8a3f1c 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -398,7 +398,7 @@ class LoginDialog extends Component { }); } handleDialogClose = () => { - + if(this.props.match===undefined){ window.location.href="/"; }else{ From 5333e28f0030c9d34158ed1c6ac99bedef8270cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:56:30 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageIndex/PackageConcent.js | 15 +++++++++++++-- .../PackageIndexNEITaskDetails.js | 2 +- .../projectPackages/ProjectPackageIndex.js | 3 ++- .../modules/projectPackages/packageconcnet.css | 4 ++-- .../src/modules/user/usersInfo/InfosPackage.js | 1 + 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index ea9de38fe..1950d7ed8 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -185,6 +185,17 @@ class PackageConcent extends Component { }) } + onChangePagelist=(pageNum)=> { + + this.setState({ + page: pageNum + }) + let {category, keyword, sort_by, sort_direction} = this.state; + this.setdatas(category, keyword, sort_by, sort_direction, pageNum) + + } + + render() { let {data,page,category,sort_by,sort_direction,project_packages, isRender,AccountProfiletype @@ -286,7 +297,7 @@ class PackageConcent extends Component {
    - this.onReleaseRequirements("/crowdsourcing/"+item.id)} title={item.title} >{item.title} @@ -346,7 +357,7 @@ class PackageConcent extends Component {
    :""}
    - +
    diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index 2eee9d882..2ad696538 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -311,7 +311,7 @@ class PackageIndexNEITaskDetails extends Component {
    - {data&&data.title} diff --git a/public/react/src/modules/projectPackages/ProjectPackageIndex.js b/public/react/src/modules/projectPackages/ProjectPackageIndex.js index 097e012e0..29d4efa17 100644 --- a/public/react/src/modules/projectPackages/ProjectPackageIndex.js +++ b/public/react/src/modules/projectPackages/ProjectPackageIndex.js @@ -36,7 +36,8 @@ class ProjectPackageIndex extends Component { } render() { - +console.log(this.props) + console.log(this.state) return (
    diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index 2fc8a8ebb..f7ee4cc06 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/public/react/src/modules/projectPackages/packageconcnet.css @@ -31,8 +31,8 @@ color:#8F8F8F !important; } -.maxwidth700{ - max-width: 700px; +.maxwidth670{ + max-width: 670px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index 272c827f4..6bd11a926 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -138,6 +138,7 @@ class InfosPackage extends Component{ axios.delete(url).then((response) => { if (response.data.status == 0) { this.getCourses(cate,status,1); + this.cancelProject; } }) .catch(function (error) { From 15f28ffa9d71c6458267f70f9b5bedb3cd946114 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 15:58:49 +0800 Subject: [PATCH 8/9] b --- public/react/src/modules/user/usersInfo/InfosPackage.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index 6bd11a926..36175295b 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -138,13 +138,12 @@ class InfosPackage extends Component{ axios.delete(url).then((response) => { if (response.data.status == 0) { this.getCourses(cate,status,1); - this.cancelProject; } }) .catch(function (error) { console.log(error); }); - + this.cancelProject; } render(){ let{ From ece14919f78d1934ac16f4144d804c463db8b769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 2 Aug 2019 16:05:46 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/projectPackages/PackageIndex/PackageConcent.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index 1950d7ed8..ba8655d9b 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -18,7 +18,7 @@ let categorylist=[ {name:"云计算和大数据",value:"cloud_compute_and_big_data"}, {name:"人工智能",value:"ai"}, {name:"运维与测试",value:"devops_and_test"}, - {name:"其他",value:"other"}, + {name:"其它",value:"other"}, ] // function setcategorylist(val){ @@ -30,7 +30,6 @@ function setcategorylist(val){ } } ) - return vals }