Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5

src/pages/activity/groupActivity/list.jsx

@@ -14,25 +14,25 @@ const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
 const header = props => {
-  const [ data, setData ] = useState({})
-//   const [page, changePage] = useState({})
+  const [data, setData] = useState({})
+  //   const [page, changePage] = useState({})
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10 });
-  },[])
+  }, [])
 
   // 查询列表
   const getList = (params) => {
-      console.log(params);
+    console.log(params);
     request({ ...apis.groupActivity.list, params: { ...params } }).then((data) => {
-        console.log(data)
-        setData(data)
+      console.log(data)
+      setData(data)
     })
   }
 
-  
-// 跳转到拼团活动新增
-const toEditActivity = (groupActivityId) => () => {
+
+  // 跳转到拼团活动新增
+  const toEditActivity = (groupActivityId) => () => {
     router.push({
       pathname: '/activity/groupActivity/editGroupActivity',
       query: {
@@ -40,14 +40,14 @@ const toEditActivity = (groupActivityId) => () => {
       },
     });
   }
-  
+
   /**
    *
    *
    * @param {*} props
    * @returns
    */
-  
+
   const columns = [
     {
       title: '活动标题',
@@ -63,11 +63,11 @@ const toEditActivity = (groupActivityId) => () => {
       render: (x, row) => <><span>{`${moment(row.startTime).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>
     },
     {
-        title: '所需积分',
-        dataIndex: 'integral',
-        key: 'integral',
-        align: 'center',
-      },
+      title: '所需积分',
+      dataIndex: 'integral',
+      key: 'integral',
+      align: 'center',
+    },
     {
       title: '已参与人数',
       dataIndex: 'participateNum',
@@ -79,7 +79,7 @@ const toEditActivity = (groupActivityId) => () => {
       dataIndex: 'groupBuyPeople',
       key: 'groupBuyPeople',
       align: 'center',
-    },  
+    },
     {
       title: '状态',
       dataIndex: 'activityStatus',
@@ -99,127 +99,129 @@ const toEditActivity = (groupActivityId) => () => {
       render: (x, row) => (
         <>
           {row.activityStatus === 0 &&
-          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
+            <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
           }
           {row.activityStatus === 0 &&
-          <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>    <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
+            <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            </AuthButton>
           }
           {row.activityStatus === 0 &&
-          <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-        </AuthButton> }
+            <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>}
 
           {row.activityStatus === 1 &&
-          <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
-          </AuthButton>
+            <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
+              <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            </AuthButton>
           }
-           {row.activityStatus === 1 &&
-          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
-                <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-          </AuthButton>
+          {row.activityStatus === 1 &&
+            <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            </AuthButton>
           }
-           {row.activityStatus === 1 &&
-           <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
-                <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-        </AuthButton>
+          {row.activityStatus === 1 &&
+            <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>
           }
 
-        {row.activityStatus === 2 &&
-        <AuthButton><span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
-        }
-         {row.activityStatus === 2 &&
-        <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-        </AuthButton>
+          {row.activityStatus === 2 &&
+            <AuthButton><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
+          }
+          {row.activityStatus === 2 &&
+            <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+            </AuthButton>
           }
         </>
       ),
     },
   ];
   const getSignList = groupActivityId => {
-      router.push({
-          pathname: '/activity/groupActivity/helpRecord',
-          query: {
-            groupActivityId,
-          },
-        });
+    router.push({
+      pathname: '/activity/groupActivity/helpRecord',
+      query: {
+        groupActivityId,
+      },
+    });
   }
-  
+
   const finishDynamic = (row) => {
-      Modal.confirm({
-          title: '结束以后将无法编辑, 是否继续?',
-          okText: '确定',
-          cancelText: '取消',
-          onOk() {
-              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
-                  console.log(data)
-                  message.info('操作成功！')
-                  getList({ pageNum: 1, pageSize: 10 })
-              }).catch((err) => {
-                  console.log(err)
-                  message.info(err.msg || err.message)
-              })
-          },
-        });
-  }
-  
-  //结束活动
-  const endGroupActivity = (row) => () => {
-      request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId} }).then((data) => {
+    Modal.confirm({
+      title: '结束以后将无法编辑, 是否继续?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk () {
+        request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: "" } }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
-      }).catch((err) => {
+        }).catch((err) => {
           console.log(err)
           message.info(err.msg || err.message)
-      })
+        })
+      },
+    });
+  }
+
+  //结束活动
+  const endGroupActivity = (row) => () => {
+    request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId } }).then((data) => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 })
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
 
   //置顶
   const topGroupActivity = (row, weight) => () => {
     request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, weight: weight } }).then((data) => {
-        console.log(data)
-        message.info('操作成功！')
-        getList({ pageNum: 1, pageSize: 10 })
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 })
     }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
+      console.log(err)
+      message.info(err.msg || err.message)
     })
   }
 
   //首页推荐
   const recommendGroupActivity = (row, code) => () => {
     request({ ...apis.groupActivity.top, data: { groupActivityId: row.groupActivityId, sort: row.sort } }).then((data) => {
-        console.log(data)
-        message.info('操作成功！')
-        getList({ pageNum: 1, pageSize: 10 })
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 })
     }).catch((err) => {
-        console.log(err)
-        message.info(err.msg || err.message)
+      console.log(err)
+      message.info(err.msg || err.message)
     })
   }
-    
+
   //发布活动
   const sendDynamic = (row) => {
-      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
-      }).catch(err => {
-          console.log(err)
-          message.info(err.msg || err.message)
-      })
+    request({ ...apis.activity.send, urlData: { id: row.dynamicId } }).then((data) => {
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10 });
+    }).catch(err => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
   }
-  
+
   const changePageNum = pageNumber => {
-      getList({ pageNum: pageNumber, pageSize: 10 })
+    getList({ pageNum: pageNumber, pageSize: 10 })
   }
 
   // 提交事件
-const handleSubmit = (e, props) => {
+  const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -229,8 +231,8 @@ const handleSubmit = (e, props) => {
     });
   }
 
-   //重置搜索
-   function handleReset() {
+  //重置搜索
+  function handleReset () {
     props.form.resetFields();
   }
 
@@ -272,14 +274,14 @@ const handleSubmit = (e, props) => {
             搜索
           </Button>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
+            重置
             </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.taShareActivity.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
       </div>

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -85,6 +85,11 @@ const header = props => {
           message.error('助力邀请人数不能超过200')
           return
         }
+          // 助力邀请人数>0
+        if (values.personNum <= 0) {
+          message.error('助力邀请人数大于0')
+          return
+        }
 
         // 判断助力人数必须大于0
         if (values.isEnlist === 1) {
@@ -92,10 +97,6 @@ const header = props => {
           message.error('限制助力次数必须大于0')
           return
         }
-        if (values.personNum <= 0) {
-          message.error('助力邀请人数大于0')
-          return
-        }
       }
         const { activityTime, signupTime, ...submitValue } = values
         const [startDate, endDate] = activityTime

src/pages/activity/helpActivity/list.jsx

@@ -93,36 +93,36 @@ const toEditGoods = (helpActivityId) => () => {
         <>
           {row.activityStatus === 0 &&
           <AuthButton name="admin.helpRecord.get">
-             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" style={{color:'#bebebe'}}   className={styles.shoppingCart} /></span>
           </AuthButton>}
           {row.activityStatus === 0 &&
           <AuthButton name="admin.top.update.post" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top"  style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
           </AuthButton> }
 
           {row.activityStatus === 1 &&
           <AuthButton name="admin.helpActivity.update.put" noRight={null}>
-            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" style={{color:'#bebebe'}} className={styles.edit} /></span>
           </AuthButton>
           }
           {row.activityStatus === 1 &&
            <AuthButton name="admin.top.update.post" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
             </AuthButton>
           }
 
           {row.activityStatus === 2 &&
           <AuthButton name="admin.helpRecord.get" noRight={null}>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" style={{color:'#bebebe'}} className={styles.shoppingCart} /></span>
           </AuthButton>
           }
            {row.activityStatus === 2 &&
         <AuthButton name="admin.top.update.post" noRight={null}>
-           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
         </AuthButton>
           }
         </>

src/pages/customer/independentList/index.jsx

@@ -210,15 +210,15 @@ class InviteTable extends React.Component {
       },
       {
         title: '用户姓名',
-        dataIndex: 'name',
-        key: 'name',
+        dataIndex: 'nickname',
+        key: 'nickname',
         align: 'center',
         render: text => <a>{text}</a>,
       },
       {
         title: '电话',
-        dataIndex: 'tel',
-        key: 'tel',
+        dataIndex: 'phone',
+        key: 'phone',
         align: 'center',
       },
       {

src/pages/style/GoodsList.less

@@ -8,16 +8,21 @@
   width: 93px;
   height: 93px;
 }
+
 .ant-table-column-title {
   font-weight: 600;
 }
-.shoppingCart{
-  color: #dcdcdc;
+
+.shoppingCart {
+  // color: #dcdcdc;
+  color: #bebebe;
   margin-left: 6px;
   font-size: 16px;
 }
-.edit{
-  color: #dcdcdc;
+
+.edit {
+  // color: #dcdcdc;
+  color: #bebebe;
   margin-left: 6px;
   font-size: 15px;
-}
+}

src/pages/system/document/audit.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Col, Row, Button, Modal, Input } from 'antd'
+import { Col, Row, Button, Modal, Input, Pagination, message } from 'antd'
 import ZmageImg from '../../../components/ZmageImg/ZmageImg'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -7,10 +7,26 @@ import { router } from 'umi';
 import AuthButton from '../../../components/AuthButton';
 import moment from 'moment';
 
+const unaudited = {
+  // color :'rgb(255, 126, 72)'
+  float: "right", fontWeight: "bold", marginRight: '30px'
+}
+
+const auditPass = {
+  // color : '#FF7E48',
+  color: 'green',
+  float: "right", fontWeight: "bold", marginRight: '30px'
+}
+
+const noauditPass = {
+  color: ' #fc515c',
+  float: "right", fontWeight: "bold", marginRight: '30px'
+}
+
 function body (props) {
   const documentVerifyId = props.location.query.id
   const [data, setData] = useState([])
-
+  const [datas, setDatas] = useState({})
   // const [status,setStatus] = useState()
   useEffect(() => {
     getList()
@@ -22,9 +38,9 @@ function body (props) {
   function getList (params) {
     // 网路请求
     console.log(props, '1111')
-    request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId } }).then(data => {
+    request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId }, params: params }).then(data => {
       console.log('data:', data.records)
-
+      setDatas(data)
       setData(data.records)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -85,10 +101,15 @@ function body (props) {
     };
 
     const handleOk1 = e => {
-      console.log(e);
-      onVerify(2)
-
-      setVisible(false)
+      console.log(reasonValue, "2222");
+      if (reasonValue ) {
+        // console.log(e);
+        onVerify(2)
+        console.log(reasonValue, "11111111");
+        setVisible(false)
+      } else {
+        message.info("不能为空")
+      }
 
     };
 
@@ -104,21 +125,21 @@ function body (props) {
     }
 
 
-    console.log("props", props.data)
+    // console.log("props", props.data)
     const carddata = props.data.imgList
     return (
       <>
-        <div style={{ background: '#ffffff', padding: '40px', marginTop: '30px',borderRadius: '12px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)'}}>
-          <p style={{ fontSize: '0.096rem'}}>
+        <div style={{ background: '#ffffff', padding: '40px', marginTop: '30px', borderRadius: '12px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}>
+          <p style={{ fontSize: '0.096rem' }}>
             <span>资料说明：{props.data.documentTitle} </span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-            <span>提交时间：{moment(props.data.createDate).format('YYYY-MM-DD')} </span>
-            <span style={{ float: "right", fontWeight: "bold", marginRight: '30px' }} className={props.data.verifyStatus == 0 ? "unaudited" : props.data.verifyStatus == 1 ? "auditPass" : "noauditPass"} > 
-             {props.data.verifyStatus == 0 ? "待审核" : props.data.verifyStatus == 1 ? "审核通过" : "不通过"}
-             </span>
+           
+            <span style={props.data.verifyStatus == 0 ? unaudited : props.data.verifyStatus == 1 ? auditPass : noauditPass} >
+              {props.data.verifyStatus == 0 ? "待审核" : props.data.verifyStatus == 1 ? "审核通过" : "不通过"}
+            </span>
           </p>
+          <p style={{ fontSize: '0.096rem' }}>提交时间：{moment(props.data.createDate).format('YYYY-MM-DD h:mm:ss')}   </p>
 
-
-          <div style={{ fontSize: '0.096rem'}}>资料图片:
+          <div style={{ fontSize: '0.096rem' }}>资料图片:
         <Row gutter={16}>
               {
                 // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
@@ -132,11 +153,11 @@ function body (props) {
           </div>
           {props.data.verifyStatus == 0 && <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
             <AuthButton name="admin.documentVerify.id.put" noRight={null}>
-              <Button type="primary" onClick={() => handleOk(1)}>通过</Button>
+              <Button type="primary" style={{ marginTop: '30px' }} onClick={() => handleOk(1)}>通过</Button>
             </AuthButton>
             &nbsp;&nbsp;&nbsp;&nbsp;
         <AuthButton name="admin.documentVerify.id.put" noRight={null}>
-              <Button onClick={() => handleOk(2)}>不通过</Button>
+              <Button style={{ marginTop: '30px' }} onClick={() => handleOk(2)}>不通过</Button>
             </AuthButton>
             {/* &nbsp;&nbsp;&nbsp;&nbsp;
         <Button onClick={cancelPage}>返回</Button> */}
@@ -159,24 +180,27 @@ function body (props) {
     // return <div>111</div>
   }
 
-
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 5 })
+  }
 
 
   return (
     <>
       {/* <div>111</div> */}
-      <div>{console.log("data1", data)}
+      <div>
         {
           // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
           data.map((data, inx) =>
 
             <Card data={data}></Card>
-            // <Col span={6}>
-            //   <ZmageImg style={{ width: '300px', height: '400px' }} src={data.img} />
-            // </Col>
+
           )
         }
         {/* <Card data = {data.records}></Card> */}
+        <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+          <Pagination showQuickJumper defaultCurrent={1} total={datas.total} pageSize={datas.size} onChange={changePageNum} current={datas.current} />
+        </div>
 
       </div>
 

src/pages/system/document/list.jsx

@@ -84,7 +84,7 @@ function body(props) {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (createDate) => moment(createDate).format('YYYY-MM-DD')
+      render: (createDate) => moment(createDate).format('YYYY-MM-DD h:mm:ss')
     },
 
     {