zhupeng 3 лет назад
Родитель
Сommit
31b471012e
3 измененных файлов с 34 добавлено и 26 удалено
  1. 4 4
      pages/user/finance/refundApp.vue
  2. 18 10
      pages/user/finance/refundDet.vue
  3. 12 12
      pages/user/finance/refundList.vue

+ 4 - 4
pages/user/finance/refundApp.vue

@@ -71,7 +71,7 @@
 		padding: 50px 0;
 		.title{
 /*			font-size: 20px;*/
-			margin-top: 20px;
+			margin-top: 40rpx;
 			@include themeify{
 				font-size:themed('font-size5'); 
 				font-weight: themed('fontWeight');
@@ -90,17 +90,17 @@
 /*				font-size: 36px;
 				line-height: 36px;*/
 			}
-			margin-top: 20px;
+			margin-top: 40rpx;
 		}
 		p{
 			color:#999;
-			margin-top: 4px;
+			margin-top: 8rpx;
 		}
 	}
 	.paySuccess-btn{
 		display: flex;
 		justify-content: space-between;
-		padding: 0 40px;
+		padding: 0 80rpx;
 	}
 	.success-btn{
 		background-color:#00B962!important;

+ 18 - 10
pages/user/finance/refundDet.vue

@@ -13,7 +13,7 @@
 				<p>退费订单</p><span>{{refund.refundOrderNo}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>手续费</p><span>¥{{refund.proceduresAmount.toFixed(2)}}</span>
+				<p>手续费</p><span>¥{{refund.proceduresAmount!=null?refund.proceduresAmount.toFixed(2):''}}</span>
 			</view>
 			<view class="rechargeDet-list">
 				<p>退费时间</p><span>{{refund.applicationTime}}</span>
@@ -22,7 +22,7 @@
 				<p>退费渠道</p><span>{{refund.refundChannelText}}</span>
 			</view>
 			<view class="rechargeDet-list">
-				<p>退费金额</p><span>¥{{refund.refundRealAmount.toFixed(2)}}</span>
+				<p>退费金额</p><span>¥{{refund.refundRealAmount!=null?refund.refundRealAmount.toFixed(2):''}}</span>
 			</view>
 		</view>
 		<view class="rechargeDet-main">
@@ -40,7 +40,7 @@
 		data() {
 			return {
 				elderMode:false,
-				refund :{}
+				refund :{"id":3,"regUserId":"c9ab09fb-1a91-4dc5-8573-cebb353cffae","refundAmount":0.01,"status":"0","refundOrderNo":"RE0525151604592452","refundTime":null,"refundChannel":"wechat","refundRealAmount":0.01,"proceduresAmount":0,"applicationTime":"2022-05-25 15:16","applicationBy":"c9ab09fb-1a91-4dc5-8573-cebb353cffae","examineTime":null,"examineBy":null,"remark":null,"createBy":"c9ab09fb-1a91-4dc5-8573-cebb353cffae","createTime":"2022-05-25 15:16","updateBy":null,"updateTime":null,"delFlag":false,"phone":null,"headImg":null,"applicationByN":null,"examineByN":null}
 			}
 		},
 		onLoad(op){
@@ -107,7 +107,7 @@
 	@import "@/_theme.scss";
 	.rechargeDet-head{
 		background-color: #fff;
-		padding: 24px 0;
+		padding: 48rpx 0;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -116,25 +116,33 @@
 			align-items: flex-end;
 			justify-content: center;
 			font{
+				@include themeify{
+					font-size:themed('font-size13'); 
+					line-height:themed('font-size13'); 
+				}
+				/*
 				font-size: 36px;
-				line-height: 36px;
+				line-height: 36px;*/
 			}
 		}
 		p{
 			color:#999;
-			margin-top: 4px;
+			margin-top: 8rpx;
 		}
 	}
 	.rechargeDet-main{
 		background-color: #fff;
-		padding-left: 16px;
-		margin-top: 12px;
+		padding-left: 32rpx;
+		margin-top: 24rpx;
 		.rechargeDet-list{
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			padding: 12px 16px 12px 0;
-			border-bottom: 1px solid #f7f7f7;
+			padding: 24rpx 32rpx 24rpx 0;
+			border-bottom: 2rpx solid #f7f7f7;
+			@include themeify{
+				font-size:themed('font-size1'); 
+ 			}
 			&:last-child{
 				border-bottom: none;
 			}

+ 12 - 12
pages/user/finance/refundList.vue

@@ -57,7 +57,7 @@
 			</u-modal> 
 		</view>
 				
-		<view style="bottom:0;position:absolute;width: 100%;padding: 20px;" v-show="account.totalAmount>0">
+		<view style="bottom:0;position:absolute;width: 100%;padding: 40rpx;" v-show="account.totalAmount>0">
 			<u-button shape="circle"    style="background-color:#00b962;color:white" @click="show=true">申请退款</u-button>
 		</view>
 	</view>
@@ -194,8 +194,8 @@
 		color: $u-content-color;
 		padding-left: 30rpx;
 		padding-right: 30rpx;
-		padding-top: 20px;
-		padding-bottom: 20px;
+		padding-top: 40rpx;
+		padding-bottom: 40rpx;
 	}
 	.refundList-none{
 		display: flex;
@@ -204,7 +204,7 @@
 	}
 	.balanceHead{
 		background-color: #fff;
-		padding: 24px 0;
+		padding: 48rpx 0;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -224,28 +224,28 @@
 		.tips{
 			display: flex;
 			align-items: center;
-			margin-top: 4px;
+			margin-top: 8rpx;
 			p{
 				color:#999;
-				margin-right: 4px;
+				margin-right: 8rpx;
 			}
 		}
 	}
 	.balanceMain{
 		background-color: #fff;
-		margin-top: 12px;
+		margin-top: 24rpx;
 		.balanceMain-title{
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
-			height: 48px;
-			border-bottom: 1px solid #f7f7f7;
-			padding: 0 16PX;
+			height: 96rpx;
+			border-bottom: 2rpx solid #f7f7f7;
+			padding: 0 32rpx;
 			.title{
 				display: flex;
 				align-items: center;
 				span{
-					margin-left: 8px;
+					margin-left: 16rpx;
 /*					font-size: 16px;*/
 					@include themeify{
 						font-size:themed('font-size3'); 
@@ -267,7 +267,7 @@
 					}
 /*					font-size: 12px;*/
 					color:#888;
-					margin-top: 3px;
+					margin-top: 6rpx;
 				}
 				.state1{
 					color:#FF9600;