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/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/poster.jsx

@@ -103,7 +103,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="" />

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

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