合并

config/config.js

@@ -122,6 +122,11 @@ export default {
                   name: '项目列表',
                   component: './building/list/index',
                 },
+                {
+                  path: '/building/list/add',
+                  name: '', // 项目添加
+                  component: './building/list/add/index',
+                },
                 {
                   path: '/building/type',
                   name: '项目类型',
@@ -144,6 +149,11 @@ export default {
                   name: '客户列表',
                   component: './customer/customerlist/index',
                 },
+                {
+                  path: '/customer/customerlist/customerDetail',
+                  name: '',
+                  component: './customer/customerlist/customerDetail',
+                },
                 {
                   path: '/customer/drift/list',
                   name: '游客列表',
@@ -265,6 +275,11 @@ export default {
                   name: '资讯列表',
                   component: './news/list/NewsList',
                 },
+                {
+                  path: '/news/list/editNewsList',
+                  name: '',
+                  component: './news/list/editNewsList',
+                },
               ],
             },
             {
@@ -289,7 +304,6 @@ export default {
                 },
               ],
             },
-
             {
               path: '/staff',
               name: '员工管理',
@@ -305,7 +319,7 @@ export default {
                   name: '',
                   component: './staff/list/editStaff',
                 },
-             
+
                 {
                   path: '/staff/RoleList',
                   name: '角色管理',
@@ -316,7 +330,34 @@ export default {
                   name: '',
                   component: './staff/list/editRole',
                 },
-             
+
+              ],
+            },
+            {
+              path: '/carouselFigure',
+              name: '轮播图管理',
+              component: '../layouts/BlankLayout',
+              routes: [
+                {
+                  path: '/carouselFigure/carouselFigureList',
+                  name: '轮播图列表',
+                  component: './carouselFigure/carouselFigureList',
+                },
+                {
+                  path: '/carouselFigure/editCarousel',
+                  name: '',
+                  component: './carouselFigure/editCarousel',
+                },
+                {
+                  path: '/carouselFigure/advertisingList',
+                  name: '开屏广告',
+                  component: './carouselFigure/advertisingList',
+                },
+                {
+                  path: '/carouselFigure/editAdvertising',
+                  name: '',
+                  component: './carouselFigure/editAdvertising',
+                },
               ],
             },
             {
@@ -382,7 +423,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.11:8080/',
+      target: 'http://127.0.0.1:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/EchartsTest/index.jsx

@@ -3,15 +3,15 @@ import React, { Component } from 'react';
 // 引入 ECharts 主模块
 import echarts from 'echarts/lib/echarts';
 // 引入柱状图
-import  'echarts/lib/chart/bar';
+import 'echarts/lib/chart/bar';
 // 引入提示框和标题组件
 import 'echarts/lib/component/tooltip';
 import 'echarts/lib/component/title';
 class Chart extends Component {
 
-  render() { 
-    return ( <div></div> );
+  render() {
+    return (<div></div>);
   }
 }
- 
+
 export default Chart;

src/components/SelectButton/NewTypeSelect.jsx

@@ -0,0 +1,40 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const NewsTypeSelect = (props) => {
+  const [ data, setData ] = useState([])
+
+  useEffect(() => {
+    getCityList();
+  },[])
+
+  const getCityList = (e) => {
+    request({
+        url: '/api/admin/taNewsType',
+        method: 'GET',
+        params: {pageNum: 1,pageSize: 999},
+    }).then((data) => {
+        setData(data.records)
+    })
+  }
+
+  return (
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择类型" onChange={props.onChange}>
+          {data.map(type => (
+            <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default NewsTypeSelect
+

src/components/Wangedit/Wangedit.jsx

@@ -32,6 +32,7 @@ class Wangedit extends React.Component {
         this.props.onChange(html)
       }
     }
+    this.editor.customConfig.zIndex = 100
     this.editor.create()
     this.editor.txt.html(this.props.value)
   }

src/global.less

@@ -110,4 +110,14 @@ ol {
 }
 .ant-table{
   line-height: 3;
+}
+.ant-modal-header{
+  border-bottom: none;
+  .ant-modal-title{
+    font-size: 24px;
+    line-height: 50px;
+  }
+}
+.ant-modal-footer{
+  border-top:none;
 }

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

@@ -0,0 +1,217 @@
+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 moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import { router } from 'umi';
+import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import TagGroup from './tags'
+
+const { Option } = Select
+const { TabPane } = Tabs;
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 2 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+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) {
+    e.preventDefault();
+    props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+      }
+    });
+  }
+
+  return (
+        <Form {...formItemLayout} onSubmit={handleSubmit}>
+          <Form.Item label="楼盘编号">
+            {getFieldDecorator('code')(<Input />)}
+          </Form.Item>
+          <Form.Item label="楼盘名称" hasFeedback>
+            {getFieldDecorator('buildingName')(<Input />)}
+          </Form.Item>
+          <Form.Item label="别名" hasFeedback>
+            {getFieldDecorator('name')(<Input />)}
+          </Form.Item>
+          <Form.Item label="项目类型" hasFeedback>
+            {getFieldDecorator('name')(<Input />)}
+          </Form.Item>
+          <Form.Item label="均价" hasFeedback>
+            {getFieldDecorator('price')(<Input />)}
+          </Form.Item>
+          <Form.Item label="开盘时间" hasFeedback>
+            {getFieldDecorator('openingDate')(<DatePicker />)}
+          </Form.Item>
+          <Form.Item label="电话" hasFeedback>
+            {getFieldDecorator('tel')(<Input />)}
+          </Form.Item>
+          <Form.Item label="项目动态" hasFeedback>
+            {getFieldDecorator('dynamic')(<Input />)}
+          </Form.Item>
+          <Form.Item label="物业类型" hasFeedback>
+            {getFieldDecorator('buildingProperty')(
+              <Select mode="multiple" placeholder="物业类型" style={{ width: '1016px' }}>
+                <Option value="未知">未知</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item label="销售状态" hasFeedback>
+            {getFieldDecorator('marketStatus')(<Input />)}
+          </Form.Item>
+          <Form.Item label="标签" hasFeedback>
+            {getFieldDecorator('tags')(
+              <Select mode="multiple" placeholder="标签" style={{ width: '1016px' }}>
+              <Option value="未知">未知</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item label="项目主图" hasFeedback>
+            {getFieldDecorator('tags')(
+              <ImageUpload />,
+            )}
+          </Form.Item>
+          <Form.Item label="地址图片" hasFeedback>
+            {getFieldDecorator('tags')(
+              <ImageUpload />,
+            )}
+          </Form.Item>
+          <Form.Item label="海报底图" hasFeedback>
+            {getFieldDecorator('tags')(
+              <ImageUpload />,
+            )}
+          </Form.Item>
+          <Form.Item label="排序" hasFeedback>
+            {getFieldDecorator('orderNo')(<Input />)}
+          </Form.Item>
+          <Form.Item label="优惠信息" hasFeedback>
+            {getFieldDecorator('discount')(<Input />)}
+          </Form.Item>
+          <Form.Item label="首页推荐" hasFeedback>
+            {getFieldDecorator('isMain')(
+            <Radio.Group>
+              <Radio value={1}>是</Radio>
+              <Radio value={2}>否</Radio>
+            </Radio.Group>,
+            )}
+          </Form.Item>
+          <Form.Item label="所在城市" hasFeedback>
+            {getFieldDecorator('cityId')(
+              <Select placeholder="选择城市" style={{ width: '200px' }}>
+                <Option value="red">Red</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item label="楼盘区域" hasFeedback>
+            {getFieldDecorator('buildingArea')(<Input />)}
+          </Form.Item>
+          <Form.Item label="项目地址" hasFeedback>
+            {getFieldDecorator('address')(<Input />)}
+          </Form.Item>
+          <Form.Item label="项目坐标" hasFeedback>
+            {getFieldDecorator('coordinate')(<Input disabled />)}
+          </Form.Item>
+          <Form.Item label="项目地址" hasFeedback>
+            {getFieldDecorator('coordinate')(<Input />)}
+          </Form.Item>
+          <Form.Item label="周边交通" hasFeedback>
+            {getFieldDecorator('buildingArea')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边交通" hasFeedback>
+            {getFieldDecorator('buildingMall')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边学校" hasFeedback>
+            {getFieldDecorator('buildingEdu')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边医院" hasFeedback>
+            {getFieldDecorator('buildingHospital')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边银行" hasFeedback>
+            {getFieldDecorator('buildingBank')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="周边餐饮" hasFeedback>
+            {getFieldDecorator('buildingRestaurant')(
+              <TagGroup />,
+            )}
+          </Form.Item>
+          <Form.Item label="绿化率" hasFeedback>
+            {getFieldDecorator('greeningRate')(<Input />)}
+          </Form.Item>
+          <Form.Item label="容积率" hasFeedback>
+            {getFieldDecorator('volumeRate')(<Input />)}
+          </Form.Item>
+          <Form.Item label="车位比" hasFeedback>
+            {getFieldDecorator('parkingRate')(<Input />)}
+          </Form.Item>
+          <Form.Item label="规划户数" hasFeedback>
+            {getFieldDecorator('familyNum')(<Input />)}
+          </Form.Item>
+          <Form.Item label="物业公司" hasFeedback>
+            {getFieldDecorator('serviceCompany')(<Input />)}
+          </Form.Item>
+          <Form.Item label="物业费" hasFeedback>
+            {getFieldDecorator('serviceFee')(<Input />)}
+          </Form.Item>
+          <Form.Item label="装修标准" hasFeedback>
+            {getFieldDecorator('decoration')(<Input />)}
+          </Form.Item>
+          <Form.Item label="交房时间" hasFeedback>
+            {getFieldDecorator('receivedDate')(<DatePicker />)}
+          </Form.Item>
+          <Form.Item label="产权年限" hasFeedback>
+            {getFieldDecorator('rightsYear')(<Input />)}
+          </Form.Item>
+          <Form.Item label="预售许可证" hasFeedback>
+            {getFieldDecorator('decoration')(
+              <ImageUpload />,
+            )}
+          </Form.Item>
+          <Form.Item label="项目备注" hasFeedback>
+            {getFieldDecorator('remark')(
+              <Wangedit />,
+            )}
+          </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={() => router.go(-1)}>
+                取消
+            </Button>
+          </Form.Item>
+        </Form>
+  )
+}
+
+const WrappedAddBuildingForm = Form.create({ name: 'addBuilding' })(AddBuilding);
+
+export default WrappedAddBuildingForm

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

@@ -0,0 +1,112 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, Table, notification } from 'antd';
+import moment from 'moment';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+import Styles from '../style.less';
+import { router } from 'umi';
+
+
+const saleType = [
+  {
+    id: 1,
+    name: '待定',
+  },
+  {
+    id: 2,
+    name: '售罄',
+  },
+  {
+    id: 3,
+    name: '在售',
+  },
+]
+
+/**
+ *图片设置
+ *
+ * @param {*} props
+ * @returns
+ */
+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
+  useEffect(() => {
+    getList()
+  }, [])
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
+  function getList(params) {
+    console.log(props)
+    // 网路请求
+    const { url, method } = apis.building.buildingApartment
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(props.building.buildingId)
+
+    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+      setData(res)
+    }).catch(err => {
+      openNotificationWithIcon('error', err)
+    })
+  }
+
+
+  const columns = [
+    {
+      title: '名称',
+      dataIndex: 'apartmentName',
+      key: 'apartmentName',
+    },
+    {
+      title: '类型',
+      dataIndex: 'apartmentType',
+      key: 'apartmentType',
+      render: (_, record) => <span>{ record.apartmentType === 'apart' ? '户型' : '相册' }</span>,
+    },
+    {
+      title: '销售状态',
+      dataIndex: 'marketStatus',
+      key: 'marketStatus',
+      render: (_, record) => <span>{ (saleType.filter(x => x.id == record.marketStatus)[0] || {}).name }</span>,
+    },
+    {
+      title: '备注',
+      dataIndex: 'remark',
+      key: 'remark',
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (_, record) => <span>{ moment(record.createDate).format('YYYY-MM-DD') }</span>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'apartmentId',
+      key: 'apartmentId',
+      render: (_, record) => (
+        <>
+          <Button type="link" style={{ color: 'red' }}>编辑</Button>
+          <Button type="link" style={{ color: 'red' }}>删除</Button>
+        </>
+      ),
+    },
+  ]
+
+  return (
+    <>
+      <Button type="primary">新增图片库</Button>
+      <Table dataSource={data} columns={columns} pagination={false} />
+    </>
+  )
+}
+
+export default imageSet

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

@@ -0,0 +1,82 @@
+import React from 'react'
+import { Tag, Input, Tooltip, Icon } from 'antd';
+
+class EditableTagGroup extends React.Component {
+  state = {
+    tags: [],
+    inputVisible: false,
+    inputValue: '',
+  };
+
+  handleClose = removedTag => {
+    const tags = this.state.tags.filter(tag => tag !== removedTag);
+    console.log(tags);
+    this.setState({ tags });
+  };
+
+  showInput = () => {
+    this.setState({ inputVisible: true }, () => this.input.focus());
+  };
+
+  handleInputChange = e => {
+    this.setState({ inputValue: e.target.value });
+  };
+
+  handleInputConfirm = () => {
+    const { inputValue } = this.state;
+    let { tags } = this.state;
+    if (inputValue && tags.indexOf(inputValue) === -1) {
+      tags = [...tags, inputValue];
+    }
+    console.log(tags);
+    this.setState({
+      tags,
+      inputVisible: false,
+      inputValue: '',
+    });
+  };
+
+  saveInputRef = input => (this.input = input);
+
+  render() {
+    const { tags, inputVisible, inputValue } = this.state;
+    return (
+      <div>
+        {tags.map((tag, index) => {
+          const isLongTag = tag.length > 20;
+          const tagElem = (
+            <Tag key={tag} closable={index !== 0} onClose={() => this.handleClose(tag)}>
+              {isLongTag ? `${tag.slice(0, 20)}...` : tag}
+            </Tag>
+          );
+          return isLongTag ? (
+            <Tooltip title={tag} key={tag}>
+              {tagElem}
+            </Tooltip>
+          ) : (
+            tagElem
+          );
+        })}
+        {inputVisible && (
+          <Input
+            ref={this.saveInputRef}
+            type="text"
+            size="small"
+            style={{ width: 78 }}
+            value={inputValue}
+            onChange={this.handleInputChange}
+            onBlur={this.handleInputConfirm}
+            onPressEnter={this.handleInputConfirm}
+          />
+        )}
+        {!inputVisible && (
+          <Tag onClick={this.showInput} style={{ background: '#fff', borderStyle: 'dashed' }}>
+            <Icon type="plus" /> 新建
+          </Tag>
+        )}
+      </div>
+    );
+  }
+}
+
+export default EditableTagGroup

src/pages/building/list/add/index.jsx

@@ -0,0 +1,67 @@
+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 moment from 'moment';
+import request from '../../../../utils/request';
+import apis from '../../../../services/apis';
+import Styles from './style.less';
+import { router } from 'umi';
+
+
+import ImageUpload from '../../../../components/XForm/ImageUpload'
+import Wangedit from '../../../../components/Wangedit/Wangedit'
+import TagGroup from './components/tags'
+import Base from './components/base'
+import ImageSet from './components/imageSet'
+
+
+const { Option } = Select
+const { TabPane } = Tabs;
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 2 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+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) {
+    e.preventDefault();
+    props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+      }
+    });
+  }
+
+  function tabsCallback(key) {
+    console.log(key);
+  }
+
+  return (
+    <Tabs defaultActiveKey="1" onChange={tabsCallback}>
+      <TabPane tab="基本信息" key="1">
+        <Base />
+      </TabPane>
+      <TabPane tab="图片" key="2">
+        <ImageSet building={{ buildingId: '159fd19bb973b6972c10fbebf07ddeb1' }} />
+      </TabPane>
+    </Tabs>
+  )
+}
+
+const WrappedAddBuildingForm = Form.create({ name: 'addBuilding' })(AddBuilding);
+
+export default WrappedAddBuildingForm

src/pages/building/list/index.jsx

@@ -4,6 +4,7 @@ import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
+import { router } from 'umi';
 
 
 const { Option } = Select;
@@ -137,6 +138,11 @@ function body(props) {
     console.log(value, dateString)
   }
 
+
+  function toAdd() {
+    router.push({ pathname: '/building/list/add' })
+  }
+
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
@@ -200,7 +206,7 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={Styles.addButton}>
+      <Button type="primary" className={Styles.addButton} onClick={() => toAdd()}>
         新增楼盘
       </Button>
 

src/pages/carouselFigure/advertisingList.jsx

@@ -0,0 +1,230 @@
+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({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'screen' });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/extendContent',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  
+// 跳转到编辑商品
+const toEdit = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/editAdvertising',
+      query: {
+        contentId
+      },
+    });
+  }
+  
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image) => <img src={image} className={styles.touxiang} />,
+    },
+    {
+      title: '类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : '' }</span>
+    },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '启用' : '停用'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => <>
+                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                         </>
+    },
+  ];
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/buildingDynamic/finish',
+                  method: 'PUT',
+                  data: {dynamicId: row.dynamicId, top: ""},
+              }).then((data) => {
+                  console.log(data)
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+  }
+  
+//   停用启用
+  const changeStatus = (row) => () => {
+      console.log(row)
+      if(row.status === 0) {
+        row.status = 1
+        Modal.confirm({
+          title: '确认发布此数据?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/extendContent/'+row.contentId,
+                  method: 'PUT',
+                  data: row,
+              }).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }else if(row.status === 1){
+        row.status = 0
+        Modal.confirm({
+          title: '确认停用此轮播图?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/extendContent/'+row.contentId,
+                  method: 'PUT',
+                  data: row,
+              }).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }
+
+  }
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10, showType: 'screen' })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'screen' })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="other">其他</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">启用</Option>
+              <Option value="0">停用</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" className={styles.addBtn} onClick={toEdit()}>新增</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/carouselFigure/carouselFigureList.jsx

@@ -0,0 +1,230 @@
+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({})
+//   const [page, changePage] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, showType: 'banner' });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/extendContent',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+
+  
+// 跳转到编辑页面
+const toEditCarouse = (contentId) => () => {
+    router.push({
+      pathname: '/carouselFigure/editCarousel',
+      query: {
+        contentId
+      },
+    });
+  }
+  
+  const columns = [
+    {
+      title: '主图',
+      dataIndex: 'image',
+      key: 'image',
+      align: 'center',
+      render: (image) => <img src={image} className={styles.touxiang} />,
+    },
+    {
+      title: '类型',
+      dataIndex: 'contentType',
+      key: 'contentType',
+      align: 'center',
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : '' }</span>
+    },
+    {
+      title: '发布位置',
+      dataIndex: 'showPosition',
+      key: 'showPosition',
+      align: 'center',
+      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    },
+    {
+      title: '发布时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '启用' : '停用'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x,row) => <>
+                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                           <span style={{ color: '#FF925C' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+                         </>
+    },
+  ];
+  
+  const finishDynamic = (row) => {
+      Modal.confirm({
+          title: '结束以后将无法编辑, 是否继续?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/buildingDynamic/finish',
+                  method: 'PUT',
+                  data: {dynamicId: row.dynamicId, top: ""},
+              }).then((data) => {
+                  console.log(data)
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+  }
+  
+//   停用启用
+  const changeStatus = (row) => () => {
+      console.log(row)
+      if(row.status === 0) {
+        row.status = 1
+        Modal.confirm({
+          title: '确认发布此数据?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/extendContent/'+row.contentId,
+                  method: 'PUT',
+                  data: row,
+              }).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }else if(row.status === 1){
+        row.status = 0
+        Modal.confirm({
+          title: '确认停用此轮播图?',
+          okText: '确定',
+          cancelText: '取消',
+          onOk() {
+              request({
+                  url: '/api/admin/extendContent/'+row.contentId,
+                  method: 'PUT',
+                  data: row,
+              }).then((data) => {
+                  message.info('操作成功！')
+                  getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
+              }).catch((err) => {
+                  console.log(err)
+                  message.info(err.msg || err.message)
+              })
+          },
+        });
+      }
+
+  }
+  
+  const changePageNum = (pageNumber) => {
+      getList({ pageNum: pageNumber, pageSize: 10, showType: 'banner' })
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values, showType: 'banner' })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('contentType')(
+            <Select style={{ width: '180px' }} placeholder="类型">
+              <Option value="activity">活动</Option>
+              <Option value="project">项目</Option>
+              <Option value="news">资讯</Option>
+              <Option value="other">其他</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('showPosition')(
+            <Select style={{ width: '180px' }} placeholder="发布位置">
+              <Option value="mall">商城</Option>
+              <Option value="index">首页</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">启用</Option>
+              <Option value="0">停用</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" className={styles.addBtn} onClick={toEditCarouse()}>新增</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/carouselFigure/editAdvertising.jsx

@@ -0,0 +1,155 @@
+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 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 [ tab, changeTab ] = useState('basic')
+  const contentId = props.location.query.contentId
+  const [ data, setData ] = useState({})
+  if(contentId){
+    useEffect(() => {
+      getDetail(contentId);
+    },[])
+
+  // 查询列表
+  const getDetail = (contentId) => {
+    request({
+        url: '/api/admin/extendContent/' + contentId,
+        method: 'GET',
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/carouselFigure/advertisingList',
+    });
+  }
+ 
+    const fields = [
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+      },
+      {
+        label: '商品图片',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title,
+      },
+      // {
+      //   label: '发布位置',
+      //   name: 'showPosition',
+      //   type: FieldTypes.Select,
+      //   dict: [{
+      //     label: '首页',
+      //     value: 'index'
+      //   },
+      //   {
+      //     label: '商城',
+      //     value: 'mall'
+      //   }],
+      //   value: data.showPosition,
+      // },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '其他',
+          value: 'other'
+        }],
+        value: data.contentType,
+      },
+      // {
+      //   label: '发布内容',
+      //   name: 'content',
+      //   render: <Wangedit />,
+      //   value: data.content,
+      // },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "启用",
+          value: 1
+        },
+        {
+          label: "停用",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      val.showType = 'screen'
+      if(contentId){
+        request({
+          url: '/api/admin/extendContent/'+contentId,
+          method: 'PUT',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/extendContent',
+          method: 'POST',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+ }
+
+
+
+export default Edit

src/pages/carouselFigure/editCarousel.jsx

@@ -0,0 +1,155 @@
+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 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 [ tab, changeTab ] = useState('basic')
+  const contentId = props.location.query.contentId
+  const [ data, setData ] = useState({})
+  if(contentId){
+    useEffect(() => {
+      getDetail(contentId);
+    },[])
+
+  // 查询列表
+  const getDetail = (contentId) => {
+    request({
+        url: '/api/admin/extendContent/' + contentId,
+        method: 'GET',
+    }).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/carouselFigure/carouselFigureList',
+    });
+  }
+ 
+    const fields = [
+      {
+        label: '所属项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: data.buildingId,
+      },
+      {
+        label: '商品图片',
+        name: 'image',
+        type: FieldTypes.ImageUploader,
+        value: data.image,
+      },
+      {
+        label: '标题',
+        name: 'title',
+        type: FieldTypes.Text,
+        value: data.title,
+      },
+      {
+        label: '发布位置',
+        name: 'showPosition',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '首页',
+          value: 'index'
+        },
+        {
+          label: '商城',
+          value: 'mall'
+        }],
+        value: data.showPosition,
+      },
+      {
+        label: '类型',
+        name: 'contentType',
+        type: FieldTypes.Select,
+        dict: [{
+          label: '活动',
+          value: 'activity'
+        },
+        {
+          label: '项目',
+          value: 'project'
+        },
+        {
+          label: '资讯',
+          value: 'news'
+        },
+        {
+          label: '其他',
+          value: 'other'
+        }],
+        value: data.contentType,
+      },
+      {
+        label: '发布内容',
+        name: 'content',
+        render: <Wangedit />,
+        value: data.content,
+      },
+      {
+        label: '状态',
+        name: 'status',
+        type: FieldTypes.Select,
+        dict: [{
+          label: "启用",
+          value: 1
+        },
+        {
+          label: "停用",
+          value: 0
+        },],
+        value: data.status != null ? data.status : 1,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      val.showType = 'banner'
+      if(contentId){
+        request({
+          url: '/api/admin/extendContent/'+contentId,
+          method: 'PUT',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/extendContent',
+          method: 'POST',
+          data: val,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  );
+ }
+
+
+
+export default Edit

src/pages/customer/customerlist/customerDetail.jsx

@@ -0,0 +1,88 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Table } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from './style.less';
+
+import router from 'umi/router';
+
+
+function header(props) {
+
+  /**
+   * @param {*} props
+   * @returns
+   */
+  const [data, setData] = useState([{ records: [] }])
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'event',
+      key: 'event',
+      align: 'center',
+    },
+    {
+      title: '访问时间',
+      dataIndex: 'time',
+      key: 'time',
+      align: 'center',
+
+    },
+    {
+      title: '停留时间',
+      dataIndex: 'stayTime',
+      key: 'stayTime',
+      align: 'center',
+    },
+  ]
+  return (
+    <>
+      <div className={styles.cardBox}>
+        <div className={styles.leftBox}>
+          <p className={styles.tit}>置业顾问信息</p>
+          <img className={styles.touxiang} src="http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg" />
+          <p className={styles.infoItem}>姓名：赵海伟</p>
+          <p className={styles.infoItem}>部门：营销部</p>
+          <p className={styles.infoItem}>岗位：营销经理</p>
+          <p className={styles.infoItem}>号码：13160056061 </p>
+          <p className={styles.infoItem}>公司：葛洲坝·南京中国府</p>
+          <p className={styles.infoItem}>所属项目：葛洲坝·南京中国府</p>
+        </div>
+        <div className={styles.rightBox}>
+          <p className={styles.tit}>客户信息</p>
+          <img className={styles.touxiang} src="http://img0.imgtn.bdimg.com/it/u=4246326797,2657995307&fm=26&gp=0.jpg" />
+          <div className={styles.right}>
+            <p className={styles.rightItem}>用户名称：董浩业</p>
+            <p className={styles.rightItem}>手机号码：15050893674</p>
+            <p className={styles.rightItem}>来访渠道：活动分享</p>
+          </div>
+          <p className={styles.rightItem}>访问时长：0秒</p>
+          <p className={styles.rightItem}>访问次数：</p>
+          <p className={styles.rightItem}>预约人数：</p>
+          <p className={styles.rightItem}>首次访问时间：</p>
+          <p className={styles.rightItem}>预约到访时间：</p>
+          <div className={styles.rightInfo}>
+            <p className={styles.rightItem}>国家：</p>
+            <p className={styles.rightItem}>省份：</p>
+            <p className={styles.rightItem}>城市：</p>
+            <p className={styles.rightItem}>详细信息：</p>
+            <p className={styles.rightItem}>意向项目：</p>
+            <p className={styles.rightItem}>价格区间：</p>
+            <p className={styles.rightItem}>客户说明：</p>
+            <p className={styles.rightItem}>客户描述：</p>
+            <p className={styles.rightItem}>需求类型：</p>
+            <p className={styles.rightItem}>物业类型：</p>
+          </div>
+        </div>
+      </div>
+      <div className={styles.recordBox}>
+        <p className={styles.tableName}>访问记录</p>
+        <Table dataSource={data.records} columns={columns} pagination={false} />
+      </div>
+
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/customer/customerlist/index.jsx

@@ -4,6 +4,7 @@ import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
+import router from 'umi/router';
 
 import Attribution from './components/attribution'
 import IntegralRecord from './components/integralRecord'
@@ -27,7 +28,7 @@ function body(props) {
   const [dataSource, setDataSource] = useState({ records: [] })
 
   // 默认私客
-    // eslint-disable-next-line react-hooks/rules-of-hooks
+  // eslint-disable-next-line react-hooks/rules-of-hooks
   const [customerType, setCustomerType] = useState('private')
 
   // 调整归属 ============  start
@@ -95,7 +96,7 @@ function body(props) {
   // 分页
   function onChange(pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNumber: pageNum, pageSize: 10, customerType })
+    getList({ pageNumber: pageNum, pageSize: 10, customerType })
   }
 
   // 私客/公客切换
@@ -127,20 +128,25 @@ function body(props) {
     setGVisibleData({ visible: false, customerId: '', realtyConsultant: '' })
     setStatusVisibleData({ visible: true, customerId: record.customerId, status: record.status })
   }
+  function toCustomerDateil() {
+    router.push({
+      pathname: '/customer/customerlist/customerDetail',
+    });
+  }
 
   const columns = [
     {
       title: '头像',
       dataIndex: 'picture',
       key: 'picture',
-      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl } size={64} icon="user" />,
+      render: (_, record) => <Avatar shape="square" src={customerType === 'private' ? record.picture : record.avatarurl} size={64} icon="user" />,
     },
     {
       title: '姓名',
       dataIndex: 'name',
       key: 'name',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{ customerType === 'private' ? record.name : record.nickname }</sapn></>,
+      render: (_, record) => <><sapn>{customerType === 'private' ? record.name : record.nickname}</sapn></>,
     },
     {
       title: '电话',
@@ -152,7 +158,7 @@ function body(props) {
       dataIndex: 'sex',
       key: 'sex',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</sapn></>,
+      render: (_, record) => <><sapn>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</sapn></>,
     },
     {
       title: '置业顾问',
@@ -161,9 +167,9 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <sapn>{ record.consultantName }</sapn>
-          <br/>
-          <sapn>{ record.consultTel }</sapn>
+          <sapn>{record.consultantName}</sapn>
+          <br />
+          <sapn>{record.consultTel}</sapn>
         </>
       ),
     },
@@ -171,8 +177,8 @@ function body(props) {
       title: '客户状态',
       dataIndex: 'reportRecommendStatus',
       key: 'reportRecommendStatus',
-       // eslint-disable-next-line no-nested-ternary
-       render: (_, record) => <><sapn>{ record.reportRecommendStatus === 0 ? '为报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : '' }</sapn></>,
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><sapn>{record.reportRecommendStatus === 0 ? '为报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</sapn></>,
     },
     {
       title: '操作',
@@ -181,13 +187,13 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={() => showStatus(record)}>变更状态</Button>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
           &nbsp;&nbsp;
-          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={() => showGM(record)}>调整归属</Button>
-          <br/>
-          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link">查看详情</Button>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
+          <br />
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={toCustomerDateil}>查看详情</Button>
           &nbsp;&nbsp;
-          <Button className={ customerType === 'private' ? Styles.text : Styles.displayS } type="link" onClick={ () => showRecord(record) }>积分记录</Button>
+          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
         </>
       ),
     },
@@ -245,22 +251,22 @@ function body(props) {
         </Form.Item>
       </Form>
 
-       <div style={{ marginTop: '20px', marginBottom: '20px' }}>
+      <div style={{ marginTop: '20px', marginBottom: '20px' }}>
         <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
-            <Radio.Button value="private">私客</Radio.Button>
-            <Radio.Button value="public">公客</Radio.Button>
+          <Radio.Button value="private">私客</Radio.Button>
+          <Radio.Button value="public">公客</Radio.Button>
         </Radio.Group>
-       </div>
+      </div>
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
 
-        {/* 调整归属 */}
-        <Attribution visibleData={gVisibleData} />
+      {/* 调整归属 */}
+      <Attribution visibleData={gVisibleData} />
 
-        {/* 积分记录 */}
-        <IntegralRecord visibleData={recordVisibleData} />
+      {/* 积分记录 */}
+      <IntegralRecord visibleData={recordVisibleData} />
 
-        {/* 变更状态 */}
-        <ChangeStatus visibleData={statusVisibleData} />
+      {/* 变更状态 */}
+      <ChangeStatus visibleData={statusVisibleData} />
     </>
   );
 }

src/pages/customer/customerlist/style.less

@@ -70,3 +70,81 @@
 .displayS {
   display: none;
 }
+
+
+// 客户详情样式
+.cardBox{
+  display: flex;
+  .leftBox{
+    width:342px;
+    min-width:342px;
+    height:511px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    margin-right: 30px;
+    padding: 30px;
+    overflow: hidden;
+  }
+  .rightBox{
+    width:-webkit-fill-available;
+    height:511px;
+    min-width: 800px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+    border-radius:8px;
+    display: inline-block;
+    padding: 30px;
+    overflow: hidden;
+    position: relative;
+  }
+  .tit{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+    margin: 10px 0 0 0;
+  }
+  .touxiang{
+    width: 120px;
+    width: 120px;
+    border-radius: 6px;
+    margin: 30px 0 20px 0;
+  }
+  .infoItem{
+    color:#666;
+    font-size: 19px;
+    margin: 0 0 10px 0;
+    
+  }
+  .rightItem{
+    color:#666;
+    font-size: 19px;
+    margin: 0 0 15px 0;
+  }
+  .right{
+    position: absolute;
+    top:108px;
+    left:170px;
+  }
+  .rightInfo{
+    position: absolute;
+    top:50px;
+    left:50%;
+  }
+  
+}
+.recordBox{
+  width:100%;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 16px 2px rgba(0,0,0,0.12);
+  border-radius:8px;
+  margin-top: 30px;
+  padding: 30px;
+  .tableName{
+    font-size:24px;
+    font-weight:600;
+    color:#222;
+  }
+}
+

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, Modal } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, notification } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -268,20 +268,21 @@ function body(props) {
     getList({ pageNumber: 1, pageSize: 10 })
   }, [])
 
+
+  function openNotificationWithIcon(type, message) {
+    notification[type]({
+      message,
+      description:
+        '',
+    });
+  }
+
   function getList(params) {
     // 网路请求
     request({ ...apis.customer.agents, params: { ...params } }).then(res => {
       setDataSource(res)
     }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
+      openNotificationWithIcon('error', err)
     })
   }
 

src/pages/customer/recommendCustomer/index.jsx

@@ -115,7 +115,7 @@ function body(props) {
       title: '推荐时间',
       dataIndex: 'createDate',
       key: 'createDate',
-      render: (_, record) => <><sapn>{ moment(record.createDate).format('YYYY-MM-DD') }</sapn></>,
+      render: (_, record) => <><sapn>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</sapn></>,
     },
     {
       title: '状态',

src/pages/integralMall/writeOff.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Tabs, Row, Col, message } from 'antd';
+import { Form, Input, Button, Icon, Tabs, Row, Col, Modal, message } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
@@ -13,20 +13,67 @@ function callback(key) {
 }
 
 /**
- *
- *
  * @param {*} props
  * @returns
  */
+class Dialog extends React.Component {
+  state = {
+    visible: false,
+  };
+
+  showModal = () => {
+    this.setState({ visible: true, });
+  };
+
+  handleCancel = () => {
+    this.setState({ visible: false });
+  };
+
+  onKeyDown = (e) => {
+
+    if (e.keyCode == 13) {
+      this.setState({ visible: false });
+      this.props.onEnter();
+    }
+  }
+
+  render() {
+    const { visible, loading } = this.state;
+    return (
+      <div>
+        <Button type="primary" onClick={this.showModal} style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+        <Modal
+          style={{ marginTop: '20vh' }}
+          visible={visible}
+          title="核销数据"
+          onCancel={this.handleCancel}
+          footer={[]}
+        >
+          <p>扫描二维码数据</p>
+          <Input placeholder="请用扫描枪扫描二维码" onKeyDown={this.onKeyDown} onChange={this.props.onChange} />
+        </Modal>
+      </div>
+    );
+  }
+}
+
 
 function header(props) {
   const [telValue, setTelValue] = useState('')
+
   const changeTel = (e) => {
     setTelValue(e.target.value)
   }
 
-  const verifyTel = () =>{
-    if(telValue === ""){
+  const [codeValue, setCodeValue] = useState('')
+  const changeCode = (e) => {
+
+    setCodeValue(e.target.value)
+
+  }
+
+  const verifyTel = () => {
+    if (telValue === "") {
       message.error("请输入手机号");
       return;
     }
@@ -38,6 +85,22 @@ function header(props) {
     });
   }
 
+
+  const handleEnter = (e) => {
+    if (codeValue === "") {
+      message.error("无二维码数据");
+      return;
+    } else {
+
+      router.push({
+        pathname: '/integralMall/verifyList',
+        query: {
+          telValue:codeValue
+        },
+      });
+    }
+  }
+
   const { getFieldDecorator } = props.form
   return (
     <>
@@ -62,7 +125,7 @@ function header(props) {
               <p style={{ margin: '44px auto' }}>根据提示进行核销操作</p>
             </Col>
           </Row>
-          <Button type="primary" style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+          <Dialog onEnter={handleEnter} onChange={changeCode} />
         </TabPane>
         <TabPane tab="手机号核销" key="2">
           <Row>
@@ -77,15 +140,17 @@ function header(props) {
               <p>点击“立即核销”按钮</p>
             </Col>
           </Row>
-          <div style={{ margin: '110px auto', display: 'block',textAlign:'center' }}>
-            <Input placeholder="请输入手机号" style={{width:'200px'}} onChange={changeTel}/>
-            <Button type="primary" style={{marginLeft:'10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
+          <div style={{ margin: '110px auto', display: 'block', textAlign: 'center' }}>
+            <Input placeholder="请输入手机号" style={{ width: '200px' }} onChange={changeTel} />
+            <Button type="primary" style={{ marginLeft: '10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
           </div>
         </TabPane>
       </Tabs>,
     </>
   )
 }
+
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
+
 export default WrappedHeader

src/pages/news/list/NewsList.jsx

@@ -1,9 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Modal, message, Card, Row, Col, Pagination, Alert } from 'antd';
 import moment from 'moment';
+import router from 'umi/router';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 
 
 const { Option } = Select;
@@ -19,7 +21,76 @@ const tempDate = [{ code: 's101' }]
  */
 function CartBody(props) {
   const { data } = props
-  console.log(props);
+  console.log(data);
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+
+  // 查询列表
+  const getList = (params) => {
+    request({
+        url: '/api/admin/taNews',
+        method: 'GET',
+        params: { ...params },
+    }).then((data) => {
+        cancelPage();
+    })
+  }
+
+  //删除资讯
+  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
+      },
+    });
+  } 
+
+  function cancelRelease (newsId, newsStatus, buildingId,newsTypeId) {
+    console.log("newsId" + newsId + "status" + newsStatus);
+    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
@@ -30,14 +101,14 @@ function CartBody(props) {
             <p className={Styles.cardText}>
               <span className={Styles.title}>资讯类型</span>
               <span >：{ data.newsType.newsTypeName }</span>
-              <span className={Styles.ediText}>
+              <span className={Styles.ediText} 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.status == 0 ? "已发布" : "未发布" }</span>
+              <span >：{ data.newsStatus == 0 ? "已发布" : "未发布" }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>阅读数量</span>
@@ -45,7 +116,7 @@ function CartBody(props) {
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>转发数量</span>
-              <span className={ Styles.address }>：{ data.shareNum }</span>
+              <span>：{ data.shareNum }</span>
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>点赞数量</span>     
@@ -60,13 +131,20 @@ function CartBody(props) {
               <span >：{ data.createDate }</span>
             </p>
             <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
-              <span style={{ color: '#1990FF' }}>
-                取消发布
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              {data.newsStatus === 0 ? 
+              <span style={{ color: '#1990FF' }} 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)}>
+              发布
+              <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
               </span>
+              }
+              
               <span style={{
                 color: '#FF4A4A', position: 'absolute', right: '0',
-              }} >
+              }} onClick={changeNewsListStatus(data.newsId)}>
                 删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
               </span>
@@ -122,6 +200,17 @@ function body(props) {
     });
   }
 
+  // 跳转到编辑资讯列表
+  const toEditList = (id) => ()  => {
+    router.push({
+      pathname: '/news/list/editNewsList',
+      query: {
+        id
+      },
+    });
+  }
+
+
   // Change 事件
   function handleSelectChange(e) {
     // eslint-disable-next-line no-console
@@ -165,9 +254,8 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('type')(
-            <Select style={{ width: '180px' }} placeholder="咨询类型" onChange={handleSelectChange}>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <NewsTypeSelect />,
           )}
         </Form.Item>       
         <Form.Item>
@@ -184,7 +272,7 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={Styles.addButton}>
+      <Button type="primary" className={Styles.addButton} onClick={toEditList()}>
         新增
       </Button>
 

src/pages/news/list/editNewsList.jsx

@@ -0,0 +1,148 @@
+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 NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+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 [ tab, changeTab ] = useState('basic')
+  const newsId = props.location.query.newsId
+  const [ dynamicData, setDynamicData ] = useState({})
+  if(newsId){
+    useEffect(() => {
+      getDynamicData(newsId);
+    },[])
+
+  // 查询列表
+  const getDynamicData = (newsId) => {
+    request({
+        url: '/api/admin/taNews/' + newsId,
+        method: 'GET',
+        params: { newsId },
+    }).then((data) => {
+        console.log(data)
+        setDynamicData(data)
+    })
+  }
+  }
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/news/list/NewsList',
+    });
+  }
+
+  const Basic = (props) => {
+    const fields = [
+      {
+        label: '意向项目',
+        name: 'buildingId',
+        render: <BuildSelect />,
+        value: dynamicData.buildingId,
+        rules: [
+          {required: true, message: '请选择所属项目'},
+        ]
+      },
+      {
+        label: '资讯图片',
+        name: 'newsImg',
+        type: FieldTypes.ImageUploader,
+        value: dynamicData.newsImg,
+      },
+      {
+        label: '资讯标题',
+        name: 'newsName',
+        type: FieldTypes.Text,
+        value: dynamicData.newsName,
+        rules: [
+          {required: true, message: '请输入资讯标题'},
+        ]
+      },
+      {
+        label: '资讯类型',
+        name: 'newsTypeId',
+        render: <NewsTypeSelect />,
+        value: dynamicData.newsTypeId,
+        rules: [
+          {required: true, message: '请选择资讯类型'},
+        ]
+      },
+      {
+        label: '资讯详情',
+        name: 'desc',
+        render: <Wangedit />,
+        value: dynamicData.desc,
+      },
+    ]
+  
+    const handleSubmit = val => { 
+      let {...submitValue} = val
+      if(newsId){
+        submitValue.newsId = newsId
+        request({
+          url: '/api/admin/taNews/' + newsId,
+          method: 'PUT',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }else{
+        request({
+          url: '/api/admin/taNews',
+          method: 'POST',
+          data: submitValue,
+        }).then((data) => {
+          cancelPage()
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    }
+    
+    return <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  }
+  
+  const Poster = (props) => {
+   return <div>Poster</div>
+  }
+ 
+  const Share = (props) => {
+    return <div>Share</div>
+  }
+
+  return (
+    <div>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button>
+        </Radio.Group>
+      </div>
+      <div>
+        { tab === 'basic' && <Basic /> }
+        { tab === 'poster' && <Poster /> }
+        { tab === 'share' && <Share /> }
+      </div>
+    </div>
+  );
+ }
+
+
+
+export default Edit

src/pages/news/type/NewsType.jsx

@@ -45,7 +45,7 @@ function header(props) {
   }
 
 
-  // 跳转到编辑咨询
+  // 跳转到编辑资讯
   const toEditNews = (id) => () => {
     router.push({
       pathname: '/news/type/editNews',

src/services/apis.js

@@ -22,6 +22,10 @@ export default {
       method: 'GET',
       url: `${prefix}/buildinglist`,
     },
+    buildingApartment: {
+      method: 'GET',
+      url: `${prefix}/buildingApartment/buildingId/id`,
+    },
   },
   buildingType: {
     getList: {