From 1a1aa9577876517340083a82a6703a0063a9a46e Mon Sep 17 00:00:00 2001
From: afc163 <afc163@gmail.com>
Date: Tue, 24 Oct 2017 18:03:19 +0800
Subject: [PATCH] update dashboard

---
 src/components/Charts/Pie/index.js   | 2 +-
 src/components/Charts/Pie/index.less | 4 ++++
 src/routes/Dashboard/Analysis.js     | 4 ++--
 src/routes/Dashboard/Analysis.less   | 9 ++-------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/Charts/Pie/index.js b/src/components/Charts/Pie/index.js
index ad180265..28252d38 100644
--- a/src/components/Charts/Pie/index.js
+++ b/src/components/Charts/Pie/index.js
@@ -192,7 +192,7 @@ class Pie extends Component {
     return (
       <div className={styles.pie} style={{ height }}>
         <div>
-          { title && <h4 className={styles.title}>{title}</h4>}
+          {title && <h4 className={styles.title}>{title}</h4>}
           <div className={styles.content}>
             <div ref={this.handleRef} />
             {
diff --git a/src/components/Charts/Pie/index.less b/src/components/Charts/Pie/index.less
index bbfcc56d..a9182749 100644
--- a/src/components/Charts/Pie/index.less
+++ b/src/components/Charts/Pie/index.less
@@ -44,6 +44,9 @@
     position: absolute;
     right: 0;
   }
+  .title {
+    margin-bottom: 16px;
+  }
   .total {
     opacity: 0;
     position: absolute;
@@ -58,6 +61,7 @@
       line-height: 22px;
       height: 22px;
       margin-bottom: 8px;
+      font-weight: normal;
     }
     & > p {
       color: @heading-color;
diff --git a/src/routes/Dashboard/Analysis.js b/src/routes/Dashboard/Analysis.js
index 7b7c5cfd..13473943 100644
--- a/src/routes/Dashboard/Analysis.js
+++ b/src/routes/Dashboard/Analysis.js
@@ -386,7 +386,7 @@ export default class Analysis extends Component {
               )}
               style={{ marginTop: 24 }}
             >
-              <div style={{ marginTop: 32, marginBottom: 54 }}>
+              <div style={{ marginTop: 32, marginBottom: 108 }}>
                 <Pie
                   hasLegend
                   title="销售额"
@@ -394,7 +394,7 @@ export default class Analysis extends Component {
                   total={yuan(salesPieData.reduce((pre, now) => now.y + pre, 0))}
                   data={salesPieData}
                   valueFormat={val => yuan(val)}
-                  height={314}
+                  height={260}
                 />
               </div>
             </Card>
diff --git a/src/routes/Dashboard/Analysis.less b/src/routes/Dashboard/Analysis.less
index 9ccdd3a9..92b28a58 100644
--- a/src/routes/Dashboard/Analysis.less
+++ b/src/routes/Dashboard/Analysis.less
@@ -104,9 +104,6 @@
     .ant-tabs-bar {
       border-bottom: none;
     }
-    .ant-tabs-ink-bar {
-      top: 1px;
-    }
     .ant-tabs-nav-container-scrolling {
       padding-left: 40px;
       padding-right: 40px;
@@ -141,10 +138,8 @@
     margin-top: 16px;
   }
 
-  .salesCard {
-    .salesBar {
-      padding: 16px;
-    }
+  .salesCard .salesBar {
+    padding: 16px;
   }
 }
 
-- 
GitLab