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

src/pages/activity/ActivityList.jsx

@@ -70,12 +70,18 @@ const header = props => {
       dataIndex: 'title',
       key: 'title',
       align: 'center',
+      // width: '15%',
+      render:  (x, row) => <><div style={{wordWrap: 'break-word',  width: '201px'}}>{row.title}</div></>,
+      // width: '300px',
+      // ellipsis:'true'
     },
     {
       title: '活动时间',
       dataIndex: 'startDate',
       key: 'startDate',
       align: 'center',
+      // width: '15%',
+      // width: '20%',
       render: (x, row) => <><span>{`${moment(row.startDate).format('YYYY-MM-DD')} —— ${moment(row.endDate).format('YYYY-MM-DD')}`}</span></>,
     },
     {
@@ -83,30 +89,36 @@ const header = props => {
       dataIndex: 'count',
       key: 'count',
       align: 'center',
+      // width: '10%',
+      // width: '6%',
     },
     {
       title: '阅读量',
       dataIndex: 'pvNum',
       key: 'pvNum',
       align: 'center',
+      // width: '10%',
     },
     {
       title: '转发量',
       dataIndex: 'shareNum',
       key: 'shareNum',
       align: 'center',
+      // width: '10%',
     },
     {
       title: '收藏数',
       dataIndex: 'saveNum',
       key: 'saveNum',
       align: 'center',
+      // width: '10%',
     },
     {
       title: '状态',
       dataIndex: 'activityStatus',
       key: 'activityStatus',
       align: 'center',
+      // width: '10%',
       render: activityStatus => <><span>{activityStatus == 0 ? '进行中' : activityStatus == 1 ? '未开始' : '已结束'}</span></>,
     },
     {

src/pages/system/document/audit.jsx

@@ -137,7 +137,7 @@ function body (props) {
               {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>
+          <p style={{ fontSize: '0.096rem' }}>提交时间：{moment(props.data.createDate).format('YYYY-MM-DD HH:mm:ss')}   </p>
 
           <div style={{ fontSize: '0.096rem' }}>资料图片:
         <Row gutter={16}>