From 15b63be594e6cbab88bf9e96dc74da9f135f7ff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Fri, 17 Sep 2021 14:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=85=AC=E5=91=8A=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/military/fetch.js                       |  6 ++--
 src/military/notice/noticeDetail/index.jsx  | 31 ++++++++++++---------
 src/military/notice/noticeDetail/index.scss |  4 +--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/src/military/fetch.js b/src/military/fetch.js
index 50b3d2a3..229d294a 100644
--- a/src/military/fetch.js
+++ b/src/military/fetch.js
@@ -6,10 +6,10 @@ import cookie from 'react-cookies';
 
 let actionUrl = '';
 if (window.location.href.indexOf('localhost') > -1) {
-  // actionUrl='https://taskapi.osredm.com';
-  actionUrl='http://192.168.31.47:8081';
+  actionUrl='https://taskapi.osredm.com';
+  // actionUrl='http://192.168.31.47:8081';
 }else if(window.location.href.indexOf('192.168.31.48') > -1){
-  actionUrl="http://117.50.100.12:8008";
+  actionUrl='https://taskapi.osredm.com';
 }else if(window.location.href.indexOf('noticeweb.osredm') > -1){
   actionUrl="https://taskapi.osredm.com";
 }else if(window.location.href.indexOf('https://osredm.com')>-1){
diff --git a/src/military/notice/noticeDetail/index.jsx b/src/military/notice/noticeDetail/index.jsx
index 47f6dc89..3843ded8 100644
--- a/src/military/notice/noticeDetail/index.jsx
+++ b/src/military/notice/noticeDetail/index.jsx
@@ -11,12 +11,14 @@ for (const item of noticeType) {
 }
 
 export default Form.create()(({ match, history, showNotification, form }) => {
-  const { getFieldDecorator, validateFields, setFieldsValue, } = form;
+  const { getFieldDecorator, validateFields, setFieldsValue } = form;
 
   const [reload, setReload] = useState(0);
   const [noticeData, setNoticeData] = useState({});
   const [visible, setVisible] = useState(false);
 
+  const [readerName,setReaderName]=useState('');
+
   const id = match.params.noticeId;
 
   useEffect(() => {
@@ -34,7 +36,7 @@ export default Form.create()(({ match, history, showNotification, form }) => {
   const helper = useCallback(
     (label, name, rules, widget) => (
       <Form.Item label={label}>
-        {getFieldDecorator(name, { rules, validateFirst: true })(widget)}
+        {getFieldDecorator(name, { rules, validateFirst: true ,getValueFromEvent: e=>e.target.value.replace(/(^\s*)|(\s*$)/g, "") })(widget)}
       </Form.Item>
     ),
     []
@@ -51,13 +53,14 @@ export default Form.create()(({ match, history, showNotification, form }) => {
             setVisible(false);
             setReload(Math.random());
           } else {
-            res && Modal.error({content:res.message});
+            res && Modal.error({ content: res.message });
           }
         })
       }
     });
   }
 
+
   return (
     <div className="centerbox notice-detail">
       <div className="head-navigation">
@@ -85,6 +88,17 @@ export default Form.create()(({ match, history, showNotification, form }) => {
             </div>
           </div>
 
+          {
+            noticeData.contactInfo ? <React.Fragment>
+              <div className="notice-content-title"><Icon type="caret-right" />联系方式</div>
+              <div className="content-secret" dangerouslySetInnerHTML={{ __html: noticeData.contactInfo && noticeData.contactInfo.replace(/\n/g, '</br>') }}>
+              </div>
+              {
+                noticeData.blockedView && <Button type="primary" onClick={() => { setVisible(true) }}>申请查看加密内容</Button>
+              }
+            </React.Fragment> : ''
+          }
+
 
           {
             noticeData.fileDownloadPath &&
@@ -98,16 +112,7 @@ export default Form.create()(({ match, history, showNotification, form }) => {
               </p>
             </React.Fragment>
           }
-          {
-            noticeData.isSecret && <React.Fragment>
-              <div className="notice-content-title"><Icon type="caret-right" />加密内容</div>
-              <div className="content-secret" dangerouslySetInnerHTML={{ __html: noticeData.contactInfo && noticeData.contactInfo.replace(/\n/g, '</br>') }}>
-              </div>
-              {
-                noticeData.blockedView && <Button type="primary" onClick={() => { setVisible(true) }}>申请查看加密内容</Button>
-              }
-            </React.Fragment>
-          }
+
 
         </div>
       </div>
diff --git a/src/military/notice/noticeDetail/index.scss b/src/military/notice/noticeDetail/index.scss
index 03e2ae88..c43c4558 100644
--- a/src/military/notice/noticeDetail/index.scss
+++ b/src/military/notice/noticeDetail/index.scss
@@ -57,8 +57,7 @@
 }
 
 .content-secret{
-    margin: 1.25rem 0;
-    min-height: 2em;
+  min-height: 2em;
 }
 
 .notice-content-title {
@@ -71,6 +70,7 @@
   display: flex;
   justify-content: space-between;
   align-items: center;
+  margin-bottom: 2rem !important;
   padding: 0 1rem;
   background: #f9f9f9;
   span:hover{