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

src/pages/activity/helpActivity/list.jsx

@@ -93,18 +93,18 @@ const toEditGoods = (helpActivityId) => () => {
         <>
           {row.activityStatus === 0 &&
           <AuthButton name="admin.helpRecord.get">
-             <span style={{ color: '#1990FF', 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" className={styles.shoppingCart} /></span>
           </AuthButton>}
           {row.activityStatus === 0 &&
           <AuthButton name="admin.top.update.post" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            <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>
           </AuthButton> }
 
           {row.activityStatus === 1 &&
           <AuthButton name="admin.helpActivity.update.put" noRight={null}>
-            <span style={{ color: '#FF925C', 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" className={styles.edit} /></span>
           </AuthButton>
           }
           {row.activityStatus === 1 &&
@@ -116,7 +116,7 @@ const toEditGoods = (helpActivityId) => () => {
 
           {row.activityStatus === 2 &&
           <AuthButton name="admin.helpRecord.get" noRight={null}>
-            <span style={{ color: '#1990FF', 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" className={styles.shoppingCart} /></span>
           </AuthButton>
           }
            {row.activityStatus === 2 &&

src/pages/system/document/audit.jsx

@@ -19,7 +19,7 @@ function body (props) {
     // 网路请求
     console.log(props, '1111')
     request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId } }).then(data => {
-      console.log('data:', data.imgList)
+      console.log('data:', data)
       setData(data.imgList)
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
@@ -40,6 +40,8 @@ function body (props) {
 
 
   const handleOk = () => {
+
+
     Modal.confirm({
       title: '审核通过后，将给当前用户发放积分 确认审核通过？',
       okText: '确认',