Merge branch 'dev' of http://git.ycjcjy.com/estateagents/pc-center into dev

src/components/uploadImage/ImageUpload.jsx

@@ -0,0 +1,52 @@
+import React from 'react';
+import { Upload, Icon, message } from 'antd';
+import './style.less';
+import { uploaderProps } from '../../utils/upload';
+
+
+
+class ImageUpload extends React.Component {
+
+  state = {
+    loading: false,
+    fileList: [],
+  };
+
+  handleChange = info => {
+    this.setState({ fileList: info.fileList })
+    if (info.file.status === "uploading") {
+      this.setState({ loading: true });
+      return;
+    }
+  };
+
+  handleUploadSucess = (url) => {
+    console.log(url,"33-------")
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(url);
+    }
+  }
+
+  render() {
+    const uploadButton = (
+      <div>
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
+      </div>
+    );
+
+    return (
+      <Upload
+        {...uploaderProps}
+        listType="picture-card"
+        className="avatar-uploader"
+        onChange={this.handleChange}
+        fileList={this.state.fileList}
+        onSuccess={this.handleUploadSucess}
+      >
+        {this.state.fileList.length >= 1 ? null : uploadButton}  
+      </Upload>
+    );
+  }
+}
+
+export default ImageUpload;

src/components/uploadImage/style.less

@@ -0,0 +1,8 @@
+:global {
+  .avatar-uploader {
+    & > .ant-upload {
+      width: 128px;
+      height: 128px;
+    }
+  }
+}

src/pages/UserManage/Editor/User.jsx

@@ -5,7 +5,8 @@ import moment from 'moment';
 import router from 'umi/router';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import { fetch, apis } from '../../../utils/request';
-import SelectCity from '../CitySelect'
+import SelectCity from '../CitySelect';
+import ImageUpload from '../../../components/uploadImage/ImageUpload';
 
 
 const defaultPass = 'abc@123';
@@ -61,7 +62,7 @@ export default props => {
     {
       label: '公司水印',
       name: 'waterMark',
-      type: FieldTypes.ImageUploader,
+      render: () => <ImageUpload onChange={e => console.log(e,"66")}/>,
       value: user.waterMark,
     },
     {

src/pages/UserManage/index.jsx

@@ -33,9 +33,7 @@ const ABCol = (props) => (
 
 export default (props) => {
   const [members, setMembers] = useState([]);
-  const [pageNavi, setPageNavi] = useState({ current: 1, pageSize: 10, total: 0 })
-  const [submitting, setSubmitting] = useState(false)
-  const [visibleData, setVisibleData] = useState({ visible: false, userId: '', oldPassword:'', newPassword: '', confirmPassword: '' })
+  const [pageNavi, setPageNavi] = useState({ current: 1, pageSize: 10, total: 0, size: 0 })
 
   useEffect(() => {
     getMembers({ params: { pageNum: pageNavi.current, pageSize: pageNavi.pageSize } }).then((dt) => {