修改issue

src/common/DateUtil.js

@@ -69,16 +69,23 @@ export function formatSeconds(value) {
 
 
 export function formatDuring(s) {
-  let days =absFloor(s / (60 * 60 * 24)) ;
-  let hours = absFloor((s % (60 * 60 * 24)) / (  60 * 60));
-  let minutes =absFloor((s % (60 * 60)) / ( 60));
-  let second = absFloor(s % 60);
+  s = Math.abs(s);
+  let days = Math.floor(s / (60 * 60 * 24));
+  let hours = Math.floor((s % (60 * 60 * 24)) / (60 * 60));
+  let minutes = Math.floor((s % (60 * 60)) / (60));
+  let second = Math.floor(s % 60);
 
   if (days) {
-    return days + "天" + hours + "小时" ;
+    if(hours){
+      return days + "天" + hours + "小时";
+    }
+    return days + "天";
   }
   if (hours) {
-    return hours + "小时" + minutes + "分";
+    if(minutes){
+      return hours + "小时" + minutes + "分";
+    }
+    return hours + "小时" ;
   }
   if (minutes) {
     return minutes + "分";
@@ -86,9 +93,7 @@ export function formatDuring(s) {
   return second + "秒";
 }
 
-export function absFloor(number){
-  return Math.abs(Math.floor(number));
-}
+
 
 /*
   返回：多久以前
@@ -105,6 +110,9 @@ export function timeAgo(backDate) {
   var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
   var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
   var seconds = Math.floor((time % (1000 * 60 * 60)) / 1000);
+  if (time <= 0) {
+    return "刚刚";
+  }
   if (days) {
     return days + "天前";
   }

src/military/fetch.js

@@ -6,7 +6,7 @@ import cookie from 'react-cookies';
 let actionUrl = '';
 if (window.location.href.indexOf('localhost') > -1) {
   actionUrl = 'http://117.50.100.12:8008';
-  // actionUrl='http://192.168.31.73:8081';
+  // actionUrl='http://192.168.31.72:8081';
 } else if (window.location.href.indexOf('117.50.100.12') > -1) {
   actionUrl = "http://117.50.100.12:8008";
   axios.defaults.withCredentials = true;

src/military/task/components/itemListMyTask/index.jsx

@@ -5,7 +5,7 @@ import Nodata from 'forge/Nodata';
 import Loading from "src/Loading";
 import Upload from 'military/components/Upload';
 import ProofModal from '../proofModal';
-import { publishModeArr, taskStatusAllArr } from '../../static';
+import { publishModeArr, taskStatusAllArr, myPaperStatusArr } from '../../static';
 import { signMethod, uploadAgreeRequire, downAgreement } from "../../api";
 import { httpUrl } from 'military/fetch';
 import '../../index.scss';
@@ -186,7 +186,10 @@ export default Form.create()((props) => {
                     <Link className="color-grey3 font-16 font-bd" to={`/task/taskDetail/${item.id}`}>{item.name}</Link>
                     {
                       joinTask ? <React.Fragment>
-                        {item.status === 4 && <span className="list_status ml10">待确认</span>}
+                        {item.myPaperStatus === 0 && <span className="list_status s_orange ml10">{myPaperStatusArr[item.myPaperStatus]}</span>}
+                        {item.myPaperStatus === 1 && <span className="list_status ml10">{myPaperStatusArr[item.myPaperStatus]}</span>}
+                        {item.myPaperStatus === 2 && <span className="list_status s_red ml10">{myPaperStatusArr[item.myPaperStatus]}</span>}
+
                         {item.status === 6 && <span className="list_status s_orange ml10">待签订协议</span>}
                       </React.Fragment> : <React.Fragment>
                         {item.status === 6 && (item.agreementSigning === 1 || (item.agreementSigning === 2 && item.auditing && item.auditing.pass === 1)) && <span className="list_status s_orange ml10">待签订协议</span>}

src/military/task/components/itemListMyTask/index.scss

@@ -27,10 +27,10 @@
 
     .mytask-title {
       justify-content: left;
-      a{
+      a {
         word-break: break-all;
       }
-      span{
+      span {
         flex: 0 0 auto;
       }
     }
@@ -52,6 +52,14 @@
     background: #ffb121;
   }
 
+  .s_red {
+    background: #fe0e36;
+  }
+
+  .s_blue {
+    background: #4cacff;
+  }
+
   .needs_condition_content_t {
     height: 40px;
     padding: 0px 20px;

src/military/task/components/itemListPaper/index.jsx

@@ -190,7 +190,6 @@ export default Form.create()((props) => {
                           <div className="comments-author">
                             <span className="color-grey3 font-bd mr20">{commentsItem.user.nickname || commentsItem.user.login}</span>
                             <span className="color-grey9">{timeAgo(commentsItem.createdAt)}</span>
-
                           </div>
                           <div className="editor-w-text comments-content" dangerouslySetInnerHTML={{ __html: commentsItem.details && commentsItem.details.content }}>
                           </div>

src/military/task/static.js

@@ -110,6 +110,8 @@ export const showUserModeArr=[
   { dicItemCode: 2, name: "手动公示", dicItemName: '手动公示' },
 ]
 
+export const myPaperStatusArr =["待确认","未采纳","评选胜出"]
+
 export const formItemLayout = {
   labelCol: {
     xs: { span: 10 },

src/military/task/taskDetail/index.jsx

@@ -157,8 +157,9 @@ export default Form.create()(
           surplus = detailData.signingDays * 24 * 3600 - (new Date() - new Date(detailData.publicityCompleteAt)) / 1000;
         }
         if (status === 7) {
-          surplus = detailData.payingDays * 24 * 3600 - (new Date() - new Date(detailData.payingCompleteAt)) / 1000;
+          surplus = detailData.payingDays * 24 * 3600 - (new Date() - new Date(detailData.signingCompleteAt)) / 1000;
         }
+        console.log(surplus);
 
         surplusTimetext = formatDuring(surplus);
       }

src/military/task/taskList/index.jsx

@@ -99,7 +99,7 @@ export default ({ history, current_user, showLoginDialog }) => {
       surplus = item.signingDays * 24 * 3600 - (new Date() - new Date(item.publicityCompleteAt)) / 1000;
     }
     if (status === 7) {
-      surplus = item.payingDays * 24 * 3600 - (new Date() - new Date(item.payingCompleteAt)) / 1000;
+      surplus = item.payingDays * 24 * 3600 - (new Date() - new Date(item.signingCompleteAt)) / 1000;
     }
 
     let surplusTimetext = formatDuring(surplus);