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

config/config.js

@@ -375,6 +375,21 @@ export default {
                   name: '报表数据',
                   component: './system/report',
                 },
+                {
+                  path: '/system/intention',
+                  name: '意向值',
+                  component: './system/intention',
+                },
+                {
+                  path: '/system/housingPolicy',
+                  name: '购房政策维护',
+                  component: './system/housingPolicy',
+                },
+                {
+                  path: '/system/editPolicy',
+                  name: '',
+                  component: './system/editPolicy',
+                },
               ],
             },
             {
@@ -440,7 +455,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://127.0.0.1:8080/',
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

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/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/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

@@ -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

@@ -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/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/staff/list/editRole.jsx

@@ -1,8 +1,15 @@
-import React from 'react';
-import { Form, Input, Button, Icon, Select } from 'antd';
+import React, { useState } from 'react';
+
+import { Checkbox, Row, Col, Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, DatePicker, Select, Form, Alert, Card } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import channels from './channelList.less';
+
+import Tagss from '../components/Tagss.jsx';
 
+const { TextArea } = Input;
 
 
 /**
@@ -11,17 +18,226 @@ import styles from '../../style/GoodsList.less';
  * @param {*} props
  * @returns
  */
+const Edit = (props) => {
+
+
+
+  // const [tab, changeTab] = useState('basic')
+
+  const Permission = [
+    '项目管理',
+    '员工管理',
+    '客户管理',
+    '系统管理',
+    '渠道管理',
+    '轮播图管理',
+    '资讯管理',
+    '活动管理',
+    '积分商城',
+    '首页数据',
+  ]
+
+  // const Basic = (props) => {
+
+  //   const dataSource = [
+
+
+  //     {
+  //       name: '员工管理',
+  //       per: [
+  //         '111111',
+  //         '22222',
+  //         '33333',
+  //       ]
+  //     },
+  //     {
+  //       name: '角色管理',
+  //       per: [
+  //         '444',
+  //         '555',
+  //         '666',
+  //       ]
+  //     },
+  //   ];
+
+  //   const columns = [
+  //     // {
+  //     //   title: '商品图片',
+  //     //   dataIndex: 'img',
+  //     //   key: 'img',
+  //     //   align: 'center',
+
+  //     //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+  //     // },
+  //     {
+  //       title: '员工管理',
+  //       dataIndex: 'name',
+  //       key: 'name',
+  //       align: 'left',
+  //       render: text => <a>{text}</a>,
+  //     },
+
+  //     {
+  //       // title: '操作  ',
+  //       dataIndex: 'status',
+  //       key: 'per',
+  //       align: 'left',
+  //       render: () => <>
+  //         {/* {pre.map((item,index)=>(
+  //       <Checkbox>{item[index]}</Checkbox>
+
+
+  //               ))} */}
+  //       </>,
+  //     },
+  //   ];
+  //   return <Table dataSource={dataSource} columns={columns} />
+
+
+
+
+  // }
+  // const [Card] = useState('Poster')
+
+  const Poster = (props) => {
+
+    const dataSource = [
+
+
+      {
+        name: '员工管理',
+        per: [
+          '111111',
+          '22222',
+          '33333',
+        ]
+      },
+      {
+        name: '角色管理',
+        per: [
+          '444',
+          '555',
+          '666',
+        ]
+      },
+    ];
+
+
+    const gridStyle1 = {
+      width: '20%',
+      textAlign: 'left',
+    };
+    const gridStyle2 = {
+      width: '80%',
+      textAlign: 'left',
+    };
 
+{/* <Checkbox>{Permission[index]}</Checkbox> */}
+    return <>
+      <div style={{}}>
 
-function header(props) {
-  const { getFieldDecorator } = props.form
-  return (
+        {Permission.map((item, index) => (
 
-    <>
-     <div>编辑角色</div>
+
+          <Card title={<Checkbox>{Permission[index]}</Checkbox>} bordered={true} style={{ width: '100%' }}>
+            
+              {dataSource.map((items, indexs) => (
+              <>
+                <Card.Grid style={gridStyle1}><Checkbox>{items.name}</Checkbox></Card.Grid>
+                
+                <Card.Grid style={gridStyle2}>
+                {items.per.map((itemss,indexss) =>(
+                  <Checkbox>{items.per[indexss]}</Checkbox>
+                ))}
+                </Card.Grid>
+                </>
+            ))}
+            
+          </Card>
+
+
+
+        ))}
+      </div>
     </>
-  )
+  }
+
+  const Share = (props) => {
+    return <div>Share</div>
+  }
+
+
+
+
+  const fields = [
+    {
+      label: '角色名称',
+      name: 'roleName',
+      type: FieldTypes.Text,
+      // placeholder: '名称',
+      value: ''
+    },
+
+
+
+    {
+      label: '简介',
+      name: 'roleIntroduction',
+      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
+      value: ''
+
+    },
+
+    {
+      label: '菜单权限',
+      name: 'rolePermission',
+      render:
+        <>
+          <div>
+
+            <Poster />
+
+            {/* <Radio.Group value={tab} defaultValue="1" buttonStyle="solid">
+             
+        <Checkbox>Checkbox</Checkbox>
+                {Permission.map((item,index)=>(
+                  <Radio.Button style={BottonStyle} value="{index}">{Permission[index]}</Radio.Button>
+                 
+                ))}
+            </Radio.Group>
+          
+          </div>
+          <div>
+             
+          <Table dataSource={Permission[index]} columns={columns} />
+           
+             */}
+          </div>
+        </>,
+
+    }
+    // {
+    //   label: '状态',
+    //   name: 'roleState',
+    //   render: <Radio.Group>
+    //     <Radio.Button style={{background:'#f0f0f0'}} value="a">禁用</Radio.Button>
+    //     <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="b">启用</Radio.Button>
+    //   </Radio.Group>,
+    //   value: 'b'
+    // },
+
+  ]
+
+  const handleSubmit = val => {
+    window.console.log('submit data --->', val)
+  }
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+
+
+
+
 }
-const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+
+
+export default Edit

src/pages/staff/list/editStaff.jsx

@@ -21,6 +21,13 @@ const { TextArea } = Input;
 const Edit = (props) => {
 
   const fields = [
+    {
+      label: '名称',
+      name: 'staffName',
+      type: FieldTypes.Text,
+      // placeholder: '名称',
+      value: ''
+    },
     {
       label: '公司',
       name: 'staffCompany',
@@ -114,7 +121,7 @@ const Edit = (props) => {
   const handleSubmit = val => {
     window.console.log('submit data --->', val)
   }
-  return <XForm onSubmit={handleSubmit} fields={fields} offset={8}></XForm>
+  return <XForm onSubmit={handleSubmit} fields={fields} push={8}></XForm>
 
 
 

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,69 @@
+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 changBuilding = (buildingId) => {
+    request({
+      url: '/api/admin/tdBizEventIntention',
+      method: 'GET',
+      params: {pageNum: 1, pageSize: 999,buildingId}
+    }).then((data) => {
+      console.log(data)
+      setData(data.records)
+    })
+  }
+
+  return (
+    <>
+    <Row>
+      <Col span={12}>
+        <BuildSelect onChange={changBuilding}/>
+      </Col>
+    </Row>
+    <Row>
+      <Col span={6} offset={6}>
+        用户操作
+      </Col>
+      <Col span={6} offset={6}>
+        意向值
+      </Col>
+    </Row>
+    {data.map((x) => {
+      console.log(x)
+      return <Row>
+                <Col span={6} offset={6}>
+                {x.eventName}
+                </Col>
+                <Col span={6} offset={6}>
+                  {x.intention}
+                </Col>
+              </Row>
+    })}
+    <Row>
+      <Button type="primary" className={styles.searchBtn} >确定</Button>
+    </Row>
+    </>
+  );
+ }
+
+
+
+export default Edit