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

config/config.js

@@ -375,6 +375,21 @@ export default {
                   name: '报表数据',
                   component: './system/report',
                 },
+                {
+                  path: '/system/intention',
+                  name: '意向值',
+                  component: './system/intention',
+                },
+                {
+                  path: '/system/housingPolicy',
+                  name: '购房政策维护',
+                  component: './system/housingPolicy',
+                },
+                {
+                  path: '/system/editPolicy',
+                  name: '',
+                  component: './system/editPolicy',
+                },
               ],
             },
             {

src/pages/channel/InviteClients.jsx

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

src/pages/channel/brokerList.jsx

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

src/pages/channel/channelList.jsx

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

src/pages/channel/channelList.less

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

src/pages/channel/recommendClients.jsx

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

src/pages/customer/independentList/index.jsx

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

src/pages/system/editPolicy.jsx

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

src/pages/system/housingPolicy.jsx

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

src/pages/system/intention.jsx

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