diff --git a/src/AppConfig.js b/src/AppConfig.js
index 34432e152..7d0284c45 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -33,8 +33,8 @@ export function initAxiosInterceptors(props) {
   initOnlineOfflineListener();
 
   // var proxy = "http://192.168.1.40:3000";
-  // var proxy = "http://111.8.36.180:8000";
-  var proxy = "http://117.50.100.12:49999";
+  var proxy = "http://111.8.36.180:8000";
+  // var proxy = "http://117.50.100.12:49999";
   // var proxy = "https://www.osredm.com";
 
   //响应前的设置
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index d5f4d5712..044180a19 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -147,7 +147,7 @@
     height: 446px;
     box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
     border-radius: 4px;
-    margin-top: -10px;
+    margin-top: -11px;
     padding: 12px 1px 12px 0;
   }
 }
@@ -184,6 +184,9 @@
 
 .message-icon{
   position: relative;
+  height: 60px;
+  display: inline-flex;
+  align-items: center;
   .ant-scroll-number{
     // right:12px;
     padding: 0 0px;
diff --git a/src/forge/Wiki/components/config.js b/src/forge/Wiki/components/config.js
index bda413390..0ed142a83 100644
--- a/src/forge/Wiki/components/config.js
+++ b/src/forge/Wiki/components/config.js
@@ -18,7 +18,7 @@ export const editorConfig = {
     customInsert: function (insertImgFn, result) {
       // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可
       if (result && result.data && result.data.id) {
-        insertImgFn(`${httpUrl}/busiAttachments/view/${result.data.id}`);
+        insertImgFn(`${httpUrl}/busiAttachments/viewAttachment/${result.data.uniqueFileName}`);
       }
     }
   },
diff --git a/src/managements/achievement/noticeEdit/index.jsx b/src/managements/achievement/noticeEdit/index.jsx
index fe1706204..5ed45127f 100644
--- a/src/managements/achievement/noticeEdit/index.jsx
+++ b/src/managements/achievement/noticeEdit/index.jsx
@@ -90,7 +90,7 @@ const NoticeEdit = Form.create()(({ form, match, history, showNotification }) =>
                   // result 即服务端返回的接口
                   // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可
                   if (result && result.data && result.data.id) {
-                    insertImgFn(`${actionUrl}/busiAttachments/view/${result.data.id}`);
+                    insertImgFn(`${actionUrl}/busiAttachments/viewAttachment/${result.data.uniqueFileName}`);
                   }
                 }
               }
@@ -149,7 +149,8 @@ const NoticeEdit = Form.create()(({ form, match, history, showNotification }) =>
         params.isSecret = Number(params.isSecret);
         if (fileList && fileList.length) {
           params.fileName = fileList[0].fileName || fileList[0].response.data.fileName;
-          params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/download/${fileList[0].response.data.id}`;
+          // params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/download/${fileList[0].response.data.id}`;
+          params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/downloadAttachment/${fileList[0].response.data.uniqueFileName}`;
         }
         if (id) {
           // 编辑
diff --git a/src/managements/needApply/list.jsx b/src/managements/needApply/list.jsx
index fa9c67d83..cf772836b 100644
--- a/src/managements/needApply/list.jsx
+++ b/src/managements/needApply/list.jsx
@@ -172,7 +172,7 @@ function List(props){
           title: '任务书',
           dataIndex: 'assignmentBookAttachments',
           ellipsis: true,
-          render: (text, record) => {return text ? <a href={`${httpUrl}/busiAttachments/download/${text[0].id}`}>{text[0].fileName}</a> : '--'}
+          render: (text, record) => {return text ? <a href={`${httpUrl}/busiAttachments/downloadAttachment/${text[0].uniqueFileName}`}>{text[0].fileName}</a> : '--'}
         },
       ]
       case 3: return [
@@ -233,7 +233,7 @@ function List(props){
           title: '策划书',
           dataIndex: 'competitionProposalAttachments',
           ellipsis: true,
-          render: (text, record) => {return text ? <a href={`${httpUrl}/busiAttachments/download/${text[0].id}`}>{text[0].fileName}</a> : '--'}
+          render: (text, record) => {return text ? <a href={`${httpUrl}/busiAttachments/downloadAttachment/${text[0].uniqueFileName}`}>{text[0].fileName}</a> : '--'}
         },
       ]
       default: return [
@@ -292,7 +292,7 @@ function List(props){
           title: '成果证明材料',
           dataIndex: 'achievementMaterialAttachments',
           ellipsis: true,
-          render: (text, record) => {return text ? <a href={`${httpUrl}/busiAttachments/download/${text[0].id}`}>{text[0].fileName}</a> : '--'}
+          render: (text, record) => {return text ? <a href={`${httpUrl}/busiAttachments/downloadAttachment/${text[0].uniqueFileName}`}>{text[0].fileName}</a> : '--'}
         },
       ]
     }
diff --git a/src/managements/notice/noticeEdit/index.jsx b/src/managements/notice/noticeEdit/index.jsx
index 6957451a5..ac05d0bb5 100644
--- a/src/managements/notice/noticeEdit/index.jsx
+++ b/src/managements/notice/noticeEdit/index.jsx
@@ -91,7 +91,7 @@ const NoticeEdit = Form.create()(forwardRef(({ form, match, history }, ref) => {
                   // result 即服务端返回的接口
                   // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可
                   if (result && result.data && result.data.id) {
-                    insertImgFn(`${actionUrl}/busiAttachments/view/${result.data.id}`);
+                    insertImgFn(`${actionUrl}/busiAttachments/viewAttachment/${result.data.uniqueFileName}`);
                   }
                 }
               }
@@ -151,7 +151,8 @@ const NoticeEdit = Form.create()(forwardRef(({ form, match, history }, ref) => {
         params.isSecret = Number(params.isSecret);
         if (fileList && fileList.length) {
           params.fileName = fileList[0].fileName || fileList[0].response.data.fileName;
-          params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/download/${fileList[0].response.data.id}`;
+          // params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/download/${fileList[0].response.data.id}`;
+          params.fileDownloadPath = fileList[0].fileDownloadPath || `${actionUrl}/busiAttachments/downloadAttachment/${fileList[0].response.data.uniqueFileName}`;
         }
         if (id) {
           // 编辑
diff --git a/src/military/components/config.js b/src/military/components/config.js
index 320dd15f3..548734e2a 100644
--- a/src/military/components/config.js
+++ b/src/military/components/config.js
@@ -18,7 +18,7 @@ export const editorConfig = {
     customInsert: function (insertImgFn, result) {
       // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可
       if (result && result.data && result.data.id) {
-        insertImgFn(`${httpUrl}/busiAttachments/view/${result.data.id}`);
+        insertImgFn(`${httpUrl}/busiAttachments/viewAttachment/${result.data.uniqueFileName}`);
       }
     }
   },
diff --git a/src/military/components/login/index.jsx b/src/military/components/login/index.jsx
index 57d3804fb..d9655ebd0 100644
--- a/src/military/components/login/index.jsx
+++ b/src/military/components/login/index.jsx
@@ -92,7 +92,7 @@ export default ({ current_user, showLoginDialog }) => {
                             src={getImageUrl(current_user.image_url)} width="34">
                         </img>
                     {/* </a> */}
-                    <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
+                    <ul className="edu-menu-list" style={{ top: '70px', textAlign: 'center' }}>
                         <li className="bor-bottom-greyE" style={{ cursor: "default", background: "#fff" }}>{current_user.username}</li>
                         <li>
                             <a target='_blank' href={`${main_web_site_url}/accounts/${current_user.login}`}>个人中心</a>
diff --git a/src/military/expert/expertList/index.jsx b/src/military/expert/expertList/index.jsx
index d8c99970f..c4da4fb42 100644
--- a/src/military/expert/expertList/index.jsx
+++ b/src/military/expert/expertList/index.jsx
@@ -158,7 +158,7 @@ function RegisterList({ showNotification }) {
       key: 'resumeAttachments',
       render: (text, record) => {
         return text && text.map(item => {
-          return <a key={item.id} className="link" onClick={() => { downFile(item.id) }}>{item.fileName}</a>
+          return <a key={item.id} className="link" onClick={() => { downFile(item) }}>{item.fileName}</a>
         })
       }
     },
@@ -168,7 +168,7 @@ function RegisterList({ showNotification }) {
       key: 'titleCertificateAttachments',
       render: (text, record) => {
         return text && text.map(item => {
-          return <a key={item.id} className="link" onClick={() => { downFile(item.id) }}>{item.fileName}</a>
+          return <a key={item.id} className="link" onClick={() => { downFile(item) }}>{item.fileName}</a>
         })
       }
     },
@@ -178,7 +178,7 @@ function RegisterList({ showNotification }) {
       key: 'academicAchievementsAttachments',
       render: (text, record) => {
         return text && text.map(item => {
-          return <a key={item.id} className="link" onClick={() => { downFile(item.id) }}>{item.fileName}</a>
+          return <a key={item.id} className="link" onClick={() => { downFile(item) }}>{item.fileName}</a>
         })
       }
     },
@@ -188,7 +188,7 @@ function RegisterList({ showNotification }) {
       key: 'honorsAttachments',
       render: (text, record) => {
         return text && text.map(item => {
-          return <a key={item.id} className="link" onClick={() => { downFile(item.id) }}>{item.fileName}</a>
+          return <a key={item.id} className="link" onClick={() => { downFile(item) }}>{item.fileName}</a>
         })
       }
     },
@@ -204,9 +204,8 @@ function RegisterList({ showNotification }) {
     ];
   }, []);
 
-  function downFile(id) {
-    let url = httpUrl + '/busiAttachments/download/' + id;
-    window.open(url);
+  function downFile(item) {
+    window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
   }
 
   // 获取列表
diff --git a/src/military/expert/expertUser/taskDetail/index.jsx b/src/military/expert/expertUser/taskDetail/index.jsx
index 2bf39d608..4a788e14f 100644
--- a/src/military/expert/expertUser/taskDetail/index.jsx
+++ b/src/military/expert/expertUser/taskDetail/index.jsx
@@ -247,8 +247,7 @@ function ReviewTasks({ showNotification, match, history, current_user }) {
 
   function downFile(item) {
     if (containerType == 1) {
-      let url = httpUrl + '/busiAttachments/download/' + item.id;
-      window.open(url);
+      window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
     } else {
       let url = main_web_site_url + `/attachments/send_file/${item.id}?disposition=attachment`;
       window.open(url);
diff --git a/src/military/expert/registerList/index.jsx b/src/military/expert/registerList/index.jsx
index 321af9859..8390166e2 100644
--- a/src/military/expert/registerList/index.jsx
+++ b/src/military/expert/registerList/index.jsx
@@ -121,7 +121,7 @@ function RegisterList({ showNotification, form }) {
       dataIndex: 'resumeAttachments',
       render: (text, record) => {
         return text && text.map(item => {
-          return <a className="link" onClick={()=>{downFile(item.id)}}>{item.fileName}</a>
+          return <a className="link" onClick={()=>{downFile(item)}}>{item.fileName}</a>
         })
       }
     },
@@ -130,7 +130,7 @@ function RegisterList({ showNotification, form }) {
       dataIndex: 'titleCertificateAttachments',
       render: (text, record) => {
         return text && text.map(item => {
-          return <a className="link" onClick={()=>{downFile(item.id)}}>{item.fileName}</a>
+          return <a className="link" onClick={()=>{downFile(item)}}>{item.fileName}</a>
         })
       }
     },
@@ -139,7 +139,7 @@ function RegisterList({ showNotification, form }) {
       dataIndex: 'academicAchievementsAttachments',
       render: (text, record) => {
         return text && text.map(item => {
-          return <a className="link" onClick={()=>{downFile(item.id)}}>{item.fileName}</a>
+          return <a className="link" onClick={()=>{downFile(item)}}>{item.fileName}</a>
         })
       }
     },
@@ -148,7 +148,7 @@ function RegisterList({ showNotification, form }) {
       dataIndex: 'honorsAttachments',
       render: (text, record) => {
         return text && text.map(item => {
-          return <a className="link" onClick={()=>{downFile(item.id)}}>{item.fileName}</a>
+          return <a className="link" onClick={()=>{downFile(item)}}>{item.fileName}</a>
         })
       }
     },
@@ -167,9 +167,8 @@ function RegisterList({ showNotification, form }) {
     ];
   }, []);
 
-  function downFile(id) {
-    let url = httpUrl + '/busiAttachments/download/' + id;
-    window.open(url);
+  function downFile(item) {
+    window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
   }
 
   function onShowSizeChange(current, pageSize){
diff --git a/src/military/task/components/itemAgreementManage/index.jsx b/src/military/task/components/itemAgreementManage/index.jsx
index bec8b3ed2..dc334af37 100644
--- a/src/military/task/components/itemAgreementManage/index.jsx
+++ b/src/military/task/components/itemAgreementManage/index.jsx
@@ -68,8 +68,7 @@ export default Form.create()((props) => {
   }
 
   function downFile(item) {
-    let url = httpUrl + '/busiAttachments/download/' + item.id;
-    window.open(url);
+    window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
   }
 
   const helper = useCallback(
@@ -89,7 +88,7 @@ export default Form.create()((props) => {
             return (
               <div className="list-box" key={item.id}>
 
-                <img alt="" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo)} width="50px" />
+                <img alt="" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo||'images/avatars/User/boy.jpg')} width="50px" />
                 <div className="flex1">
                   <li className="clearfix mb20">
                     <a className="user-box fl mr15 color-grey-3 font-16" onClick={() => {item.user && goUser(item.user.login) }}>{item.user && (item.user.nickname || item.user.login)}</a>
diff --git a/src/military/task/components/itemDelayManage/index.jsx b/src/military/task/components/itemDelayManage/index.jsx
index 46a7dab81..0e44f7f3e 100644
--- a/src/military/task/components/itemDelayManage/index.jsx
+++ b/src/military/task/components/itemDelayManage/index.jsx
@@ -133,7 +133,7 @@ export default Form.create()((props) => {
             return (
               <div className="list-box" key={item.id}>
 
-                <img alt="" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo)} width="50px" onClick={() => { goUser(item.user.login) }} />
+                <img alt="" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo||'images/avatars/User/boy.jpg')} width="50px" onClick={() => { goUser(item.user.login) }} />
                 <div className="flex1">
 
                   <div className="clearfix">
diff --git a/src/military/task/components/itemListMyTask/index.jsx b/src/military/task/components/itemListMyTask/index.jsx
index 296bef857..32daecbda 100644
--- a/src/military/task/components/itemListMyTask/index.jsx
+++ b/src/military/task/components/itemListMyTask/index.jsx
@@ -144,21 +144,21 @@ export default Form.create()((props) => {
         title: '凭证文件',
         dataIndex: 'fileName',
         render: (text, record) => {
-          return <a className="line_1 color-grey3" onClick={() => { download(record.winnerContracts[0].id) }}> {record.winnerContracts && record.winnerContracts[0].fileName}</a >
+          return <a className="line_1 color-grey3" onClick={() => { download(record.winnerContracts[0]) }}> {record.winnerContracts && record.winnerContracts[0].fileName}</a >
         }
       },
       {
         title: '操作',
         dataIndex: 'action',
         render: (text, record) => {
-          return <a className="line_1 color-grey3" onClick={(e) => { download(record.winnerContracts[0].id) }}> 下载凭证</a >
+          return <a className="line_1 color-grey3" onClick={(e) => { download(record.winnerContracts[0]) }}> 下载凭证</a >
         }
       }
     ];
   }, []);
 
-  function download(id) {
-    window.open(httpUrl + '/busiAttachments/download/' + id);
+  function download(item) {
+    window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
   }
 
   function unfollow(id) {
diff --git a/src/military/task/components/itemListPaper/index.jsx b/src/military/task/components/itemListPaper/index.jsx
index 585979b3a..0732a97ca 100644
--- a/src/military/task/components/itemListPaper/index.jsx
+++ b/src/military/task/components/itemListPaper/index.jsx
@@ -47,8 +47,7 @@ export default Form.create()((props) => {
 
   function downFile(item) {
     if(item.uniqueFileName){
-      let url = httpUrl + '/busiAttachments/download/' + item.id;
-      window.open(url);
+      window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
     }else{
       showNotification("您没有下载权限！");
     }
@@ -169,7 +168,7 @@ export default Form.create()((props) => {
               const winReview = [5,6,7,8].includes(detailStatus) && expertReview && item.reviewFinalGrades!==null;
               return (
                 <div className="fileComments df" key={item.id}>
-                  <img alt="头像加载失败" src={item.user && getImageUrl(item.user.logo)} width="50" height="50" className="bor-radius-all mr20" />
+                  <img alt="头像加载失败" src={item.user && getImageUrl(item.user.logo||'images/avatars/User/boy.jpg')} width="50" height="50" className="bor-radius-all mr20" />
                   <div className="flex1">
                     <ul>
                       <li className="fl pr taskReview">
diff --git a/src/military/task/components/itemListTask/index.jsx b/src/military/task/components/itemListTask/index.jsx
index 06c4f837b..397873e35 100644
--- a/src/military/task/components/itemListTask/index.jsx
+++ b/src/military/task/components/itemListTask/index.jsx
@@ -48,7 +48,7 @@ export default (props) => {
                   </div>
                   <div className="list-other">
                     <span className="user-box mr30" onClick={() => { goUser(item.user && item.user.login) }}>
-                      <img alt="" className="head-log-small" src={getImageUrl(item.user && item.user.logo)} />
+                      <img alt="" className="head-log-small" src={getImageUrl(item.user && item.user.logo||'images/avatars/User/boy.jpg')} />
                       <span>{(item.user && item.user.nickname) || (item.user && item.user.login)}</span>
                     </span>
                     <span className="font-14 mr30"><i className="iconfont icon-dianjiliang mr3 font-12" />{item.visits}</span>
diff --git a/src/military/task/components/itemPayProof/index.jsx b/src/military/task/components/itemPayProof/index.jsx
index 266f09249..b9a7ef51f 100644
--- a/src/military/task/components/itemPayProof/index.jsx
+++ b/src/military/task/components/itemPayProof/index.jsx
@@ -4,8 +4,9 @@ import { Link } from "react-router-dom";
 import Nodata from 'forge/Nodata';
 import Loading from "src/Loading";
 import Upload from 'military/components/Upload';
-import { timeAgo, getImageUrl,goUser,goUserMes } from 'educoder';
+import { timeAgo, getImageUrl, goUser, goUserMes } from 'educoder';
 import { uploadPayProof } from '../../api';
+import { httpUrl } from '../../fetch';
 import './index.scss';
 
 export default Form.create()((props) => {
@@ -47,6 +48,10 @@ export default Form.create()((props) => {
     })
   }
 
+  function downFile(item) {
+    window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
+  }
+
   return (
     loading ? <Loading /> :
       <React.Fragment>
@@ -55,10 +60,10 @@ export default Form.create()((props) => {
             return (
               <div className="list-box" key={item.id}>
 
-                <img alt="" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo)} width="50px" />
+                <img alt="" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo || 'images/avatars/User/boy.jpg')} width="50px" />
                 <div className="flex1">
                   <li className="clearfix mb20">
-                    <a className="user-box fl mr15 color-grey-3 font-16" onClick={() => {item.user && goUser(item.user.login) }}>{item.user && (item.user.nickname || item.user.login)}</a>
+                    <a className="user-box fl mr15 color-grey-3 font-16" onClick={() => { item.user && goUser(item.user.login) }}>{item.user && (item.user.nickname || item.user.login)}</a>
                     <span className="fl color-grey-9 mt3 mr15">{timeAgo(item.createdAt)}</span>
                     <span className="infos_item color-grey-9 fl">发布方式:</span>
                     <span className="infos_item mr15 fl">{item.task && item.task.publishMode === 1 ? '统筹任务' : '自主提交'}</span>
@@ -79,12 +84,22 @@ export default Form.create()((props) => {
                       </span>
                     </div>
                     <div className="clearfix">
-                    <span className="with40 fl lineh-35" style={{ display: "inline-flex" }}>
+                      <span className="with40 fl lineh-35" style={{ display: "inline-flex" }}>
                         <span className="color-grey-9 fl">联系手机:</span>
                         <span className="infos_item">{item.user.phone}</span>
                       </span>
                     </div>
 
+                    {
+                      item.paperPayOrder && item.paperPayOrder.payOrderAttachments && item.paperPayOrder.payOrderAttachments.map(i => {
+                        return <div className="file-list-box" key={i.id}>
+                            <a className="primary-link" onClick={() => { downFile(i) }}><i className="iconfont icon-fujian color-green font-14 mr3"></i>
+                              {i.fileName} </a>
+                            <span className="ml10 color-grey-9">({i.fileSizeString})</span>
+                          </div>
+                      })
+                    }
+
                     <div className="clearfix"></div>
                     {!item.isPay && (item.status !== 8) && <div className="width100 lineh-35 clearfix">
                       <Button type="primary" onClick={() => { setVisible(true); setCheckedItem(item) }}>上传支付报酬凭证</Button>
diff --git a/src/military/task/components/itemProofManage/index.jsx b/src/military/task/components/itemProofManage/index.jsx
index 02db5de37..dfa19ac5d 100644
--- a/src/military/task/components/itemProofManage/index.jsx
+++ b/src/military/task/components/itemProofManage/index.jsx
@@ -62,8 +62,7 @@ export default (props) => {
 
 
   function downFile(item) {
-    let url = httpUrl + '/busiAttachments/download/' + item.id;
-    window.open(url);
+    window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
   }
 
 
@@ -76,7 +75,7 @@ export default (props) => {
             return (
               <div className="list-box" key={item.id}>
 
-                <img alt="" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo)} width="50px" />
+                <img alt="" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo||'images/avatars/User/boy.jpg')} width="50px" />
                 <div className="flex1">
                   <li className="clearfix mb20">
                     <a className="user-box fl mr15 color-grey-3 font-16" onClick={() => {item.user && goUser(item.user.login) }}>{item.user && (item.user.nickname || item.user.login)}</a>
diff --git a/src/military/task/components/itemPublicityComplain/index.jsx b/src/military/task/components/itemPublicityComplain/index.jsx
index 81cd6e7ff..a177429ce 100644
--- a/src/military/task/components/itemPublicityComplain/index.jsx
+++ b/src/military/task/components/itemPublicityComplain/index.jsx
@@ -61,8 +61,7 @@ export default Form.create()((props) => {
   }
 
   function downFile(item) {
-    let url = httpUrl + '/busiAttachments/download/' + item.id;
-    window.open(url);
+    window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
   }
 
   const helper = useCallback(
@@ -83,7 +82,7 @@ export default Form.create()((props) => {
             return (
               <div className="list-box" key={item.id}>
 
-                <img alt="头像加载失败" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo)} width="50px" />
+                <img alt="头像加载失败" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo||'images/avatars/User/boy.jpg')} width="50px" />
                 <div className="flex1">
                   <li className="clearfix mb20">
                     <a className="user-box fl mr15 color-grey-3 font-16" onClick={() => {item.user && goUser(item.user.login) }}>{item.user && (item.user.nickname || item.user.login)}</a>
diff --git a/src/military/task/components/itemTaskManage/index.jsx b/src/military/task/components/itemTaskManage/index.jsx
index 334897d93..8d78c75a1 100644
--- a/src/military/task/components/itemTaskManage/index.jsx
+++ b/src/military/task/components/itemTaskManage/index.jsx
@@ -83,7 +83,7 @@ export default (props) => {
             return (
               <div className="list-box" key={item.id}>
 
-                <img alt="头像加载失败" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo)} width="50px" />
+                <img alt="头像加载失败" className="radius mr15" height="50px" src={item.user && getImageUrl(item.user.logo||'images/avatars/User/boy.jpg')} width="50px" />
                 <div className="flex1">
                   <li className="clearfix mb20">
                     <a className="user-box fl mr15 color-grey-3 font-16" onClick={() => {item.user && goUser(item.user.login) }}>{item.user && (item.user.nickname || item.user.login)}</a>
diff --git a/src/military/task/myTask/followTask.jsx b/src/military/task/myTask/followTask.jsx
index 7fa4579dd..08a32dcd6 100644
--- a/src/military/task/myTask/followTask.jsx
+++ b/src/military/task/myTask/followTask.jsx
@@ -1,12 +1,8 @@
 import React, { useCallback, useEffect, useState, useMemo } from 'react';
-import { Tabs, Input, Table, Pagination, Modal, Button } from 'antd';
-import { Link } from "react-router-dom";
-import ChooseNav from '../../components/chooseNav';
+import { Tabs, Input, Modal, Button } from 'antd';
 import ItemListMyTask from '../components/itemListMyTask';
-import AgreementModal from '../components/agreementModal';
-import ComplainModal from '../components/complainModal';
 import { applyStatusAllArr, paperCheckStatusArr, applyStatusArr, publishModeArr, taskStatusAllArr,} from '../static';
-import { getJoinTaskList, followTaskList, confirmReceipt } from '../api';
+import { followTaskList } from '../api';
 import './index.scss';
 const Search = Input.Search;
 
@@ -22,26 +18,14 @@ for (const item of paperCheckStatusArr) {
   paperCheckStatus[item.dicItemCode] = item.dicItemName;
 }
 
-export default ({ taskCategoryValueArr, showNotification,current_user }) => {
+export default ({ taskCategoryValueArr, current_user }) => {
 
-  const [paperStatusString, setPaperStatusString] = useState('0,1,2,3,4');
-  const [taskStatusString, setTaskStatusString] = useState('3,4,5,6,7,8');
-
-  const [requirePaper, setRequirePaper] = useState('1');
   const [searchInput, setSearchInput] = useState('');
   const [curPage, setCurPage] = useState(1);
   const [total, setTotal] = useState(0);
   const [taskList, setTaskList] = useState([]);
   const [loading, setLoading] = useState(false);
 
-  const [curPagePaper, setCurPagePaper] = useState(1);
-  const [totalPaper, setTotalPaper] = useState(0);
-  const [paperList, setPaperList] = useState([]);
-
-  const [checkedItem, setCheckedItem] = useState({});
-  const [complainVisible, setComplainVisible] = useState(false);
-  const [agreeVisible, setAgreeVisible] = useState(false);
-
   const [reload, setReload] = useState(0);
 
   useEffect(() => {
@@ -62,21 +46,6 @@ export default ({ taskCategoryValueArr, showNotification,current_user }) => {
 
 
 
-  function confirmReceiptModal(paperId) {
-    Modal.confirm({
-      title: '确认收款',
-      content: '确认已经收到任务报酬',
-      onOk: () => {
-        confirmReceipt(paperId).then(res => {
-          if (res && res.message === "success") {
-            showNotification("您已确认收款！");
-            reloadList();
-          }
-        })
-      }
-    })
-  }
-
   const reloadList = useCallback(() => {
     setReload(Math.random());
   }, [])
diff --git a/src/military/task/paperComplain/index.js b/src/military/task/paperComplain/index.js
index 1f2f36a1e..d17b2e761 100644
--- a/src/military/task/paperComplain/index.js
+++ b/src/military/task/paperComplain/index.js
@@ -91,8 +91,7 @@ export default Form.create()(({  form, showNotification, history}) => {
   }
 
   function downFile(item) {
-    let url = httpUrl + '/busiAttachments/download/' + item.id;
-    window.open(url);
+    window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
   }
 
   const columns = useMemo(() => {
diff --git a/src/military/task/paperManage/index.jsx b/src/military/task/paperManage/index.jsx
index 029c42875..5640d61cd 100644
--- a/src/military/task/paperManage/index.jsx
+++ b/src/military/task/paperManage/index.jsx
@@ -193,9 +193,9 @@ export default Form.create()(({ current_user, form, showNotification, match, his
         key: 'action',
         render: (text, record) => (
           <React.Fragment>
-            {record.checkStatus ===2&&<Button className="mr5 font-12" type="primary" size="small" onClick={() => { checkPaperItem(record.id, true) }}>通过</Button>}
-            {record.checkStatus ===0&&<Button className="mr5 font-12" type="primary" size="small" onClick={() => { agreeNoPass(record.id) }}>通过</Button>}
-            {record.checkStatus !==0&&<Button className="mr5 font-12" type="info" size="small" onClick={() => { disagree(record) }}>不通过</Button>}
+            {record.task&&record.task.status==3&&record.checkStatus ===2&&<Button className="mr5 font-12" type="primary" size="small" onClick={() => { checkPaperItem(record.id, true) }}>通过</Button>}
+            {record.task&&record.task.status==4&&record.checkStatus ===0&&<Button className="mr5 font-12" type="primary" size="small" onClick={() => { agreeNoPass(record.id) }}>通过</Button>}
+            {record.task&&record.task.status==3&&record.checkStatus ===2&&<Button className="mr5 font-12" type="info" size="small" onClick={() => { disagree(record) }}>不通过</Button>}
             {record.task&&record.task.status==3&&<Button type="danger" size="small" className="mr5 font-12"  onClick={() => { deleteItem(record.id) }}>删除</Button>}
 
           </React.Fragment>
@@ -211,6 +211,7 @@ export default Form.create()(({ current_user, form, showNotification, match, his
       setLoading(false);
       if (res && res.message === 'success') {
         setReload(Math.random());
+        showNotification('操作成功!');
       }
     });
   }
diff --git a/src/military/task/taskDetail/index.jsx b/src/military/task/taskDetail/index.jsx
index dbf26850c..ed6b1491f 100644
--- a/src/military/task/taskDetail/index.jsx
+++ b/src/military/task/taskDetail/index.jsx
@@ -191,8 +191,7 @@ export default Form.create()(
         showLoginDialog();
         return;
       }
-      let url = httpUrl + '/busiAttachments/download/' + item.id;
-      window.open(url);
+      window.open(httpUrl+'/busiAttachments/downloadAttachment/'+item.uniqueFileName);
     }
 
     const helper = useCallback(
@@ -432,9 +431,8 @@ export default Form.create()(
 
     //  在线预览佐证材料
     function showProof() {
-      let pdfId = detailData.taskResultProof && detailData.taskResultProof.proofFileNumbers;
-
-      Number(pdfId) > 0 && window.open(`${httpUrl}/busiAttachments/view/${pdfId}?disposition=inline`, '_blank');
+      let proofFile = detailData.taskResultProof && detailData.taskResultProof.proofAttachments&& detailData.taskResultProof.proofAttachments[0];
+      proofFile && window.open(`${httpUrl}/busiAttachments/viewAttachment/${proofFile.uniqueFileName}?disposition=inline`, '_blank');
     }
 
     return (
diff --git a/src/military/task/taskEdit/index.jsx b/src/military/task/taskEdit/index.jsx
index 861cbdb0b..f2ad92d62 100644
--- a/src/military/task/taskEdit/index.jsx
+++ b/src/military/task/taskEdit/index.jsx
@@ -372,11 +372,7 @@ export default Form.create()(forwardRef(({ current_user, form, showNotification,
         </div>
 
         <div className="padding30 bor-bottom-greyE">
-          <p className="partTitle">任务内容<span className="color-red font-14">（*必填）</span>
-            {/* <span>
-              <a href="https://task.osredm.com/busiAttachments/download/121" className="icon icon-attachment font-13 color-blue" length="32" target="_blank">创客任务模版.xlsx</a>
-            </span><span className="color-grey-9 ml5 font-12 ">点击下载示例模版</span> */}
-          </p>
+          <p className="partTitle">任务内容<span className="color-red font-14">（*必填）</span></p>
 
           <div className="pl15 task-edit-content">
             <p className="color-grey3 mb20">选择任务所在领域</p>
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 2ada6db67..ecac55f69 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -594,7 +594,7 @@ class NewHeader extends Component {
       str = match.path;
     }
 
-    console.log(str, (url + "/"), url && str === url);
+    // console.log(str, (url + "/"), url && str === url);
     if (url && (str === url || str === (url + "/"))) {
       return true
     } else {
@@ -803,7 +803,7 @@ class NewHeader extends Component {
             {this.props.user && this.props.user.login &&
               <div className="edu-menu-panel mr5">
                 <i className={`iconfont icon-tianjiafangda ${activeIndex ? 'color-home' : 'color-grey-6'} `}></i>
-                <div className="edu-menu-list" style={{ top: '48px' }}>
+                <div className="edu-menu-list" style={{ top: '53px' }}>
                   <div className="overPart"></div>
                   {
                     (coursestypes === true && this.props.user.main_site === false && (settings && !settings.add && (settings.add && settings.add.length === 0))) ? "" :
@@ -892,7 +892,7 @@ class NewHeader extends Component {
                 src={getImageUrl(user.image_url)} width="34">
               </img>
               {/* </a> */}
-              <ul className="edu-menu-list" style={{ top: '60px', textAlign: 'center' }}>
+              <ul className="edu-menu-list" style={{ top: '70px', textAlign: 'center' }}>
                 <li className="bor-bottom-greyE ellipsis-1" style={{ cursor: "default", background: "#fff" }}>{this.props.current_user.username}</li>
                 {
                   settings && settings.personal && settings.personal.length > 0 && settings.personal.map((item, key) => {
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index b247ebb70..5b9d77912 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -32,7 +32,7 @@ body>.-task-title {
   position: fixed;
   background: #fff;
   color: #333;
-  /* box-shadow: 0 0 12px rgb(0 ,0 ,0,10%); */
+  box-shadow: 0 0 12px rgb(0 ,0 ,0,10%);
 }
 .newHeaders.publicNav{
   position: absolute;
@@ -321,7 +321,7 @@ body>.-task-title {
 .logoimg {
   float: left;
   min-width: 34px;
-  height: 34px;
+  height: 48px;
 }
 
 .headwith100b {