样式调整

pagesFinance/detailed/details.vue

@@ -48,8 +48,11 @@
 					充电服务费包月卡	
 				</span>
 			</view>
-		<view class="details-row"   ><p>订单来源 </p><span>{{detail.record?detail.record.platformText:''}}</span></view>
-		
+			<view class="details-row"   ><p>订单来源 </p><span>{{detail.record?detail.record.platformText:''}}</span></view>
+			
+			<view class="details-row"   ><p>支付方式 </p><span>{{detail.payType==1?'先付后退':''}}{{detail.payType==2?'个人账户':''}}{{detail.payType==3?'企业账户':''}}</span></view>
+			<view class="details-row"   ><p>用户类型 </p><span>{{detail.userType==1?'游客':''}}{{detail.userType==2?'会员':''}} </span></view>
+			
  		</view>
 		
 	

pagesFinance/detailed/index.vue

@@ -115,45 +115,54 @@
 				<view class="detailed-list" v-for="(item ,index) in list"
 				@click="gotoUrl('pagesFinance/detailed/details?id='+item.id)"
 				:key="index">
-				<view class="detailed-time"    v-if="item.show">
+				<view class="detailed-time" style="background-color:#f3f4f7"    v-if="item.show">
 					<p>{{item.showtime}}</p>
 					<p  v-if="showMap">共收{{showMap.get(item.showtime).num}}笔,{{showMap.get(item.showtime).amount.toFixed(2)}}元</p>
 				</view>
+				<view class="detailed-item" style="padding-top: 20rpx;">
+					<p style="   text-align: end;" >
+					<u-icon name="clock"></u-icon>
+
+					
+					{{item.endTime?item.endTime.slice(11):''}}</p>
+				</view>
 				<view class="detailed-item">
-					<view class="detailed-item-name" style="
-							    width: 70%;
-						">
+					
+					<view class="detailed-item-name" style=" width: 70%;	">
 						<h2 class="showName">{{item.stationName}}/{{item.deviceName}}</h2>
-						<!-- <p>{{item.flowNo?item.flowNo:'无充电单号'}}</p> -->
-						<span
 						
-						 :style="{
-							color:colorList[item.platform%3]
-						}">{{item.platformText}}</span>
-						
-						<span v-if="item.userCardId" style="color:#FF8B00  ;margin-left: 10px;">月卡订单</span>
 					</view>
 					<view class="detailed-item-name"  style="
 						
 							    min-width: 60px;
-							    width: 30%;
-						">
+							    width: 30%;">
 						
 						<h2 style="   text-align: end;">{{item.actualFee?item.actualFee.toFixed(2):0}}元</h2>
-						<p style="   text-align: end;" >{{item.endTime?item.endTime.slice(11):''}}</p>
 						
 					</view>
-					<view class="sign" v-if="false">
-						<!-- //<img src="../../assets/img/tixian.png" alt=""> -->
-						<!-- 月卡 -->
-						<view class="product_tip" >
-								<view class="product_tip_bg"></view>
-								<p>月卡</p>
-							</view>
-					</view>
-					
 					
 				</view>
+				<view class="detailed-item" style="padding-bottom: 20rpx;">
+					<view class="detailed-item-name" style="
+							    width: 100%;
+						">
+						<span
+						
+						 :style="{
+							color:colorList[item.platform%3],
+							borderColor:colorList[item.platform%3],
+						}">{{item.platformText}}</span>
+						
+						<span
+						v-show="item.payType"
+						 :style="{
+							
+							marginLeft: '2px',
+						}">{{item.payType==1?'先付后退':''}}{{item.payType==2?'个人账户':''}}{{item.payType==3?'企业账户':''}}</span>
+						<span  style="">{{item.userType==1?'游客':''}}{{item.userType==2?'会员':''}}</span>
+						<span v-if="item.userCardId" style="color:#FF8B00 ;border-color:#FF8B00;">月卡订单</span>
+					</view>
+				</view>
 				
 					
 				</view>
@@ -642,19 +651,25 @@
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		padding: 10px 20px;
+		padding: 5px 10px;
 		font-size: 16px;
 		p{
 			color:#666;
 			
 		}
 	}
+	.detailed-list{
+		border-bottom: 1px solid #ededed;
+		
+		background-color: #fff;
+	}
 	.detailed-item{
+		
 		background-color: #fff;
 		display: flex;
 		justify-content: space-between;
-		padding: 10px 20px;
-		border-bottom: 1px solid #ededed;
+		padding: 2px 15px;
+		
 		position: relative;
 		.sign{
 			width: 32px;
@@ -673,7 +688,12 @@
 				font-weight: normal;
 			}
 			span{
-				font-size: 15px;
+				font-size: 24rpx;
+				border: 1px solid rgba(119, 119, 119, 1);
+				padding: 4rpx 12rpx;
+				border-radius: 3px;
+				color:rgba(119, 119, 119, 1);
+				margin-right: 12rpx;
 			}
 			p{
 				font-size: 15px;