Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghs/src/views/home.vue

@@ -52,9 +52,10 @@
 		</div>
 		<!-- income -->
 		<div class="card card-income">
-			<div class="card-title">最近15天收入</div>
+			<div class="card-title"><span>最近15天收入</span>
+        <span class="title_right">本月收入： {{ incomeData.month || 0 }}<span style="margin-right: 20px;"></span>上月收入： {{ incomeData.previousMonth || 0 }}</span></div>
 			<div class="card-body">
-				<div class="echart-left-wrap">
+				<!-- <div class="echart-left-wrap">
 					<div>
 						<div>本月收入</div>
 						<div class="num">{{ incomeData.month || 0 }}</div>
@@ -63,7 +64,7 @@
 						<div>上月收入</div>
 						<div class="num">{{ incomeData.previousMonth || 0 }}</div>
 					</div>
-				</div>
+				</div> -->
 				<div class="echart-wrap">
 					<trend-echart ref="incomeEchart" :chartData="incomeData.list"></trend-echart>
 				</div>
@@ -322,7 +323,10 @@ export default {
 .home {
 	overflow-y: auto;
 	overflow-x: hidden;
-
+  .title_right{
+    color: #666;
+    font-weight: 400;
+  }
 	.card {
 		background-color: #fff;
 		border-radius: 5px;
@@ -333,6 +337,8 @@ export default {
 			padding: 20px 20px 0 20px;
 			font-size: 14px;
 			font-weight: bold;
+      display: flex;
+      justify-content: space-between;
 		}
 
 		.card-body {
@@ -491,7 +497,7 @@ export default {
 				}
 			}
 			.echart-wrap {
-				width: calc(100% - 150px);
+				width: 100%;
 				border-left: 1px solid $borderColor;
 				.echart-tit {
 					color: $fontColor2;

hd/src/views/home.vue

@@ -52,9 +52,12 @@
 		</div>
 		<!-- income -->
 		<div class="card card-income">
-			<div class="card-title">最近15天收入</div>
+			<div class="card-title">
+        <span>最近15天收入</span>
+        <span class="title_right">本月收入： {{ incomeData.month || 0 }}<span style="margin-right: 20px;"></span>上月收入： {{ incomeData.previousMonth || 0 }}</span>
+      </div>
 			<div class="card-body">
-				<div class="echart-left-wrap">
+				<!-- <div class="echart-left-wrap">
 					<div>
 						<div>本月收入</div>
 						<div class="num">{{ incomeData.month || 0 }}</div>
@@ -63,7 +66,7 @@
 						<div>上月收入</div>
 						<div class="num">{{ incomeData.previousMonth || 0 }}</div>
 					</div>
-				</div>
+				</div> -->
 				<div class="echart-wrap">
 					<trend-echart ref="incomeEchart" :chartData="incomeData.list"></trend-echart>
 				</div>
@@ -315,7 +318,10 @@ export default {
 .home {
 	overflow-y: auto;
 	overflow-x: hidden;
-
+  .title_right{
+    color: #666;
+    font-weight: 400;
+  }
 	.card {
 		background-color: #fff;
 		border-radius: 5px;
@@ -326,6 +332,8 @@ export default {
 			padding: 20px 20px 0 20px;
 			font-size: 14px;
 			font-weight: bold;
+      display: flex;
+      justify-content: space-between;
 		}
 
 		.card-body {
@@ -484,7 +492,7 @@ export default {
 				}
 			}
 			.echart-wrap {
-				width: calc(100% - 150px);
+				width: 100%;
 				border-left: 1px solid $borderColor;
 				.echart-tit {
 					color: $fontColor2;