调整合计

pagesFinance/detailed/index.vue

@@ -106,7 +106,7 @@
 				:key="index">
 				<view class="detailed-time"    v-if="item.show">
 					<p>{{item.showtime}}</p>
-					<p  >共收入 {{showMap.get(item.showtime)}}元</p>
+					<p>共收{{showMap.get(item.showtime).num}}笔,{{showMap.get(item.showtime).amount}}元</p>
 				</view>
 				<view class="detailed-item">
 					<view class="detailed-item-name">
@@ -118,7 +118,7 @@
 						">
 						
 						<h2 style="   text-align: end;">{{item.actualFee?item.actualFee:0}}元</h2>
-						<p style="   text-align: end;" >{{item.createTime?item.createTime.slice(11):''}}</p>
+						<p style="   text-align: end;" >{{item.endTime?item.endTime.slice(11):''}}</p>
 					</view>
 				</view>
 				
@@ -289,15 +289,19 @@
 					];
 					var showMap=new Map()
 					this.list.forEach(item=>{
-						var ktime=item.createTime.split(" ")[0]
+						var ktime=item.endTime.split(" ")[0]
 						if(showMap.has(ktime)){
 							item.show=false;
 						
 							
 						}else{
 							var Amount=item.totalAmount 
-							
-							showMap.set(ktime,Amount)
+							var num=item.totalNum
+							showMap.set(ktime,{
+								amount:Amount,
+								num:num
+							})
+						
 							
 							item.show=true;
 							item.showtime=ktime;

pagesFinance/share/index.vue

@@ -108,7 +108,9 @@
 			 
 					<view class="detailed-time"    v-if="item.show">
 						<p>{{item.showtime}}</p>
-						<p  >共收入 {{showMap.get(item.showtime)}}元</p>
+					
+						<p>共收{{showMap.get(item.showtime).num}}笔,{{showMap.get(item.showtime).amount}}元</p>
+						
 					</view>
 					<view class="detailed-item">
 						<view class="detailed-item-name">
@@ -335,9 +337,12 @@
 							
 						}else{
 							var Amount=item.todaySPAmount 
-							
-							showMap.set(ktime,Amount)
-							
+							var num=item.todaySPNum
+							showMap.set(ktime,{
+								amount:Amount,
+								num:num
+							})
+													
 							item.show=true;
 							item.showtime=ktime;
 						}