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

src/global.less

@@ -108,8 +108,8 @@ ol {
   padding: 0;
 }
 .antd-pro-pages-index-echarts-styles-pie,.antd-pro-pages-index-echarts-styles-bar{
-  padding: 26px;
-  margin-bottom: 25px;
+  padding: 40px;
+  margin-bottom: 40px;
 }
 .ant-breadcrumb{
   font-size: 0.1rem;

src/pages/Welcome.jsx

@@ -7,60 +7,55 @@ import router from 'umi/router';
 import request from '../utils/request';
 import apis from '../services/apis';
 
-const header = props => {
+const welcome = (props) => {
 
- const [data, setData] = useState([])
+  const [data, setData] = useState([])
 
-useEffect(() => {
-  getIndexEcharts()
-}, [])
-
-function getIndexEcharts (params) {
-  request({
-    ...apis.indexEcharts.list,
-    params
-  }).then((data) => {
-   setData(data)
-    console.log(data, '11111')
-  })
-}
-  
+  useEffect(() => {
+    getIndexEcharts()
+  }, [])
 
+  function getIndexEcharts(params) {
+    request({
+      ...apis.indexEcharts.list,
+      params
+    }).then((data) => {
+      setData(data)
+      console.log(data, '11111')
+    })
+  }
   return (
     <>
-       <div style={{ display: 'flex',marginBottom:'28px' }}>
-           <div style={{
-            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
-            boxShadow: '0px  0.11rem 14px -15px rgba(241,43,62,1)',
-            borderRadius: '12px', width: '32%', marginRight: '2%'
-          }}>
-            <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
-            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount}</span>
-          </div>
-          <div style={{
-            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-            boxShadow: '0px  0.11rem 14px -15px rgba(255,126,74,1)',
-            borderRadius: '12px', width: '32%', marginRight: '2%'
-          }}>
-            <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
-            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount}</span>
-          </div>
-          <div onClick={()=>router.push('/indexEcharts/newUsers')} style={{
-            textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
-            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: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount}</span>
-          </div>
+      <div style={{ display: 'flex', marginBottom: '33px' }}>
+        <div style={{
+          textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
+          boxShadow: '0px  0.11rem 14px -15px rgba(241,43,62,1)',
+          borderRadius: '12px', width: '32%', marginRight: '2%'
+        }}>
+          <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
+          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount || '0'}</span>
+        </div>
+        <div style={{
+          textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
+          boxShadow: '0px  0.11rem 14px -15px rgba(255,126,74,1)',
+          borderRadius: '12px', width: '32%', marginRight: '2%'
+        }}>
+          <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
+          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
+        </div>
+        <div onClick={() => router.push('/indexEcharts/newUsers')} style={{
+          textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
+          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: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
         </div>
-        <IndexEcharts style={{ width: '100%'}} onReData={(e) => redata(e)} ></IndexEcharts>
-    
-        {/* <EchartsTest style={{ width: 500, height: 500 }}></EchartsTest> */}
-    
-      </>
+      </div>
+      <IndexEcharts style={{ width: '100%' }} onReData={(e) => redata(e)} ></IndexEcharts>
+    </>
   )
 
 }
+export default welcome
 
-export default  header

src/pages/charts/CityNums.jsx

@@ -6,8 +6,8 @@ const geoOptions = {
   backgroundColor: '#fff',
   title: {
     text: '城市分布',
-    left: 20,
-    top: 20
+    left: 40,
+    top: 40
   },
   tooltip : {
       trigger: 'item',
@@ -128,7 +128,7 @@ const CityNums = (props) => {
   }
 
   return (
-    <div style={{ margin: ' 0 0 20px  0', width: '100%', borderRadius: '12px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
+    <div style={{ marginBottom:'40px', width: '100%', borderRadius: '12px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
       <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
     </div>
   )

src/pages/indexEcharts/components/UserSourcepie.jsx

@@ -54,7 +54,7 @@ const UserSource = (props) => {
     series: [
       {
         type: 'pie',
-        center: ['44%', '65%'],
+        center: ['40%', '65%'],
         radius: ['34%', '52%'],
       },
     ],

src/pages/indexEcharts/styles.less

@@ -23,8 +23,8 @@
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
-  margin-bottom: 25px;
-  padding: 26px;
+  margin-bottom: 40px;
+  padding: 40px;
 }
 
 .customers {
@@ -33,5 +33,5 @@
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px 12px 0px 0px;
-  padding: 26px;
+  padding: 40px;
 }

src/pages/indexEcharts/userBehavior.jsx

@@ -157,13 +157,7 @@ function getUserBehaviorSummary(params) {
   const dataSource = []
 
   return (<>
-    <div style={{
-      backgroundColor: '#fff',
-      padding: '32PX 28px',
-      boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-      borderRadius: '12px',
-      minHeight: '60vh'
-    }}>
+    <div>
       <div>
         <Radio.Group buttonStyle="solid" defaultValue="a">
           <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>