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

src/pages/activity/editActivity.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
@@ -8,37 +8,42 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import request from '../../utils/request'
+import PosterBottom from '../../assets/bottom.png'
+import yinhao from '../../assets/yinhao.png'
+import ImageUploader from '../../components/XForm/ImageUpload';
+import logo from '../../assets/logo.png';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
 /**
  *
  *
  * @param {*} props
  * @returns
  */
- const Edit = (props) => {
-  const [ tab, changeTab ] = useState('basic')
+const Edit = (props) => {
+  const [tab, changeTab] = useState('basic')
   const dynamicId = props.location.query.dynamicId
-  const [ dynamicData, setDynamicData ] = useState({})
-  if(dynamicId){
+  const [dynamicData, setDynamicData] = useState({})
+  if (dynamicId) {
     useEffect(() => {
       getDynamicData(dynamicId);
-    },[])
+    }, [])
 
-  // 查询列表
-  const getDynamicData = (dynamicId) => {
-    request({
+    // 查询列表
+    const getDynamicData = (dynamicId) => {
+      request({
         url: '/api/admin/buildingDynamic/Details',
         method: 'GET',
         params: { dynamicId },
-    }).then((data) => {
+      }).then((data) => {
         console.log(data)
         setDynamicData(data)
-    })
-  }
+      })
+    }
   }
 
-  const cancelPage = () =>{
+  const cancelPage = () => {
     router.push({
       pathname: '/activity/ActivityList',
     });
@@ -52,7 +57,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         render: <BuildSelect />,
         value: dynamicData.buildingId,
         rules: [
-          {required: true, message: '请选择所属项目'},
+          { required: true, message: '请选择所属项目' },
         ]
       },
       {
@@ -67,16 +72,16 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         type: FieldTypes.Text,
         value: dynamicData.title,
         rules: [
-          {required: true, message: '请输入活动标题'},
+          { required: true, message: '请输入活动标题' },
         ]
       },
       {
         label: '活动时间',
         name: 'activityTime',
         type: FieldTypes.RangePicker,
-        value: dynamicData.startDate != null ?  [moment(dynamicData.startDate,'YYYY-MM-DD'),moment(dynamicData.endDate,'YYYY-MM-DD')] : null,
+        value: dynamicData.startDate != null ? [moment(dynamicData.startDate, 'YYYY-MM-DD'), moment(dynamicData.endDate, 'YYYY-MM-DD')] : null,
         rules: [
-          {required: true, message: '请选择活动时间'},
+          { required: true, message: '请选择活动时间' },
         ]
       },
       {
@@ -85,7 +90,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         type: FieldTypes.Text,
         value: dynamicData.address,
         rules: [
-          {required: true, message: '请输入活动地点'},
+          { required: true, message: '请输入活动地点' },
         ]
       },
       {
@@ -94,7 +99,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         type: FieldTypes.Text,
         value: dynamicData.enlistNum,
         rules: [
-          {required: true, message: '请输入活动人数'},
+          { required: true, message: '请输入活动人数' },
         ]
       },
       {
@@ -107,24 +112,24 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         label: '是否需要报名',
         name: 'isEnlist',
         render: <Radio.Group name="radiogroup">
-                  <Radio value={1}>是</Radio>
-                  <Radio value={0}>否</Radio>
-                </Radio.Group>,
-        value: dynamicData.isEnlist != null ? dynamicData.isEnlist-0 : 1,
+          <Radio value={1}>是</Radio>
+          <Radio value={0}>否</Radio>
+        </Radio.Group>,
+        value: dynamicData.isEnlist != null ? dynamicData.isEnlist - 0 : 1,
       },
       {
         label: '报名时间',
         name: 'signupTime',
         type: FieldTypes.RangePicker,
-        value: dynamicData.enlistStart != null ?  [moment(dynamicData.enlistStart,'YYYY-MM-DD'),moment(dynamicData.enlistEnd,'YYYY-MM-DD')] : null,
+        value: dynamicData.enlistStart != null ? [moment(dynamicData.enlistStart, 'YYYY-MM-DD'), moment(dynamicData.enlistEnd, 'YYYY-MM-DD')] : null,
         rules: [
-          {required: true, message: '请选择报名时间'},
+          { required: true, message: '请选择报名时间' },
         ]
       },
     ]
-  
-    const handleSubmit = val => { 
-      let {activityTime,signupTime, ...submitValue} = val
+
+    const handleSubmit = val => {
+      let { activityTime, signupTime, ...submitValue } = val
       const [startDate, endDate] = activityTime
       submitValue.startDate = moment(startDate).format('YYYY-MM-DD');
       submitValue.endDate = moment(endDate).format('YYYY-MM-DD');
@@ -132,7 +137,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD');
       submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD');
       console.log('submit data --->', submitValue)
-      if(dynamicId){
+      if (dynamicId) {
         submitValue.dynamicId = dynamicId
         request({
           url: '/api/admin/buildingDynamic/update',
@@ -143,7 +148,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
-      }else{
+      } else {
         request({
           url: '/api/admin/buildingDynamic/add',
           method: 'POST',
@@ -155,16 +160,83 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         })
       }
     }
-    
+
     return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
   }
-  
+
   const Poster = (props) => {
-   return <div>Poster</div>
+
+    return <div style={{ display: 'flex' }}>
+      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+        <div style={{ width: '375px', height: '785px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+
+          <img style={{ width: '100%', height: '300px' }} src="http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg" alt="" />
+
+          <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+            <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src="http://img0.imgtn.bdimg.com/it/u=3463541938,2540701974&fm=26&gp=0.jpg" alt="" />
+            <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+            <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+            <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
+          </div>
+          <p style={{
+            margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+            display: '-webkit-box', lineClamp: '3', height: '60px',
+            WebkitLineClamp: '2',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis'
+          }}>破晓·内容生态下半场的版权到企业高峰论坛会议破晓·内容生态下半场的版权到企业高峰论坛活动</p>
+
+          <img src={yinhao} style={{ width: '30px', marginLeft: '10px' }} alt="" />
+          <p style={{
+            margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+            display: '-webkit-box', lineClamp: '3', height: '76px',
+            WebkitLineClamp: '3',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis'
+          }}>活动描述:破晓·内容生态下半场的版权到企业高峰论坛活动破晓·内容生态下半场的版权到企业高峰论坛活动破晓·内容生态下半场的版权到企业高峰论坛活动</p>
+          <img src={PosterBottom} style={{ width: '100%' }} alt="" />
+        </div>
+        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+      </div>
+      <div></div>
+    </div>
   }
- 
+
   const Share = (props) => {
-    return <div>Share</div>
+    const fields = [
+      {
+        label: '分享模板',
+        name: 'buildingId',
+        render: () => <div style={{ margin: ' 10px 20px' }}>
+          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />知与行互动</p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>置业V客厅 精准获客平台</p>
+          <img style={{ width: '200px', height: '140px' }} src="http://house.china.com.cn/nanjing/UserFiles/20171124/11070256.jpg" alt="" />
+        </div>,
+      },
+      {
+        label: '海报标题',
+        name: 'newsTypeName',
+        type: FieldTypes.Text,
+        value: '',
+        rules: [
+          { required: true, message: '请输入咨询名称' },
+        ]
+      },
+      {
+        label: '类型图',
+        name: 'newsTypeImg',
+        type: FieldTypes.ImageUploader,
+        value: 'newsTypeImg',
+      },
+    ]
+    const handleSubmit = (values) => {
+
+    }
+    return <div>
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    </div>
   }
 
   return (
@@ -177,13 +249,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         </Radio.Group>
       </div>
       <div>
-        { tab === 'basic' && <Basic /> }
-        { tab === 'poster' && <Poster /> }
-        { tab === 'share' && <Share /> }
+        {tab === 'basic' && <Basic />}
+        {tab === 'poster' && <Poster />}
+        {tab === 'share' && <Share />}
       </div>
     </div>
   );
- }
+}
 
 
 

src/pages/building/list/add/components/base.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, InputNumber } from 'antd';
 import moment from 'moment';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
@@ -24,12 +24,6 @@ const formItemLayout = {
 };
 
 function AddBuilding(props) {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
-
-  const [buildingAreaTags, setBuildingAreaTags] = useState({ tags: ['Unremovable', 'Tag 2', 'Tag 3'], inputVisible: false, inputValue: '' })
-
-
   const { getFieldDecorator } = props.form;
 
   function handleSubmit(e) {
@@ -80,7 +74,7 @@ function AddBuilding(props) {
           <Form.Item label="标签" hasFeedback>
             {getFieldDecorator('tags')(
               <Select mode="multiple" placeholder="标签" style={{ width: '1016px' }}>
-              <Option value="未知">未知</Option>
+                <Option value="未知">未知</Option>
               </Select>,
             )}
           </Form.Item>
@@ -172,7 +166,7 @@ function AddBuilding(props) {
             {getFieldDecorator('parkingRate')(<Input />)}
           </Form.Item>
           <Form.Item label="规划户数" hasFeedback>
-            {getFieldDecorator('familyNum')(<Input />)}
+            {getFieldDecorator('familyNum')(<InputNumber />)}
           </Form.Item>
           <Form.Item label="物业公司" hasFeedback>
             {getFieldDecorator('serviceCompany')(<Input />)}
@@ -187,7 +181,7 @@ function AddBuilding(props) {
             {getFieldDecorator('receivedDate')(<DatePicker />)}
           </Form.Item>
           <Form.Item label="产权年限" hasFeedback>
-            {getFieldDecorator('rightsYear')(<Input />)}
+            {getFieldDecorator('rightsYear')(<InputNumber />)}
           </Form.Item>
           <Form.Item label="预售许可证" hasFeedback>
             {getFieldDecorator('decoration')(

src/pages/building/list/add/components/imageSet.jsx

@@ -5,6 +5,7 @@ import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
 import Styles from '../style.less';
 import { router } from 'umi';
+import ModalImage from './modalImage';
 
 
 const saleType = [
@@ -32,6 +33,9 @@ function imageSet(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState([])
 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, apartmentId: '', buildingId: '' })
+
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
     getList()
@@ -46,7 +50,6 @@ function imageSet(props) {
   }
 
   function getList(params) {
-    console.log(props)
     // 网路请求
     const { url, method } = apis.building.buildingApartment
     const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(props.building.buildingId)
@@ -54,7 +57,34 @@ function imageSet(props) {
     request({ url: tempUrl, method, params: { ...params } }).then(res => {
       setData(res)
     }).catch(err => {
-      openNotificationWithIcon('error', err)
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  /**
+   *打开编辑页
+   *
+   * @param {*} record
+   */
+  function showEdi(record) {
+    setVisibleData({ visible: true, apartmentId: record === undefined ? '' : record.apartmentId, buildingId: props.building.buildingId })
+  }
+
+  /**
+   * 删除
+   *
+   * @param {*} record
+   */
+  function deleteApartment(record) {
+    // 网路请求
+    const { url, method } = apis.building.buildingApartmentDelete
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(record.apartmentId)
+
+    request({ url: tempUrl, method }).then(res => {
+      getList()
+      openNotificationWithIcon('error', '操作成功')
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
     })
   }
 
@@ -94,8 +124,8 @@ function imageSet(props) {
       key: 'apartmentId',
       render: (_, record) => (
         <>
-          <Button type="link" style={{ color: 'red' }}>编辑</Button>
-          <Button type="link" style={{ color: 'red' }}>删除</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => showEdi(record)}>编辑</Button>
+          <Button type="link" style={{ color: 'red' }} onClick={() => deleteApartment(record)}>删除</Button>
         </>
       ),
     },
@@ -103,8 +133,12 @@ function imageSet(props) {
 
   return (
     <>
-      <Button type="primary">新增图片库</Button>
+      <Button type="primary" onClick={() => showEdi()}>新增图片库</Button>
       <Table dataSource={data} columns={columns} pagination={false} />
+
+      {/* 编辑页 */}
+      {/*  onSuccess是子组件传递事件信息  */}
+      <ModalImage visibleData={visibleData} key={visibleData.apartmentId} onSuccess={getList}/>
     </>
   )
 }

src/pages/building/list/add/components/modalImage.jsx

@@ -0,0 +1,223 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const { TextArea } = Input;
+
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 2 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+const saleType = [
+  {
+    id: 1,
+    name: '待定',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+]
+
+/**
+ * 图片信息
+ *
+ * @param {*} props
+ * @returns
+ */
+class ModalImage extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = {
+       visibleData: { visible: false, apartmentId: '', buildingId: '' },
+    }
+  }
+
+  // 挂载之后
+  // componentDidMount() {
+  //
+  // }
+
+  componentDidUpdate(preProps, preState) {
+    console.log(this.props.visibleData)
+    if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      this.getById()
+      this.setState({ visibleData: this.props.visibleData });
+    }
+  }
+
+  // 弹框确定按钮
+  // eslint-disable-next-line react/sort-comp
+  handleOk() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  // 弹框取消按钮
+  handleCancel() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  getById(params) {
+    const { apartmentId } = this.props.visibleData
+    if (apartmentId === '' || apartmentId === undefined) {
+      return
+    }
+
+    // 网路请求
+    const { url, method } = apis.building.buildingApartmentGetById
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(apartmentId)
+
+    request({ url: tempUrl, method , params: { ...params } }).then(res => {
+      // res.img = res.buildingImgList.map((item, _) => item.url)
+      res.img = res.buildingImgList[0].url
+      this.props.form.setFieldsValue(res)
+    }).catch(err => {
+     this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  };
+
+  // 提交
+  handleSubmit(e) {
+    e.preventDefault();
+    this.props.form.validateFields((err, values) => {
+      if (!err) {
+        this.submitData(values)
+      }
+    });
+  }
+
+  submitData(data) {
+    // TODO 这里应该是要支持多图，但是封装的控件没有
+    data.img = [{ imgType: 'aparment', url: data.img, orderNo: 1 }]
+    data.buildingId = this.props.visibleData.buildingId;
+    const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
+
+    // 网路请求
+    request({ ...api, data: { ...data } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('success', '操作成功')
+
+      // 传递父组件事件
+      // onSuccess() 是自定义
+      this.props.onSuccess()
+
+      this.handleCancel()
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      this.openNotificationWithIcon('error', err)
+    })
+  }
+
+  /**
+   * 取消按钮
+   *
+   * @memberof ModalImage
+   */
+  closeModal() {
+    this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } })
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+    return (
+      <>
+        <Modal
+            title="图片信息"
+            width={1100}
+            destroyOnClose="true"
+            footer={null}
+            visible={this.state.visibleData.visible}
+            onOk={() => this.handleOk()}
+            onCancel={e => this.handleCancel(e)}
+          >
+            <Form {...formItemLayout} onSubmit={e => this.handleSubmit(e)}>
+              <Form.Item label="编号" style={{ display: 'none' }}>
+                  {getFieldDecorator('apartmentId')(<Input />)}
+              </Form.Item>
+              <Form.Item label="名称">
+                {getFieldDecorator('apartmentName')(<Input />)}
+              </Form.Item>
+              <Form.Item label="类型">
+                {getFieldDecorator('apartmentType')(
+                  <Select placeholder="类型">
+                    <Option value="apart">户型</Option>
+                    <Option value="photo">相册</Option>
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item label="销售状态">
+                {getFieldDecorator('marketStatus')(
+                  <Select placeholder="销售状态">
+                    {
+                      saleType.map((item, _) => <Option value={item.id}>{item.name}</Option>)
+                    }
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item label="图片">
+              {getFieldDecorator('img')(
+                <ImageUpload />,
+              )}
+              </Form.Item>
+              <Form.Item label="面积">
+                {getFieldDecorator('buildingArea')(<Input />)}
+              </Form.Item>
+              <Form.Item label="套内面积">
+                {getFieldDecorator('insideArea')(<Input />)}
+              </Form.Item>
+              <Form.Item label="户型总价">
+                {getFieldDecorator('apartmentPrice')(<Input />)}
+              </Form.Item>
+              <Form.Item label="户型简介">
+                {getFieldDecorator('apartmentDescription')(
+                  <Wangedit />,
+                )}
+              </Form.Item>
+              <Form.Item label="备注">
+                {getFieldDecorator('remark')(<TextArea rows={10} />)}
+              </Form.Item>
+              <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
+                <Button type="primary" htmlType="submit">保存</Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => this.closeModal()}>取消</Button>
+              </Form.Item>
+            </Form>
+        </Modal>
+      </>
+    );
+  }
+}
+
+const WrappedModalImageForm = Form.create({ name: 'modalImage' })(ModalImage);
+
+export default WrappedModalImageForm

src/pages/building/list/add/components/tags.jsx

@@ -45,7 +45,7 @@ class EditableTagGroup extends React.Component {
         {tags.map((tag, index) => {
           const isLongTag = tag.length > 20;
           const tagElem = (
-            <Tag key={tag} closable={index !== 0} onClose={() => this.handleClose(tag)}>
+            <Tag key={tag} closable onClose={() => this.handleClose(tag)}>
               {isLongTag ? `${tag.slice(0, 20)}...` : tag}
             </Tag>
           );

src/pages/building/list/index.jsx

@@ -201,12 +201,12 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+          <Button type="primary" htmlType="submit">
             搜索
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={Styles.addButton} onClick={() => toAdd()}>
+      <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
         新增楼盘
       </Button>
 

src/pages/building/list/style.css

@@ -10,7 +10,6 @@
   border: 1px solid #dbdbdb;
 }
 .addButton {
-  background: #50be00;
   border-radius: 4px;
   border: 0px;
   margin: 10px 0px;

src/pages/building/list/style.less

@@ -10,7 +10,6 @@
   border: 1px solid #dbdbdb;
 }
 .addButton {
-  background: #50be00;
   border-radius: 4px;
   border: 0px;
   margin: 10px 0px;

src/pages/building/list/style.wxss

@@ -10,7 +10,6 @@
   border: 1px solid #dbdbdb;
 }
 .addButton {
-  background: #50be00;
   border-radius: 4px;
   border: 0px;
   margin: 10px 0px;

src/pages/channel/brokerList.jsx

@@ -54,7 +54,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
-    render: (text, list) => <a style={ { color: '#66B3FF' } } >{ list.sex === 1 ? '男' : '女' }</a>,
+    render: (text, list) => <a>{ list.sex === 1 ? '男' : '女' }</a>,
   },
   {
     title: '推荐客户',

src/pages/channel/channelList.jsx

@@ -59,20 +59,20 @@ const columns = [
   },
   {
     title: '经纪人数',
-    dataIndex: 'agentsNum',
-    key: 'agentsNum',
+    dataIndex: 'brokerCount',
+    key: 'brokerCount',
     align: 'center',
   },
   {
     title: '推荐客户有效',
-    dataIndex: 'recommendEffective',
-    key: 'recommendEffective',
+    dataIndex: 'recommendCount',
+    key: 'recommendCount',
     align: 'center',
   },
   {
     title: '邀请经济人',
-    dataIndex: 'agentsInvite',
-    key: 'agentsInvite',
+    dataIndex: 'inviteCount',
+    key: 'inviteCount',
     align: 'center',
   },
   {

src/pages/channel/editChannel.jsx

@@ -27,7 +27,6 @@ const header = props => {
 
   // 编辑
   function editChannel(data) {
-    alert(1111111)
       request({
         url: `/api/admin/channel/${props.location.query.id}`,
         method: 'PUT',
@@ -48,6 +47,11 @@ const header = props => {
       }
     });
   }
+  function go() {
+    router.push({
+      pathname: '/channel/channelList',
+    });
+  }
 
   const { getFieldDecorator } = props.form;
 
@@ -77,7 +81,7 @@ const header = props => {
           <Button type="primary" htmlType="submit">
             保存
           </Button>
-          <Button className={channels.formButton} onClick = {() => router.go(-1)} type="primary" htmlType="submit">
+          <Button className={channels.formButton} onClick = { go } type="primary" htmlType="submit">
             取消
           </Button>
         </Form.Item>

src/services/apis.js

@@ -26,6 +26,22 @@ export default {
       method: 'GET',
       url: `${prefix}/buildingApartment/buildingId/id`,
     },
+    buildingApartmentGetById: {
+      method: 'GET',
+      url: `${prefix}/buildingApartment/id`,
+    },
+    buildingApartmentUpdate: {
+      method: 'PUT',
+      url: `${prefix}/buildingApartment/update`,
+    },
+    buildingApartmentAdd: {
+      method: 'POST',
+      url: `${prefix}/buildingApartment/add`,
+    },
+    buildingApartmentDelete: {
+      method: 'DELETE',
+      url: `${prefix}/apartment/deleted/id`,
+    },
   },
   buildingType: {
     getList: {