diff --git a/package-lock.json b/package-lock.json
index cc7165667..84bb726ce 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19205,13 +19205,15 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
           "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "is-glob": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
           "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extglob": "^2.1.1"
           }
diff --git a/public/favicon.back.ico b/public/favicon.back.ico
new file mode 100755
index 000000000..29b4c3af1
Binary files /dev/null and b/public/favicon.back.ico differ
diff --git a/public/favicon.ico b/public/favicon.ico
old mode 100755
new mode 100644
index 29b4c3af1..d0159c655
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/military/fetch.js b/src/military/fetch.js
index 2261b6e49..99ee3d71f 100644
--- a/src/military/fetch.js
+++ b/src/military/fetch.js
@@ -7,9 +7,12 @@ let actionUrl = '';
 if (window.location.href.indexOf(':3007') > -1) {
   actionUrl = 'http://117.50.100.12:8008';
   // actionUrl='http://192.168.31.74:8081'; //万佳后台
-} else if (window.location.href.indexOf('117.50.100.12') > -1 ||window.location.href.indexOf('forgeweb.osredm') > -1) {
+} else if (window.location.href.indexOf('117.50.100.12') > -1 ) {
   actionUrl = "http://117.50.100.12:8008";  //测试环境
   axios.defaults.withCredentials = true;
+} else if (window.location.href.indexOf('noticeweb.osredm') > -1) {
+  actionUrl = "https://taskapi.osredm.com";  //测试环境
+  axios.defaults.withCredentials = true;
 } else if (window.location.href.indexOf('forge.osredm') > -1) {
   actionUrl = "https://info.osredm.com";  //生产环境
   axios.defaults.withCredentials = true;
diff --git a/src/military/notice/api.js b/src/military/notice/api.js
index b397f7798..3bc02b78f 100644
--- a/src/military/notice/api.js
+++ b/src/military/notice/api.js
@@ -27,7 +27,7 @@ export async function getNoticeDetail(id) {
     method: 'get',
     params:{flag:1}
   });
-  if (res.message === 'success') {
+  if (res.data) {
     return res.data;
   } else {
     notification.open({
diff --git a/src/modules/tpm/NewHeader.js b/src/modules/tpm/NewHeader.js
index 9f57b0db3..9d1d53202 100644
--- a/src/modules/tpm/NewHeader.js
+++ b/src/modules/tpm/NewHeader.js
@@ -580,7 +580,9 @@ class NewHeader extends Component {
         return true
       } else if (url.indexOf('projects') > -1 && match.path.indexOf('projects') > -1) {
         return true
-      } else if (url.indexOf('notice') > -1 && match.path.indexOf('notice') > -1) {
+      } else if (url.indexOf('.com/notice') > -1 && match.path.indexOf('/notice') > -1) {
+        return true
+      } else if (url.indexOf('/task') > -1 && match.path.indexOf('/task') > -1) {
         return true
       } else if (url.indexOf('users') > -1 && match.path.indexOf('users') > -1) {
         return true