首页样式修改

components/detail/Detail.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="contentike">
 		<view class="fixed" style="color: #FFFDEF;">
-			<cu-custom bgColor="bg-gradual-sisBlack" :isBack="true">
-				<block slot="backText">
-					<view style="height: 80rpx;line-height: 80rpx; color: #FFFDEF;font-size: 18px;" @tap="goToIndex()">返回</view>
-					<view class="addressName">{{address}}</view>
-				</block>
+			<cu-custom bgColor="bg-gradual-sisBlack" :isBack="true">				
+				<block slot="backText"><view style="height: 80rpx;line-height: 80rpx;color: silver;">返回</view></block>
+					<block slot="content">
+						<view style="color: silver;">{{ address }}</view>
+					</block>
 				
 			</cu-custom>
 		</view>
@@ -327,10 +327,11 @@ created: function() {
 	.addressName {
 		/* width: 100%; */
 		/* background-color: white; */
+		/* width: 126px; */
 		height: 80rpx;
 		line-height: 80rpx;
-		margin-left: 100px;
-		color: #FFFDEF;
+		margin-left: 40%;
+		color: silver;
 		font-size: 18px;
 	}
 

pages/index/Index.vue

@@ -31,7 +31,7 @@
 			</view>
 			<view class="timeText">推荐时间：2020年4月15日 19:31</view>
 			<view class="timeIcon">
-				<image src="../../static/picture/qingwhite.png" style="width: 25px;height: 25px;margin-left: 54px;"></image>
+				<image src="../../static/picture/qingwhite.png" style="width: 25px;height: 25px;"></image>
 			</view>
 		</view>
 		<!--电量卡片-->
@@ -43,7 +43,7 @@
 						<view class="textWhite">15</view>
 					</view>
 					<view class="informationCardTextzj">
-						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">装机容量(MV):</view>					
+						<view class="textSilver" @tap="common.navTo('/components/detail/Detail')">装机容量(mv):</view>					
 						<view class="textWhite">15</view>
 					</view>
 				</view>
@@ -1746,6 +1746,7 @@
 					series: chartData.series,
 					animation: true,
 					xAxis: {
+						disableGrid:true,
 						type: 'grid',
 						gridColor: 'silver',
 						fontColor: 'silver',
@@ -1822,6 +1823,7 @@
 					series: chartData.series,
 					animation: true,
 					xAxis: {
+						disableGrid:true,
 						type: 'grid',
 						gridColor: 'silver',
 						fontColor: 'silver',
@@ -1898,6 +1900,7 @@
 					series: chartData.series,
 					animation: true,
 					xAxis: {
+						disableGrid:true,
 						type: 'grid',
 						gridColor: 'silver',
 						fontColor: 'silver',
@@ -1974,6 +1977,7 @@
 					series: chartData.series,
 					animation: true,
 					xAxis: {
+						disableGrid:true,
 						type: 'grid',
 						gridColor: 'silver',
 						fontColor: 'silver',
@@ -2050,6 +2054,7 @@
 					series: chartData.series,
 					animation: true,
 					xAxis: {
+						disableGrid:true,
 						type: 'grid',
 						gridColor: 'silver',
 						fontColor: 'silver',
@@ -2129,7 +2134,7 @@
 			/* background-color: #161616; */
 			background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%);
 			color: silver;
-			margin-left: 20px;
+			margin-left: 9px;
 			text-align: center;
 			padding-top: 7px;
 			font-size: 12px;
@@ -2142,7 +2147,7 @@
 			/* background-color: #161616; */
 			background: -webkit-linear-gradient(top, rgba(159, 131, 111, 0.1) 0%, rgba(193, 94, 21, 0.2) 100%);
 			color: silver;
-			margin-left: 20px;
+			margin-left: 9px;
 			text-align: center;
 			padding-top: 7px;
 			font-size: 12px;
@@ -2307,7 +2312,7 @@
 
 	.Histogram {
 		width: 100%;
-		height: 280px;
+		height: 300px;
 		background-color: #242424;
 		margin-top: 10px;
 		float: left;
@@ -2384,14 +2389,15 @@
 	}
 
 	.plus {
-		width: 50px;
+		width: 30px;
 		height: 45px;
 		float: right;
 		color: white;
 		font-size: 35px;
 		line-height: 45px;
-		text-align: center;
+		text-align: right;
 		margin-top: 11px;
+		margin-right: 2.5%;
 	}
 	.textWindpowerstation{
 		width: 180px;
@@ -2432,10 +2438,11 @@
 	}
 
 	.timeIcon {
-		width: 21%;
+		width: 25px;
 		height: 30px;
-		float: left;
-		margin-left: 5px;
+		float: right;
+		margin-right: 2.5%;
+		/* margin-left: 5px; */
 	}
 
 	.timeIconImage {
@@ -2593,7 +2600,8 @@
 
 	.greenMinText {
 		line-height: 20px;
-		float: right;
+		float: left;
+		margin-left: 40px;
 	}
 
 	.greenMaxText {
@@ -2720,7 +2728,7 @@
 
 	.textWhite {
 		color: white;
-		float: left;
+		float: right;
 		width: 24px;
 		text-align: right;
 	}
@@ -2748,7 +2756,8 @@
 	}
 
 	.informationCardAll {
-		width: 100%;
+		width: 95%;
+		margin-left: 2.5%;
 		margin-top: 10px;
 		height: 60px;
 		float: left;
@@ -2758,10 +2767,11 @@
 		width: 100%;
 		height: 35px;
 		float: left;
+		margin-top: -10px;
 	}
 
 	.informationCardTextNo1{
-			margin-left: 2%;
+			/* margin-left: 2%; */
 			width: 115px;
 			height: 35px;
 			font-size: 13px;
@@ -2769,7 +2779,7 @@
 			float: left;
 		}
 		.informationCardText {
-			margin-left: 2%;
+			/* margin-left: 2%; */
 			width: 115px;
 			height: 35px;
 			line-height: 35px;
@@ -2794,7 +2804,7 @@
 			color: silver;
 			font-size: 13px;
 			float: right;
-			margin-right: 1%;
+			/* margin-right: 1%; */
 		}
 	
 		.informationCardTextTwo {
@@ -2810,7 +2820,7 @@
 	
 		.informationCardText2 {
 			/* margin-left: 6%; */
-			margin-left: calc(48% - 175px);
+			margin-left: calc(50% - 175px);
 			width: 115px;
 			height: 35px;
 			font-size: 13px;
@@ -2819,7 +2829,7 @@
 		}
 		.informationCardText3 {
 			/* margin-left: 6%; */
-			margin-left: calc(48% - 175px);
+			margin-left: calc(50% - 175px);
 			width: 120px;
 			height: 35px;
 			font-size: 13px;