调整

pagesFinance/detailed/index.vue

@@ -109,12 +109,16 @@
 					<p>共收{{showMap.get(item.showtime).num}}笔,{{showMap.get(item.showtime).amount}}元</p>
 				</view>
 				<view class="detailed-item">
-					<view class="detailed-item-name">
-						<h2>{{item.flowNo?item.flowNo:'无充电单号'}}</h2>
-						<p>{{item.stationName}}/{{item.deviceName}}</p>
+					<view class="detailed-item-name" style="
+							    width: 70%;
+						">
+						<h2 class="showName">{{item.stationName}}/{{item.deviceName}}</h2>
+						<p>{{item.flowNo?item.flowNo:'无充电单号'}}</p>
 					</view>
 					<view class="detailed-item-name"  style="
-							width: 80px;
+						
+							    min-width: 60px;
+							    width: 30%;
 						">
 						
 						<h2 style="   text-align: end;">{{item.actualFee?item.actualFee:0}}元</h2>
@@ -289,23 +293,26 @@
 					];
 					var showMap=new Map()
 					this.list.forEach(item=>{
-						var ktime=item.endTime.split(" ")[0]
-						if(showMap.has(ktime)){
-							item.show=false;
-						
+						if(item.endTime){
+							var ktime=item.endTime.split(" ")[0]
+							if(showMap.has(ktime)){
+								item.show=false;
 							
-						}else{
-							var Amount=item.totalAmount 
-							var num=item.totalNum
-							showMap.set(ktime,{
-								amount:Amount,
-								num:num
-							})
-						
+								
+							}else{
+								var Amount=item.totalAmount 
+								var num=item.totalNum
+								showMap.set(ktime,{
+									amount:Amount,
+									num:num
+								})
 							
-							item.show=true;
-							item.showtime=ktime;
+								
+								item.show=true;
+								item.showtime=ktime;
+							}
 						}
+						
 					})
 					
 					this.showMap=showMap;
@@ -467,4 +474,11 @@
 			}
 		}
 	}
+	.showName{
+		font-weight: unset;
+		    font-weight: unset;
+		    overflow: hidden;
+		    text-overflow: ellipsis;
+		    white-space: nowrap;
+	}
 </style>

pagesFinance/share/index.vue

@@ -113,12 +113,15 @@
 						
 					</view>
 					<view class="detailed-item">
-						<view class="detailed-item-name">
-							<h2>{{item.flowNo?item.flowNo:'无充电单号'}}</h2>
-							<p>{{item.stationName}}/{{item.deviceName}}</p>
+						<view class="detailed-item-name" style="
+								    width: 70%;
+							">
+							<h2 class="showName">{{item.stationName}}/{{item.deviceName}}</h2>
+							<p>{{item.flowNo?item.flowNo:'无充电单号'}}</p>
 						</view>
 						<view class="detailed-item-name"  style="
-								width: 80px;
+								min-width: 60px;
+								width: 30%;
 							">
 							
 							<h2 style="   text-align: end;">{{item.shareProfitAmount}}元</h2>
@@ -126,6 +129,7 @@
 						</view>
 						
 					</view>
+				
 					<view  class="product_tip" v-if="item.status=='1'">
 						<view class="product_tip_bg"></view>
 						<p>已提现</p>
@@ -531,4 +535,11 @@
 			}
 		}
 	}
+	.showName{
+		font-weight: unset;
+		
+		    overflow: hidden;
+		    text-overflow: ellipsis;
+		    white-space: nowrap;
+	}
 </style>

pagesFinance/statistics/index.vue

@@ -222,7 +222,7 @@
 					<span>{{indexData2.incomeMap.electricQuantity/10000}}度</span>
 				</view>
 				<view class="details-row" >
-					<p>电费收益</p>
+					<p>电费</p>
 					<span>{{indexData2.incomeMap.costAmount}}元</span>
 				</view>
 				<view class="details-row" >

pagesFinance/user/deviceList.vue

@@ -237,6 +237,10 @@
 			padding: 8px 16px;
 		}
 		.deviceList-main{
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			
 			font-size: 28px;
 			padding: 0px 16px;
 			font-weight: bold;