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

src/components/SelectButton/CitySelect.jsx

@@ -30,7 +30,7 @@ const CitySelect = (props) => {
   }
 
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择城市" onChange={props.onChange}>
+      <Select showSearch value={props.value} style={{ width: '180px' }} placeholder="请选择城市" onChange={props.onChange}>
           {data.map(city => (
             <Option key={city.id} value={city.id}>{city.name}</Option>
           ))}

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

@@ -60,6 +60,9 @@ function AddBuilding(props) {
       if (res.receivedDate !== null) {
         res.receivedDate = moment(res.receivedDate)
       }
+      if (res.buildingTag !== null) {
+        res.tag = res.buildingTag.map((item, _) => item.tagName)
+      }
 
       res.avatarImage = res.buildingImg.map(item => item.url)
       props.form.setFieldsValue(res)
@@ -80,6 +83,9 @@ function AddBuilding(props) {
     data.receivedDate = moment(data.receivedDate, 'yyyy-MM-dd HH:mm:ss')
     // 项目主图
     data.img = data.avatarImage && data.avatarImage.map((item, index) => ({ imgType: 'banner', url: item, orderNo: index + 1 }))
+    if (data.tag) {
+      data.tag = data.tag.map((item, _) => ({ tagName: item }))
+    }
 
     const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
     request({ ...api, data: { ...data } }).then(() => {
@@ -108,7 +114,7 @@ function AddBuilding(props) {
             {getFieldDecorator('buildingProjectType')(<BudildingProjectType />)}
           </Form.Item>
           <Form.Item label="均价" hasFeedback>
-            {getFieldDecorator('price')(<Input />)}
+            {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}m²/元
           </Form.Item>
           <Form.Item label="开盘时间"  hasFeedback>
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
@@ -128,12 +134,18 @@ function AddBuilding(props) {
             )}
           </Form.Item>
           <Form.Item label="销售状态" hasFeedback>
-            {getFieldDecorator('marketStatus')(<Input />)}
+            {getFieldDecorator('marketStatus')(
+              <Select placeholder="销售状态" style={{ width: '1016px' }}>
+                <Option value="待定">待定</Option>
+                <Option value="在售">在售</Option>
+                <Option value="售完">售完</Option>
+              </Select>,
+            )}
           </Form.Item>
-          <Form.Item label="标签" hasFeedback style={{ display: 'none' }}>
-            {getFieldDecorator('tags')(
-              <Select mode="multiple" placeholder="标签" style={{ width: '1016px' }}>
-                <Option value="未知">未知</Option>
+          <Form.Item label="项目标签" hasFeedback>
+            {getFieldDecorator('tag')(
+              <Select mode="tags" placeholder="输入后选中" style={{ width: '1016px' }}>
+                
               </Select>,
             )}
           </Form.Item>

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

@@ -94,7 +94,7 @@ function imageSet(props) {
 
   const columns = [
     {
-      title: '名称',
+      title: '户型名称',
       dataIndex: 'apartmentName',
       key: 'apartmentName',
     },
@@ -136,7 +136,7 @@ function imageSet(props) {
 
   return (
     <>
-      <Button type="primary" onClick={() => showEdi()}>新增户型库</Button>
+      <Button type="primary" onClick={() => showEdi()}>新增户型</Button>
       <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
 
       {/* 编辑页 */}

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

@@ -165,14 +165,14 @@ class ModalImage extends React.Component {
               <Form.Item label="名称">
                 {getFieldDecorator('apartmentName')(<Input />)}
               </Form.Item>
-              {/* <Form.Item label="类型">
+              <Form.Item label="类型">
                 {getFieldDecorator('apartmentType')(
                   <Select placeholder="类型">
                     <Option value="apart">户型</Option>
                     <Option value="photo">相册</Option>
                   </Select>,
                 )}
-              </Form.Item> */}
+              </Form.Item>
               <Form.Item label="销售状态">
                 {getFieldDecorator('marketStatus')(
                   <Select placeholder="销售状态">

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

@@ -49,7 +49,7 @@ function AddBuilding(props) {
           props.location.query.id &&
           (
             <>
-              <Radio.Button value="image">图片</Radio.Button>
+              <Radio.Button value="image">户型库</Radio.Button>
               <Radio.Button value="poster">海报图片</Radio.Button>
               <Radio.Button value="share">分享设置</Radio.Button>
             </>

src/pages/channel/brokerList.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select } from 'antd';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
@@ -125,45 +125,64 @@ const header = props => {
       // eslint-disable-next-line react-hooks/rules-of-hooks
       getListBroker({ pageNum: pageNumber, pageSize: 10 })
     }
-    // 获取input的值
-    function onInputChangePhone (e) {
-      // const InputValue = e.target.name.x.value;
-      setQueryData({ ...queryData, name: e.target.value })
-   }
+  //   // 获取input的值
+  //   function onInputChangeName (e) {
+  //     // const InputValue = e.target.name.x.value;
+  //     setQueryData({ ...queryData, name: e.target.value })
+  //  }
 
-   function onInputChangeName (e) {
-    // const InputValue = e.target.name.x.value;
-    setQueryData({ ...queryData, phone: e.target.value })
-  }
-  function refurbishList () {
-    getListBroker({ pageNum: 1, pageSize: 10 })
-  }
+  //  function onInputChangePhone (e) {
+  //   // const InputValue = e.target.name.x.value;
+  //   setQueryData({ ...queryData, phone: e.target.value })
+  // }
+  // function refurbishList () {
+  //   getListBroker({ pageNum: 1, pageSize: 10 })
+  // }
   // eslint-disable-next-line no-undef
-  function handleClick() {
-    alert('11', this)
-    console.log('this is:', this);
+  // function handleClick() {
+  //   alert('11', this)
+  //   console.log('this is:', this);
+  // }
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      console.log('values', values)
+      if (!err) {
+        console.log('values', values)
+        getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId: props.location.query.id, name: values.name, phone: values.phone })
+      }
+    });
   }
+
+  function handleReset() {
+    props.form.resetFields();
+    getListBroker({ pageNum: 1, pageSize: 10, channelId: props.location.query.id })
+  }
+  const { getFieldDecorator } = props.form;
 return (
   <>
-    <div className={ channels.searchBox }>
-      <div style = {{ marginLeft: '-5px' }}>
-        <span className={ channels.selectName }>姓名</span>
-        <Input onChange = { onInputChangePhone } style ={{ width: 150 }} />
-        <span className={ channels.selectName }>电话</span>
-        <Input onChange = { onInputChangeName } style ={{ width: 150 }} />
-      </div>
-      <div>
-      <Button type="primary" onClick={() => queryList() }>查询</Button>
-      {/* <Button onClick={() => refurbishList() }>重置</Button> */}
-    </div>
-    </div>
-    <Table style={{marginTop:'40px'}} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} rowKey="brokerList"/>
+   <Form layout="inline" onSubmit={handleSubmit}>
+   <Form.Item label="姓名">
+          {getFieldDecorator('name', {
+          })(<Input/>)}
+        </Form.Item>
+    <Form.Item label="电话">
+      {getFieldDecorator('phone', {
+      })(<Input/>)}
+    </Form.Item>
+    <Form.Item >
+   <Button type="primary" htmlType="submit" >保存</Button>
+     <Button onClick={handleReset} style={{ marginLeft: 18 }}>重置</Button>
+    </Form.Item>
+   </Form>
+    <Table style={{ marginTop: '40px' }} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} rowKey="brokerList"/>
   </>
 )
 }
-
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
 function handleMenuClick(e) {
   message.info('Click on menu item.');
   console.log('click', e);
 }
-export default header
+export default WrappedNormalLoginForm

src/pages/channel/channelList.jsx

@@ -64,7 +64,7 @@ const columns = [
     dataIndex: 'brokerCount',
     key: 'brokerCount',
     align: 'center',
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.recommendCount }</a>,
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.brokerCount }</a>,
   },
   {
     title: '推荐客户有效',

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -116,9 +116,10 @@ const UserBehavior = props => {
       activity: props.activity,
       event: props.event,
       eventType: props.eventType,
+      buildingId: props.buildingId,
     })
     // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
-  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType])
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType, props.buildingId])
 
   const [recordList, setList] = useState([])
   function getUserBehaviorSummary(params) {
@@ -127,13 +128,12 @@ const UserBehavior = props => {
       params,
     }).then(data => {
       setData(data || {})
-      setList(data.data.records || [])
-
+      setList((data.data.records || []).filter(e => e.activity !== '客户'))
     })
   }
 
 
-  const seriesMaker = (data.selectUserBehavior || []).reduce((series, item) => {
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户').reduce((series, item) => {
     let { date, activityCount, activity } = item
     date = moment(date).format('YYYY-MM-DD')
     if (!activityCount) activityCount = 0

src/pages/indexEcharts/components/UserConversion.jsx

@@ -13,22 +13,23 @@ import styles from '../styles.less'
 const UserSource = props => {
 
   const [theCurrent, setTheCurrent] = useState({ records: [] })
-
+  const [conversionRate, setConversionRate] = useState(0)
   useEffect(() => {
     UserConversionRate({ conversion: 'authorization_phone' })
   }, [])
 
- function UserConversionRate(params) {
-   
-      request({
-        ...apis.indexEcharts.userConversion,
-        params,
-      }).then(data => {
-        setDataset(data, params.conversion)
-      })
+  function UserConversionRate (params) {
+
+    request({
+      ...apis.indexEcharts.userConversion,
+      params,
+    }).then(data => {  
+      console.log(data.data_count.registeredCount/data.data_count.pvNum,'1241234')
+      setDataset(data, params.conversion)
+    })
   }
 
- function setDataset(data, theStatis) {
+  function setDataset (data, theStatis) {
     const { pvNum, ...other } = data.data_count
 
     // 获取第一个值
@@ -41,6 +42,8 @@ const UserSource = props => {
     if (pvNum < num) {
       setTheCurrent([])
     } else {
+
+      setConversionRate(num/pvNum)
       setTheCurrent([
         { name: getStatisName(theStatis), value: num },
         { name: '其余', value: pvNum - num },
@@ -48,34 +51,51 @@ const UserSource = props => {
     }
   }
 
-  function getStatisName(theStatis) {
-     const statisTypes = [
-    { label: '授权手机', value: 'authorization_phone' },
-    { label: '项目收藏', value: 'building_save' },
-    { label: '项目转发', value: 'building_share' },
-    { label: '活动收藏', value: 'activity_save' },
-    { label: '活动转发', value: 'activity_share' },
-    { label: '资讯收藏', value: 'news_save' },
-    { label: '资讯转发', value: 'news_share' },
-    { label: '活动报名', value: 'activity_sign' },
-
-  ]
+  function getStatisName (theStatis) {
+    const statisTypes = [
+      { label: '授权手机', value: 'authorization_phone' },
+      { label: '项目收藏', value: 'building_save' },
+      { label: '项目转发', value: 'building_share' },
+      { label: '活动收藏', value: 'activity_save' },
+      { label: '活动转发', value: 'activity_share' },
+      { label: '资讯收藏', value: 'news_save' },
+      { label: '资讯转发', value: 'news_share' },
+      { label: '活动报名', value: 'activity_sign' },
+
+    ]
     return statisTypes.filter(x => x.value === theStatis)[0].label
   }
 
   const options = {
     legend: {},
-    color: ['#8B7FE2', '#DDDDDD'],
+    color: ['#FF7E48', '#dcdcdc'],
     tooltip: {},
     series: {
       type: 'pie',
       name: '转化率',
       radius: ['34%', '52%'],
+      avoidLabelOverlap: false,
+      label: { 
+        normal: { 
+          show: true,
+          position: 'center',
+          color: '#666666',
+          fontSize: 24,
+          fontWeight: 'bold',
+          formatter: `${(conversionRate*100).toFixed(2) === 'NaN' ? 0 : (conversionRate*100).toFixed(2) }%`, // {b}:数据名； {c}：数据值； {d}：百分比，可以自定义显示内容，
+        }
+      },
+      labelLine: {
+        normal: {
+          show: false
+        }
+      },
+
       data: theCurrent,
     },
   }
 
-  function onChange(e) {
+  function onChange (e) {
     UserConversionRate({ conversion: e })
   }
   const piestyles = {
@@ -86,7 +106,7 @@ const UserSource = props => {
   return (
     <>
       <div>
-      <p style={{ fontSize: '0.12rem', fontWeight: '600' }}>转化率</p>
+        <p style={{ fontSize: '0.12rem', fontWeight: '600' }}>转化率</p>
 
         <Select
           style={{ width: 200 }}
@@ -110,6 +130,6 @@ const UserSource = props => {
 
     </>
   )
- }
+}
 
 export default UserSource

src/pages/indexEcharts/userBehavior.jsx

@@ -121,6 +121,11 @@ function getUserBehaviorSummary(params) {
     setActivity(value)
   }
 
+  const [buildingId, setBuildingId] = useState('')
+  function handleBuildingChange(value) {
+    setBuildingId(value)
+  }
+
   const columns = [
     {
       title: '访问事件',
@@ -200,7 +205,7 @@ function getUserBehaviorSummary(params) {
 
 
       <div style={{ margin: '24px 0' }}>
-        <UserBehavior tableShow={true} BuildSelectHide={true} endDate={endDate} startDate={startDate}  eventType={eventType} activity={activity}  event={event} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
+        <UserBehavior tableShow={true} BuildSelectHide={true} buildingId={buildingId} endDate={endDate} startDate={startDate}  eventType={eventType} activity={activity}  event={event} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
       </div>
 
       {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}

src/pages/staff/list/addRole.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Checkbox, Input, Card, Form, Button, Row, Col, Spin } from 'antd';
+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';
@@ -145,6 +145,11 @@ const Poster = props => {
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
+      if (values.roleName === undefined || values.roleName === '') {
+        message.error('请输入角色名称')
+        return
+      }
+
       if (props.location.query.id !== undefined) {
         console.log('menus', menus)