.

src/pages/applicationList/detail.jsx

@@ -14,10 +14,35 @@ export default (props) => {
   const { location } = props;
   const { id } = location.query;
   const [application, setApplication] = useState({});
-
+  const [orderStatus, setOrderStatus] = useState();
+  //已发证有快递 1
+  //已发证无快递 2
+  //审核驳回     3
+  //待发证       4
+  //待审核       5
+  //待支付       6
   useEffect(() => {
     getApplicationDetail(id).then((res) => {
       setApplication(res)
+      if (res?.status == 3) {
+        if (res?.applyMethod == 2) {
+          setOrderStatus(1)
+        } else {
+          setOrderStatus(2)
+        }
+      } else if (res.status == 2) {
+        if (res?.verifyStatus == 2) {
+          setOrderStatus(3)
+        } else if (res?.verifyStatus == 1) {
+          setOrderStatus(4)
+        }
+      }
+      else if (res?.status == 0) {
+        setOrderStatus(6)
+      }
+      else if (res?.status == 1) {
+        setOrderStatus(5)
+      }
     }).catch((err) => {
       console.log(err.message)
     });
@@ -78,29 +103,47 @@ export default (props) => {
               }
             </FormItem>
           }
-          <FormItem label="付款状态">
+
+          <FormItem label="订单状态">
             {
-              application.payStatus === 0
-                ? '待支付'
-                : application.payStatus === 1
-                  ? '支付中'
-                  : application.payStatus === 2
-                    ? '已支付' : ''
+              (orderStatus === 1 || orderStatus === 2)
+                ? '已发证'
+                : orderStatus === 3
+                  ? '审核驳回'
+                  : orderStatus === 4
+                    ? '待发证'
+                    : orderStatus === 5
+                      ? '待审核'
+                      : '待支付'
             }
           </FormItem>
-          {/* <FormItem label="狗证有效期">
-           2021-1-5~2022-1-5
-          </FormItem>
-          //判断是否为续期
-          <FormItem label="快递公司">
-            <Input type="text" value='极兔快递' style={{ width: '350px' }} />
-          </FormItem>
-          <FormItem label="快递单号">
-            <Input type="text" value='99999' style={{ width: '350px' }} />
-          </FormItem>
-          <FormItem label="驳回原因">
-            <TextArea placeholder='请输入驳回原因' rows='3' style={{ width: '350px' }} />
-          </FormItem> */}
+          {
+            (orderStatus == 1 || orderStatus == 2) &&
+            <FormItem label="证件号">
+              {application.originCardNo}
+            </FormItem>
+          }
+          {
+            orderStatus == 1 &&
+            <>
+              <FormItem label="快递公司">
+                {application.trackingType}
+              </FormItem>
+              <FormItem label="快递单号">
+                {application.trackingNo}
+              </FormItem>
+            </>
+          }
+          {
+            orderStatus == 3 &&
+            <FormItem label="驳回原因">
+              <TextArea placeholder='请输入驳回原因' rows='3'
+                style={{ width: '350px' }}
+                value={application.rejectReason}
+                readOnly
+              />
+            </FormItem>
+          }
           <FormItem label=" " colon={false}>
             <Button type="default" onClick={() => goBack()}>
               返回

src/pages/applicationList/index.jsx

@@ -59,7 +59,7 @@ export default (props) => {
       },
     },
     {
-      title: '订单状态',
+      title: '支付状态',
       dataIndex: 'payStatus',
       key: 'payStatus',
       search: true,//已支付 待支付
@@ -69,12 +69,15 @@ export default (props) => {
           : record.payStatus === 1
             ? '支付中'
             : record.payStatus === 2
-              ? '已支付' : ''
+              ? '已支付' 
+              : record.payStatus === 3
+              ? '已退款' : ''
       },
       valueType: 'select',
       valueEnum: {
         0: { text: '待支付' },
         2: { text: '已支付' },
+        3: { text: '已退款' },
       },
     },
     {
@@ -97,6 +100,23 @@ export default (props) => {
         2: { text: '审核驳回' },
       },
     },
+    {
+      title: '制证状态',
+      dataIndex: 'makeStatus',
+      key: 'makeStatus',
+      search: true,// 
+      render: (_, record) => {
+        return record.makeStatus === 0
+          ? '待发放'
+          : record.makeStatus === 1
+            ? '已发放' : ''
+      },
+      valueType: 'select',
+      valueEnum: {
+        0: { text: '待发放' },
+        1: { text: '已发放' },
+      },
+    },
     {
       title: '操作',
       valueType: 'option',

src/pages/cardList/detail.jsx

@@ -32,7 +32,7 @@ export default (props) => {
             {
               card?.status == 1 ? '正常' :
                 card?.status == 2 ? '挂失' :
-                  card?.status == 3 ? '续期' : ''
+                  card?.status == 3 ? '过期' : ''
             }
           </FormItem>
           <FormItem label="犬主">

src/pages/dashboard/components/ReportList.jsx

@@ -1,6 +1,7 @@
 import moment from 'moment'
 import { Card, List, Badge, Space, Carousel } from 'antd'
 import { useEffect, useMemo, useState } from 'react'
+import { history } from 'umi';
 
 const Avatar = (props) => {
   const style = useMemo(() => {
@@ -115,7 +116,10 @@ export default (props) => {
       createDate: '2021-5-6 11:22:50'
     },
   ])
-
+  const toAudit = () => {
+    //审核详情
+    // history.push('../../examine');
+  }
   useEffect(() => {
     setDisabled(!list || list.length <= showNum)
   }, [list])
@@ -136,7 +140,7 @@ export default (props) => {
           {
             list.map(item => (
               <div key={item.formId} style={{ display: 'flex' }}>
-                <List.Item>
+                <List.Item onClick={()=>toAudit(item)}>
                   <List.Item.Meta
                     avatar={<Avatar item={item}>{item.orgName.substring(0, 1)}</Avatar>}
                     title={item.userName}

src/pages/examine/index.jsx

@@ -39,7 +39,7 @@ export default (props) => {
       renderFormItem: (_, record) => <RangePicker placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
     },
     {
-      title: '订单状态',
+      title: '支付状态',
       dataIndex: 'payStatus',
       key: 'payStatus',
       search: true,//已支付 待支付
@@ -49,12 +49,15 @@ export default (props) => {
           : record.payStatus === 1
             ? '支付中'
             : record.payStatus === 2
-              ? '已支付' : ''
+              ? '已支付'
+              : record.payStatus === 3
+                ? '已退款' : ''
       },
       valueType: 'select',
       valueEnum: {
         0: { text: '待支付' },
         2: { text: '已支付' },
+        3: { text: '已退款' },
       },
     },
     {
@@ -79,8 +82,8 @@ export default (props) => {
     },
     {
       title: '审核人',
-      dataIndex: 'verifyUser',
-      key: 'verifyUser',
+      dataIndex: 'verifyUserName',
+      key: 'verifyUserName',
       search: true,
     },
     {