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] =?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 (