Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin into master

config/defaultSettings.js

@@ -2,6 +2,7 @@ export default {
   navTheme: 'dark',
   // 拂晓蓝
   primaryColor: '#1890ff',
+  backgroundColor:'red',
   layout: 'sidemenu',
   contentWidth: 'Fluid',
   fixedHeader: false,

config/routes.js

@@ -443,7 +443,6 @@ export default [
                 component: './channel/Agent/List',
               },
 
-
               // {
               //   path: '/channel/channelList',
               //   name: '渠道管理',
@@ -510,6 +509,50 @@ export default [
               },
             ],
           },
+          {
+            //帮我找房页面+
+            path: '/home',
+            name: '帮我找房',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/home/recommend/home',
+                name: '找房需求',
+                component: './home/recommend/index',
+              },
+              {
+                path: '/home/recommend/audit',
+                name: '回访确认',
+                hideInMenu: true,
+                component: './home/Recommend/audit',
+              },
+              {
+                path: '/home/recommend/auditcopy',
+                name: '回访确认',
+                hideInMenu: true,
+                component: './home/Recommend/auditCopy',
+              },
+            ],
+          },
+          {
+            //我的课堂+
+            path: '/course',
+            name: '我的课堂',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/course/List',
+                name: '课程管理',
+                component: './course/List',
+              },
+              {
+                path: '/course/Edit',
+                name: '课程编辑',
+                hideInMenu: true,
+                component: './course/Edit',
+              },
+            ],
+          },
           {
             path: '/carouselFigure',
             name: '资源位管理',
@@ -581,6 +624,29 @@ export default [
                 name: '意向值',
                 component: './system/intention',
               },
+              //+购房百科
+              {
+                path: '/system/Sellhouse/index',
+                name: '购房百科',
+                component: './system/Sellhouse/index',
+              },
+              {
+                path: '/system/houseTypes/index',
+                name: '购房百科类型',
+                component: './system/Sellhouse/houseTypes/index',
+              },
+              {
+                path: '/system/Sellhouse/Edit',
+                name: '新增/编辑购房百科',
+                hideInMenu: true,
+                component: './system/Sellhouse/Edit',
+              },
+              {
+                path: '/system/Sellhouse/houseTypes/Newindex',
+                name: '新增',
+                hideInMenu: true,
+                component: './system/Sellhouse/houseTypes/Newindex',
+              },
               {
                 path: '/system/housingPolicy/list',
                 name: '购房百科',

src/components/SelectButton/BuildSelectCourse.jsx

@@ -0,0 +1,22 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+//弃用
+const { Option } = Select;
+
+const handleChange = (buildingId) => {
+  props.onChange(buildingId, building)
+}
+
+const BuildSelectHouse = props => {
+  
+  return (
+    <Select defaultValue='0' style={{ width: 220 }} onChange={handleChange}>
+      <Option value="0">置业顾问</Option>
+      <Option value="1">经纪人</Option>
+      <Option value="2">置业顾问&amp;经纪人</Option>
+    </Select>
+  )
+}
+export default BuildSelectHouse

src/components/SelectButton/BuildSelectHouse.jsx

@@ -0,0 +1,35 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+function handleChange(value) {
+  console.log(`selected ${value}`);
+}
+
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
+
+const BuildSelectHouse = props => {
+  
+  
+
+
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  return (
+    <Select defaultValue='0' style={{ width: 220 }} onChange={handleChange}>
+      <Option value="0">南京</Option>
+      <Option value="1">北京</Option>
+    </Select>
+  )
+}
+export default BuildSelectHouse

src/layouts/BasicLayout.jsx

@@ -131,7 +131,7 @@ const BasicLayout = (props) => {
       footerRender={footerRender}
       menuDataRender={menuDataRender(menus)}
       formatMessage={formatMessage}
-      rightContentRender={() => <GlobalHeader title={routeItem.name} history={history} location={location} />}
+      rightContentRender={() => <GlobalHeader title={routeItem?.name} history={history} location={location} />}//加非空判断
       {...props}
       {...settings}
     >

src/pages/building/Developers/index.jsx

@@ -2,10 +2,10 @@ import React, { useMemo, useRef, useCallback, useState } from 'react'
 import {Button} from 'antd'
 import apis from '@/services/apis'
 import AuthButton from '@/components/AuthButton';
-// import QueryTable from '@/components/QueryTable'
-import TableList from '@/components/TableList'
+import QueryTable from '@/components/QueryTable'
 import getTableColumns from './tableColumns'
 import { router } from 'umi';
+import getSearchFields from './searchFields'//searchbox
 
 export default (props) => {
   const ref = useRef()
@@ -20,14 +20,12 @@ export default (props) => {
     });
   }, [])
 
-  const onDelete = useCallback((row) => {
-
-  }, [])
-
+  const onDelete = useCallback((row) => {}, [])//格式
+  const searchFields = useMemo(getSearchFields, [])//搜索框
 
   const tableColumns = useMemo(() => {
     return getTableColumns({
-      page,
+      page,//可无
       onEdit:(e)=>toEdit(e),
       onDelete,
     })
@@ -35,8 +33,9 @@ export default (props) => {
 
   const actionRender = () => {
     return (
+      //name 名字错误
       <AuthButton name="admin.tdBuildingType.add" noRight={null}>
-        <Button type="primary" icon="plus" onClick={() => toEdit()} >
+        <Button type="primary" icon="plus" onClick={toEdit} >
           新增
         </Button>
       </AuthButton>
@@ -45,11 +44,13 @@ export default (props) => {
 
   return (
     <>
-      <TableList
+      <QueryTable
+      //搜索组件
         rowKey="buildingId"
         api={apis.building.getList}
         columns={tableColumns}
         actionRender={actionRender}
+        searchFields={searchFields}
       />
     </>
   )

src/pages/building/Developers/searchFields.js

@@ -0,0 +1,20 @@
+
+export default () => [
+
+  {
+    name: 'name',
+    label: '开发商名称',
+    placeholder: '请输入开发商名称',
+  },
+  // {
+  //   name: 'buildingName',
+  //   label: '开发商名称',
+  //   placeholder: '开发商名称',
+  //   type: 'select',
+  //   options: [
+  //     {label: '全部', value:0},
+  //     {label: '雅居乐·龙悦幸福小镇',value:1},
+  //     {label: '中国碧桂园', value: 2}
+  //   ]
+  // }
+]

src/pages/building/Developers/tableColumns.js

@@ -10,7 +10,7 @@ export default ({page, onEdit, onDelete}) => [
     title: '开发商索引字母',
     key: '#',
     align: 'center',
-    render: (t, r, index) => (page.current - 1) * page.pageSize + index + 1,
+    render: (t, r, index) => (page.current - 1) * page.pageSize + index + 1,//可无
   },
   {
     title: '开发商名称',

src/pages/course/Edit/index.jsx

@@ -0,0 +1,259 @@
+import React, { useState, useEffect } from 'react';
+import { UploadOutlined } from '@ant-design/icons';
+import { Input, Card, message, Radio, Select,Upload, Button } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '@/components/SelectButton/BuildSelectCourse'
+import router from 'umi/router';
+import { FieldTypes, createForm } from '@/components/XForm';
+import Wangedit from '@/components/Wangedit/Wangedit'
+// import channels from './channelList.less';
+// import Tagss from '../components/Tagss.jsx';
+import apis from '@/services/apis';
+import request from '@/utils/request'
+import BuildingSelection from '../components/BuildingSelection'
+import { render } from 'react-dom';
+import ImageUpload from '@/components/XForm/ImageUpload';
+//下拉
+function handleChange(value) {
+  console.log(`selected ${value}`);
+}
+const { TextArea } = Input;
+const { Option } = Select;
+let consultantChecked = false;
+
+const setExtraData = (data) => {
+  consultantChecked = data.isConsultant
+}
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const StaffEdit = (props) => {
+  const roleId = props.location.query.roleId
+  const [userData, setUserData] = useState({})
+  const [tagData, setTagData] = useState([])
+  const [roleData, setRoleData] = useState([])
+  const [buildData, setBuildData] = useState([])
+  const [visible, setVisible] = useState(false)
+  //图文单选详情Radio
+  const [newsDetailType, setNewsOenType] = useState(1);
+
+  //视频组件
+  
+  const getVideo = {
+    action: '//jsonplaceholder.typicode.com/posts/',
+    listType: 'picture',
+    previewFile(file) {
+      console.log('Your upload file:', file);
+      // Your process logic. Here we just mock to the same file
+      return fetch('https://next.json-generator.com/api/json/get/4ytyBoLK8', {
+        method: 'POST',
+        body: file,
+      })
+        .then(res => res.json())
+        .then(({ thumbnail }) => thumbnail);
+    },
+  };
+
+  const getTagList = () => {
+    request({ ...apis.staff.taTags, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
+      setTagData(data.records)
+    })
+  }
+
+  const getRoleList = () => {
+    request({ ...apis.role.getRoleList, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
+      console.log(data)
+      setRoleData(data.records)
+    })
+  }
+
+  //获取项目列表
+  const getBuildList = e => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setBuildData(data)
+    })
+  }
+
+  // 查询列表
+  const getUserData = (roleId) => {
+    request({ ...apis.staff.getTaUser, urlData: { id: roleId } }).then((data) => {
+      consultantChecked = data.isConsultant
+      setUserData(data)
+      setNewsOenType(Number(data.newsDetailType))
+    })
+  }
+
+  if(userData.buildingIds && buildData.length > 0 && !consultantChecked){
+      const newBuildings = userData.buildingIds.filter(x => buildData.filter(it => it.buildingId === x)[0])
+      userData.buildingIds = newBuildings
+  }
+
+  if(userData.roleIds && roleData.length > 0){
+    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0])
+      userData.roleIds = newRoleIds
+  }
+
+  useEffect(() => {
+    getTagList();
+    getRoleList();
+    getBuildList();
+    if (roleId) {
+      getUserData(roleId);
+    }
+  }, [])
+
+  // const tagsChange = (value) => {
+  //   console.log(`selected ${value}`);
+  // }
+
+  const handleSubmit = val => {
+    if (roleId) {
+      request({ ...apis.course.alterCourse, urlData: { id: roleId }, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    } else {
+      request({ ...apis.course.addCourse, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    }
+  }
+
+
+  //视频--------------------
+ 
+
+
+
+
+  const photoBeforeUpload = (file) => {
+    // const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+    // if (!isJpgOrPng) {
+    //   message.error('请上传 JPG/PNG 格式的图片!');
+    // }
+    console.log(file.size, file.size / 1024)
+    const isLt100k = (file.size / 1024) < 100;
+    if (!isLt100k) {
+      message.error('请上传小于100k的图片!');
+    }
+    return isLt100k;
+  }
+  const handleChange = (value) => {
+    console.log(`selected ${value}`);
+  }
+
+  const fields = [
+    {
+      label: '参与对象',
+      name: 'roleId',
+      render:<Select  initialValue={'0'} style={{ width: 200 }}>
+        <Option value='0'>置业顾问</Option>
+        <Option value='1'>经纪人</Option>
+        <Option value='2'>置业顾问&amp;经纪人</Option>
+      </Select> ,
+      rules: [
+        { required: true, message: '请输入参与对象' },
+      ],
+    },
+    {
+      label: '主图',
+      name: 'curriculumImg',
+      type: FieldTypes.ImageUploader,
+      extra: '建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情',
+      value: userData.curriculumImg,
+      // render:<ImageUpload/>,
+      // beforeUpload: (e) => photoBeforeUpload(e),
+      rules: [
+        { required: true, message: '主图' },
+      ]
+    },
+
+    {
+      label: '课程标题',
+      name: 'content',
+      render: <Input style={{width:'550px'}} ></Input>,
+      value: userData.usernew,
+    
+      // className={channels.inpuitTxt}
+      rules: [
+        { required: true, message: '请输入课程标题' },
+      ]
+    },
+    {
+      label: '简介',
+      name: 'remark',
+      render: <TextArea  style={{width:'550px'}}  rows='5' ></TextArea>,
+      value: userData.description,
+      rules: [
+        { required: true, message: '请输入简介' },
+      ]
+  
+      // className={channels.inpuitTxt}
+    },
+    {
+      label:'详情',
+      name:'newsOen',
+      render:(
+        <Radio.Group 
+        onChange={e=>{
+          setNewsOenType(e.target.value)
+        }} >
+          <Radio value='1'>图文</Radio>,
+          <Radio value='0'>视频</Radio>,
+        </Radio.Group>
+      ),
+      value:userData,
+      rules: [{ required: true, message: '请选择详情类型' }],
+
+    },
+    {
+      label: '详情内容',
+      name: 'newsDetail',
+      render: <Wangedit />,
+      hidden: newsDetailType == 0,
+      value: userData.newsDetail,
+      rules: [{ required: true, message: '请输入详情内容' }],
+    },
+    {
+      label:'视频详情',
+      name:'newVideo',
+      hidden: newsDetailType == 1,
+      value:userData.newVideo,
+      render: <Upload {...getVideo} maxCount='1' accept='.avi,.mp4,.wmv,.flv'>
+      <Button ><UploadOutlined />上传视频</Button>
+    </Upload>,
+      extra: '仅支AVI、MP4、WMV、FIV格式视频',
+    rules:[{required:true,message:'请上传视频详情'}]
+    },
+    {
+      label: '权重',
+      name: 'weight',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 150}} />,
+      value: '1',
+      help: '数字越大越靠前',
+    },
+  ]
+
+  return <Card>
+            <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+        </Card>
+}
+export default StaffEdit

src/pages/course/list/index.jsx

@@ -0,0 +1,197 @@
+import React, { useMemo, useRef, useCallback, useState } from 'react';
+import { Button, Avatar,Radio ,Modal, message } from 'antd';
+import moment from 'moment';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import AuthButton from '@/components/AuthButton';
+import QueryTable from '@/components/QueryTable';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import OperButton from '@/components/OperButton';
+import withActions from '@/components/ActionList';
+import { router } from 'umi';
+
+
+export default props => {
+  const ref = useRef();
+  const [visible, setVisible] = useState(false);
+  const [data, setData] = useState(false);
+  const toEdit = useCallback(row => {
+    //跳转到编辑页面
+    router.push({
+      pathname: '/course/Edit',
+      query: {
+        userId: row?.userId || undefined,
+      },
+    });
+  }, []);
+
+
+  const confirm = data => () => {
+    // console.log(data, "11111")
+    if (data.status === 1) {
+      if (data.isConsultant) {
+        request({
+          // ...apis.staff.check,
+          ...apis.course.alterCourse,
+          
+          params: {
+            content: data.content,
+            // roleId: data.consultantPersonId,
+            roleId: data.roleId,
+            createdBy: data.createdBy,
+          },
+        }).then(res => {
+          if (res.length > 0) {
+          } else {
+            const titleMessahe = data.isConsultant
+              ? '确认取消发布此课程吗？'
+              : '确认发布此课程吗？';
+            Modal.confirm({
+              title: titleMessahe,
+              okText: '确认',
+              cancelText: '取消',
+              onOk() {
+                // ...apis.staff.change,
+                request({ ...apis.course.alterCourse, urlData: { id: data.userId, type: 'off' } }).then(
+                  res => {
+                    message.info('操作成功');
+                    ref.current.reload();
+                  },
+                );
+              },
+            });
+          }
+        });
+      } else {
+        const titleMessahe = data.isConsultant
+          ? '确认发布此课程吗？'
+          : '确认取消发布此课程吗？';
+        Modal.confirm({
+          title: titleMessahe,
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({ ...apis.course.alterCourse, urlData: { id: data.userId, type: 'off' } }).then(
+              res => {
+                message.info('操作成功');
+                ref.current.reload();
+              },
+            );
+          },
+        });
+      }
+    } else {
+      Modal.confirm({
+        title: '确认发布此课程吗？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.course.alterCourse, urlData: { id: data.userId, type: 'on' } }).then(res => {
+            message.info('操作成功');
+            ref.current.reload();
+          });
+        },
+      });
+    }
+  };
+
+  const searchFields = [
+    {
+      name: 'content',
+      label: '课程标题',
+      placeholder: '请输入课程标题',
+    },
+    {
+      name: 'roleId',
+      label: '阅读对象',
+      placeholder: '请选阅读对象',
+      type: 'select',
+      options: [
+        { label: '全部', value: '' },
+        { label: '置业顾问', value: '0' },
+        { label: '经纪人', value: '1' },
+      ],
+    },
+  ];
+  const tableColumns = [
+    {
+      title: '课程标题',
+      dataIndex: 'content',
+      key: 'content',
+      align: 'center',
+    },
+    {
+      title:'课程主图',
+      dataIndex:'curriculumImg',
+      key:'curriculumImg',
+      align:'center',
+      render: (_,record) => <img src={record.curriculumImg} style={{ width: '165px', height: '104px' }} />,
+      // render:(record)=>(<img src={require(record)}/>)
+    },
+    {
+      title: '阅读人数',
+      dataIndex: 'lookNum',
+      key: 'lookNum',
+      align: 'center',
+    },
+    {
+      title: '阅读对象',
+      dataIndex: 'roleId',
+      key: 'roleId',
+      align: 'center',
+      render: text  => (text === '0' ? '置业顾问' :text === '1' ? '经纪人':'置业顾问&经纪人'),
+    },
+    
+    {
+      //权重---
+      title: '权重',
+      dataIndex: 'weight',
+      key: 'weight',
+      align: 'center',
+      // render: (_, record) => <><span>{record.numear = '20'}</span></>,
+    },
+    {
+      title: '操作',
+      key: 'isPublish',
+      //isPublish
+      align: 'center',
+      render: withActions(
+        (_, row) => [
+          <AuthButton name="admin.building.public" noRight={null}>
+            <OperButton onClick={confirm(row)}> {row.status === 1 ? '取消发布' : '发布'}</OperButton>
+          </AuthButton>,
+          <AuthButton name="admin.building.delete" noRight={null}>
+               <OperButton onClick>添加标签</OperButton>
+               <OperButton onClick={()=>toEdit(row)}>{row.status ===1? '编辑':''}</OperButton>
+               {/* <OperButton onClick={()=>toEdit(row)} >编辑</OperButton> */}
+          </AuthButton>,
+        ],
+        { noMargin: true },
+      ),
+    },
+  ];
+  const actionRender = () => {
+    return (
+      <AuthButton name="admin.newclassType.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toEdit()}>
+          新增
+        </Button>
+      </AuthButton>
+    );
+  };
+
+  return (
+    <>
+      <QueryTable
+        ref={ref}
+        rowKey="curriculumId"
+        // api={apis.staff.taUser}
+        
+        api={apis.course.Tablecourse}
+        columns={tableColumns}
+        searchFields={searchFields}
+        actionRender={actionRender}
+      />
+    </>
+  );
+};

src/pages/home/Recommend/audit.jsx

@@ -0,0 +1,148 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Card, Radio, 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 { TextArea } = Input;
+
+const tailFormItemLayout = {
+  labelCol: {
+    xs: { span: 20 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 20 },
+    sm: { span: 16 },
+  },
+};
+
+const openNotificationWithIcon = (type, message) => {
+  notification[type]({
+    message, 
+    description:
+      '',
+  });
+}
+
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [visibleData, setVisibleData] = useState({ visible: false, customerId: '', realtyConsultant: '', buildingId: ''})
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ picture: '' })
+
+  const { id } = props.location.query;
+
+  if (id !== '') {
+    //useEffect循环可能导致在呈现字段之前无法设置表单字段
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id)
+    }, [])
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
+      // res.reportDate = moment(res.reportDate)
+    if(res){
+        props.form.setFieldsValue({...res,reportDate:moment(res.reportDate)})
+        //包裹的没渲染完就执行set 导致在呈现字段之前无法设置表单字段
+    }
+
+    })
+  }
+
+  function submitDate(params) {
+    // props.form.setFieldsValue(res)
+    console.log(params, 'params')
+    request({ ...apis.customer.auto, urlData: { id: params.customerId || props.form.getFieldValue('customerId') }, params: { verifyStatus: params.verifyStatus, realtyConsultant: props.form.getFieldValue('realtyConsultant') } }).then(() => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        submitDate({ verifyStatus: '1' })
+        // submitDate({ ...values })
+      }
+    });
+  }
+
+  return (
+    <Card>
+      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
+        <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(
+            <Input
+              placeholder="客户ID"
+            />,
+          )}
+        </Form.Item>
+        {/* ············分割线............. */}
+        <Form.Item label="意向项目：">
+          {getFieldDecorator('intention')(
+            <Input placeholder="意向项目"/>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(
+            <Input placeholder="客户姓名" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(
+            <Input placeholder="客户电话" />,
+            
+          )}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户备注"   >
+          {getFieldDecorator('say')(
+            <TextArea  placeholder="客户描述" rows={7} />,
+          )}
+        </Form.Item>
+        <Form.Item label="回访备注" >
+          {getFieldDecorator('describe' ,{
+            rules:[{required:true,message:'请输入回访备注！'}]//v3x必填
+          })(
+            <TextArea placeholder="回访备注" rows={7} />,
+          )}
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button type="primary" className={Styles.SubmitButton} htmlType="submit" >
+            有效
+          </Button>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button onClick={() => submitDate({ verifyStatus: '2' })}>
+            无效
+          </Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+const HouseCopm = Form.create({ name: 'body' })(body);
+
+export default HouseCopm

src/pages/home/Recommend/auditCopy.jsx

@@ -0,0 +1,104 @@
+import React, { useEffect } from 'react';
+import { Form, Input, Button, Card, Radio } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+
+
+const { TextArea } = Input;
+
+const tailFormItemLayout = {
+  labelCol: {
+    xs: { span: 20 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 20 },
+    sm: { span: 16 },
+  },
+};
+
+function body(props) {
+  const { getFieldDecorator } = props.form
+  const { id } = props.location.query;
+
+  if (id !== '') {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      getById(id)
+    }, [])
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
+      // res.reportDate = moment(res.reportDate)
+      if(res){
+        props.form.setFieldsValue({...res,reportDate:moment(res.reportDate)})
+      }
+    
+    })
+  }
+  //返回上一页
+  function backCom(){
+    window.history.back(-1)
+  }
+  return (
+    <Card>
+      <Form {...tailFormItemLayout} onSubmit={e => handleSubmit(e)} style={{ width: '800px', margin: 'auto' }}>
+        <Form.Item label="客户ID" style={{ display: 'none' }}>
+          {getFieldDecorator('customerId')(
+            <Input
+              placeholder="客户ID"
+            />,
+          )}
+        </Form.Item>
+        {/* ············分割线............. */}
+        <Form.Item label="意向项目：">
+          {getFieldDecorator('intention')(
+            <Input
+              placeholder="意向项目"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户姓名">
+          {getFieldDecorator('name')(
+            <Input placeholder="客户姓名" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户电话">
+          {getFieldDecorator('phone')(
+            <Input placeholder="客户电话" />,
+          )}
+        </Form.Item>
+        <Form.Item label="客户性别">
+          {getFieldDecorator('sex')(
+            <Radio.Group>
+              <Radio value={1}>男</Radio>
+              <Radio value={2}>女</Radio>
+            </Radio.Group>,
+          )}
+        </Form.Item>
+        <Form.Item label="客户备注"  >
+          {getFieldDecorator('say')(
+            <TextArea  placeholder="客户描述" rows={7}
+            />,
+          )}
+        </Form.Item>
+        <Form.Item label="回访备注" >
+          {getFieldDecorator('describe' ,{
+            rules:[{required:true}]//v3x必填
+          })(
+            <TextArea placeholder="回访备注" rows={7}  value={props}/>,
+          )}
+        </Form.Item>
+        <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
+          <Button onClick={backCom} >返回</Button>
+        </Form.Item>
+      </Form>
+    </Card>
+  );
+}
+const HouseCopm = Form.create({ name: 'body' })(body);
+
+export default HouseCopm

src/pages/home/Recommend/index.jsx

@@ -0,0 +1,241 @@
+import React, {PureComponent, useMemo, useState } from 'react';
+import {  Avatar, Button } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import QueryTable from '@/components/QueryTable'
+import { router } from 'umi';
+import { render } from 'enzyme';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import renderAuthorize from '@/components/Authorized/renderAuthorize';
+import { setLocale } from 'umi-plugin-locale';
+import { fromPairs } from 'lodash';
+import { backgroundColor } from 'echarts/lib/theme/dark';
+
+
+// const a={
+//   /**
+//  *
+//  *
+//  * @param {*} props
+//  * @returns
+//  */
+
+// }
+// let(dataIndex){
+//   render(){
+//     return(
+//       <h1><input type="datetime-local" name="ckassname" id="" /></h1>
+//     )
+//   }
+// }
+
+function Recommend() {
+  const [exportLoding,setExportLoding] = useState(false)
+  //详情页面弹窗配置
+  function toAudit(cuurentId) {
+    router.push({
+      pathname: '/home/recommend/audit',
+      query: {
+        id: cuurentId,
+      },
+    })
+    
+  }
+  function toSee(cuurentId) {
+    router.push({
+      pathname: '/home/recommend/auditCopy',
+      query: {
+        id: cuurentId,
+      },
+    })
+    
+  }
+
+
+  /**
+   *导出数据（推荐用户）
+   *
+   */
+  function exportRecommendCustomer() {
+    setExportLoding(true)
+    request({
+      ...apis.customer.customerRecommendRecommenderExport,
+      responseType: 'blob',
+    }).then(response => {
+      console.log('exportRecommendCustomer: ', response)
+      download(response)
+    }).catch(error => {
+
+    })
+  }
+
+  function download(data) {
+    if (!data) {
+      return 
+    }
+    const url = window.URL.createObjectURL(new Blob([data]))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', '推荐客户.xlsx')
+    document.body.append(link)
+    link.click()
+    setExportLoding(false)
+  }
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      align:'center',
+      render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align:'center',
+      // render: (_, record) => <><span>{record.name = '曹建芳'}</span></>,
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align:'center',
+    },
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      align:'center',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+    },
+    {
+      title: '意向区域',
+      dataIndex: 'area',//意向区域
+      key: 'area',
+      align:'center',
+      render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
+
+    },
+    {
+      title: '意向项目',
+      dataIndex: 'intention',
+      key: 'intention',
+      // intention
+      //project
+      align:'center',
+      // render: (_, record) => <><span>{record.area = '香颂.蔚澜半岛'}</span></>,
+      render:(_,record)=><span>{record='香颂.蔚澜半岛'}</span>
+
+    },
+    {
+      title: '提交时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align:'center',
+      render: (_, record) => <><span>{record.createDate && moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+    },
+    {
+      title: '状态',
+      dataIndex: 'verifyStatus',
+      key: 'verifyStatus',
+      align:'center',
+      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访'   : record.verifyStatus === 2 ? '无效' : ''}</span></>,
+    },
+    {
+      title: '操作',
+      dataIndex: 'customerId',
+      key: 'customerId',
+      align:'center',
+
+      render: (_, record) => (
+        <><span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} >
+          {record.verifyStatus ===0?<span onClick={() => toAudit(record.customerId)}>审核</span>
+          : record.verifyStatus ===1?<span onClick={() => toSee(record.customerId)}>查看详情</span>
+          : record.verifyStatus ===2?<span onClick={() => toSee(record.customerId)}>查看详情</span>
+          :''}</span>
+        </>
+      ),
+    },
+  ]
+
+
+ const searchFields=[
+  // {
+  //   name:'builidingId',
+  //   label:'用户',
+  //   placeholder:'选择用户',
+  //   render:()=><BuildSelect style={{width:160}}/>
+
+  // },
+  {
+    name: 'project',
+    label: '意向项目',
+    placeholder: '请输入意向项目',
+  },
+
+  {
+    name: 'name',
+    label: '姓名',
+    placeholder: '请输入姓名',
+  },
+  {
+    name: 'tel',
+    label: '电话',
+    placeholder: '请输入电话',
+  },
+    {
+    name: 'types',
+    label: '类型',
+    placeholder: '类型',
+    type: 'select',
+    placeholder:'全部',//错误
+    options: [
+      {label: '全部'},
+      {label: '买房',value:1},
+      {label: '租房', value: 2},
+      {label: '海外', value: 3}
+    ]
+  },
+  {
+    name: 'verifyStatus',
+    label: '状态',
+    placeholder: '请选择状态',
+    type: 'select',
+    placeholder:'全部',//错误
+    options: [
+      {label: '全部'},
+      {label: '待回访', value: 0},
+      {label: '已回访', value: 1},
+      {label: '无效', value: 2}
+    ]
+  },
+  ]
+ const actionRender = () => {
+  return (
+    <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+      导出
+    </Button>
+  );
+};
+
+  return (
+    <>
+      <QueryTable
+          rowKey="recommendCustomer"
+          // recommendCustomer
+          api={apis.homeload.houseSchr}
+          searchFields={searchFields}
+          columns={columns}
+          actionRender={actionRender}
+        />
+    
+    </>
+  );
+}
+
+export default Recommend

src/pages/home/Recommend/style.less

@@ -0,0 +1,151 @@
+.SubmitButton {
+  // background: rgba(239,39,58,1);
+  border-radius: 7px;
+  border: 0px;
+}
+.text {
+  color: rgba(239,39,58,1);
+}
+.SelectFrom {
+  width: 180px;
+  background: #ffffff;
+  border-radius: 7px;
+  border: 1px solid #dbdbdb;
+}
+.addButton {
+  background: #50be00;
+  border-radius: 4px;
+  border: 0px;
+  margin: 10px 0px;
+}
+.cardText {
+  color: #333;
+  display: flex;
+  align-items: center;
+  position: relative;
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem;
+
+}
+.cardItem{
+  color: #666;
+  display: flex;
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.106rem;
+  margin-bottom: 0.08rem; 
+}
+.ediText {
+  font-size: 0.106rem;
+  color: #ff925c;
+  line-height: 24px;
+  position: absolute;
+  right: 0;
+}
+.title{
+  display: inline-block;
+  width:  0.54rem;
+  justify-content: space-between;
+  text-align: justify;
+  text-align-last:justify
+}
+
+.address { 
+  width: 400px;
+  height: 24px; 
+  text-overflow: ellipsis; 
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+.pitchButton { 
+  border-color: rgba(255,126,72,1);
+  background-color: rgba(255,126,72,1);
+  color: rgba(255,255,255,1); 
+}
+.noButton {
+  border-color: rgba(255,126,72,1);
+  color: rgba(255,126,72,1);
+}
+.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/staff/Organization/index.jsx

@@ -1,15 +1,142 @@
-import React from 'react';
+import React, { Component } from 'react';
+import { Tree } from 'antd';
+const { DirectoryTree } = Tree;
 
-function Organization(props) {
+// function Organization(props) {
   
 
 
+//   return (
+//     <>
+//      组织架构
+//     </>
+//   );
+// }
+
+
+// export default Organization
+
+
+const treeData = [
+  {
+    title: '江苏XX软件集团',
+    key: '0-0',
+    children: [
+      {
+        title: '南京123电子科技有限公司',
+        key: '0-0-1',
+
+        // isLeaf: true,
+        children: [
+          {
+            title: '秦淮区分公司',
+            key: '0-0-1-0',
+            // isLeaf: true,
+            children: [
+              {
+                title: '制造一区',
+                key: '0-0-1-1',
+                isLeaf: true,
+              },
+              {
+                title: '总裁办公室',
+                key: '0-0-1-2',
+                isLeaf: true,
+              },
+              {
+                title: '工艺部',
+                key: '0-0-1-3',
+                isLeaf: true,
+              },
+              {
+                title: '技术部',
+                key: '0-0-1-4',
+                isLeaf: true,
+              },
+            ]
+          },
+        ]
+      },
+      {
+        title: '苏州￥￥科技股份有限公司',
+        key: '0-0-0',
+        isLeaf: true,
+      },
+      {
+        title: '宿迁ABC电商服务有限公司',
+        key: '0-0-0-1',
+        isLeaf: true,
+      },
+    ],
+  },
+  //---------------
+  {
+    title: '系统管理',
+    key: '0-2',
+    children: [
+      {
+        title: '机器设置',
+        key: '0-2-0',
+        isLeaf: true,
+      },
+      {
+        title: '散热设置',
+        key: '0-2-1',
+        // isLeaf: true,
+        children:[
+          {
+            title:'一号风扇',
+            key:'0-2-1-0'
+          },
+          {
+            title:'二号风扇',
+            key:'0-2-1-1'
+          },
+        ]
+      },
+      {
+        title: '广播设置',
+        key: '0-2-2',
+        isLeaf: true,
+      },
+    ],
+  },
+];
+
+const Demo = () => {
+  const onSelect = (keys, info) => {
+    console.log('Trigger Select', keys, info);
+  };
+
+  const onExpand = () => {
+    console.log('Trigger Expand');
+  };
+
   return (
-    <>
-     组织架构
-    </>
+    <DirectoryTree
+      multiple
+      defaultExpandAll
+      onSelect={onSelect}
+      onExpand={onExpand}
+      treeData={treeData}
+    />
   );
-}
+};
 
 
-export default Organization
+class Treetest extends Component {
+    // constructor(props) {
+    //     super(props);
+    //     //react定义数据
+    //     this.state = {
+    //     }
+    // }
+    render() {
+        return (
+          <div>
+            <DirectoryTree  treeData={treeData} />
+          </div>
+        )
+    }
+}
+export default  Treetest;

src/pages/system/Sellhouse/Edit.jsx

@@ -0,0 +1,21 @@
+import React, {  } from 'react';
+// import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { Card, Tabs } from 'antd';
+import Basic from './compents/Basic'
+
+const { TabPane } = Tabs;
+
+export default props => {
+    const newsId = props.location.query.newsId
+  return (
+    <Card>
+      <Tabs defaultActiveKey="1">
+        <TabPane tab="基本信息" key="1">
+          {/* <div style={{ maxWidth: 1000 }}> */}
+            <Basic newsId={newsId} />
+          {/* </div> */}
+        </TabPane>
+      </Tabs>
+    </Card>
+  );
+};

src/pages/system/Sellhouse/NewsHouse.jsx

@@ -0,0 +1,354 @@
+import React, { useState, useEffect } from 'react';
+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 styles from '../../style/GoodsList.less';
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import Prompt from 'umi/prompt';
+
+import AuthButton from '@/components/AuthButton';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const tempDate = [{ code: 's101' }]
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+  const [page, setPage] = useState(props.location.query.page || 1)
+
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    if (localStorage.getItem("newsPageParams")) {
+      props.form.setFieldsValue(JSON.parse(localStorage.getItem("newsPageParams")));
+      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
+
+      getList(JSON.parse(localStorage.getItem("newsPageParams")))
+    } else {
+      localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: 1, pageSize: 6 }));
+      getList({ pageNum: 1, pageSize: 6 })
+    }
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.news.getList, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        localStorage.setItem("newsPageParams", (JSON.stringify({ pageNum: 1, pageSize: 6, ...values })));
+        getList({ pageNum: 1, pageSize: 6, ...values })
+      }
+    });
+  }
+
+  // 跳转到编辑资讯列表
+  const toEditList = (id) => () => {
+    router.push({
+      pathname: '/system/Sellhouse/editNewsList',
+      query: {
+        id
+      },
+    });
+  }
+
+
+
+  /**
+   *卡片
+   *
+   * @returns
+   */
+  function CartBody(props) {
+    const { data } = props
+    console.log(data);
+    const cancelPage = () => {
+      router.push({
+        pathname: '/system/Sellhouse/NewsHouse',
+      });
+    }
+
+    //删除资讯
+    const changeNewsListStatus = (row, newsId) => () => {
+      Modal.confirm({
+        title: '资讯会被删除，小程序端和后台都无法再看到',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.news.put, urlData: { id: newsId }, data: { ...row, status: -1 } }).then((data) => {
+            message.info('操作成功！')
+            getList(JSON.parse(localStorage.getItem("newsPageParams")));
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
+          })
+        }
+      });
+    }
+
+    // 跳转到编辑资讯列表
+    const toEditList = (newsId) => () => {
+      router.push({
+        pathname: '/system/Sellhouse/editNewsList',
+        query: {
+          newsId,
+        },
+      });
+    }
+
+    //   置顶
+    const topNews = (weightParam, newsId) => () => {
+      const weight = Math.abs(weightParam - 1)
+      request({ ...apis.news.weight, params: { newsId: newsId, weight } }).then((data) => {
+        console.log(data)
+        message.info('操作成功！')
+        getList(JSON.parse(localStorage.getItem("newsPageParams")))
+      }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
+      })
+    }
+
+    function cancelRelease(newsId, newsStatus, buildingId, newsTypeId) {
+      console.log("newsId" + newsId + "status" + newsStatus);
+      if (newsStatus === 1) {
+        Modal.confirm({
+          title: '资讯会在小程序端隐藏，后台可继续编辑重新发布',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({ ...apis.news.cancel, data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId }, urlData: { id: newsId }, }).then((data) => {
+              message.info('操作成功！')
+              getList(JSON.parse(localStorage.getItem("newsPageParams")));
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      } else if (newsStatus === 0) {
+        Modal.confirm({
+          title: '确认发布该资讯？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({ ...apis.news.cancel, data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId }, urlData: { id: newsId }, }).then((data) => {
+              message.info('操作成功！')
+              getList(JSON.parse(localStorage.getItem("newsPageParams")));
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      }
+    }
+
+    return (
+      <Card
+        // hoverable
+        style={{ height: '230px', minWidth: '570px', 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: '230px', height: '228px' }}></img>}
+        bodyStyle={{ padding: '10px 20px' }}
+      >
+        <AuthButton name="admin.taNews.top" noRight={null}>
+          <span style={{ position: 'absolute', right: '83px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{data.weight === 1 ? '取消置顶' : '置顶'}</span>
+        </AuthButton>
+
+        <AuthButton name="admin.taNews.id.put" noRight={null}>
+          <span style={{ position: 'absolute', right: '10px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
+            <EditIcon text="编辑" color='#ff925c' type="edit"></EditIcon>
+          </span>
+        </AuthButton>
+        <AuthButton name="admin.taNews.publish" noRight={null}>
+          {data.newsStatus === 0 ?
+            <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+              <EditIcon text="取消发布" color='#FF4A4A' type="cancel"></EditIcon>
+            </span> :
+            <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+              <EditIcon text="发布" color='#ff925c' type="publish"></EditIcon>
+            </span>
+          }
+        </AuthButton>
+        <AuthButton name="admin.taNews.id.delete" noRight={null}>
+          <span style={{ position: 'absolute', right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', zIndex: 1 }} onClick={changeNewsListStatus(data, data.newsId)}>
+            <EditIcon text="删除" color='#FF4A4A' type="delete"></EditIcon>
+          </span>
+        </AuthButton>
+        <div style={{ position: 'absolute', left: '240px', top: '0px', padding: '16px 10px', width: '64%' }}>
+          <p style={{
+            fontSize: ' 0.106rem', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+            width: '75%',
+          }}><Navigate to={`/news/list/editNewsList?newsId=${data.newsId}`}>{data.newsName}</Navigate></p>
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex' }}>
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>资讯类型：{data.newsType.newsTypeName}</span>
+            <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
+            <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>阅读数量：{data.pvNum}</span>
+            <span>转发数量：{data.shareNum}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#555', marginBottom: '8px', display: 'flex', alignItems: 'center' }}>
+            {/* <span style={{ display: 'inline-block', width: '50%', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span> */}
+            <span>收藏数量：{data.saveNum}</span>
+          </p>
+
+          <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</p>
+        </div>
+      </Card>
+    )
+  }
+
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 6, ...values }));
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        getList({ pageNum: pageNumber, pageSize: 6, ...values })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+    localStorage.setItem("newsPageParams", JSON.stringify({ pageNum: 1, pageSize: 6 }));
+    getList({ pageNum: 1, pageSize: 6 })
+  }
+
+  function getDate(value, dateString) {
+    // moment(value).format('YYYY-MM-DD HH:mm:ss')
+    console.log(value, dateString)
+  }
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('newsTypeId')(
+            <NewsTypeSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('newsStatus')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="0">已发布</Option>
+              <Option value="1">未发布</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.news.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taNews.post" noRight={null}>
+        <Button type="danger" style={{ padding: '0 40px', margin: '20px 0' }} onClick={toEditList()}>
+          新增
+        </Button>
+      </AuthButton>
+
+      {/* 卡片内容，显示楼盘项目  */}
+      <Row>
+        {
+          dataSource.records.map((item, index) => (
+            <Col span={12}>
+              <CartBody data={item} key={item.buildingId} />
+            </Col>
+          ))
+        }
+      </Row>
+      {/* 分页 */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} pageSize={6} onChange={onChange} current={dataSource.current} />
+      </div>
+      <Prompt message={location =>
+        location.pathname.startsWith("/news/list")
+          ? true
+          : localStorage.removeItem("newsPageParams")} />
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/system/Sellhouse/compents/Basic.jsx

@@ -0,0 +1,148 @@
+import React, { useEffect, useState } from 'react';
+
+import { message} from 'antd';
+import apis from '@/services/apis';
+import router from 'umi/router';
+import XForm, { FieldTypes } from '@/components/XForm';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import request from '@/utils/request';
+import searchFields from '@/pages/building/Developers/searchFields';
+import QueryTable from '@/components/QueryTable'
+import BuildSelect from '@/components/SelectButton/BuildSelectHouse';
+
+
+
+const Basic = props => {
+  const { newsId } = props;
+  const [dynamicData, setDynamicData] = useState({});
+  const [changeBuildingId, setChangeBuildingIdData] = useState('');
+  const [newsDetailType, setNewsDetailType] = useState(1);
+
+  useEffect(() => {
+    if (newsId) {
+      getDynamicData(newsId);
+    }
+  }, [newsId]);
+
+  // 查询详情
+  const getDynamicData = newsId => {
+    request({ ...apis.news.get, urlData: { id: newsId } })
+      .then(data => {
+        setDynamicData(data);
+        console.log(data, 'sss');
+        setNewsDetailType(Number(data.newsDetailType));
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  const handleBuildingChange = e => {
+    console.log(e);
+    setChangeBuildingIdData(e);
+  };
+
+
+  const fields = [
+
+
+    // {
+    //   label: '城市',
+    //   name: 'building',
+    //   option:[
+    //     {label:'南京',value:'1'},
+    //     {label:'北京',value:'2'},
+    //   ]
+    // },
+    {
+      label: '意向项目',
+      name: 'buildingId',
+      render: <BuildSelect  />,
+      // onChange={e => handleBuildingChange(e)}
+      // value: dynamicData.buildingId,
+      rules: [{ required: true, message: '请选择所属项目' }],
+    },
+    {
+      label: '类型',
+      name: 'typesId',
+      value: dynamicData.buildingId,
+      option:[
+        {label:'买房准备',value:'1'},
+        {label:'看房选房',value:'2'},
+        {label:'认筹签约',value:'3'},
+      ]
+    },
+    {
+      label: '购房百科封面图',
+      name: 'newsImg',
+      type: FieldTypes.ImageUploader,
+      value: dynamicData.newsImg,
+      help: '建议尺寸：220px*176px，比例5:4，格式：jpg，用于：购房百科列表',
+      rules: [{ required: true, message: '请选择购房百科封面图' }],
+    },
+    {
+      label: '政策标题',
+      name: 'newsName',
+      type: FieldTypes.Text,
+      value: dynamicData.newsName,
+      rules: [{ required: true, message: '请输入政策标题' }],
+    },
+
+    {
+      label: '政策详情',
+      name: 'newsDetail',
+      render: <Wangedit />,
+      hidden: newsDetailType == 0,
+      value: dynamicData.newsDetail,
+      rules: [{ required: true, message: '请输入政策详情' }],
+    },
+      {
+      label: '状态',
+      name: 'newsTypeId',
+      option:[
+        {label:'已发布',value:'1'},
+        {label:'未发布',value:'2'},
+      ]
+    },
+  ];
+
+  // const handleSubmit = val => {
+  //   console.log(dynamicData, '12312345');
+  //   let { ...submitValue } = val;
+
+  //   if (newsId) {
+  //     submitValue.newsId = newsId;
+  //     request({ ...apis.news.put, urlData: { id: newsId }, data: { ...submitValue } })
+  //       .then(data => {
+  //         // cancelPage();
+  //         message.info('保存成功');
+  //         console.log(data, 'data1');
+  //       })
+  //       .catch(err => {
+  //         message.info(err.msg || err.message);
+  //       });
+  //   } else {
+  //     request({ ...apis.news.post, data: { ...submitValue } })
+  //       .then(data => {
+  //         // cancelPage();
+  //         message.info('保存成功');
+  //         router.go(-1);
+  //         console.log(data, 'data2');
+  //       })
+  //       .catch(err => {
+  //         message.info(err.msg || err.message);
+  //       });
+  //   }
+  // };
+
+  const cancelPage = () => {
+    router.go(-1);
+  };
+
+  return <XForm  onCancel={cancelPage} searchFields={searchFields} fields={fields}></XForm>;
+  // onSubmit={handleSubmit}
+  
+};
+
+export default Basic;

src/pages/system/Sellhouse/houseTypes/Newindex.jsx

@@ -0,0 +1,37 @@
+import React, { useState, useEffect } from 'react';
+import { Checkbox, Input, Card, Form, Button, Row, Col, Spin, message } from 'antd';
+import { connect } from 'dva';
+import XForm, { FieldTypes } from '@/components/XForm';
+import request from '@/utils/request';
+import router from 'umi/router';
+import apis from '@/services/apis';
+
+const { TextArea } = Input;
+
+const Backcom=()=>{
+  window.history.back(-1)
+}
+const Poster = props => {
+  const { getFieldDecorator } = props.form;
+  
+  return (
+    <Card>
+      <div>
+        <Form >
+          <Form.Item label="类型名称">
+            {getFieldDecorator('roleName', {})(<Input  style={{width:'500px'}} />)}
+
+          </Form.Item>
+            <Button  type="primary" htmlType="submit">
+              保存
+          </Button>
+            <Button style={{marginLeft:'20px'}} onClick={Backcom} >
+              取消
+          </Button>
+        </Form>
+      </div>
+    </Card>
+  )
+}
+const WrappedNormalLoginForm = Form.create({ name: 'Poster' })(Poster);
+export default connect(({ user }) => ({ user }))(WrappedNormalLoginForm);

src/pages/system/Sellhouse/houseTypes/index.jsx

@@ -0,0 +1,86 @@
+
+import React, { useState, useEffect } from 'react';
+import { Button, message, Table, Modal, Card } from 'antd';
+import withActions from '@/components/ActionList';
+import EditIcon from '@/components/EditIcon';
+import router from 'umi/router';
+import request from '@/utils/request'
+import apis from '@/services/apis';
+import AuthButton from '@/components/AuthButton';
+
+
+const header = props => {
+  function addRole(roleId) {
+    router.push({
+      pathname: '/system/Sellhouse/houseTypes/Newindex',
+    });
+  }
+  function stop(ids, status) {
+    Modal.confirm({
+      title: "确认要删除此条内容吗",
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
+          getRoleList({ pageNum: 1, pageSize: 100 })
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const columns = [
+    // {
+    //   title: '商品图片',
+    //   dataIndex: 'img',
+    //   key: 'img',
+    //   align: 'center',
+
+    //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+    // },
+    {
+      title: '类型名称',
+      dataIndex: 'roleName',
+      key: 'roleName',
+      align: 'center',
+
+    },
+
+    {
+      title: '操作  ',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+
+      render: withActions((text, record) => {
+        return record.isAdmin ? [] :
+          [
+            record.status === 1 ?
+            <AuthButton name="admin.role.publish" noRight={null}>
+              <EditIcon type="delete" text="删除" onClick={() => stop(record.roleId, record.status)} />
+            </AuthButton> : null,
+
+            <AuthButton name="admin.role.put" noRight={null}>
+              <EditIcon text="编辑" type="edit" onClick={() => toEditRole(record.roleId)} />
+            </AuthButton>,
+          ]
+      }),
+    },
+  ];
+
+
+  return (
+    <Card>
+      <AuthButton name="admin.role.add" noRight={null}>
+        <Button type="primary"  onClick={addRole}>新增</Button>
+      </AuthButton>
+      <div style={{marginTop:'20px'}}>
+        <Table rowKey="roleList"  columns={columns} />
+      </div>
+    </Card>
+
+  )
+}
+export default header

src/pages/system/Sellhouse/index.jsx

@@ -0,0 +1,259 @@
+import React, { useMemo, useRef, useCallback, useState } from 'react';
+// import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { Button, notification, Spin, Modal, message } from 'antd';
+import { router } from 'umi';
+import QueryTable from '@/components/QueryTable';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import SelectCity from '@/components/SelectButton/CitySelect';
+import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+import moment from 'moment';
+import OperButton from '@/components/OperButton';
+import AuthButton from '@/components/AuthButton';
+import withActions from '@/components/ActionList';
+import { number } from 'echarts/lib/export';
+
+export default props => {
+  const ref = useRef();
+  const [loading, setLoading] = useState(false);
+  const [page, setPage] = useState({ current: 1, pageSize: 10 });
+  const onPublish = useCallback(row => {
+    const buidingStatus = row.status === 1 ? 2 : 1;
+    request({ ...apis.building.updateStatus, data: { id: row.buildingId, status: buidingStatus } })
+      .then(() => {
+        notification.success({ message: '操作成功' });
+        setLoading(false);
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.error(err);
+        setLoading(false);
+      });
+  }, []);
+
+  // 跳转到新增/编辑购房百科列表
+  const toEditList = newsId => {
+    router.push({
+      pathname: '/system/Sellhouse/Edit',
+      query: {
+        newsId,
+      },
+    });
+  };
+
+  const onDelete = useCallback(row => {
+    setLoading(true);
+    request({ ...apis.building.deleteBuilding, urlData: { id: row.buildingId } })
+      .then(() => {
+        notification.success({ message: '操作成功' });
+        setLoading(false);
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.error(err);
+        setLoading(false);
+      });
+  }, []);
+
+  //   置顶
+  const topNews = (weightParam, newsId) => {
+    const weight = Math.abs(weightParam - 1);
+    request({ ...apis.news.weight, params: { newsId: newsId, weight } })
+      .then(data => {
+        console.log(data);
+        message.info('操作成功！');
+        ref.current.reload();
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  //发布
+  function cancelRelease(newsId, newsStatus, buildingId, newsTypeId) {
+    console.log('newsId' + newsId + 'status' + newsStatus);
+    if (newsStatus === 1) {
+      Modal.confirm({
+        title: '确认发布',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({
+            ...apis.news.cancel,
+            data: { newsStatus: newsStatus, buildingId: buildingId, newsTypeId: newsTypeId },
+            urlData: { id: newsId },
+          })
+            .then(data => {
+              message.info('操作成功！');
+              ref.current.reload();
+            })
+            .catch(err => {
+              console.log(err);
+              message.info(err.msg || err.message);
+            });
+        },
+        onCancel() {
+          console.log('Cancel');
+        },
+      });
+    } else if (newsStatus === 0) {
+      Modal.confirm({
+        title: '确认发布该资讯？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({
+            ...apis.news.cancel,
+            data: { newsStatus: newsStatus, buildingId: buildingId, newsTypeId: newsTypeId },
+            urlData: { id: newsId },
+          })
+            .then(data => {
+              message.info('操作成功！');
+              ref.current.reload();
+            })
+            .catch(err => {
+              console.log(err);
+              message.info(err.msg || err.message);
+            });
+        },
+        onCancel() {
+          console.log('Cancel');
+        },
+      });
+    }
+  }
+
+  const searchFields = [
+    {
+      name:'cityId',
+      label:'城市',
+      placeholder:'请选择城市',
+      type:'select',
+      // defaultValue:1,
+      options:[
+      {label:'南京',value:'1'},
+      {label:'北京',value:'2'},
+      {label:'上海',value:'3'},
+      ]
+
+    },
+    // {
+    //   name: 'cityId',
+    //   label: '城市',
+    //   placeholder: '请选择城市',
+    //   render: () => <SelectCity style={{ width: 160 }} />,
+    // },
+  ];
+
+  const tableColumns = [
+    {
+      title: '购房政策主图',
+      key: 'houseImg',
+      //newsImg
+      dataIndex: 'houseImg',
+      align: 'center',
+      // render: t => <img src={t} width={128} height={72} style={{ borderRadius: '4px' }} alt="" />,
+    },
+    {
+      title: '标题',
+      key: 'huoseName',
+      dataIndex: 'huoseName',
+      align: 'center',
+      with: 300,
+      // ellipsis: true,
+      render:(_,record)=><span>{record.houseName='高奢生活，在遇到它之前你想象不到'}</span>
+    },
+    {
+      title: '城市',
+      key: 'houseType',
+      dataIndex: 'houseType',
+      align: 'center',
+      // render: t => t.newsTypeName,
+      render:(_,record)=><span>{record.houseType='南京'}</span>
+
+    },
+    {
+      title: '创建时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: t => moment(t).format('YYYY-MM-DD HH:mm'),
+    },
+    {
+      title: '状态',
+      dataIndex: 'newsStatus',
+      key: 'newsStatus',
+      align: 'center',
+      render: t => (t == 0 ? '已发布' : '未发布'),
+    },
+
+    {
+      title: '操作',
+      key: 'options',
+      align: 'center',
+      render: withActions(
+        (_, row) => [
+          <AuthButton name="admin.taNews.publish" noRight={null}>
+            <OperButton
+              onClick={() =>
+                cancelRelease(
+                  row.newsId,
+                  row.newsStatus === 0 ? 1 : 0,
+                  row.buildingId,
+                  row.newsType.newsTypeId,
+                )
+              }
+            >
+              {row.newsStatus === 0 ? '取消发布' : '发布'}
+            </OperButton>
+          </AuthButton>,
+          //   <AuthButton name="admin.taNews.top" noRight={null}>
+          //   <span style={{ position: 'absolute', right: '83px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{data.weight === 1 ? '取消置顶' : '置顶'}</span>
+          // </AuthButton>
+          row.newsStatus === 0 && (
+            <AuthButton name="admin.taNews.top" noRight={null}>
+              <OperButton onClick={() => topNews(row.weight, row.newsId)}>
+                {row.weight === 1 ? '取消置顶' : '置顶'}
+              </OperButton>
+            </AuthButton>
+          ),
+
+          <AuthButton name="admin.taNews.id.put" noRight={null}>
+            <OperButton onClick={() => toEditList(row.newsId)}>编辑</OperButton>
+          </AuthButton>,
+
+          <AuthButton name="admin.taNews.id.delete" noRight={null}>
+            <OperButton.Confirm
+              title="确认删除?"
+              content="删除之后不可恢复"
+              onClick={() => onDelete(row)}
+            >
+              删除
+            </OperButton.Confirm>
+          </AuthButton>,
+        ],
+        { noMargin: true },
+      ),
+    },
+  ];
+  const actionRender = () => {
+    return (
+      <Button type="primary" icon="plus" onClick={() => toEditList()}>
+        新增
+      </Button>
+    );
+  };
+
+  return (
+    <QueryTable
+      ref={ref}
+      rowKey="newsId"
+      api={apis.news.getList}
+      searchFields={searchFields}
+      columns={tableColumns}
+      actionRender={actionRender}
+    />
+  );
+};

src/pages/system/Sellhouse/style.less

@@ -0,0 +1,119 @@
+.SubmitButton {
+    background: #3a91d5;
+    border-radius: 7px;
+    border: 0px;
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: relative;
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  
+  }
+  .cardItem{
+    color: #666;
+    display: flex;
+    align-items: center;  
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  }
+  .ediText {
+    font-size: 0.106rem;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width:  0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+
+  .SubmitButton {
+    background: rgba(239,39,58,1);
+    border-radius: 7px;
+    border: 0px;
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: relative;
+    line-height: 1.5;
+    font-size: 0.106rem;
+    margin-bottom: 0.08rem;
+  
+  }
+  .cardItem{
+    font-size: 0.106rem;
+    font-weight: 400;
+    color: #666;
+    line-height: 24px;
+    display: flex;
+    align-items: center;  
+  }
+  .ediText {
+    font-size:  0.106rem;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width:  0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  
+  
+  
+  

src/pages/user/login/index.jsx

@@ -5,6 +5,7 @@ import { connect } from 'dva';
 import md5 from "md5";
 import LoginComponents from './components/Login';
 import styles from './style.less';
+import { defineLocale } from 'moment';
 
 const { UserName, Password, Submit } = LoginComponents;
 

src/services/apis.js

@@ -208,6 +208,17 @@ export default {
       action: 'admin.taNewsType.get',
     }
   },
+  //预加 帮我找房
+  homeload: {
+    houseSchr:{
+      method: 'GET',
+      url: `${prefix}/home/Recommend/searchHouse`,
+      action: 'admin.home.Recommend.searchHouse.get',
+      // action: 'admin.customer.recommend.recommender.get',
+
+    }
+  },
+
   customer: {
     drift: {
       method: 'GET',
@@ -299,6 +310,13 @@ export default {
       url: `${prefix}/customer/recommend/recommender/export`,
       action: 'admin.customer.recommend.recommender.export.get',
     },
+
+    // //recommender
+    // homeRecommendrecommenderExport: { // 导出数据（home   推荐客户 预加）
+    //   method: 'GET',
+    //   url: `${prefix}/home/recommend/recommender/export`,
+    //   action: 'admin.home.recommend.recommender.export.get',
+    // },
     customerRecommendReportExport: { // 导出数据（报备客户）
       method: 'GET',
       url: `${prefix}/customer/recommend/report/export`,
@@ -712,6 +730,32 @@ export default {
       action: 'admin.taCustomImg.id.get',
     },
   },
+  //Course+
+  course:{
+  Tablecourse:{
+    method:'GET',
+    url:`${prefix}/curriculum`,
+    action: 'admin.curriculum.get',
+  },
+    searchCourse:{
+      method:'GET',
+      url:`${prefix}/curriculum/:id`,
+      // action:'admin.curriculum.id.get'
+      action: 'admin.taCustomImg.id.get',
+    },
+    addCourse:{
+      method:'POST',
+      // POST /api/admin/curriculum
+      url:`${prefix}/curriculum`,
+      action:'admin.curriculum.post',
+    },
+    //修改
+    alterCourse:{
+      method:'PUT',
+      url:`${prefix}/curriculum/:id`,
+      action:'admin.curriculum.id.put'
+    }
+  },
   system: {
     taPolicy: {
       url: `${prefix}/taPolicy/:id`,

src/utils/request.js

@@ -56,7 +56,7 @@ request.interceptors.request.use((url, options) => {
         },
         data,
         requestType: data instanceof FormData ? 'form' : 'json',
-        credentials: 'include', // 带 cookie
+        // credentials: 'include', // 带 cookie/s
         interceptors: true,
         getResponse: true,
       },