diff --git a/src/military/fetch.js b/src/military/fetch.js index bb159c3e..f1e2553f 100644 --- a/src/military/fetch.js +++ b/src/military/fetch.js @@ -28,6 +28,7 @@ const service = axios.create({ // request拦截器 service.interceptors.request.use(config => { if (cookie.load(TokenKey)) { + console.log(cookie.load(TokenKey)); config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改 } if (window.location.port === "3007") { diff --git a/src/military/task.js b/src/military/task.js index 8fa95994..d356ef27 100644 --- a/src/military/task.js +++ b/src/military/task.js @@ -127,7 +127,9 @@ const Index = (propsTransmit) => { ( - + + + )} > diff --git a/src/military/task/components/adminRouter/index.jsx b/src/military/task/components/adminRouter/index.jsx new file mode 100644 index 00000000..f7351a50 --- /dev/null +++ b/src/military/task/components/adminRouter/index.jsx @@ -0,0 +1,135 @@ +import React, { useEffect, useState, useCallback, useMemo } from 'react'; +import { Menu, Dropdown, Button } from 'antd'; +import './index.scss'; + +const { SubMenu } = Menu; + +export default props => { + const current_main_site_url = useMemo(() => { + return JSON.parse(localStorage.chromesetting).current_main_site_url; + }); + + const projectMenu = useMemo(() => { + return + 项目管理后台 + + }); + + const taskMenu = useMemo(() => { + return + + 任务领域 + 行业信息 + 职位信息 + 需求导入模板 + 签订协议内容 + 应征投稿协议内容 + + + 延期任务处理 + 协议签订凭证上传 + 支付报酬凭证上传 + + + 创客列表 + 创意征集评论 + + }); + + const competitionMenu = useMemo(() => { + return + 竞赛列表 + + }); + + const userMenu = useMemo(() => { + return + 用户列表 + 主体信息列表 + 试用授权列表 + 自动授权列表 + + }); + + const forumMenu = useMemo(() => { + return + 帖子 + 申请删帖 + 回复 + 版块配置 + 禁言列表 + 版主审批 + + }); + + + const checkMenu = useMemo(() => { + return + 企业认证 + 开源项目 + 统筹任务发布审批 + 协议审批 + 成果举报申诉 + 评选佐证材料 + 支付报酬凭证上传 + + }); + + + const limitsMenu = useMemo(() => { + return + 权限组配置 + 权限操作配置 + + }); + + + const configMenu = useMemo(() => { + return + 关于我们 + 首页版块 + 合作伙伴 + + }); + + + return ( +
+ +
+ 项目 +
+ + + +
+ 创客 +
+ + + +
竞赛
+ + + +
用户
+ + + +
论坛交流
+ + + +
审批
+ + + +
权限管理
+ + + +
网站配置
+ +
+ ) +} \ No newline at end of file diff --git a/src/military/task/components/adminRouter/index.scss b/src/military/task/components/adminRouter/index.scss new file mode 100644 index 00000000..954e3e35 --- /dev/null +++ b/src/military/task/components/adminRouter/index.scss @@ -0,0 +1,24 @@ +.managements_menus { + background: #fff; + border: 1px solid #eee; + + .drop-div { + position: relative; + float: left; + width: 108px; + text-align: center; + padding: 15px 0px; + box-sizing: border-box; + position: relative; + cursor: pointer; + &::after { + content: ""; + position: absolute; + right: 1px; + top: 20px; + width: 1px; + height: 20px; + background-color: #ddd; + } + } +} diff --git a/src/military/task/components/itemListPaper/index.jsx b/src/military/task/components/itemListPaper/index.jsx index adc7b8a9..f1a0c1dc 100644 --- a/src/military/task/components/itemListPaper/index.jsx +++ b/src/military/task/components/itemListPaper/index.jsx @@ -163,7 +163,7 @@ export default Form.create()((props) => { {item.status === 2 && detailStatus === 6 && (current_user.login === item.user.login) && { setAgreeVisible(true); setCheckedItem(item) }}>签订协议} - {item.status === 2 && detailStatus === 7 && (current_user.login === item.user.login) && item.isPay && + {item.status === 2 && detailStatus === 7 && (current_user.login === item.user.login) && (item.agreementSigning === 1) && (!item.isPay) && { confirmReceiptModal(item.id) }}>确认收款} @@ -202,11 +202,14 @@ export default Form.create()((props) => { 成果编号：#{item.number} 提交时间：{item.createdAt} 稿件状态：{item.read ? '雇主已浏览' : '雇主未浏览'} - - { setReportVisible(true); setCheckedItem(item) }}>举报 - { commentEdit(item.id) }}>{item.comments ? item.comments.length : 0} - { thumbUp(item.id) }}>{item.thumbsUp} - + { + item.user.nickname !== "******" && + { setReportVisible(true); setCheckedItem(item) }}>举报 + { commentEdit(item.id) }}>{item.comments ? item.comments.length : 0} + { thumbUp(item.id) }}>{item.thumbsUp} + + } + {commentId === item.id && diff --git a/src/military/task/components/itemPublicityComplain/index.jsx b/src/military/task/components/itemPublicityComplain/index.jsx index bfa6be33..dd456114 100644 --- a/src/military/task/components/itemPublicityComplain/index.jsx +++ b/src/military/task/components/itemPublicityComplain/index.jsx @@ -93,7 +93,7 @@ export default Form.create()((props) => { {timeAgo(item.createdAt)} { goUserMes(item.user.login) }}>私信 - { deal(item) }}>处理 + {item.status === 2 && { deal(item) }}>处理} {/* {item.taskResultProof.status === 1 && 已同意} {item.taskResultProof.status === 0 && 已拒绝} diff --git a/src/military/task/myTask/joinTask.jsx b/src/military/task/myTask/joinTask.jsx index f1cf2c7e..276774b1 100644 --- a/src/military/task/myTask/joinTask.jsx +++ b/src/military/task/myTask/joinTask.jsx @@ -134,7 +134,7 @@ export default ({ taskCategoryValueArr, showNotification }) => { } - {record.status === 2 && record.task.status === 7 && + {record.status === 2 && record.task.status === 7 && record.task.agreementSigning === 1 && } diff --git a/src/military/task/paperComplain/index.js b/src/military/task/paperComplain/index.js index 98f318a3..d63c36c5 100644 --- a/src/military/task/paperComplain/index.js +++ b/src/military/task/paperComplain/index.js @@ -1,6 +1,7 @@ import React, { useCallback, useMemo, useEffect, useState } from 'react'; import { Input, Button, Radio, Form, Table, Pagination, Modal } from 'antd'; import { Link } from "react-router-dom"; +import AdminRouter from '../components/adminRouter'; import StatusNav from '../../components/statusNav'; import { complainPaperList, checkComplain } from '../api'; import { paperComplainStatusArr } from '../static'; @@ -16,7 +17,7 @@ for (const item of paperComplainStatusArr) { } const paperComplain = paperComplainStatusArr.slice(0, 2); -export default Form.create()(({ current_user, form, showNotification, match, }) => { +export default Form.create()(({ current_user, form, showNotification, match, history}) => { const { getFieldDecorator, validateFields, setFieldsValue, getFieldsValue } = form; @@ -187,6 +188,7 @@ export default Form.create()(({ current_user, form, showNotification, match, }) return (
+
diff --git a/src/military/task/paperManage/index.jsx b/src/military/task/paperManage/index.jsx index 3ffc5814..d086bf00 100644 --- a/src/military/task/paperManage/index.jsx +++ b/src/military/task/paperManage/index.jsx @@ -2,6 +2,7 @@ import React, { useCallback, useEffect, useState, useMemo } from 'react'; import { Input, Radio, Select, Button, Form, DatePicker, Table, Pagination, Modal } from 'antd'; import { Link } from "react-router-dom"; import DelModal from 'military/components/DelModal'; +import AdminRouter from '../components/adminRouter'; import { paperCheckStatusArr } from '../static'; import { readyCheckPapers, checkPaper, deletePaper } from '../api'; import '../index.scss'; @@ -152,7 +153,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his function checkPaperItem(paperId, passStatus) { validateFields((err, values) => { if (!err) { - setLoading(true); + setLoading(true); checkPaper({ paperId, auditingVo: { @@ -192,7 +193,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his return (
- +
{helper( diff --git a/src/military/task/payProof/index.js b/src/military/task/payProof/index.js index 8b19a69e..78bd719b 100644 --- a/src/military/task/payProof/index.js +++ b/src/military/task/payProof/index.js @@ -1,6 +1,7 @@ import React, { useCallback, forwardRef, useEffect, useState } from 'react'; import { Input, Button, Form } from 'antd'; import ItemPayProof from '../components/itemPayProof'; +import AdminRouter from '../components/adminRouter'; // import StatusNav from '../../components/statusNav'; import { agreementArr } from '../static'; import { uploadPayProofList } from '../api'; @@ -75,6 +76,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his return (
+
diff --git a/src/military/task/proofManage/index.js b/src/military/task/proofManage/index.js index 900a8c31..1c00c201 100644 --- a/src/military/task/proofManage/index.js +++ b/src/military/task/proofManage/index.js @@ -1,12 +1,13 @@ import React, { useCallback, forwardRef, useEffect, useState } from 'react'; import { Input, Button, Form } from 'antd'; +import AdminRouter from '../components/adminRouter'; import ItemProofManage from '../components/itemProofManage'; import StatusNav from '../../components/statusNav'; import { proofArr } from '../static'; import { proofList, } from '../api'; import '../index.scss'; -const proofArrCheck=proofArr.slice(0,2); +const proofArrCheck = proofArr.slice(0, 2); export default Form.create()(({ current_user, form, showNotification, match, history }) => { const { getFieldDecorator, validateFields, setFieldsValue } = form; const [approve, setApprove] = useState(1); @@ -84,7 +85,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his return (
- +
diff --git a/src/military/task/publicityComplain/index.js b/src/military/task/publicityComplain/index.js index e0278f11..ddec55f1 100644 --- a/src/military/task/publicityComplain/index.js +++ b/src/military/task/publicityComplain/index.js @@ -1,5 +1,6 @@ import React, { useCallback, useEffect, useState } from 'react'; import { Input, Button, Form } from 'antd'; +import AdminRouter from '../components/adminRouter'; import ItemPublicityComplain from '../components/itemPublicityComplain'; import StatusNav from '../../components/statusNav'; import { publicityArr } from '../static'; @@ -82,7 +83,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his return (
- +
diff --git a/src/military/task/taskAdmin/index.jsx b/src/military/task/taskAdmin/index.jsx index 8d41c5e3..7ff4b6b6 100644 --- a/src/military/task/taskAdmin/index.jsx +++ b/src/military/task/taskAdmin/index.jsx @@ -1,6 +1,7 @@ import React, { useCallback, useEffect, useState, useMemo } from 'react'; import { Input, Select, Button, Form, DatePicker, Table, Pagination, } from 'antd'; import { Link } from "react-router-dom"; +import AdminRouter from '../components/adminRouter'; import { paperCheckStatusArr, publishModeArr, taskStatusAllArr, showUserModeArr } from '../static'; import { getTaskAdminList, changeShowUserMode } from '../api'; import '../index.scss'; @@ -217,6 +218,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his return (
+
{helper( "任务名称", @@ -239,7 +241,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his
{helper( - "创建时间:", + "发布时间:", "startTime", [], - +