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

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/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