zzzz

config/config.js

@@ -23,11 +23,11 @@ const plugins = [
         // default true, when it is true, will use `navigator.language` overwrite default
         baseNavigator: true,
       },
-      // dynamicImport: {
-      //   loadingComponent: './components/PageLoading/index',
-      //   webpackChunkName: true,
-      //   level: 3,
-      // },
+      dynamicImport: {
+        loadingComponent: './components/PageLoading/index',
+        webpackChunkName: true,
+        level: 3,
+      },
       pwa: pwa
         ? {
           workboxPluginMode: 'InjectManifest',
@@ -329,8 +329,21 @@ export default {
                   name: '报表',
                   component: './indexEcharts/index',
                 },
-                
-
+                {
+                  path: '/system/intention',
+                  name: '意向值',
+                  component: './system/intention',
+                },
+                {
+                  path: '/system/housingPolicy',
+                  name: '购房政策维护',
+                  component: './system/housingPolicy',
+                },
+                {
+                  path: '/system/editPolicy',
+                  name: '',
+                  component: './system/editPolicy',
+                },
               ],
             },
             {

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -29,7 +29,7 @@ class AvatarDropdown extends React.Component {
     const {
       currentUser = {
         avatar: '',
-        name: '',
+        userName: '',
       },
       menu,
     } = this.props;
@@ -55,11 +55,11 @@ class AvatarDropdown extends React.Component {
         </Menu.Item>
       </Menu>
     );
-    return currentUser && currentUser.name ? (
+    return currentUser && currentUser.userName ? (
       <HeaderDropdown overlay={menuHeaderDropdown}>
         <span className={`${styles.action} ${styles.account}`}>
           <Avatar size="small" className={styles.avatar} src={currentUser.avatar} alt="avatar" />
-          <span className={styles.name}>{currentUser.name}</span>
+          <span className={styles.name}>{currentUser.userName}</span>
         </span>
       </HeaderDropdown>
     ) : (

src/components/SelectButton/BuildSelect.jsx

@@ -13,6 +13,7 @@ const { Option } = Select;
  */
 const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
+  const [ value, setValue ] = useState(props.value)
 
   useEffect(() => {
     getCityList();
@@ -28,8 +29,13 @@ const BuildingSelect = (props) => {
     })
   }
 
+  const handleChange = (e) => {
+    setValue(e)
+    props.onChange(e)
+  }
+
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择项目" onChange={props.onChange}>
+      <Select value={value} style={{ width: '180px' }} placeholder="请选择项目" onChange={handleChange}>
           {data.map(building => (
             <Option key={building.buildingId}>{building.buildingName}</Option>
           ))}

src/components/SelectButton/NewTypeSelect.jsx

@@ -29,7 +29,7 @@ const NewsTypeSelect = (props) => {
   }
 
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择咨询类型" onChange={props.onChange}>
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择讯类型" onChange={props.onChange}>
           {data.map(type => (
             <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
           ))}

src/components/XForm/ImageUpload.jsx

@@ -34,10 +34,10 @@ class ImageUpload extends React.Component {
     }
   };
 
-  render () {
+  render() {
     const uploadButton = (
       <div>
-        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />        
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"} />
       </div>
     );
 
@@ -56,8 +56,8 @@ class ImageUpload extends React.Component {
         {(this.state.imageUrl || value) ? (
           <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />
         ) : (
-          uploadButton
-        )}
+            uploadButton
+          )}
       </Upload>
     );
   }

src/models/login.js

@@ -36,7 +36,6 @@ const Model = {
       }
 
       yield put(routerRedux.replace(redirect || '/'));
-      
     },
 
     *getCaptcha({ payload }, { call }) {
@@ -60,7 +59,7 @@ const Model = {
   },
   reducers: {
     changeLoginStatus(state, { payload }) {
-      setAuthority('admin');
+      setAuthority((payload.user.roles || []).map(x => x.roleId));
       return { ...state, status: 'ok', type: payload.type };
     },
   },

src/models/user.js

@@ -5,6 +5,7 @@ const UserModel = {
   namespace: 'user',
   state: {
     currentUser: {},
+    menuList: [],
   },
   effects: {
     // *fetch(_, { call, put }) {
@@ -25,8 +26,8 @@ const UserModel = {
     },
   },
   reducers: {
-    saveCurrentUser(state, action) {
-      return { ...state, currentUser: action.payload || {} };
+    saveCurrentUser(state, { payload = {} }) {
+      return { ...state, currentUser: payload.taUser || {}, menuList: payload.menuList || [] };
     },
     changeNotifyCount(
       state = {

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, Upload } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
@@ -8,37 +8,47 @@ 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';
+import touxiang from '../../assets/touxiang.jpg';
+import poster1 from '../../assets/poster1.png';
+import poster2 from '../../assets/poster2.png';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
 /**
  *
  *
  * @param {*} props
  * @returns
  */
- const Edit = (props) => {
-  const [ tab, changeTab ] = useState('basic')
+const Edit = (props) => {
+  const [tab, changeTab] = useState('poster')
+  // 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 +62,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         render: <BuildSelect />,
         value: dynamicData.buildingId,
         rules: [
-          {required: true, message: '请选择所属项目'},
+          { required: true, message: '请选择所属项目' },
         ]
       },
       {
@@ -67,16 +77,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 +95,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         type: FieldTypes.Text,
         value: dynamicData.address,
         rules: [
-          {required: true, message: '请输入活动地点'},
+          { required: true, message: '请输入活动地点' },
         ]
       },
       {
@@ -94,7 +104,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         type: FieldTypes.Text,
         value: dynamicData.enlistNum,
         rules: [
-          {required: true, message: '请输入活动人数'},
+          { required: true, message: '请输入活动人数' },
         ]
       },
       {
@@ -107,24 +117,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 +142,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 +153,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 +165,103 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         })
       }
     }
-    
+
     return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
   }
-  
+
   const Poster = (props) => {
-   return <div>Poster</div>
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    return <div>
+      <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={imgValue ? imgValue : poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} 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'
+            }}>{inputValue ? inputValue : '海报标题'}</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'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+            <img src={PosterBottom} style={{ width: '100%' }} alt="" />
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+        </div>
+
+        <div >
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+            <ImageUploader onChange={e => changeImg(e)} />
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+            <Input style={{ width: '20vw' }} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          </div>
+          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+            <TextArea rows={5} onChange={e => changeTextArea(e.target.value)} />
+          </div>
+
+        </div>
+      </div>
+      <Button type="primary" onClick={() => router.go(-1)} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
+
   }
- 
+
+
+
   const Share = (props) => {
-    return <div>Share</div>
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    // const changeInputValue = e => {
+    //   changeInput(e.target.value)
+    // }
+
+    // const handleSubmit = (values) => {
+
+    // }
+
+    return <div style={{ padding: '20px' }}>
+      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+        <div>
+          <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' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+          <img style={{ width: '200px', height: '140px' }} src={imgValue ? imgValue : poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+        <Input placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+        <ImageUploader onChange={e => changeImg(e)} />
+      </div>
+      <Button type="primary" htmlType="submit" style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
   }
 
   return (
@@ -177,13 +274,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/InviteClients.jsx

@@ -37,6 +37,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
+    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
   },
 ];
 const header = props => {

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: '推荐客户',
@@ -155,7 +155,7 @@ const header = props => {
 return (
   <>
     <div className={ channels.searchBox }>
-      <div>
+      <div style = {{ marginLeft: '-5px' }}>
         <span className={ channels.selectName }>姓名</span>
         <Input onChange = { onInputChangePhone } style ={{ width: 150 }} />
         <span className={ channels.selectName }>电话</span>
@@ -163,7 +163,7 @@ return (
       </div>
       <div>
       <Button type="primary" onClick={() => queryList() }>查询</Button>
-      <Button onClick={() => refurbishList() }>重置</Button>
+      {/* <Button onClick={() => refurbishList() }>重置</Button> */}
     </div>
     </div>
     <Table dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />

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',
   },
   {
@@ -168,10 +168,10 @@ const header = props => {
         </dvi>
         <div >
         <Button type="primary" onClick={() => queryList() }>查询</Button>
-        <Button onClick={() => reset() }>重置</Button>
+        {/* <Button onClick={() => reset() }>重置</Button> */}
         </div>
       </div>
-      <Button type="danger" onClick={toAdd}>新增</Button>
+      <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
       <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
   </>
   )

src/pages/channel/channelList.less

@@ -32,13 +32,12 @@
 .about {
   padding: 0 30px;
   height: 36px;
-  background-color:rgba(255,255,255,1);
-  color: #fff;
   margin: 30px 0;
+  margin-left:8px;
 }
 
 .selectName {
-  font-size: 17px;
+  font-size: 14px;
   padding: 0 10px;
   height: 36px;
   color: rgb(10, 10, 10);
@@ -62,3 +61,8 @@
   float: 'left'; 
   width: 500
 }
+.brokerTable{
+  padding: 0 30px;
+  height: 36px;
+  margin: 30px 0;
+}

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/pages/channel/recommendClients.jsx

@@ -70,6 +70,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
+    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
   },
   {
     title: '意向项目',

src/pages/customer/independentList/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, notification } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, notification, Modal } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';

src/pages/news/list/NewsList.jsx

@@ -63,7 +63,7 @@ function body(props) {
   }
 
   // 跳转到编辑资讯列表
-  const toEditList = (id) => ()  => {
+  const toEditList = (id) => () => {
     router.push({
       pathname: '/news/list/editNewsList',
       query: {
@@ -74,153 +74,145 @@ function body(props) {
 
 
 
-/**
- *卡片
- *
- * @returns
- */
-function CartBody(props) {
-  const { data } = props
-  console.log(data);
-  const cancelPage = () =>{
-    router.push({
-      pathname: '/news/list/NewsList',
-    });
-  }
-
-  //删除资讯
-  const changeNewsListStatus = (newsId) => () => {
-    Modal.confirm({
-      title: '确认删除该资讯？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({
-          url: '/api/admin/taNews/' + newsId,
-          method: 'DELETE',
-          // data: { ...row },
-        }).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
-        })
-      }
-    });
-  }
-
-  // 跳转到编辑资讯列表
-  const toEditList = (newsId) => ()  => {
-    router.push({
-      pathname: '/news/list/editNewsList',
-      query: {
-        newsId
-      },
-    });
-  } 
+  /**
+   *卡片
+   *
+   * @returns
+   */
+  function CartBody(props) {
+    const { data } = props
+    console.log(data);
+    const cancelPage = () => {
+      router.push({
+        pathname: '/news/list/NewsList',
+      });
+    }
 
-  function cancelRelease (newsId, newsStatus, buildingId,newsTypeId) {
-    console.log("newsId" + newsId + "status" + newsStatus);
-    if (newsStatus === 1){
+    //删除资讯
+    const changeNewsListStatus = (newsId) => () => {
       Modal.confirm({
-        title: '确认取消该资讯？',
+        title: '确认删除该资讯？',
         okText: '确认',
         cancelText: '取消',
-        onOk () {
+        onOk() {
           request({
             url: '/api/admin/taNews/' + newsId,
-            method: 'PUT',
-            data: { "newsStatus": newsStatus, "buildingId":buildingId, "newsTypeId":newsTypeId },
+            method: 'DELETE',
+            // data: { ...row },
           }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10 });
           })
-        },
-        onCancel () {
-          console.log('Cancel');
-        },
+        }
       });
-    }else if (newsStatus === 0){
-      Modal.confirm({
-        title: '确认发布该资讯？',
-        okText: '确认',
-        cancelText: '取消',
-        onOk () {
-          request({
-            url: '/api/admin/taNews/' + newsId,
-            method: 'PUT',
-            data: { "newsStatus": newsStatus, "buildingId":buildingId, "newsTypeId":newsTypeId },
-          }).then((data) => {
-            message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10 });
-          })
-        },
-        onCancel () {
-          console.log('Cancel');
+    }
+
+    // 跳转到编辑资讯列表
+    const toEditList = (newsId) => () => {
+      router.push({
+        pathname: '/news/list/editNewsList',
+        query: {
+          newsId
         },
       });
-    }  
-  }
+    }
 
-  return (
-          <Card
-            hoverable
-            style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-            cover={<img alt="example" src={ data.newsImg } style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
-            bodyStyle={{ padding: '10px 20px' }}
-          >
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>资讯类型</span>
-              <span >：{ data.newsType.newsTypeName }</span>
-              <span className={Styles.ediText} onClick={toEditList(data.newsId)}>
-                编辑
+    function cancelRelease(newsId, newsStatus, buildingId, newsTypeId) {
+      console.log("newsId" + newsId + "status" + newsStatus);
+      if (newsStatus === 1) {
+        Modal.confirm({
+          title: '确认取消该资讯？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({
+              url: '/api/admin/taNews/' + newsId,
+              method: 'PUT',
+              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
+            }).then((data) => {
+              message.info('操作成功！')
+              getList({ pageNum: 1, pageSize: 10 });
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      } else if (newsStatus === 0) {
+        Modal.confirm({
+          title: '确认发布该资讯？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({
+              url: '/api/admin/taNews/' + newsId,
+              method: 'PUT',
+              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
+            }).then((data) => {
+              message.info('操作成功！')
+              getList({ pageNum: 1, pageSize: 10 });
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      }
+    }
+
+    return (
+      <Card
+        hoverable
+        style={{ height: '255px', minWidth: '640px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)', position: 'relative' }}
+        cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '260px', height: '253px' }}></img>}
+        bodyStyle={{ padding: '10px 20px' }}
+      >
+        <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: '18px', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
+          编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-              </span>
-            </p>
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>状态</span>
-              <span >：{ data.newsStatus == 0 ? "已发布" : "未发布" }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>阅读数量</span>
-              <span > ：{ data.pvNum }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>转发数量</span>
-              <span>：{ data.shareNum }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>点赞数量</span>     
-              <span >：{ data.favorNum }</span>         
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>收藏数量</span>
-              <span >：{ data.saveNum }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>录入时间</span>
-              <span >：{ data.createDate }</span>
-            </p>
-            <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
-              {data.newsStatus === 0 ? 
-              <span style={{ color: '#1990FF' }} onClick={cancelRelease.bind(this,data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
-              取消发布
+        </span>
+        {data.newsStatus === 0 ?
+          <span style={{ position: 'absolute', left: '280px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+            取消发布
               <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>:
-              <span style={{ color: '#1990FF' }} onClick={cancelRelease.bind(this,data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
-              发布
+          </span> :
+          <span style={{ position: 'absolute', left: '280px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+            发布
               <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-              }
-              
-              <span style={{
-                color: '#FF4A4A', position: 'absolute', right: '0',
-              }} onClick={changeNewsListStatus(data.newsId)}>
-                删除
+          </span>
+        }
+
+        <span style={{ position: 'absolute', right: '20px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
+          删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-            </p>
-          </Card>
-  )
-}
+        </span>
+        <div style={{ position: 'absolute', left: '260px', top: '0px', padding: '20px' }}>
+          <p style={{
+            fontSize: '18px', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+            width: '300px',
+          }}>{data.newsName}</p>
+          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+            <span style={{ display: 'inline-block', width: '190px' }}>咨询类型：{data.newsType.newsTypeName}</span>
+            <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
+          </p>
+
+          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+            <span style={{ display: 'inline-block', width: '190px' }}>阅读数量：{data.pvNum}</span>
+            <span>转发数量：{data.shareNum}</span>
+          </p>
+
+          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+            <span style={{ display: 'inline-block', width: '190px' }}>点赞数量：{data.favorNum}</span>
+            <span>收藏数量：{data.saveNum}</span>
+          </p>
+
+          <p style={{ fontSize: '18px', color: '#999', marginBottom: '10px' }}>发布时间：{data.createDate}</p>
+        </div>
+      </Card>
+    )
+  }
 
 
   // Change 事件
@@ -232,7 +224,7 @@ function CartBody(props) {
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 6 })
+    getList({ pageNum: pageNumber, pageSize: 6 })
   }
 
   function getDate(value, dateString) {
@@ -246,27 +238,27 @@ function CartBody(props) {
 
         <Form.Item>
           {getFieldDecorator('cityId')(
-            <SelectCity />,  
+            <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('buildingId')(
-              <BuildSelect />,
-            )}
+            <BuildSelect />,
+          )}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('title')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="请输入标题"
             />,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('newsTypeId')(
             <NewsTypeSelect />,
           )}
-        </Form.Item>       
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('newsStatus')(
             <Select style={{ width: '180px' }} placeholder="状态">
@@ -276,12 +268,12 @@ function CartBody(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={toEditList()}>
+      <Button type="danger" style={{ padding: '0 40px', margin: '20px 0' }} onClick={toEditList()}>
         新增
       </Button>
 
@@ -289,10 +281,10 @@ function CartBody(props) {
       <Row style={{ padding: ' 0 10px' }}>
         {
           dataSource.records.map((item, index) => (
-              <Col span={8}>
-                <CartBody data={item} key={item.buildingId}/>
-              </Col>
-            ))
+            <Col span={12}>
+              <CartBody data={item} key={item.buildingId} />
+            </Col>
+          ))
         }
       </Row>
       {/* 分页 */}

src/pages/system/editPolicy.jsx

@@ -0,0 +1,115 @@
+import React, { useState, useEffect } from 'react';
+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';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import SelectCity from '../../components/SelectButton/CitySelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import request from '../../utils/request'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const policyId = props.location.query.policyId
+  const [ policyData, setPolicyData ] = useState({})
+  if(policyId){
+    useEffect(() => {
+      getPolicyData(policyId);
+    },[])
+
+  // 查询列表
+  const getPolicyData = (policyId) => {
+    request({
+        url: '/api/admin/taPolicy/' + policyId,
+        method: 'GET',
+    }).then((data) => {
+        console.log(data)
+        setPolicyData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/system/housingPolicy',
+    });
+  }
+    const fields = [
+      {
+        label: '城市',
+        name: 'cityId',
+        render: <SelectCity />,
+        value: policyData.cityId,
+      },
+      {
+        label: '政策图片',
+        name: 'policyImg',
+        type: FieldTypes.ImageUploader,
+        value: policyData.policyImg,
+      },
+      {
+        label: '政策标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: policyData.title,
+      },
+      {
+        label: '政策详情',
+        name: 'body',
+        render: <Wangedit />,
+        value: policyData.body,
+      },
+      {
+        label: '状态',
+        name: 'publishStatus',
+        type: FieldTypes.Select,
+        dict: [{label:"未发布",value:0},{label:"已发布",value:1}],
+        value: policyData.publishStatus != null ? policyData.publishStatus : 1,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      console.log('submit data --->', val)
+      if(policyId){
+        val.policyId = policyId
+        request({
+          url: '/api/admin/taPolicy/'+policyId,
+          method: 'PUT',
+          data: val,
+        }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/taPolicy',
+          method: 'POST',
+          data: val,
+        }).then((data) => {
+          message.info("保存成功")
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+     
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+ }
+
+
+
+export default Edit

src/pages/system/housingPolicy.jsx

@@ -0,0 +1,202 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../components/SelectButton/CitySelect'
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = (props) => {
+  const [ data, setData ] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10,cityId: '' });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/taPolicy',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  
+// 跳转到编辑商品
+const toEditPolicy = (policyId) => () => {
+    router.push({
+      pathname: '/system/editPolicy',
+      query: {
+        policyId
+      },
+    });
+  }
+  
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  
+  const columns = [
+    {
+      title: '购房政策主图',
+      dataIndex: 'policyImg',
+      key: 'policyImg',
+      align: 'center',
+      render: (policyImg) => <img src={policyImg} className={styles.touxiang} />,
+    },
+    {
+      title: '标题',
+      dataIndex: 'title',
+      key: 'title',
+      align: 'center',
+    },
+    {
+      title: '城市',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (createDate) => <><span>{moment(createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'publishStatus',
+      key: 'publishStatus',
+      align: 'center',
+      render: (publishStatus)=> <><span>{publishStatus === 1 ? '已发布' : '未发布' }</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => <>
+                           <span style={{ color: '#1990FF' }} onClick={publicOrNoPublic(row)}>{ row.publishStatus === 0 ? '发布' : '取消发布' }<Icon type="close-circle" className={styles.edit} /></span>
+                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topPolicy(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEditPolicy(row.policyId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={deletePolicy(row.policyId)}>删除<Icon type="form" className={styles.edit} /></span>
+                         </>
+    },
+  ];
+  
+  // 删除
+const deletePolicy = (policyId) => () => {
+  Modal.confirm({
+    title: '是否继续删除此政策?',
+    okText: '确定',
+    cancelText: '取消',
+    onOk() {
+        request({
+            url: '/api/admin/taPolicy/'+policyId,
+            method: 'DELETE',
+        }).then((data) => {
+            message.info('操作成功！')
+            getList({ pageNum: 1, pageSize: 10,cityId: '' });
+        }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+        })
+    },
+  });
+}
+
+
+//   置顶
+  const topPolicy = (row) => () => {
+      const weight = Math.abs(row.weight - 1)
+      row.weight = weight
+      request({
+          url: '/api/admin/taPolicy/'+row.policyId,
+          method: 'PUT',
+          data: row,
+      }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10,cityId: '' });
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  const publicOrNoPublic = (row) => () => {
+      if (row.publishStatus === 1) {
+        row.publishStatus = 0
+      } else {
+        row.publishStatus = 1
+      }
+
+      request({
+        url: '/api/admin/taPolicy/'+row.policyId,
+        method: 'PUT',
+        data: row,
+      }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10,cityId: '' });
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+  }
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10 })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
+      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/system/intention.jsx

@@ -0,0 +1,96 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox,Row, Col } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import request from '../../utils/request'
+import SelectCity from '../../components/SelectButton/CitySelect'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+ const Edit = (props) => {
+  const [ data, setData ] = useState([])
+  const [ buildingIdValue, setBuildingIdData ] = useState('')
+
+  const changBuilding = (buildingId) => {
+    setBuildingIdData(buildingId)
+    request({
+      url: '/api/admin/tdBizEventIntention',
+      method: 'GET',
+      params: {pageNum: 1, pageSize: 999,buildingId}
+    }).then((data) => {
+      console.log(data)
+      setData(data.records)
+    })
+  }
+
+  const changeBox = (x) => (e) => {
+    setData(data.map((item) => {
+      return x.eventId === item.eventId ? {...item, checkbox: e.target.checked} : item
+    }))
+  }
+
+  const changeInput = (x) => (e) => {
+    setData(data.map((item) => {
+      return x.eventId === item.eventId ? {...item, intention: e.target.value} : item
+    }))
+  }
+
+  const submitValue = () => {
+    console.log(buildingIdValue)
+    if(buildingIdValue === ''){
+      return
+    }
+    request({
+      url: '/api/admin/taBuildingIntentionAddOrUpdate/' + buildingIdValue,
+      method: 'POST',
+      data
+    }).then((data) => {
+      message.info("保存成功")
+    })
+  }
+
+  return (
+    <>
+    <Row>
+      <Col span={12}>
+        <BuildSelect onChange={changBuilding}/>
+      </Col>
+    </Row>
+    <Row>
+      <Col span={3} offset={3}>
+        用户操作
+      </Col>
+      <Col span={3} offset={3}>
+        意向值
+      </Col>
+    </Row>
+    {data.map((x) => {
+      return <Row>
+                <Col span={3} offset={3}>
+                  <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
+                </Col>
+                <Col span={3} offset={3}>
+                  <Input value={x.intention} onChange={changeInput(x)}/>
+                </Col>
+              </Row>
+    })}
+    <Row>
+      <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
+    </Row>
+    </>
+  );
+ }
+
+
+
+export default Edit

src/pages/system/report.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox,Row, Col  } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
@@ -62,7 +62,9 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   return (
     <>
-      <Checkbox.Group options={data} value={checkData} onChange={onChange} />
+      <Row>
+        <Checkbox.Group options={data} value={checkData} onChange={onChange} />
+      </Row>
       <Button type="primary" className={styles.searchBtn} onClick={saveCheckedReport}>提交</Button>
     </>
   );

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: {

src/utils/mixStr.js

@@ -0,0 +1,31 @@
+
+const fill2Len = (str, len) => {
+  if (!str) {
+    return '*'.repeat(len)
+  }
+
+  const orginLen = str.length
+  if (len <= orginLen) {
+    return str.substr(0, len)
+  }
+
+  return str.repeat(Math.floor(len / orginLen)) + str.substr(0, len % orginLen)
+}
+
+const mixChars = window.navigator.userAgent + (new Date).toUTCString().replace(/\d{2}:\d{2}:\d{2}/, '')
+
+const strXOR = (str, mix) => {
+  if (!str) return str
+
+  const strLen = str.length
+  const mixStr = fill2Len(mix, strLen)
+
+  const result = []
+  for (let i = 0; i < strLen; i ++) {
+    result.push(String.fromCharCode(str.charCodeAt(i) ^ mixStr.charCodeAt(i)))
+  }
+
+  return result.join('')
+}
+
+export default str => strXOR(str, mixChars)

src/utils/request.js

@@ -4,6 +4,9 @@
  */
 import request from 'umi-request';
 import { notification } from 'antd';
+import apis from '../services/apis';
+import mixStr from './mixStr';
+
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -25,18 +28,18 @@ const codeMessage = {
 const replaceURLParams = (url, params = {}) => {
   return Object.keys(params).reduce((acc, k) => { // 此方法对每个元素进行处理
     const re = new RegExp(`:${k}(?!w)`, 'i')
-    return acc.replace(re, args[k])
+    return acc.replace(re, params[k])
   }, url)
 }
 
 request.interceptors.request.use((url, options) => {
   const { urlData, headers = {}, logout = false, data, ...opts } = options
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
-  const token = window.localStorage.getItem('x-token')
+  const token = mixStr(window.localStorage.getItem('test-foobar'))
   const authHeader = token ? { Authorization: `Bearer ${token}` } : {}
 
   if (logout) {
-    window.localStorage.removeItem('x-token')
+    window.localStorage.removeItem('test-foobar')
   }
 
   return (
@@ -79,7 +82,7 @@ request.interceptors.response.use(async (response, options) => {
       }
 
       if (data && data.token) {
-        window.localStorage.setItem('x-token', data.token)
+        window.localStorage.setItem('test-foobar', mixStr(data.token))
       }
 
       return data;
@@ -92,6 +95,9 @@ request.interceptors.response.use(async (response, options) => {
   }
 });
 
+
+const fetch = api => options => request(api.url, {...api, ...options || {}})
+
 export default config => {
   if (typeof config === 'string') {
     return request(config);
@@ -100,3 +106,5 @@ export default config => {
     return request(url, options);
   }
 };
+
+export { fetch, apis }