合并

src/components/SelectButton/BuildSelect.jsx

@@ -22,11 +22,15 @@ function usePrevious(props) {
 const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
   const [ value, setValue ] = useState('')
-  const preProps = usePrevious(props)
+  // const preProps = usePrevious(props)
 
-  if ((!preProps || !preProps.value) && props.value && !value) {
+  // if ((!preProps) && props.value != value) {
+  //   setValue(props.value)
+  // }
+
+  useEffect(() => {
     setValue(props.value)
-  }
+  }, [props.value])
 
   useEffect(() => {
     getCityList();
@@ -36,7 +40,7 @@ const BuildingSelect = (props) => {
     request({ ...apis.building.buildingSelect, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
         setData(data.records)
         // 默认选中第一个
-        if ((!preProps || !preProps.one) && props.one === 'true') {
+        if (props.checkFirst) {
           setValue(data.records[0].buildingId)
           props.onChange(data.records[0].buildingId)
         }
@@ -51,7 +55,7 @@ const BuildingSelect = (props) => {
   return (
       <Select
       showSearch
-      value={props.value}
+      value={value}
       style={{ width: '180px' }} 
       placeholder="请选择项目" 
       onChange={handleChange}
@@ -65,4 +69,3 @@ const BuildingSelect = (props) => {
   )
 }
 export default BuildingSelect
-

src/components/Wangedit/Wangedit.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
-import E from 'wangeditor'
+import E from 'wangeditor';
+import { fetch, apis } from '../../utils/request';
 
 /**
  * @param {*} props
@@ -33,7 +34,15 @@ class Wangedit extends React.Component {
       }
     }
     this.editor.customConfig.zIndex = 100
-    this.editor.customConfig.uploadImgShowBase64 = true   
+    this.editor.customConfig.uploadImgMaxLength = 1
+    this.editor.customConfig.customUploadImg = function (files, insert) {
+      if (!files.length) return
+      
+      const data = new FormData()
+      data.append('file', files[0])
+
+      fetch(apis.image.upload)({data}).then(insert)
+    }
     this.editor.create()
     this.editor.customConfig.uploadImgShowBase64 = true
     this.editor.txt.html(this.props.value)

src/pages/activity/groupActivity/helpRecord.jsx

@@ -421,6 +421,7 @@ function helpRecord(row) {
       key: 'createTime',
       align: 'center',
       width: '15%',
+      render: (x, row) => <><span>{`${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
     },
     {
       title: '参团者',

src/pages/carouselFigure/SelectGroup.jsx

@@ -15,7 +15,7 @@ export default props => {
   const [visible, setVisible] = useState(false);
   const [group, setGroup] = useState({ groupId: undefined, groupName: '请选择拼团' })
   const getGroupTitle = val => {
-    return (list.filter(x => x.groupActicityId == val)[0] || {}).activityName || '请选择拼团'
+    return (list.filter(x => x.groupActivityId == val)[0] || {}).activityName || '请选择拼团'
   }
   const updateGroup = val => setGroup({ groupId: val, groupName: getGroupTitle(val) })
 
@@ -65,7 +65,7 @@ export default props => {
             option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
           }>
           {
-            list.map(x => (<Select.Option key={x.groupActicityId} value={x.groupActicityId}>{x.activityName}</Select.Option>))
+            list.map(x => (<Select.Option key={x.groupActivityId} value={x.groupActivityId}>{x.activityName}</Select.Option>))
           }
         </Select>
       </Modal>

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -272,7 +272,7 @@ const UserBehavior = props => {
           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
         </p>
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
-          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} one="true"></BuildSelect>}
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} checkFirst></BuildSelect>}
         </div>
         <EChart options={options} style={style} />
         {props.tableShow &&

src/pages/system/document/list.jsx

@@ -3,6 +3,8 @@ import { Table, Form, Icon, Input, Button, message  } from 'antd'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import { router } from 'umi';
+import moment from 'moment';
+
 
 function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -81,13 +83,14 @@ function body(props) {
     },
     {
       title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
+      dataIndex: 'tel',
+      key: 'tel',
     },
     {
       title: '提交时间',
       dataIndex: 'createDate',
       key: 'createDate',
+      render: (createDate) => moment(createDate).format('YYYY-MM-DD')
     },
     {
       title: '状态',

src/pages/system/document/see.jsx

@@ -1,9 +1,9 @@
 import React, { useState, useEffect } from 'react';
-import { Col, Row, Button, Modal} from 'antd'
+import { Col, Row, Button, Modal } from 'antd'
+import { router } from 'umi';
 import ZmageImg from '../../../components/ZmageImg/ZmageImg'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
-import { router } from 'umi';
 
 
 function body (props) {
@@ -12,51 +12,49 @@ function body (props) {
 
   useEffect(() => {
     getList()
-
   }, [])
 // , documentVerifyId: documentVerifyId
-  function getList (params) {
+  function getList (_params) {
     // 网路请求
-    console.log(props,'1111')
-    request({ ...apis.system.documentVerifyDetail, urlData:{ id:documentVerifyId }  }).then(data => {
+    console.log(props, '1111')
+    request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId } }).then(data => {
       console.log('data:', data.imgList)
       setData(data.imgList)
-    }).catch(err => {
+    }).catch(_err => {
       // eslint-disable-next-line no-unused-expressions
 
     })
   }
-  
 
-  const cancelPage = () =>{
+
+  const cancelPage = () => {
     router.push({
       pathname: '/system/document/list',
     });
   }
 
 
-
   return (
     <>
       <div style={{ background: '#ECECEC', padding: '30px' }}>
         <Row gutter={16}>
           {
             // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
-            data.map((data, inx) => 
-              <Col span={6}>
-               <ZmageImg style={{ width: '300px', height: '400px' }} src={data.img} />
-              </Col>
+            data.map(item =>
+              <Col span={6} key={item.documentImgId}>
+               <ZmageImg style={{ width: '300px', height: '400px' }} src={item.img} />
+              </Col>,
             )
           }
         </Row>
       </div>
       <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
-       
+
         <Button onClick={cancelPage}>返回</Button>
-        
+
       </div>
-     
-      
+
+
     </>
   )
 }

src/pages/system/intention.jsx

@@ -57,7 +57,7 @@ const Edit = (props) => {
     <>
       <Row>
         <Col span={6}>
-          <BuildSelect onChange={changBuilding} one="true" />
+          <BuildSelect onChange={changBuilding} checkFirst />
         </Col>
         <Col span={5} style={{ lineHeight: '30px' }}>
           用户操作