git pull

package.json

@@ -56,6 +56,7 @@
     "md5": "^2.3.0",
     "moment": "^2.24.0",
     "omit.js": "^1.0.2",
+    "package.json": "^2.0.1",
     "path-to-regexp": "2.4.0",
     "qs": "^6.9.0",
     "react": "^16.8.6",

src/pages/building/Developers/tableColumns.js

@@ -27,7 +27,7 @@ export default ({page,getBrandData, onEdit, onDelete}) => [
     dataIndex: 'brandImg',
     key: 'brandImg',
     align: 'center',
-    render:(_,record)=> <img src={getImgURL(record.brandImg)} style={{width:'165px',height:'104px'}}/>,
+    render:(_,record)=> <img src={getImgURL(record.brandImg)} style={{width:'165px',height:'104px',borderRadius:'5px'}}/>,
   },
   {
     title: '简介',

src/pages/home/Recommend/auditCopy.jsx

@@ -33,14 +33,14 @@ function body(props) {
   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)})
+      if (res) {
+        props.form.setFieldsValue({ ...res, reportDate: moment(res.reportDate) })
       }
-    
+
     })
   }
   //返回上一页
-  function backCom(){
+  function backCom() {
     window.history.back(-1)
   }
   return (
@@ -81,15 +81,15 @@ function body(props) {
         </Form.Item>
         <Form.Item label="客户备注"  >
           {getFieldDecorator('say')(
-            <TextArea  placeholder="客户描述" rows={7}
+            <TextArea placeholder="客户描述" rows={7}
             />,
           )}
         </Form.Item>
         <Form.Item label="回访备注" >
-          {getFieldDecorator('describe' ,{
-            rules:[{required:true}]//v3x必填
+          {getFieldDecorator('describe', {
+            rules: [{ required: true }]//v3x必填
           })(
-            <TextArea placeholder="回访备注" rows={7}  value={props}/>,
+            <TextArea placeholder="回访备注" rows={7} value={props} />,
           )}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>

src/pages/home/Recommend/index.jsx

@@ -1,5 +1,5 @@
-import React, {PureComponent, useMemo, useState } from 'react';
-import {  Avatar, Button } from 'antd';
+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';
@@ -26,7 +26,7 @@ import { backgroundColor } from 'echarts/lib/theme/dark';
 
 
 function Recommend() {
-  const [exportLoding,setExportLoding] = useState(false)
+  const [exportLoding, setExportLoding] = useState(false)
   //详情页面弹窗配置
   function toAudit(cuurentId) {
     router.push({
@@ -35,7 +35,7 @@ function Recommend() {
         id: cuurentId,
       },
     })
-    
+
   }
   function toSee(cuurentId) {
     router.push({
@@ -44,7 +44,7 @@ function Recommend() {
         id: cuurentId,
       },
     })
-    
+
   }
 
 
@@ -64,19 +64,16 @@ function Recommend() {
 
     })
   }
-  function back(){
-    window.history.back(-1)
-  }
 
   function download(data) {
     if (!data) {
-      return 
+      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')
+    link.setAttribute('download', '找房需求.xlsx')
     document.body.append(link)
     link.click()
     setExportLoding(false)
@@ -84,146 +81,143 @@ function Recommend() {
   const columns = [
     {
       title: '头像',
-      dataIndex: 'picture',
-      key: 'picture',
-      align:'center',
-      render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+      dataIndex: 'avatarurl',
+      key: 'avatarurl',
+      align: 'center',
+      render: (_, record) => <Avatar shape="square" src={record.avatarurl} size={64} />,
     },
     {
       title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-      align:'center',
+      dataIndex: 'nickname',
+      key: 'nickname',
+      align: 'center',
       // render: (_, record) => <><span>{record.name = '曹建芳'}</span></>,
     },
     {
       title: '电话',
       dataIndex: 'phone',
       key: 'phone',
-      align:'center',
+      align: 'center',
     },
     {
       title: '性别',
-      dataIndex: 'sex',
-      key: 'sex',
-      align:'center',
+      dataIndex: 'gender',
+      key: 'gender',
+      align: 'center',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
     },
     {
       title: '意向区域',
-      dataIndex: 'area',//意向区域
-      key: 'area',
-      align:'center',
-      render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
+      dataIndex: 'intentArea',//意向区域
+      key: 'intentArea',
+      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>
+      align: 'center',
+      // 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></>,
+      dataIndex: 'createdTime',
+      key: 'createdTime',
+      align: 'center',
+      render: (_, record) => <><span>{record.createdTime && moment(record.createdTime).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></>,
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (_, record) => <><span>{record.verifyStatus === 0 ? '待回访' : record.verifyStatus === 1 ? '已回访' : record.verifyStatus === 2 ? '无效' : ''}</span></>,
     },
     {
       title: '操作',
       dataIndex: 'customerId',
       key: 'customerId',
-      align:'center',
+      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>
+          {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: 'project',
-    label: '意向项目',
-    placeholder: '请输入意向项目',
-  },
-
-  {
-    name: 'name',
-    label: '姓名',
-    placeholder: '请输入姓名',
-  },
-  {
-    name: 'tel',
-    label: '电话',
-    placeholder: '请输入电话',
-  },
+  const searchFields = [
+
+    {
+      name: 'project',
+      label: '意向项目',
+      placeholder: '请输入意向项目',
+    },
+
+    {
+      name: 'name',
+      label: '姓名',
+      placeholder: '请输入姓名',
+    },
     {
-    name: 'types',
-    label: '类型',
-    placeholder: '类型',
-    type: 'select',
-    options: [
-      {label: '全部',value:''},
-      {label: '买房',value: '1'},
-      {label: '租房', value: '2'},
-      {label: '海外', value: '3'}
-    ]
-  },
-  {
-    name: 'verifyStatus',
-    label: '状态',
-    placeholder: '请选择状态',
-    type: 'select',
-    placeholder:'全部',//错误
-    options: [
-      {label: '全部',value:''},
-      {label: '待回访', value: '0'},
-      {label: '已回访', value: '1'},
-      {label: '无效', value: '2'}
-    ]
-  },
+      name: 'tel',
+      label: '电话',
+      placeholder: '请输入电话',
+    },
+    {
+      name: 'types',
+      label: '类型',
+      placeholder: '类型',
+      type: 'select',
+      options: [
+        { label: '全部', value: '' },
+        { label: '买房', value: '1' },
+        { label: '租房', value: '2' },
+        { label: '海外', value: '3' }
+      ]
+    },
+    {
+      name: 'verifyStatus',
+      label: '状态',
+      placeholder: '请选择状态',
+      type: 'select',
+      placeholder: '全部',//错误
+      options: [
+        { label: '全部', value: '' },
+        { label: '待回访', value: '0' },
+        { label: '已回访', value: '1' },
+        { label: '无效', value: '2' }
+      ]
+    },
   ]
- const actionRender = () => {
-  return (
-    <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
-      导出
-    </Button>
-  );
-};
+  const actionRender = () => {
+    return (
+      <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+        导出
+      </Button>
+    );
+  };
 
   return (
     <>
       <QueryTable
-          rowKey="recommendCustomer"
-          // recommendCustomer
-          api={apis.searchHouse.list}
-          searchFields={searchFields}
-          columns={columns}
-          actionRender={actionRender}
-        />
-    
+        rowKey="recommendCustomer"
+        // recommendCustomer
+        api={apis.searchHouse.list}
+        searchFields={searchFields}
+        columns={columns}
+        actionRender={actionRender}
+      />
+
     </>
   );
 }

src/pages/staff/Organization/index.jsx

@@ -1,140 +1,253 @@
+import React, { useState } from "react";
+import { Tree, Icon, Card } from "antd";
+import { nanoid } from "nanoid";//生成唯一id
+import { duration } from "moment";
 
-import React, { Component,useState } from 'react';
-import { Card, Tree,Icon } from 'antd';
-import { render } from 'preact';
-import { turn } from 'cli-table';
-const { DirectoryTree,TreeNode } = Tree;
+const { TreeNode } = Tree;
+//树形数据
 const treeData = [
   {
-    value:'江苏省公安厅',
-    defaultValue:'0',
-    parentKey:'0',
-    isEditable:false,
-    key:'0',
-    children:[
+    value: "0",
+    defaultValue: "0",
+    key: "0",
+    parentKey: '0',
+    isEditable: false,
+    children: [
       {
-        value:'南京分局',
-        key:'0-1',
+        value: "0",
+        key: "0-1",
         defaultValue: "0-1",
         isEditable: false,
       },
-      {
-        value:'苏州分局',
-        key:'0-2',
-        defaultValue: "0-2",
-        isEditable: false,
-      },
     ],
   },
+
 ];
 
+const expandedKeyArr = ["0"];
+export default function TreeDemo() {
+  const [data, setData] = useState(treeData);//获取值，及时更新被修改的值。变量
+  const [expandedKeys, setExpandedKeys] = useState(expandedKeyArr);//状态
+  const onExpand = (expandedKeys) => {
+    //记录折叠的key值
+    setExpandedKeys(expandedKeys);
+  };
+  //开始渲染树形节点 data拿到数据
+  const renderTreeNodes = (data) => {
+    //遍历项目
+    let nodeArr = data.map((item) => {
+      //项目编辑内容=title
+      if (item.isEditable) {
+        item.title = (
+          <div>
+            {/* 逻辑运算 OR  */}
+            {/* item项目value根据状态切换 */}
+            {/*onChange这个API是一个函数，并且需要返回值，API的返回值是onChange方法的返回值
+            e就是api的形参，这个参数的生成需要onChange的API触发，同时将e传给方法并获取其返回值
+            实参把值给形参，由形参保存。
 
-const expandedKeyArr=['0'];
+            这个e会获取到最新的变化值并且传到onchange方法
+            */}
+            <input value={item.value || ''} onChange={(e) => onChange(e, item.key)} />
 
+            <Icon
+              //取消保存
+              type="close-circle"
+              theme="filled"
 
-export default function TreeDemo() {
-  const[data,setData]=useState(treeData)//获取值，及时更新被修改的值。变量
-  const renderTreeNodes=(data)=>{
-    let nodeArr=data.map((item)=>{//遍历数据
-      item.title=(//修改
-        <div style={{display:'flex', minWidth: '100px'}}>
-          <span style={{ flex: 'auto' }}>{item.value}</span>
-          <span style={{ width: '6em', flex: 'none',marginLeft:'20px' }}>
-            {/* 编辑 */}
-            <Icon type="edit" onClick={()=>onDelete(item.key)} /> 
-            {/* 添加 */}
-            <Icon type="diff" onClick={()=>onAdd(item.key)} />
-            {/* 删除 */}
-            <Icon type="delete"  onClick={()=>onEdit(item.key)}/>
-          </span>
-        </div>
-      )
-      if(item.children){//如果有子项就返回下面组件
-        return(
+              style={{ marginLeft: 10 }}
+              onClick={() => onClose(item.key, item.defaultValue)}//恢复默认值 
+            />
+            <Icon
+              //保存节点
+              type="check-circle"
+              theme="filled"
+              style={{ marginLeft: 10 }}
+              onClick={() => onSave(item.key)}
+            />
+          </div>
+        );
+      } else {
+        //放在标题旁边
+        item.title = (
+          <div >
+            <span>{item.value}</span>
+            <span>
+              {/* 编辑edit onclick 拿到项目的key */}
+              <Icon
+                type="edit"
+                style={{ marginLeft: 10 }}
+                onClick={() => onEdit(item.key)}
+              />
+              {/* 编辑plus onclick 拿到项目的key */}
+              <Icon
+                type="plus"
+                style={{ marginLeft: 10 }}
+                onClick={() => onAdd(item.key)}
+              />
+              {/* 先确认父key是不是绝对等于"0" */}
+              {item.parentKey === "0" ? null : (
+                <Icon
+                  type="delete"
+                  style={{ marginLeft: 10 }}
+                  onClick={() => onDelete(item.key)}
+                />
+              )}
+            </span>
+          </div>
+        );
+      }
+      //更新数据----------------------------
+      if (item.children) {
+        return (
           <TreeNode title={item.title} key={item.key} dataRef={item}>
+            {/* 渲染 */}
             {renderTreeNodes(item.children)}
-            {/* 重新渲染节点 */}
-          </TreeNode>//title 接收的 ReactNode类型数据 自定义
-        )
+          </TreeNode>
+        );
       }
-      //返回
-      return <TreeNode title={item.title} key={item.key} />
-    })
-      return nodeArr
-  };
-//添加
-  const onAdd=(key)=>{
-    // useState 里面数据是不能变的对象。需要slice返回一个新的数组
-    addNode(key.treeData);//添加节点 树形
-    setData(treeData.slice()) //设置 子项
+      //返回他的标题，和key值
+      return <TreeNode title={item.title} key={item.key} />;
+    });
+    //返回节点
+    return nodeArr;
   }
+  //新增
+  const onAdd = (key) => {
+    if (expandedKeys.indexOf(key) === -1) {
+      expandedKeyArr.push(key);
+    }
+    setExpandedKeys(expandedKeyArr.slice());
+    addNode(key, treeData);//添加节点 树形
+    //useState里数据务必为immutable （不可赋值的对象），所以必须加上slice()返回一个新的数组对象
+    setData(treeData.slice());//添加子项
+  };
   //编辑
-  const onEdit=(key)=>{
-    editNode(key,treeData);
+  //拿到key treeData数据--setData设置数据---slice删除数据中已返回的元素  [aa,bb,cc,dd,ee]--slice(2)输出[cc,dd,ee]
+  const onEdit = (key) => {
+    editNode(key, treeData);
     setData(treeData.slice());
   };
-  const editNode=(key,data)=>
-    data.forEach((item)=>{
-      if (item.key===key) {
-        item.isEditable=true;//可编辑状态更改
-      }else{
-        item.isEditable=false;
+  const editNode = (key, data) =>
+    data.forEach((item) => {
+      if (item.key === key) {
+        //编辑状态 true
+
+        item.isEditable = true;
+      } else {
+
+        //编辑状态 false
+        item.isEditable = false;
       }
-      item.value=item.defaultValue;//当某子项处于编辑状态，改变数据，点击其他时候，此项变成不可编辑
+      item.value = item.defaultValue; // 当某节点处于编辑状态，并改变数据，点击编辑其他节点时，此节点变成不可编辑状态，value 需要回退到 defaultvalue
+      //当某子项处于编辑状态，改变数据，点击其他时候，此项变成不可编辑
       if (item.children) {
-        editNode(key,item.children);
+        editNode(key, item.children);
+        //编辑子节点
       }
-    })  
+    });
 
-    //删除
-    const onDelete = (key) => {
-      deleteNode(key, treeData);
-      setData(treeData.slice());
-    };
-    const deleteNode = (key, data) =>
-      data.forEach((item, index) => {
-        if (item.key === key) {
-          data.splice(index, 1);//从某个位置开始删除元素
-          return;
-        } else {
-          if (item.children) {
-            deleteNode(key, item.children);
-          }
-        }
-      });
-
-  const addNode=(key,data)=>
-    data.forEach((item)=>{
-      if(item.key===key){//如果拿到的key相同则判断子项
+  const addNode = (key, data) =>
+    data.forEach((item) => {
+      if (item.key === key) {//如果拿到的key相同则判断子项
         if (item.children) {
           item.children.push({
-            value:"请输入内容",
-            key:key+Math.random(100),//随机唯一的key
+            value: "default",//创建新的子项默认值
+            key: nanoid(), // 这个 key 应该是唯一的
+          });
+        } else {
+          item.children = [];
+          item.children.push({
+            value: "default",
+            key: nanoid(),
           });
         }
         return;
       }
       if (item.children) {
-        addNode(key,item.children)//子项
+        addNode(key, item.children);
+      }
+    });
+
+  const onChange = (e, key) => {
+    changeNode(key, e.target.value, treeData);
+    setData(treeData.slice());
+  };
+
+  const changeNode = (key, value, data) =>
+    data.forEach((item) => {
+      if (item.key === key) {//新增子项内容赋值
+        item.value = value;
+      }
+      if (item.children) {
+        changeNode(key, value, item.children);//子项
+      }
+    });
+
+  const onSave = (key) => {
+    saveNode(key, treeData);
+    setData(treeData.slice());
+  };
+  //确认保存节点
+  const saveNode = (key, data) =>
+    data.forEach((item) => {
+      if (item.key === key) {
+        item.defaultValue = item.value;//item.value内容赋值给defaultValue
+      }
+      //子项保存不能编辑
+      if (item.children) {
+        saveNode(key, item.children);
       }
-    })
+      //项目是否能编辑
+      item.isEditable = false;
+    });
+
+  const onClose = (key, defaultValue) => {
+    closeNode(key, defaultValue, treeData);
+    //项目关闭，获取treeData树数据值
+    setData(treeData);
+  };
+  //取消确认
+  const closeNode = (key, defaultValue, data) =>
+    data.forEach((item) => {
+      item.isEditable = false;
+      if (item.key === key) {
+        item.value = defaultValue;
+      }
+      if (item.children) {
+        closeNode(key, defaultValue, item.children);
+      }
+    });
+  // slice() 方法可提取字符串的某个部分，并以新的字符串返回被提取的部分。
+  const onDelete = (key) => {
+    deleteNode(key, treeData);
+    setData(treeData.slice());
+  };
+  //删除节点
+  const deleteNode = (key, data) =>
+    //拿到每个key数据， 如果要删除的key相同，则删除，并返回。如果不同判断子项
+    data.forEach((item, index) => {
+      if (item.key === key) {
+        data.splice(index, 1);//从某个位置开始删除元素
+        return;
+      } else {
+        if (item.children) {
+          deleteNode(key, item.children);
+        }
+      }
+    });
+
   return (
     <div>
-      <Card style={{width:'90%'}}>
-        <Tree 
-        switcherIcon={<Icon type="down-square" theme="filled" />}
-        // icon={<Icon type="carry-out" />}
-        style={{paddingLeft:'60px'}} 
-        treeData={treeData}  >
-        {renderTreeNodes(data)}
+      <Card style={{ width: '90%' }}>
+        <Tree
+          switcherIcon={<Icon type="down-square" theme="filled" />}
+          expandedKeys={expandedKeys}
+          onExpand={onExpand}>
+          {renderTreeNodes(data)}
         </Tree>
-        {/* 渲染被更新 */}
       </Card>
+
     </div>
   );
-}
-
-
-
-
-
+}

src/pages/system/Sellhouse/index.jsx

@@ -163,7 +163,7 @@ export default props => {
       align: 'center',
       with: 300,
       // ellipsis: true,
-      render:(_,record)=><span>{record.houseName='高奢生活，在遇到它之前你想象不到'}</span>
+      // render:(_,record)=><span>{record.houseName='高奢生活，在遇到它之前你想象不到'}</span>
     },
     {
       title: '城市',
@@ -171,7 +171,7 @@ export default props => {
       dataIndex: 'houseType',
       align: 'center',
       // render: t => t.newsTypeName,
-      render:(_,record)=><span>{record.houseType='南京'}</span>
+      // render:(_,record)=><span>{record.houseType='南京'}</span>
 
     },
     {

src/pages/system/housingPolicy/Edit/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Card } from 'antd';
 
 import moment from 'moment';
 import router from 'umi/router';
@@ -16,118 +16,120 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
  * @param {*} props
  * @returns
  */
- const Edit = (props) => {
+const Edit = (props) => {
   const policyId = props.location.query.policyId
-  const [ policyData, setPolicyData ] = useState({})
-  if(policyId){
+  const [policyData, setPolicyData] = useState({})
+  if (policyId) {
     useEffect(() => {
       getPolicyData(policyId);
-    },[])
+    }, [])
 
-  // 查询列表
-  const getPolicyData = (policyId) => {
-    request({ ...apis.system.taPolicy, urlData: {id: policyId} }).then((data) => {
+    // 查询列表
+    const getPolicyData = (policyId) => {
+      request({ ...apis.system.taPolicy, urlData: { id: policyId } }).then((data) => {
         console.log(data)
         setPolicyData(data)
-    })
-  }
+      })
+    }
   }
 
-  const cancelPage = () =>{
+  const cancelPage = () => {
     router.push({
       pathname: '/system/housingPolicy',
     });
   }
-    const fields = [
-      {
-        label: '城市',
-        name: 'cityId',
-        render: <SelectCity />,
-        value: policyData.cityId,
-        rules: [
-          {
-            required: true,
-            message: '请选择城市',
-          },
-        ],
-      },
-      {
-        label: '购房须知封面图',
-        name: 'policyImg',
-        type: FieldTypes.ImageUploader,
-        value: policyData.policyImg,
-        help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，用于购房须知列表',
-        rules: [
-          {
-            required: true,
-            message: '请选择购房须知封面图',
-          },
-        ],
-      },
-      {
-        label: '购房须知标题',
-        name: 'title',
-        type: FieldTypes.Text,
-        value: policyData.title,
-        rules: [
-          {
-            required: true,
-            message: '请输入购房须知标题',
-          },
-        ],
-      },
-      {
-        label: '购房须知详情',
-        name: 'body',
-        render: <Wangedit />,
-        value: policyData.body,
-        rules: [
-          {
-            required: true,
-            message: '请输入购房须知详情',
-          },
-        ],
-      },
-      {
-        label: '状态',
-        name: 'publishStatus',
-        type: FieldTypes.Select,
-        dict: [{label:"未发布",value:0},{label:"已发布",value:1}],
-        value: policyData.publishStatus != null ? policyData.publishStatus : 1,
-      },
-    ]
-  
-    const handleSubmit = val => { 
-      console.log('submit data --->', val)
-      console.log(val.body, 'val.body')
-      if (val.body == '<p><br></p>'){
-        message.info("购房须知详情必填")
-        return
-      }
-      
-      if(policyId){
-        val.policyId = policyId
-        request({ ...apis.system.updateTaPolicy, urlData: {id: policyId},data: val, }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }else{
-        request({ ...apis.system.addTaPolicy,data: val, }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }
+  const fields = [
+    {
+      label: '城市',
+      name: 'cityId',
+      render: <SelectCity />,
+      value: policyData.cityId,
+      rules: [
+        {
+          required: true,
+          message: '请选择城市',
+        },
+      ],
+    },
+    {
+      label: '购房须知封面图',
+      name: 'policyImg',
+      type: FieldTypes.ImageUploader,
+      value: policyData.policyImg,
+      help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，用于购房须知列表',
+      rules: [
+        {
+          required: true,
+          message: '请选择购房须知封面图',
+        },
+      ],
+    },
+    {
+      label: '购房须知标题',
+      name: 'title',
+      type: FieldTypes.Text,
+      value: policyData.title,
+      rules: [
+        {
+          required: true,
+          message: '请输入购房须知标题',
+        },
+      ],
+    },
+    {
+      label: '购房须知详情',
+      name: 'body',
+      render: <Wangedit />,
+      value: policyData.body,
+      rules: [
+        {
+          required: true,
+          message: '请输入购房须知详情',
+        },
+      ],
+    },
+    {
+      label: '状态',
+      name: 'publishStatus',
+      type: FieldTypes.Select,
+      dict: [{ label: "未发布", value: 0 }, { label: "已发布", value: 1 }],
+      value: policyData.publishStatus != null ? policyData.publishStatus : 1,
+    },
+  ]
+
+  const handleSubmit = val => {
+    console.log('submit data --->', val)
+    console.log(val.body, 'val.body')
+    if (val.body == '<p><br></p>') {
+      message.info("购房须知详情必填")
+      return
     }
-     
+
+    if (policyId) {
+      val.policyId = policyId
+      request({ ...apis.system.updateTaPolicy, urlData: { id: policyId }, data: val, }).then((data) => {
+        message.info("保存成功")
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    } else {
+      request({ ...apis.system.addTaPolicy, data: val, }).then((data) => {
+        message.info("保存成功")
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+    }
+  }
+
 
   return (
-    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    <Card>
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    </Card>
   );
- }
+}