From 89b7a5099f4b9426413eb99b8b6d0b642b4ab4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 30 Jul 2019 17:53:34 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=97=E5=8C=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 2 +- .../projectPackages/PackageIndex/PackageConcent.js | 4 ++-- .../PackageIndexNEITaskDetails.js | 6 +++--- .../PackageIndexNEIBannerConcent.js | 4 ++-- .../PackageIndexNewandEdit/PackageIndexNEISubmit.js | 4 ++-- .../PackageIndexNewandEditIndex.js | 2 +- .../src/modules/projectPackages/ProjectPackageIndex.js | 8 ++++---- public/react/src/modules/tpm/NewHeader.js | 4 ++-- public/react/src/modules/user/usersInfo/Infos.js | 10 +++++----- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index e713cd0fd..6d1e2a521 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -304,7 +304,7 @@ class App extends Component { {/**/} {/*众包创新*/} - + {/*认证*/} diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index cfc54bb98..921c3e555 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -158,7 +158,7 @@ class PackageConcent extends Component { enterButton={ 搜索} onSearch={ (value)=>this.setdatafuns(value)} />

@@ -224,7 +224,7 @@ class PackageConcent extends Component {
{item.title}
diff --git a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js index ac7c8a1a5..35ca952a7 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js +++ b/public/react/src/modules/projectPackages/PackageIndexNEITaskDetails/PackageIndexNEITaskDetails.js @@ -230,7 +230,7 @@ class PackageIndexNEITaskDetails extends Component { } goback = () => { // window.history.go(-1) - window.location.href="/crowdsourcings"; + window.location.href="/crowdsourcing"; } render() { @@ -252,7 +252,7 @@ class PackageIndexNEITaskDetails extends Component { '} className={"fl"}> {/*{this.props.current_user.username}*/} - 众包创新 + 众包创新 {data&&data.title} @@ -353,7 +353,7 @@ class PackageIndexNEITaskDetails extends Component { 需求详情： {data&&data.status==="pending"&&data&&data.operation.can_select_bidding_user===true?:""} diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index eae5589f2..ccc78f04b 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -462,7 +462,7 @@ class PackageIndexNEIBannerConcent extends Component { if(type===true){ this.props.setPublicationfun(response.data.id) }else{ - window.location.href="/crowdsourcings/"+response.data.id + window.location.href="/crowdsourcing/"+response.data.id } this.setState({ springtype:false @@ -510,7 +510,7 @@ class PackageIndexNEIBannerConcent extends Component { if(type===true){ this.props.setPublicationfun(response.data.id) }else{ - window.location.href="/crowdsourcings/"+response.data.id + window.location.href="/crowdsourcing/"+response.data.id } this.setState({ springtype:false diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js index 932b9295f..e44e654b9 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEISubmit.js @@ -14,10 +14,10 @@ class PackageIndexNEISubmit extends Component { } setageload=(sum)=>{ if(sum===undefined){ - window.location.href="/crowdsourcings/new" + window.location.href="/crowdsourcing/new" }else{ // this.props.history.push("/project_packages/"+sum) - window.location.href="/crowdsourcings/"+sum + window.location.href="/crowdsourcing/"+sum } } diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js index 8d73a6e55..0481577bf 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNewandEditIndex.js @@ -30,7 +30,7 @@ class PackageIndexNewandEditIndex extends Component{ goback = () => { // window.history.go(-1) - window.location.href="/crowdsourcings"; + window.location.href="/crowdsourcing"; } render() { diff --git a/public/react/src/modules/projectPackages/ProjectPackageIndex.js b/public/react/src/modules/projectPackages/ProjectPackageIndex.js index 6f2e32b8b..097e012e0 100644 --- a/public/react/src/modules/projectPackages/ProjectPackageIndex.js +++ b/public/react/src/modules/projectPackages/ProjectPackageIndex.js @@ -43,25 +43,25 @@ class ProjectPackageIndex extends Component { {/*众包首页*/} - () } > - () } > - () } > - () } diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index b84982d86..79b0aa443 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -718,7 +718,7 @@ submittojoinclass=(value)=>{
  • 教学案例
  • 众包创新
  • 交流问答
  • {
  • 我的实训
  • 我的实践课程
  • 我的项目
    • - {/*
  • 我的众包
    • */} +
  • 我的众包
  • 账号管理
    • {/*
  • this.educoderlogin()} >登入测试接口
    • */} {/*
  • this.trialapplications()} >试用申请
    • */} diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js index f20cd5be5..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`}>项目 - {/*
  • */} - {/* this.setState({moduleName: 'package'})}*/} - {/*to={`/users/${username}/package`}>众包*/} - {/*
    • */} +
  • + this.setState({moduleName: 'package'})} + to={`/users/${username}/package`}>众包 +
    • {/*{ data && data.identity!="学生" &&
  • 题库
    • }*/} From 0bc92a8729a1e8b9a8022d70c9cd26ee119e81ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 30 Jul 2019 23:18:22 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BC=97=E5=8C=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/user/usersInfo/InfosPackage.js | 125 +++++++++++++++--- 1 file changed, 109 insertions(+), 16 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosPackage.js b/public/react/src/modules/user/usersInfo/InfosPackage.js index f1077cd62..65cf2467a 100644 --- a/public/react/src/modules/user/usersInfo/InfosPackage.js +++ b/public/react/src/modules/user/usersInfo/InfosPackage.js @@ -2,16 +2,35 @@ import React, { Component } from 'react'; import { SnackbarHOC } from 'educoder'; import {BrowserRouter as Router,Route,Switch} from 'react-router-dom'; import {Tooltip,Menu,Pagination,Spin} from 'antd'; -import Loadable from 'react-loadable'; -import Loading from '../../../Loading'; import axios from 'axios'; -import NoneData from '../../courses/coursesPublic/NoneData' import {getImageUrl} from 'educoder'; -import { TPMIndexHOC } from '../../tpm/TPMIndexHOC'; -import { CNotificationHOC } from '../../courses/common/CNotificationHOC' +import NoneData from '../../courses/coursesPublic/NoneData' import "./usersInfo.css" -import Create from './publicCreatNew' +import moment from 'moment'; +let categorylist=[ + {name:"全部",value:undefined}, + {name:"前端开发",value:"front"}, + {name:"后端开发",value:"backend"}, + {name:"移动开发",value:"mobile"}, + {name:"数据库",value:"database"}, + {name:"云计算和大数据",value:"cloud_compute_and_big_data"}, + {name:"人工智能",value:"ai"}, + {name:"运维与测试",value:"devops_and_test"}, + {name:"其他",value:"other"}, +] +// +function setcategorylist(val){ + let vals="" + categorylist.some((item,key)=> { + if (item.name === val) { + vals=item.value + return true + } + } + ) + return vals +} class InfosPackage extends Component{ constructor(props){ super(props); @@ -19,8 +38,8 @@ class InfosPackage extends Component{ category:undefined, status:undefined, page:1, - per_page:16, - + per_page:20, + sort_direction:'desc', totalCount:undefined, data:undefined, isSpin:false @@ -36,12 +55,14 @@ class InfosPackage extends Component{ } getCourses=(category,status,page)=>{ - let url=`/users/${this.props.match.params.username}/courses.json`; + let url=`/users/${this.props.match.params.username}/project_packages.json`; axios.get((url),{params:{ category, status, page, - per_page: this.props.is_current && category && page ==1?17:16 + sort_by:"published_at", + sort_direction:'desc', + per_page:20 }}).then((result)=>{ if(result){ this.setState({ @@ -103,21 +124,93 @@ class InfosPackage extends Component{ } = this.state; let is_current=this.props.is_current; - console.log(this.props.current_user&&this.props.current_user.user_identity==="学生") + console.log(data) return(
    - + { + category=="manage"? + : category=="bidden"? + :"" + }

    - 共{0}个 + 共{totalCount}个 发布时间

    + {/*bidden_status: "pending"*/} + + {/*category_id: 2*/} + + {/*status: "published"*/} + + {/*type: "bidden"*/} + + + {data===undefined?:data.project_packages.length===0?:data.project_packages.map((item,key)=>{ + return( +
    +
    +
    + 图片 +
    +
    +
    + +
    +
    +
    +
    + {item.min_price===null?"":￥{item.min_price}} + {item.max_price===null||item.min_price===null?"":~} + {item.max_price===null?"":￥{item.max_price}} + {item.min_price===null&&item.max_price===null?可议价:""} +
    +
    +
    +
    {item.category_name}
    +
    +
    +
    + + {item.visit_count}人浏览 +
    +
    + + {moment(item.deadline_at).endOf('day').fromNow()}竞标截止 +
    +
    + + {item.bidding_users_count}人竞标 +
    +
    +
    + 发布于：{item.published_at} +
    +
    +
    +
    +
    + )})} + + +
    ) From 60645e22064fc91d0ddc58e7eab94deb9e4922db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 09:59:20 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=AE=9E=E8=AE=ADTPM=EF=BC=8C=E5=AE=9E?= =?UTF-8?q?=E8=B7=B5=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=95=88=E6=9E=9C=E5=B1=95?= =?UTF-8?q?=E7=8E=B0=E5=A2=9E=E5=8A=A0=E2=80=9CMP3/MP4=E2=80=9D=E7=9A=84?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tpm/challengesnew/TPMevaluation.js | 56 ++++++++++--------- 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js index 5d66829c3..6cd0b9977 100644 --- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js +++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js @@ -339,9 +339,6 @@ export default class TPMevaluation extends Component { goblakepath=(path,key)=>{ let {main,selectpath,pathtype} =this.state; - - - let newmain=[] for(var i=0;i<=key;i++){ newmain.push(main[i]) @@ -366,16 +363,20 @@ export default class TPMevaluation extends Component { }); if(pathtype===2){ - // var str=path; - // str.slice(0,str.length-1) - // debugger - // console.log(str) + let paths = path.substring(0,path.length-1); + console.log(paths) this.setState({ - selectpath: path, + selectpath: paths, }) } + } + + + + + // delesavegetfilepath=(value)=>{ // let {selectpatharr} = this.state // let newarr =selectpatharr; @@ -674,6 +675,7 @@ export default class TPMevaluation extends Component { this.setState({ selectpath:e.target.value }) + } updatepath=(e,name,type)=>{ this.setState({ @@ -949,6 +951,8 @@ export default class TPMevaluation extends Component { + + this.showrepositoryurltip(1)}>
    - {pathoptionvalue===1?
    + {pathoptionvalue===1||pathoptionvalue===5||pathoptionvalue===6?

    待处理图片路径

    this.updatepath(e,"shixunfileexpectpicturepath",2)} onClick={(e)=>this.getfilepath(e,"shixunfileexpectpicturepath",2)} />

    - 该路径下的文件将在学员评测本关任务时，作为原始图片显示在查看效果页，供学员参考,任务为图片处理时请指定该路径，并注意与程序文件所在文件夹分开 + 该路径下的文件将在学员评测本关任务时，作为原始文件显示在查看效果页，供学员参考；任务为文件处理时请指定该路径，并注意与程序文件所在文件夹分开。

    @@ -997,20 +1001,20 @@ export default class TPMevaluation extends Component {
    :""} - {pathoptionvalue===1?
    + {pathoptionvalue===1||pathoptionvalue===5||pathoptionvalue===6?

    标准答案图片路径

    this.updatepath(e,"shixunfilestandardpicturepath",2)} onClick={(e)=>this.getfilepath(e,"shixunfilestandardpicturepath",2)} />

    - 该路径下的文件将在学员评测本关任务时，作为参考答案显示在查看效果页，供学员参考任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开 + 该路径下的文件将在学员评测本关任务时，作为参考答案显示在查看效果页，供学员参考；任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开。

    @@ -1029,9 +1033,9 @@ export default class TPMevaluation extends Component { value={shixunfilepicturepath} onInput={(e)=>this.updatepath(e,"shixunfilepicturepath",2)} onClick={(e)=>this.getfilepath(e,"shixunfilepicturepath",2)} - placeholder="请在版本库中指定用来保存学员代码实际输出结果的路径。例：src/step1/outputimages"/> + placeholder="请在版本库中指定用来保存学员代码实际输出结果的路径。例：src/step1/outputfiles"/>

    - 学员评测本关任务时生成的文件将保存在该路径下，并作为实际输出显示在查看效果页，供学员确认任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开 + 学员评测本关任务时生成的文件将保存在该路径下，并作为实际输出显示在查看效果页，供学员确认；任务输出结果为文件时请指定该路径，并注意与程序文件所在文件夹分开。

    @@ -1066,16 +1070,16 @@ export default class TPMevaluation extends Component {

    - - 系统评分占比： - - 均分比例 - 自定义比例 - - + + 系统评分占比： + + 均分比例 + 自定义比例 + +

    From df69ef1ade9f35d54db42e84076177846e9b750c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 14:57:07 +0800 Subject: [PATCH 04/10] b --- public/react/src/modules/tpm/TPMIndexHOC.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index b0bcf6f2a..425faba34 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -32,14 +32,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?15254409771`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?15254409781`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?15254409781`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1`)); // $('head').append($('') From 58bf4afde26dd0c84b8bb7c9c23c5dfc8c33f684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 15:10:22 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/public/css/edu-all.css | 351 +++++++++++++++++ .../PackageIndex/PackageConcent.js | 2 +- .../projectPackages/packageconcnet.css | 5 + public/react/src/modules/tpm/TPMIndexHOC.js | 6 +- public/stylesheets/educoder/edu-all.css | 352 +++++++++++++++++- 5 files changed, 711 insertions(+), 5 deletions(-) diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 600520410..6bc9d30fc 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -3065,3 +3065,354 @@ a.singlepublishtwo{ /*课程目标VS毕业要求指标点*/ .CourseTargetPoint thead th{vertical-align: baseline;} .CourseTargetPoint tbody tr td{vertical-align: top;} + + +/*众包*/ + +.packinput .ant-input{ + height: 50px; + width:749px; + border-color: #E1EDF8 !important; +} + +.packinput{ + width:749px; +} + + +.packinput .ant-input-group-addon .ant-btn{ + width:140px !important; + font-size: 18px; + height: 50px; + background:rgba(76,172,255,1); +} + +.setissues{ + width:280px; + height:50px; + background:rgba(76,172,255,1); + border-radius:4px; + margin-left: 15px; +} + +.pagetype li{ + color:#8F8F8F !important; +} + +.maxwidth700{ + max-width: 700px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.mbf10{ + margin-bottom:-10px; +} + +.PackageIndexNEIBanner{ + width:1200px; + height:110px; + background:rgba(255,255,255,1); + box-shadow:0px 2px 6px 0px rgba(125,125,125,0.26); + border-radius:8px; +} + +.padding110{ + padding: 39px 110px 0px; + box-sizing: border-box; +} + +.borderccc{ + border: 1px solid #ccc; +} + +.input-100-40s{ + width: 100%; + padding: 5px; + box-sizing: border-box; +} + +.fafafas{ + background-color: #fafafa!important; + height: 40px; +} + +.fafafas:focus{ + background-color: #fff!important; +} + +.fafas .ant-input{ + background-color: #fafafa!important; + height: 40px; +} + +.fafas .ant-input:focus{ + background-color: #fff!important; +} +.fafas .ant-input-group-addon .ant-btn{ + width:140px !important; + font-size: 14px; + height: 40px; + background:rgba(76,172,255,1); +} + +.newFormbox .upload_filename{ + line-height: 32px; +} + +.newFormbox .attachment span{ + line-height: 23px; +} + +.newFormbox .attachment .remove-upload{ + line-height: 28px; +} + +.pd26a0{ + padding: 26px 26px 16px 26px; +} + +.newFormbox .attachment .icon-fujian{ + font-size: 14px !important; + line-height: 14px; + margin-top: 9px; +} + +.newFormbox{ + height:20px +} + +.ml24{ + margin-left:24px; +} + +.defalutCancelbtns{ + display: block; + border: 1px solid #4CACFF !important; + background-color: #fff; + color: #4CACFF !important; + width:130px; + height:40px; + text-align: center; + line-height: 40px; + border-radius: 4px; +} + +.defalutSubmitbtns{ + background-color: #4CACFF; + height:40px; +} + +.defalutSubmitbtnmodels{ + width:127px; + height:30px; + background-color: #4CACFF; +} + +.ant-steps-item-process .ant-steps-item-icon{ + background-color: #4CACFF !important; +} + +.ant-steps-item-process .ant-steps-item-icon{ + background-color: #4CACFF !important; +} + +.padding200{ + padding: 115px 200px 215px 200px; +} + +.fontcircle{ + font-size: 80px; + display: inherit; +} + +.sumbtongs{ + font-size: 24px; + display: inherit; + text-align: center; +} + +.terraces{ + font-size: 16px; + display: inherit; + text-align: center; + color:#999; +} +.padding251{ + padding: 0px 245px; +} + +.ant-modal-title{ + text-align: center; +} +.ml17{ + margin-left: 17px; +} + +.project-package-items{ + display: -webkit-flex; + display: flex; + flex-direction: row; + margin:0px !important; + padding: 20px; + background: white; + margin-bottom:0px !important; + box-shadow: none !important; +} + +.mtf7{ + margin-top:-7px; +} + +.publicpart.orangeGreen { + border-left: 80px solid #29BD8B; +} + +.publicwords{ + left: 3px; + top: 18px; +} + +.project-packages-list .project-package-items .item-image{ + width:100px !important; +} + +.height185{ + height: 185px; +} + +.ContacttheTA{ + width: 80px; + height: 26px; + font-size: 14px; + line-height: 26px; + display: block; + border: 1px solid #4CACFF !important; + background-color: #fff; + color: #4CACFF !important; + text-align: center; + border-radius: 4px; +} +.ContacttheTAs{ + width: 80px; + height: 26px; + font-size: 14px; + line-height: 24px; + /*display: block;*/ + border: 1px solid #fff !important; + background-color: #4CACFF; + color: #fff !important; + text-align: center; + border-radius: 4px; +} +.ml28{ + margin-left: 28px; +} + +.longboxs{ + font-size: 16px; + font-family: MicrosoftYaHei-Bold; + font-weight: bold; + color: rgba(5,16,26,1); + border-left: 4px solid rgba(76,172,255,1); + padding-left: 10px; + margin-bottom: 20px; +} + +.padding020{ + padding: 0px 20px 20px; +} + +.mtf3{ + margin-top:-3px; +} + +.task-btn-nebules{ + background: #fff!important; + color: #4CACFF!important; + border: 1px solid #4CACFF!important; + margin-left: 20px; + cursor: pointer; + display: inline-block; + padding: 0 12px; + letter-spacing: 1px; + text-align: center; + font-size: 14px; + height: 30px; + line-height: 30px; + border-radius: 2px; +} + +.packageabsolute{ + position: absolute; + right: -16px; + top: -7px; +} +.relativef{ + position: relative; +} + +.homehove:hover .ptext{ + color: #4CACFF!important; +} + +.homehove:hover .ContacttheTAs{ + display: block; +} + +.topsj{ + position: absolute; + top: -6px; +} +.bottomsj{ + position: absolute; + bottom: -6px; +} +.touchSelect .ant-spin-dot-spin{ + margin-top: 30% !important; +} + +.pagenoedits{ + margin-left: 20px; + color: #ccc; +} + +.pagemancenter{ + text-align: center; +} + +.ml0{ + margin-left: 0px; +} +.tabelcli{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 850px; + display: table-cell; +} + +.mtf10{ + margin-top:-10px; +} + +.padding26{ + padding: 26px; + box-sizing: border-box; +} + +.pd26{ + padding: 26px; +} +.pd30a0{ + padding: 30px 30px 16px 30px; +} + +.shaiContent li.shaiItem:hover span{ + color: #fff !important; +} + +.shaiContent li.shaiItem:hover i.iconfont{ + color: #4CACFF!important +} diff --git a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js index 921c3e555..692cfc330 100644 --- a/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndex/PackageConcent.js @@ -153,7 +153,7 @@ class PackageConcent extends Component {

    搜索} onSearch={ (value)=>this.setdatafuns(value)} /> diff --git a/public/react/src/modules/projectPackages/packageconcnet.css b/public/react/src/modules/projectPackages/packageconcnet.css index 7a8c11897..db2decfdd 100644 --- a/public/react/src/modules/projectPackages/packageconcnet.css +++ b/public/react/src/modules/projectPackages/packageconcnet.css @@ -7,6 +7,11 @@ border-color: #E1EDF8 !important; } +.packinput{ + width:749px; +} + + .packinput .ant-input-group-addon .ant-btn{ width:140px !important; font-size: 18px; diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index 425faba34..bf07e9970 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -32,14 +32,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?1`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2`)); // $('head').append($('') diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 05e767ba4..33649a220 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -3361,4 +3361,354 @@ a.singlepublishtwo{ #trophyreturn i{ font-size: 16px!important; color: #AAAAAA; -} \ No newline at end of file +} + +/*众包*/ + +.packinput .ant-input{ + height: 50px; + width:749px; + border-color: #E1EDF8 !important; +} + +.packinput{ + width:749px; +} + + +.packinput .ant-input-group-addon .ant-btn{ + width:140px !important; + font-size: 18px; + height: 50px; + background:rgba(76,172,255,1); +} + +.setissues{ + width:280px; + height:50px; + background:rgba(76,172,255,1); + border-radius:4px; + margin-left: 15px; +} + +.pagetype li{ + color:#8F8F8F !important; +} + +.maxwidth700{ + max-width: 700px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.mbf10{ + margin-bottom:-10px; +} + +.PackageIndexNEIBanner{ + width:1200px; + height:110px; + background:rgba(255,255,255,1); + box-shadow:0px 2px 6px 0px rgba(125,125,125,0.26); + border-radius:8px; +} + +.padding110{ + padding: 39px 110px 0px; + box-sizing: border-box; +} + +.borderccc{ + border: 1px solid #ccc; +} + +.input-100-40s{ + width: 100%; + padding: 5px; + box-sizing: border-box; +} + +.fafafas{ + background-color: #fafafa!important; + height: 40px; +} + +.fafafas:focus{ + background-color: #fff!important; +} + +.fafas .ant-input{ + background-color: #fafafa!important; + height: 40px; +} + +.fafas .ant-input:focus{ + background-color: #fff!important; +} +.fafas .ant-input-group-addon .ant-btn{ + width:140px !important; + font-size: 14px; + height: 40px; + background:rgba(76,172,255,1); +} + +.newFormbox .upload_filename{ + line-height: 32px; +} + +.newFormbox .attachment span{ + line-height: 23px; +} + +.newFormbox .attachment .remove-upload{ + line-height: 28px; +} + +.pd26a0{ + padding: 26px 26px 16px 26px; +} + +.newFormbox .attachment .icon-fujian{ + font-size: 14px !important; + line-height: 14px; + margin-top: 9px; +} + +.newFormbox{ + height:20px +} + +.ml24{ + margin-left:24px; +} + +.defalutCancelbtns{ + display: block; + border: 1px solid #4CACFF !important; + background-color: #fff; + color: #4CACFF !important; + width:130px; + height:40px; + text-align: center; + line-height: 40px; + border-radius: 4px; +} + +.defalutSubmitbtns{ + background-color: #4CACFF; + height:40px; +} + +.defalutSubmitbtnmodels{ + width:127px; + height:30px; + background-color: #4CACFF; +} + +.ant-steps-item-process .ant-steps-item-icon{ + background-color: #4CACFF !important; +} + +.ant-steps-item-process .ant-steps-item-icon{ + background-color: #4CACFF !important; +} + +.padding200{ + padding: 115px 200px 215px 200px; +} + +.fontcircle{ + font-size: 80px; + display: inherit; +} + +.sumbtongs{ + font-size: 24px; + display: inherit; + text-align: center; +} + +.terraces{ + font-size: 16px; + display: inherit; + text-align: center; + color:#999; +} +.padding251{ + padding: 0px 245px; +} + +.ant-modal-title{ + text-align: center; +} +.ml17{ + margin-left: 17px; +} + +.project-package-items{ + display: -webkit-flex; + display: flex; + flex-direction: row; + margin:0px !important; + padding: 20px; + background: white; + margin-bottom:0px !important; + box-shadow: none !important; +} + +.mtf7{ + margin-top:-7px; +} + +.publicpart.orangeGreen { + border-left: 80px solid #29BD8B; +} + +.publicwords{ + left: 3px; + top: 18px; +} + +.project-packages-list .project-package-items .item-image{ + width:100px !important; +} + +.height185{ + height: 185px; +} + +.ContacttheTA{ + width: 80px; + height: 26px; + font-size: 14px; + line-height: 26px; + display: block; + border: 1px solid #4CACFF !important; + background-color: #fff; + color: #4CACFF !important; + text-align: center; + border-radius: 4px; +} +.ContacttheTAs{ + width: 80px; + height: 26px; + font-size: 14px; + line-height: 24px; + /*display: block;*/ + border: 1px solid #fff !important; + background-color: #4CACFF; + color: #fff !important; + text-align: center; + border-radius: 4px; +} +.ml28{ + margin-left: 28px; +} + +.longboxs{ + font-size: 16px; + font-family: MicrosoftYaHei-Bold; + font-weight: bold; + color: rgba(5,16,26,1); + border-left: 4px solid rgba(76,172,255,1); + padding-left: 10px; + margin-bottom: 20px; +} + +.padding020{ + padding: 0px 20px 20px; +} + +.mtf3{ + margin-top:-3px; +} + +.task-btn-nebules{ + background: #fff!important; + color: #4CACFF!important; + border: 1px solid #4CACFF!important; + margin-left: 20px; + cursor: pointer; + display: inline-block; + padding: 0 12px; + letter-spacing: 1px; + text-align: center; + font-size: 14px; + height: 30px; + line-height: 30px; + border-radius: 2px; +} + +.packageabsolute{ + position: absolute; + right: -16px; + top: -7px; +} +.relativef{ + position: relative; +} + +.homehove:hover .ptext{ + color: #4CACFF!important; +} + +.homehove:hover .ContacttheTAs{ + display: block; +} + +.topsj{ + position: absolute; + top: -6px; +} +.bottomsj{ + position: absolute; + bottom: -6px; +} +.touchSelect .ant-spin-dot-spin{ + margin-top: 30% !important; +} + +.pagenoedits{ + margin-left: 20px; + color: #ccc; +} + +.pagemancenter{ + text-align: center; +} + +.ml0{ + margin-left: 0px; +} +.tabelcli{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + max-width: 850px; + display: table-cell; +} + +.mtf10{ + margin-top:-10px; +} + +.padding26{ + padding: 26px; + box-sizing: border-box; +} + +.pd26{ + padding: 26px; +} +.pd30a0{ + padding: 30px 30px 16px 30px; +} + +.shaiContent li.shaiItem:hover span{ + color: #fff !important; +} + +.shaiContent li.shaiItem:hover i.iconfont{ + color: #4CACFF!important +} From 872fc5bb6ce02c79e2607f8415cdcdfda2aa4c84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 15:35:43 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BC=97=E5=8C=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/projectPackages/MDEditors.js | 2 +- .../PackageIndexNEIBannerConcent.js | 30 ++++++++++++------- public/react/src/modules/tpm/NewHeader.js | 21 +++++++------ 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/public/react/src/modules/projectPackages/MDEditors.js b/public/react/src/modules/projectPackages/MDEditors.js index b6fee5582..2c11e0895 100644 --- a/public/react/src/modules/projectPackages/MDEditors.js +++ b/public/react/src/modules/projectPackages/MDEditors.js @@ -222,7 +222,7 @@ export default class MDEditors extends Component { const _placeholder = placeholder || ""; // amp; // 编辑时要传memoId - const imageUrl = `/upload_with_markdown?container_id=&container_type=Memo`; + const imageUrl = `/api/attachments.json`; // 创建editorMd let react_id = `react_${_id}`; diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index ccc78f04b..6fb573ce3 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -43,6 +43,12 @@ function disabledDateTime() { disabledMinutes: () => range(1, 30).concat(range(31, 60)), }; } + +function disabledDate(current) { + return current && current < moment().endOf('day').subtract(1, 'days'); +} + + class PackageIndexNEIBannerConcent extends Component { constructor(props) { super(props) @@ -50,7 +56,7 @@ class PackageIndexNEIBannerConcent extends Component { this.state = { modalCancel:false, getverificationcodes:true, - seconds:35, + seconds:60, springtype:false, category:undefined, title:undefined, @@ -83,7 +89,7 @@ class PackageIndexNEIBannerConcent extends Component { deadline_at:moment(data.deadline_at), min_price:data.min_price, max_price:data.max_price, - contact_name:data.contact_name==null||data.contact_name==undefined?this.props.current_user.username:data.contact_name, + contact_name:data.contact_name==null||data.contact_name==undefined?this.props.current_user.real_name:data.contact_name, phones:data.contact_phone, attachments:data.attachments, @@ -93,7 +99,7 @@ class PackageIndexNEIBannerConcent extends Component { }) }else{ - console.log(this.props.current_user&&this.props.current_user.username) + console.log(this.props.current_user&&this.props.current_user.real_name) } let Url = `/project_package_categories.json`; @@ -112,7 +118,7 @@ class PackageIndexNEIBannerConcent extends Component { }) this.setState({ - contact_name:this.props.current_user&&this.props.current_user.username + contact_name:this.props.current_user&&this.props.current_user.real_name }) // this.contentMdRef.current.setValue("测试赋值") @@ -123,7 +129,7 @@ class PackageIndexNEIBannerConcent extends Component { if(prevProps.current_user!=this.props.current_user){ if(this.props.current_user!=undefined){ this.setState({ - contact_name:this.props.current_user.username + contact_name:this.props.current_user.real_name }) } } @@ -151,7 +157,7 @@ class PackageIndexNEIBannerConcent extends Component { clearInterval(timer); this.setState({ getverificationcodes: false, - seconds: 35, + seconds: 60, }) } }); @@ -170,7 +176,7 @@ class PackageIndexNEIBannerConcent extends Component { clearInterval(timer); this.setState({ getverificationcodes: false, - seconds: 35, + seconds: 60, }) } @@ -187,7 +193,7 @@ class PackageIndexNEIBannerConcent extends Component { axios.get((url), { params: { value: contact_phone, - type: 9, + type: 5, } }).then((result) => { //验证有问题{"status":1,"message":"success"} @@ -452,7 +458,7 @@ class PackageIndexNEIBannerConcent extends Component { deadline_at:deadline_at._i, min_price:parseInt(min_price), max_price:parseInt(max_price), - contact_name: contact_name===null||contact_name===undefined?this.props.current_user.username:contact_name, + contact_name: contact_name===null||contact_name===undefined?this.props.current_user.real_name:contact_name, contact_phone: contact_phone===undefined?this.props.current_user&&this.props.current_user.phone:contact_phone, code:code, publish:types @@ -500,7 +506,7 @@ class PackageIndexNEIBannerConcent extends Component { deadline_at:deadline_at._i, min_price:parseInt(min_price), max_price:parseInt(max_price), - contact_name: contact_name===null||contact_name===undefined?this.props.current_user.username:contact_name, + contact_name: contact_name===null||contact_name===undefined?this.props.current_user.real_name:contact_name, contact_phone: contact_phone===undefined?this.props.current_user&&this.props.current_user.phone:contact_phone, code:code, publish:types @@ -805,6 +811,8 @@ class PackageIndexNEIBannerConcent extends Component { placeholder="请选择任务的竞标截止日期" className={"fafas"} disabledTime={disabledDateTime} + disabledDate={disabledDate} + dropdownClassName="hideDisable" value={this.state.deadline_at} onChange={this.onChangeTimePicker} /> @@ -848,7 +856,7 @@ class PackageIndexNEIBannerConcent extends Component { this.onChangeContact_name(e)} /> diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 79b0aa443..da44b0397 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -617,8 +617,10 @@ submittojoinclass=(value)=>{ let activeShixuns = false; let activePaths = false; let coursestype=false; + let activePackages=false; - if (match.path === '/forums') { + + if (match.path === '/forums') { activeForums = true; } else if (match.path.startsWith('/shixuns')) { activeShixuns = true; @@ -626,14 +628,12 @@ submittojoinclass=(value)=>{ activePaths = true; } else if (match.path.startsWith('/courses')) { coursestype = true; - }else { + }else if (match.path.startsWith('/crowdsourcing')) { + activePackages = true; + }else { activeIndex = true; } - // join_course_url: "https://www.educoder.net/courses/join_course_multi_role" - // join_project_url: "https://www.educoder.net/applied_project/applied_project_info" - // rolearr:["",""], - // console.log("618"); - // console.log(user_phone_binded); + return (

    @@ -716,10 +716,9 @@ submittojoinclass=(value)=>{ />
  • 教学案例
    • -
  • 众包创新
    • +
  • + 众包创新 +
  • 交流问答
  • Date: Wed, 31 Jul 2019 15:47:38 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2e2c7ff56..7aa89dbd7 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -243,7 +243,6 @@ class ApplicationController < ActionController::Base # 测试版前端需求 - logger.info("######domain: #{request.host}") if request.host == "47.96.87.25" if params[:debug] == 'teacher' #todo 为了测试,记得讲debug删除 User.current = User.find 81403 From c905419f5ec389817641238ca56c907bf341b378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 31 Jul 2019 15:58:20 +0800 Subject: [PATCH 08/10] Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun # Conflicts: # public/react/src/modules/courses/exercise/Testpapersettinghomepage.js --- .../src/modules/courses/exercise/Testpapersettinghomepage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index ae4addd59..c76e31b7a 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -195,7 +195,7 @@ class Testpapersettinghomepage extends Component{ }else { this.setState({ donwloading: true }) downloadFile({ - url: url+`?${queryString.stringify(params)}`+ '&export=true', + url: url+`?${queryString.stringify(params)}`, successCallback: (url) => { this.setState({ donwloading: false }); console.log('successCallback') From e86309377e9c7e263bf78612571d05f6316b0aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 15:59:43 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BC=97=E5=8C=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js | 2 +- public/react/src/modules/tpm/TPMIndexHOC.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index 6fb573ce3..c2fde1be0 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -726,7 +726,7 @@ class PackageIndexNEIBannerConcent extends Component {
    • -

    +

    {this.state.categories.map((item,key)=>{ return( diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index bf07e9970..b122a904a 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -32,14 +32,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?6`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?6`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?6`)); // $('head').append($('') From 5d3fb4b4b6aad55d376b6c5008965f662b4ef8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 31 Jul 2019 16:18:33 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E4=BC=97=E5=8C=85=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PackageIndexNEIBannerConcent.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js index c2fde1be0..493152def 100644 --- a/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js +++ b/public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js @@ -720,13 +720,13 @@ class PackageIndexNEIBannerConcent extends Component {

    -

    +
    -
    +
    -

    +

    {this.state.categories.map((item,key)=>{ return( @@ -735,9 +735,10 @@ class PackageIndexNEIBannerConcent extends Component { })}

    - {this.state.categorytypes===true?
    请选择类型
    :""} -
    + {this.state.categorytypes===true?
    请选择类型
    :""} + +