调整

pagesFinance/statistics/index.vue

@@ -1263,9 +1263,10 @@
 								}
 								var markerU="";
 								if(value[i].seriesName == "收入"){
-									markerU="（含卡）"
+									
 								}
 								if (this.type_head == 2&&value[i].seriesName == "收入") {
+										markerU="（含卡）"
 											u="万元"
 											num=info.todayAmountW
 											if(!num){

pagesFinance/statistics/list.vue

@@ -101,8 +101,8 @@
 							</view>
 						</view>
 
-						<view class="detailsline" v-if="item.fastNum&&item.slowNum">
-							<view class="details-row details-row-1">
+						<view class="detailsline" v-if="item.fastNum||item.slowNum" >
+							<view class="details-row details-row-1"  v-if="item.fastNum" >
 
 
 								<view class="span1">快充枪平均充电量</view>
@@ -111,7 +111,9 @@
 								</view>
 								<view class="span2" v-else>0<span>度/枪/天</span></view>
 							</view>
-							<view class="details-row">
+							<view class="details-row " v-if="item.slowNum" :class="{
+								'details-row-1':item.fastNum==0
+							}" >
 
 								<view class="span1">慢充枪平均充电量</view>
 								<view class="span2" v-if="item.slowNum">
@@ -119,6 +121,14 @@
 								</view>
 								<view class="span2" v-else>0<span>度/枪/天</span></view>
 							</view>
+							
+							<view class="details-row "  v-if="!item.fastNum||!item.slowNum">
+							
+							
+								<view class="span1">折扣卡收益</view>
+								<view class="span2">{{(item.cardMoney).toFixed(2)}}<span>元</span></view>
+							
+							</view>
 						</view>
 
 						<view class="detailsline" v-if="item.fastNum&&item.slowNum">