瀏覽代碼

主页头部样式调整

常志远 1 年之前
父節點
當前提交
e1a241b3c7
共有 4 個文件被更改,包括 196 次插入73 次删除
  1. 6 0
      assets/img/riFill-numbers-fill.svg
  2. 6 0
      assets/img/riLine-refresh-line.svg
  3. 6 0
      assets/img/titleIcon.svg
  4. 178 73
      pagesFinance/statistics/index.vue

+ 6 - 0
assets/img/riFill-numbers-fill.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="16" height="16" style="border-color: rgba(0,0,0,0);border-width: bpx;border-style: undefined" filter="none">
+    
+    <g>
+    <path d="M12 24h-6.667v-10.667h6.667v10.667zM20 24h-6.667v-16h6.667v16zM28 24h-6.667v-21.333h6.667v21.333zM29.333 29.333h-25.333v-2.667h25.333v2.667z" fill="rgba(0,184.875,97.92,1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/riLine-refresh-line.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 32 32" width="20" height="20" style="border-color: rgba(0,0,0,0);border-width: bpx;border-style: undefined" filter="none">
+    
+    <g>
+    <path d="M7.284 5.911c2.316-2.015 5.363-3.244 8.697-3.244 0.007 0 0.013 0 0.020 0h-0.001c7.364 0 13.333 5.969 13.333 13.333 0 2.848-0.893 5.488-2.413 7.653l-4.253-7.653h4c0-0 0-0.001 0-0.001 0-5.891-4.776-10.667-10.667-10.667-2.869 0-5.473 1.133-7.39 2.975l0.004-0.003-1.329-2.393zM24.716 26.089c-2.316 2.015-5.363 3.244-8.697 3.244-0.006 0-0.013 0-0.020 0h0.001c-7.364 0-13.333-5.969-13.333-13.333 0-2.848 0.893-5.488 2.413-7.653l4.253 7.653h-4c0 0 0 0.001 0 0.001 0 5.891 4.776 10.667 10.667 10.667 2.869 0 5.473-1.133 7.39-2.975l-0.004 0.003 1.329 2.393z" fill="rgba(255,255,255,1)"></path>
+    </g>
+  </svg>

+ 6 - 0
assets/img/titleIcon.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 120 119.99999237060547" width="20" height="20" style="border-color: rgba(0,0,0,0);border-width: bpx;border-style: undefined" filter="none">
+    
+    <g>
+    <defs fill="rgba(255,255,255,1)"><clipPath id="master_svg0_227_60-ilpga5xv84klt4z" fill="rgba(255,255,255,1)"><rect x="0" y="0" width="120" height="119.99999237060547" rx="0" fill="rgba(255,255,255,1)"></rect></clipPath></defs><g clip-path="url(#master_svg0_227_60-ilpga5xv84klt4z)" fill="rgba(255,255,255,1)"><g fill="rgba(255,255,255,1)"><g fill="rgba(255,255,255,1)"><g fill="rgba(255,255,255,1)"><path d="M102.8956,41.5796L108.2069,12L64.3783,12C61.3844,17.22848,57.1792,21.664279999999998,52.115,24.9357C46.0148,29.0951,39.2345,32.159400000000005,32.0791,33.990700000000004C31.178,34.1342,30.2598,34.1342,29.3587,33.990700000000004L22.277,76.1179C29.1428,76.1179,30.9132,76.1179,33.7631,76.1179L26.5088,111.9497L15.3681,111.9497L12,132L97.4549,132L100.7798,111.9497L90.2868,111.9497L102.0752,46.4951L77.7212,46.4951L72.88499999999999,72.8839L94.0436,72.8839L53.0218,119.797L60.4057,79.0931L44.2561,79.0931L45.3788,72.8408L50.215,46.4951L51.0787,41.7952L52.8059,32.3953L80.3121,32.3953L78.5848,41.7952L102.8956,41.5796Z" fill="rgba(255,255,255,1)" fill-opacity="1" stroke="none"></path></g></g></g></g>
+    </g>
+  </svg>

+ 178 - 73
pagesFinance/statistics/index.vue

@@ -1,93 +1,143 @@
 <template>
 	<view>
-
-		<view class="navbar-tit">{{title}}</view>
-
-		<view class="statisticsChart" style="margin-top: 120rpx;margin-bottom: 0px">
-			<view class="statisticsChart-head">
-				<h4>充电统计</h4>
-				<view class="navbar-screen ">
-					<u-button text="月落" size="mini" class="headbotton1" style="border-radius: 10px 0 0 10px;"
-						:type="current==1?'primary':'info'" @click="changesub(1)">按天</u-button>
-					<u-button text="月落" size="mini" class="headbotton2" style="border-radius: 0 10px 10px 0;"
-						:type="current==2?'primary':'info'" @click="changesub(2)">按月</u-button>
-
-
-				</view>
-			</view>
-		</view>
-
-		<view class="statisticsData">
-
-			<view class="detailstableHead" style="
-						padding-top: 1px;
-					">
-				<view id="pieEcharts" style="min-height:240px;margin-top: 20px">
-
+        <view class="top-cover">
+			<view class="navbar-tit">
+			<text><img src="../../assets/img/titleIcon.svg" alt=""></text>
+			{{title}}</view>
+			
+			<view class="income">
+				<!-- 今日收入 -->
+				<view class="today-income">
+					<view class="number">
+						10000.00<text><img src="../../assets/img/riLine-refresh-line.svg" alt=""></text>
+					</view>
+					<view class="text">
+						今日收入 (元)
+					</view>
 				</view>
-			</view>
-			<view class="detailstableHead" v-if="indexData&&false">
-
-				<view class="detailsline">
-					<view class="details-row  details-row-head-1 ">
-
-						<view class="span1">今日收入</view>
-						<view class="span2">{{indexData.todayAmount?indexData.todayAmount.toFixed(2):0}}<span>元</span>
+				<!-- 其他 -->
+				<view class="else">
+					<view class="item">
+						<view class="item-number">
+							3000.00
 						</view>
-					</view>
-					<view class="details-row details-row-head-2">
-						<view class="span1">今日利润</view>
-						<view class="span2">{{indexData.todayProfit?indexData.todayProfit.toFixed(2):0}}<span>元</span>
+						<view class="item-text">
+							利润(元)
 						</view>
 					</view>
-					<view class="details-row details-row-head-3">
-						<view class="span1">今日笔数</view>
-						<view class="span2">{{indexData.todayEQNum?indexData.todayEQNum:0}}<span>笔</span></view>
+					<view class="item">
+						<view class="item-number">
+							8000.00
+						</view>
+						<view class="item-text">
+							今日电量 (度)
+						</view>
 					</view>
-				</view>
-				<view class="detailsline">
-					<view class="details-row details-row-head-1 ">
-
-						<view class="span1">昨日收入</view>
-						<view class="span2">
-							{{indexData.yesterdayAmount?indexData.yesterdayAmount.toFixed(2):0}}<span>元</span>
+					<view class="item">
+						<view class="item-number">
+							10 / 2
+						</view>
+						<view class="item-text">
+							6折卡/月卡 (张)
 						</view>
 					</view>
-					<view class="details-row details-row-head-2">
-						<view class="span1">昨日利润</view>
-						<view class="span2">
-							{{indexData.yesterdayProfit?indexData.yesterdayProfit.toFixed(2):0}}<span>元</span>
+				</view>
+			</view>
+			
+			
+			
+			<view class="statisticsData">
+				
+				<view class="statisticsChart" style="padding-top:20rpx;margin-bottom: 0px">
+					<view class="statisticsChart-head ">
+						<h4 class="h4-1"><img src="../../assets/img/riFill-numbers-fill.svg" alt="">充电统计</h4>
+						<view class="navbar-screen ">
+							<u-button text="月落" size="mini" class="headbotton1" style="border-radius: 10px 0 0 10px;"
+								:type="current==1?'success':'info'" @click="changesub(1)">按天</u-button>
+							<u-button text="月落" size="mini" class="headbotton2" style="border-radius: 0 10px 10px 0;"
+								:type="current==2?'success':'info'" @click="changesub(2)">按月</u-button>
+				
+				
 						</view>
 					</view>
-					<view class="details-row details-row-head-3">
-						<view class="span1">昨日笔数</view>
-						<view class="span2">{{indexData.yesterdayEQNum?indexData.yesterdayEQNum:0}}<span>笔</span></view>
+				</view>
+			
+				<view class="detailstableHead" style="
+							padding-top: 1px;
+						">
+					<view id="pieEcharts" style="min-height:240px;margin-top: 20px">
+			
 					</view>
 				</view>
-				<view class="detailsline—bottom">
-					<view class="details-row details-row-head-1">
-
-						<view class="span1">本月收入</view>
-						<view class="span2">
-							{{indexData.thisMonthAmount?indexData.thisMonthAmount.toFixed(2):0}}<span>元</span>
+				<view class="detailstableHead" v-if="indexData&&false">
+			
+					<view class="detailsline">
+						<view class="details-row  details-row-head-1 ">
+			
+							<view class="span1">今日收入</view>
+							<view class="span2">{{indexData.todayAmount?indexData.todayAmount.toFixed(2):0}}<span>元</span>
+							</view>
+						</view>
+						<view class="details-row details-row-head-2">
+							<view class="span1">今日利润</view>
+							<view class="span2">{{indexData.todayProfit?indexData.todayProfit.toFixed(2):0}}<span>元</span>
+							</view>
+						</view>
+						<view class="details-row details-row-head-3">
+							<view class="span1">今日笔数</view>
+							<view class="span2">{{indexData.todayEQNum?indexData.todayEQNum:0}}<span>笔</span></view>
 						</view>
 					</view>
-					<view class="details-row details-row-head-2">
-						<view class="span1">本月利润</view>
-						<view class="span2">
-							{{indexData.thisMonthProfit?indexData.thisMonthProfit.toFixed(2):0}}<span>元</span>
+					<view class="detailsline">
+						<view class="details-row details-row-head-1 ">
+			
+							<view class="span1">昨日收入</view>
+							<view class="span2">
+								{{indexData.yesterdayAmount?indexData.yesterdayAmount.toFixed(2):0}}<span>元</span>
+							</view>
+						</view>
+						<view class="details-row details-row-head-2">
+							<view class="span1">昨日利润</view>
+							<view class="span2">
+								{{indexData.yesterdayProfit?indexData.yesterdayProfit.toFixed(2):0}}<span>元</span>
+							</view>
+						</view>
+						<view class="details-row details-row-head-3">
+							<view class="span1">昨日笔数</view>
+							<view class="span2">{{indexData.yesterdayEQNum?indexData.yesterdayEQNum:0}}<span>笔</span></view>
 						</view>
 					</view>
-					<view class="details-row details-row-head-3">
-						<view class="span1">本月笔数</view>
-						<view class="span2">{{indexData.thisMonthEQNum?indexData.thisMonthEQNum:0}}<span>笔</span></view>
+					<view class="detailsline—bottom">
+						<view class="details-row details-row-head-1">
+			
+							<view class="span1">本月收入</view>
+							<view class="span2">
+								{{indexData.thisMonthAmount?indexData.thisMonthAmount.toFixed(2):0}}<span>元</span>
+							</view>
+						</view>
+						<view class="details-row details-row-head-2">
+							<view class="span1">本月利润</view>
+							<view class="span2">
+								{{indexData.thisMonthProfit?indexData.thisMonthProfit.toFixed(2):0}}<span>元</span>
+							</view>
+						</view>
+						<view class="details-row details-row-head-3">
+							<view class="span1">本月笔数</view>
+							<view class="span2">{{indexData.thisMonthEQNum?indexData.thisMonthEQNum:0}}<span>笔</span></view>
+						</view>
 					</view>
+			
 				</view>
-
+			
+			
 			</view>
+        	
+        </view>
+		
 
+		
 
-		</view>
+		
 
 		<u-picker mode="time" v-model="popupShow" @confirm="changedate" :default-time="queryTime" :params="params">
 		</u-picker>
@@ -1460,8 +1510,9 @@
 </script>
 <style>
 	page {
-		background: url(../../assets/img/index_header_bg.png) no-repeat top center #f7f7f7;
-		background-size: 100%;
+		
+	/* background: url(../../assets/img/index_header_bg.png) no-repeat top center #f7f7f7;
+		background-size: 100%; */
 	}
 </style>
 
@@ -2020,9 +2071,13 @@
 
 	.navbar-tit {
 		color: #fff;
-		font-size: 24px;
+		font-size: 20px;
+		line-height: 20px;
 		padding-left: 15px;
 		padding-top: 10px;
+		text{
+			margin-right: 8rpx;
+		}
 	}
 
 	.statisticsData {
@@ -2077,7 +2132,7 @@
 
 	.statisticsChart {
 		margin: 32rpx;
-
+  
 		.statisticsChart-head {
 			margin-bottom: 10rpx;
 			display: flex;
@@ -2100,6 +2155,18 @@
 					top: 5px;
 				}
 			}
+			.h4-1{
+				display: flex;
+				align-items: center;
+				padding-left: 0;
+				color: rgba(16, 16, 16, 1);
+				img{
+					margin-right: 8rpx;
+				}
+				&::after{
+					content: none;
+				}
+			}
 
 			.statisticsChart-time {
 				display: flex;
@@ -2118,5 +2185,43 @@
 		}
 	}
 	
-	 
+	 .top-cover{
+		 // height: 470px;
+		 // margin-bottom: 70px;
+		 background: linear-gradient(179.94deg, rgba(0,185,98,1) 71.55%,rgba(0,196,104,0) 99.35%);
+	   .income{
+		   padding: 64rpx 32rpx 24rpx 32rpx;
+		   color: rgba(255, 255, 255, 1);
+		   .today-income{
+			   
+			   text-align: center;
+			   .number{
+				   
+				   font-size: 36px;
+				  
+				   text{
+					   margin-left: 8rpx;
+				   }
+			   }
+			   .text{
+				   font-size: 16px;
+			   }
+		   }
+		   .else{
+			   margin-top: 32rpx;
+			   display: flex;
+			   justify-content: space-between;
+			   .item{
+				   text-align: center;
+				   .item-number{
+					   font-size: 48rpx;
+					   margin-bottom: 8rpx;
+				   }
+				  
+			   }
+		   }
+	   }
+	
+	
+	 }
 </style>