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

config/config.js

@@ -94,6 +94,9 @@ export default {
     'btn-primary-bg': '#EF273A',
     'table-row-hover-bg': '#eee',
     'btn-danger-bg': '#FF7E48',
+    'radio-button-hover-color': '#FF7E48',
+    'radio-button-active-color': 'red',
+    
 
   },
   define: {

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/components/SelectButton/NewTypeSelect.jsx

@@ -30,7 +30,7 @@ const NewsTypeSelect = (props) => {
   }
 
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择讯类型" onChange={props.onChange}>
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择资讯类型" onChange={props.onChange}>
           {data.map(type => (
             <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
           ))}

src/global.less

@@ -97,10 +97,18 @@ ol {
   color: #fff;
   background: #FF7E48;
   border-color: #FF7E48;
+  box-shadow: none;
 }
 .ant-radio-button-wrapper:not(:first-child)::before{
   background: #FF7E48;
 }
+.ant-radio-button-wrapper:first-child {
+  border-left: 1px solid #FF7E48;
+}
+.ant-radio-button-wrapper:hover{
+  border-color: #FF7E48;
+  color: #FF7E48; ;
+}
 .ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
   min-width: 100px;
 }

src/layouts/BasicLayout.jsx

@@ -84,8 +84,7 @@ const BasicLayout = props => {
       menuItemRender={(menuItemProps, defaultDom) => {
         if (menuItemProps.isUrl) {
           return defaultDom;
-        }
-
+        }        
         return <Link to={menuItemProps.path}>{defaultDom}</Link>;
       }}
       breadcrumbRender={(routers = []) => [

src/pages/Welcome.jsx

@@ -48,7 +48,7 @@ const welcome = (props) => {
           boxShadow: '0px  0.11rem 14px -15px rgba(107,130,230,1)',
           borderRadius: '12px', width: '32%',
         }}>
-          <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0' }}>最近7天新增 </span>
+          <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0',cursor: 'pointer' }}>最近7天新增 </span>
           <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
         </div>
       </div>

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" />)}
@@ -136,12 +142,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/poster.jsx

@@ -24,7 +24,7 @@ const Poster = props => {
   const [imgValue, changeImg] = useState('')
   const [posterId, setPosterId] = useState('')
 
-  const [building, setBuilding] = useState({})
+  const [building, setBuilding] = useState({ buildingImg: [{ url: '' }] })
   const { buildingId } = props.building
 
   if (buildingId) {
@@ -54,6 +54,7 @@ const Poster = props => {
  
     request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
       setBuilding(res)
+      console.log('getById: ', res)
     })
   }
 
@@ -89,7 +90,7 @@ const Poster = props => {
     <div style={{ display: 'flex' }}>
       <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
         <div style={{ width: '375px', height: '785px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
-          <img style={{ width: '100%', height: '300px' }} src={imgValue || poster1} alt="" />
+          <img style={{ width: '100%', height: '300px' }} src={ imgValue || ( building.buildingImg[0].url || poster1 ) } alt="" />
 
           <p className={Styles.tagLabel}>
             {
@@ -103,7 +104,7 @@ const Poster = props => {
             WebkitBoxOrient: 'vertical',
             overflow: 'hidden',
             textOverflow: 'ellipsis',
-          }}>{building.buildingName || '楼盘标题'}</p>
+          }}>{inputValue || (building.buildingName || '海报标题')}</p>
           <p style={{ color: '#999',padding:' 0 20px' }}>约<span style={{ color: '#fd0d0c', fontSize: '24px',marginLeft:'6px' }}>{ building.price }</span><span style={{ color: '#fd0d0c', fontSize: '20px' }}>元/m²</span></p>
 
           <img src={yinhao} style={{ width: '30px', marginLeft: '22px' }} alt="" />
@@ -122,7 +123,7 @@ const Poster = props => {
       <div >
         <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
-          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          <ImageUploader value={ imgValue } onChange={e => changeImg(e)} />
         </div>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
           <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>

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 onInputChangeName (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 onInputChangePhone (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 = { onInputChangeName } style ={{ width: 150 }} />
-        <span className={ channels.selectName }>电话</span>
-        <Input onChange = { onInputChangePhone } 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/indexEcharts/components/NewUsers.jsx

@@ -92,9 +92,9 @@ const NewUsers = (props) => {
     <>
       <div>
         <div >
-          <p onClick={()=>router.push('/indexEcharts/newUsers')}><span style={{borderBottom:'1px solid #f02d40',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+          <p onClick={()=>router.push('/indexEcharts/newUsers')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
        </div>
-        <EChart options={options} style={piestyles} onClick={()=>router.push('/indexEcharts/newUsers')} />
+        <EChart options={options} style={piestyles}  />
       </div>
     </>
   )

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -133,7 +133,7 @@ const UserBehavior = props => {
   }
 
 
-  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户').reduce((series, item) => {
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户' && e.activity !== '首页').reduce((series, item) => {
     let { date, activityCount, activity } = item
     date = moment(date).format('YYYY-MM-DD')
     if (!activityCount) activityCount = 0
@@ -260,14 +260,14 @@ const UserBehavior = props => {
   return (
     <>
       <div>
-        <p onClick={() => router.push('/indexEcharts/userBehavior')}>
+        <p onClick={() => router.push('/indexEcharts/userBehavior')} style={{cursor: 'pointer'}}>
           <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
           {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
         </p>
         <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
           {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>}
         </div>
-        <EChart onClick={() => router.push('/indexEcharts/userBehavior')} options={options} style={style} />
+        <EChart options={options} style={style} />
         {props.tableShow &&
           <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
         }

src/pages/indexEcharts/components/UserConversion.jsx

@@ -18,18 +18,18 @@ const UserSource = props => {
     UserConversionRate({ conversion: 'authorization_phone' })
   }, [])
 
-  function UserConversionRate (params) {
+  function UserConversionRate(params) {
 
     request({
       ...apis.indexEcharts.userConversion,
       params,
-    }).then(data => {  
-      console.log(data.data_count.registeredCount/data.data_count.pvNum,'1241234')
+    }).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
 
     // 获取第一个值
@@ -43,7 +43,7 @@ const UserSource = props => {
       setTheCurrent([])
     } else {
 
-      setConversionRate(num/pvNum)
+      setConversionRate(num / pvNum)
       setTheCurrent([
         { name: getStatisName(theStatis), value: num },
         { name: '其余', value: pvNum - num },
@@ -51,7 +51,7 @@ const UserSource = props => {
     }
   }
 
-  function getStatisName (theStatis) {
+  function getStatisName(theStatis) {
     const statisTypes = [
       { label: '授权手机', value: 'authorization_phone' },
       { label: '项目收藏', value: 'building_save' },
@@ -75,14 +75,21 @@ const UserSource = props => {
       name: '转化率',
       radius: ['34%', '52%'],
       avoidLabelOverlap: false,
-      label: { 
-        normal: { 
-          show: true,
+      label: {
+        normal: {
+          show: false,
           position: 'center',
           color: '#666666',
-          fontSize: 24,
-          fontWeight: 'bold',
-          formatter: `${(conversionRate*100).toFixed(2) === 'NaN' ? 0 : (conversionRate*100).toFixed(2) }%`, // {b}:数据名； {c}：数据值； {d}：百分比，可以自定义显示内容，
+          fontSize: 22,
+          formatter: '{d}%'
+        },
+        emphasis: {
+          show: true,
+          formatter: '{d}%',
+          textStyle: {
+            fontSize: '22',
+            fontWeight: 'bold'
+          }
         }
       },
       labelLine: {
@@ -95,7 +102,7 @@ const UserSource = props => {
     },
   }
 
-  function onChange (e) {
+  function onChange(e) {
     UserConversionRate({ conversion: e })
   }
   const piestyles = {

src/pages/indexEcharts/components/UserSource.jsx

@@ -104,9 +104,9 @@ const UserSource = (props) => {
   return (
     <>
       <div>
-      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+      <p onClick={()=>router.push('/indexEcharts/userSource')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
 
-        <EChart onClick={() => router.push('/indexEcharts/userSource')} options={baroptions} style={barstyle} />
+        <EChart options={baroptions} style={barstyle} />
 
       </div>
 

src/pages/indexEcharts/components/UserSourcepie.jsx

@@ -56,7 +56,25 @@ const UserSource = (props) => {
         type: 'pie',
         center: ['40%', '65%'],
         radius: ['34%', '52%'],
+        label: {
+          normal: {
+            show: false,
+            position: 'center',
+            color: '#666666',
+            fontSize: 22,
+            formatter: '{d}%'
+          },
+          emphasis: {
+            show: true,
+            formatter: '{d}%',
+            textStyle: {
+              fontSize: '22',
+              fontWeight: 'bold'
+            }
+          }
+        },
       },
+
     ],
 
     dataset: {

src/pages/news/list/NewsList.jsx

@@ -195,22 +195,22 @@ function body(props) {
             whiteSpace: 'nowrap',
             width: '300px',
           }}>{data.newsName}</p>
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
-            <span style={{ display: 'inline-block', width: '190px' }}>咨询类型：{data.newsType.newsTypeName}</span>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px',display:'flex' }}>
+            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>资讯类型：{data.newsType.newsTypeName}</span>
             <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
           </p>
 
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
-            <span style={{ display: 'inline-block', width: '190px' }}>阅读数量：{data.pvNum}</span>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px' }}>
+            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>阅读数量：{data.pvNum}</span>
             <span>转发数量：{data.shareNum}</span>
           </p>
 
-          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
-            <span style={{ display: 'inline-block', width: '190px' }}>点赞数量：{data.favorNum}</span>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '8px' }}>
+            <span style={{ display: 'inline-block', width: '180px',overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap' }}>点赞数量：{data.favorNum}</span>
             <span>收藏数量：{data.saveNum}</span>
           </p>
 
-          <p style={{ fontSize: ' 0.11rem', color: '#999', marginBottom: '10px' }}>发布时间：{data.createDate}</p>
+          <p style={{ fontSize: ' 0.11rem', color: '#999', marginBottom: '8px' }}>发布时间：{data.createDate}</p>
         </div>
       </Card>
     )

src/pages/news/type/editNews.jsx

@@ -55,7 +55,7 @@ const header = props => {
       type: FieldTypes.Text,
       value: newsData.newsTypeName,
       rules: [
-        {required: true, message: '请输入咨询名称'},
+        {required: true, message: '请输入资讯名称'},
       ]
     },
   ]