调整

pagesFinance/statistics/index.vue

@@ -2,53 +2,61 @@
 	<view>
 
 		<view class="navbar-tit">{{title}}运管中心</view>
-
-		<view class="statisticsData">
-		<!-- 	<view class="statisticsData-item">
-				<h3 style="font-size: 20px;">{{info.merchantAccountName}}</h3>
-			</view> -->
+
+	<view class="statisticsChart" style="margin-top: 120rpx;margin-bottom: 0px">
+		<view class="statisticsChart-head" >
+			<h4>充电统计</h4>
+		
+		</view>
+		</view>
+			
+		<view class="statisticsData">
+			
+	
+		
 			<view class="detailstableHead" v-if="indexData">
+				
 				<view class="detailsline"  >
-						<view class="details-row ">
+						<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" style="width: 40%;">
+						<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" style="width: 40%;">
+						<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="detailsline"  >
-							<view class="details-row ">
+							<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" style="width: 40%;">
+							<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" style="width: 40%;">
+							<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="detailsline—bottom"  >
-								<view class="details-row ">
+								<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" style="width: 40%;">
+								<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" style="width: 40%;">
+								<view class="details-row details-row-head-3"  >
 									<view class="span1">本月笔数</view>
 								<view class="span2">{{indexData.thisMonthEQNum?indexData.thisMonthEQNum:0}}<span >笔</span></view>
 								</view>
@@ -104,7 +112,7 @@
 							<view class="span2">{{(serviceMoneySum).toFixed(2)}}<span>元</span></view>
 						</view>
 					</view>
- 					<u-collapse  :style="changeitemBl?' border-Bottom: 1px solid #000205':''"
+ 					<u-collapse  
 					 
 					 :headStyle="{
 								color:'#101010',
@@ -231,11 +239,15 @@
 				</view>
 				<view class="details-row">
 					<p>服务费预估收益</p>
-					<span><b>{{indexData2.incomeMap.serviceAmount.toFixed(2)}}元</b></span>
+					<span>{{indexData2.incomeMap.serviceAmount.toFixed(2)}}元</span>
 				</view>
 				<view class="details-row">
 					<p>月卡收益</p>
 					<span>{{indexData2.incomeMap.cardIncomeAmount.toFixed(2)}}元</span>
+				</view>
+				<view class="details-row">
+					<p>预估总利润</p>
+					<span>{{(indexData2.incomeMap.serviceAmount+indexData2.incomeMap.cardIncomeAmount).toFixed(2)}}元</span>
 				</view>
 			</view>
 
@@ -835,6 +847,22 @@
 		padding: 40rpx 30rpx !important;
 	}
 	.detailstableHead{
+		.span1{
+			font-size: 32rpx!important;
+		}
+		.details-row-head-1{
+			
+		}
+		.details-row-head-2{
+			
+		}
+		.details-row-head-3{
+			width: 30% !important;
+			max-width: 150rpx;
+			.span{
+				
+			}
+		}
 		.span2{
 			font-size: 44rpx !important;
 			font-weight: bold;
@@ -850,9 +878,9 @@
 		.details-row{
 			padding-left: 8rpx!important;
 		}
-		font-size: 12px;
+		font-size: 30rpx!important;
 		.span1 span{
-			font-size: 10px;
+			font-size: 28rpx;
 		}
 	}
 	.detailstable,.detailstableHead {
@@ -882,15 +910,15 @@
 				margin-bottom: 20rpx;
 				.span1 {
 					color: rgba(136, 136, 136, 100);
-					font-size:14px;
+					font-size:28rpx;
 					width: 100%;
 				}
 				.span2{
-					font-size: 18px;
+					font-size: 36rpx;
 					width: 100%;
 					color: #101010;
 					span{
-						font-size: 12px;
+						font-size: 24rpx;
 					}
 				}
 			}
@@ -1038,12 +1066,12 @@
 
 	.statisticsData {
 		background-color: #fff;
-		margin: 24rpx 24rpx;
+		margin:0px 24rpx 24rpx;
 
-		padding: 24rpx 32rpx;
+		padding:0px 24rpx 24rpx;
 		border-radius: 8px;
 
-		margin-top: 60px;
+		
 	}
 
 	.statisticsDataMain {

pagesFinance/user/withdrawRecord.vue

@@ -29,7 +29,7 @@
 					<view class="detailed-item-num">
 						<h2>{{item.applicationAmount?item.applicationAmount.toFixed(2):'0'}}元</h2>
 						
-						<p>{{showTime2(info.createTime)}}</p>
+						<p>{{showTime2(item.createTime)}}</p>
 					</view>
 				</view>