Yansen 2 years ago
parent
commit
b68a82c7f4
3 changed files with 14 additions and 6 deletions
  1. 1
    1
      config/prod.js
  2. 1
    0
      src/components/IssueCard/index.jsx
  3. 12
    5
      src/utils/biz.js

+ 1
- 1
config/prod.js View File

6
     HOST: '"https://wmcj.huoshannews.com"',
6
     HOST: '"https://wmcj.huoshannews.com"',
7
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
7
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
8
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
8
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
9
-    VERSION: '"1.1.15-20230328"',
9
+    VERSION: '"1.1.16-20230331"',
10
   },
10
   },
11
   mini: {},
11
   mini: {},
12
   h5: {
12
   h5: {

+ 1
- 0
src/components/IssueCard/index.jsx View File

12
   ['rgba(251, 157, 75, 0.08)', 'rgba(232, 116, 16, 1)'], // 已办结
12
   ['rgba(251, 157, 75, 0.08)', 'rgba(232, 116, 16, 1)'], // 已办结
13
   ['rgba(255, 245, 245, 1)', 'rgba(255, 76, 76, 1)'], // 已逾期
13
   ['rgba(255, 245, 245, 1)', 'rgba(255, 76, 76, 1)'], // 已逾期
14
   ['transparent', 'rgba(159, 159, 159, 1)'], // 已打回
14
   ['transparent', 'rgba(159, 159, 159, 1)'], // 已打回
15
+  ['rgba(255, 245, 245, 1)', 'rgba(255, 76, 76, 1)'], // 逾期办结
15
 ]
16
 ]
16
 
17
 
17
 export default (props) => {
18
 export default (props) => {

+ 12
- 5
src/utils/biz.js View File

41
       label: '待交办',
41
       label: '待交办',
42
     }
42
     }
43
   } else if (taIssue.processNode === PROCESS_END) {
43
   } else if (taIssue.processNode === PROCESS_END) {
44
+    if (dayjs(taIssue.expireDate).add(1,'day').format('YYYY-MM-DD') < dayjs().format('YYYY-MM-DD')) {
45
+      return {
46
+        value: 5,
47
+        label: '逾期办结',
48
+      };
49
+    }
50
+
44
     return {
51
     return {
45
       value: 2,
52
       value: 2,
46
       label: '已办结',
53
       label: '已办结',
47
     };
54
     };
48
-  } else if (taIssue.processNode !== PROCESS_END && taIssue.expireDate <= dayjs().format('YYYY-MM-DD')) {
49
-    return {
50
-      value: 3,
51
-      label: '已逾期',
52
-    };
53
   } else if (taIssue.processNode.indexOf(PROCESS_ASSIGNED) === 0) {
55
   } else if (taIssue.processNode.indexOf(PROCESS_ASSIGNED) === 0) {
54
     if (taIssue.processStatus === APPLY_READY) {
56
     if (taIssue.processStatus === APPLY_READY) {
55
       if (taIssue.processNode === PROCESS_APPLY_REJECT) {
57
       if (taIssue.processNode === PROCESS_APPLY_REJECT) {
128
       value: 1,
130
       value: 1,
129
       label: '已交办',
131
       label: '已交办',
130
     };
132
     };
133
+  } else if (taIssue.processNode !== PROCESS_END && dayjs(taIssue.expireDate).add(1,'day').format('YYYY-MM-DD') < dayjs().format('YYYY-MM-DD')) {
134
+    return {
135
+      value: 3,
136
+      label: '已逾期',
137
+    };
131
   }
138
   }
132
 
139
 
133
   return {};
140
   return {};