diff --git a/src/forge/Information/Pages/selfList.jsx b/src/forge/Information/Pages/selfList.jsx index ab69589d1..9f87a96d1 100644 --- a/src/forge/Information/Pages/selfList.jsx +++ b/src/forge/Information/Pages/selfList.jsx @@ -21,7 +21,7 @@ function SelfList(props){ const [ deleId , setDeleId] = useState(undefined); const pathname = props.location.pathname; const { deptId} = props.match.params; - const { id , temp } = props; + const { id , temp , data } = props; const limit = 15; useEffect(()=>{ @@ -100,8 +100,7 @@ function SelfList(props){ delNewsMyList(deleId).then(response=>{ setVisible(false); if(status ===1){ - props.history.push(`/zone/${deptId}/newdetail/${deleId}`); - props.showNotification("已提交删除申请,待管理员审核通过后改文章将被删除"); + props.showNotification("提交成功!"); }else{ props.showNotification("删除成功!"); getNew(); @@ -124,7 +123,7 @@ function SelfList(props){

确定删除该{source?"资源":"文章"}?

- {(source || (!source && status === 1)) &&

{source?"删除后所有资源文件将被清除,请谨慎操作":"此操作将提交删除申请,管理员同意申请后该文章将被删除"}

} + {(source || (!source && status === 1 && (data && data.docNeedAudit===1))) &&

{source?"删除后所有资源文件将被清除,请谨慎操作":"此操作将提交删除申请,管理员同意申请后该文章将被删除"}

}
diff --git a/src/forge/Information/fetch.js b/src/forge/Information/fetch.js index 29cc15d28..c9057bca0 100644 --- a/src/forge/Information/fetch.js +++ b/src/forge/Information/fetch.js @@ -7,6 +7,7 @@ function beforeFetch(actionUrl){ } const service = axios.create({ + headers:{Authorization:"fb55fcaae60bb0c341078dade4b37c965e285394"}, baseURL: actionUrl, timeout: 1800000, // 请求超时时间 }); diff --git a/src/forge/Information/index.jsx b/src/forge/Information/index.jsx index e8b70855e..e82f0c35f 100644 --- a/src/forge/Information/index.jsx +++ b/src/forge/Information/index.jsx @@ -159,7 +159,7 @@ function Index(props){ ( - + )} > ( - + )} >