From 04204cb0fc3e35b1588da697ca9417a395c13cb5 Mon Sep 17 00:00:00 2001
From: 1154079537 <1154079537@qq.com>
Date: Mon, 29 Apr 2024 17:19:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/orderList/index.vue | 12 ++++++-
 pages/index/index.vue           | 56 +--------------------------------
 2 files changed, 12 insertions(+), 56 deletions(-)

diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue
index 13b036b..09369c9 100644
--- a/pages/admin/orderList/index.vue
+++ b/pages/admin/orderList/index.vue
@@ -129,6 +129,9 @@
 							<view>交易完成</view>
 							<view style="color: #FFE4BF;" v-if="!!item.refund_order_id  && item.refund_status != -1 && item.refund_status != 3">退款中</view>
 						</text>
+						<text class="fk_status" v-if="item.refund_mark == 1">
+							<view>退款成功</view>
+						</text>
 					</view>
 					<view class="pos-order-goods" v-for="(val, key) in item.storeOrder.orderProduct" :key="key"
 						@click="toDetail(item)">
@@ -155,7 +158,14 @@
 						</view>
 					</view>
 					
-					<view class="public-total" >
+					<view class="public-total" v-if="item.refund_mark == 1">
+						共{{ item.total_num }}件商品，
+						已退款
+						<span class="money" style="margin-right: 30rpx;">￥{{ item.pay_price }}</span> (邮费
+						¥{{ item.pay_postage}})
+					</view>
+					
+					<view class="public-total" v-else>
 						共{{ item.total_num }}件商品，
 						<span v-if="item.order_status < 1">应</span>
 						<span v-else>已</span>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2828326..3755f2a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1663,12 +1663,10 @@
 <style lang="scss" scoped>
 	page {
 		background-color: #f4f7fe;
-		// background: linear-gradient(180deg, #FFFFFF 0%, #F6F6F6 100%);
 	}
 
 	/deep/.statistical-page .navs {
 		top: 400rpx !important;
-
 	}
 
 	.userpage {
@@ -1778,7 +1776,6 @@
 	.merchantsSettled {
 		height: 100%;
 		padding-top: 130rpx;
-
 	}
 
 	.merchantsSettled .title {
@@ -1837,7 +1834,6 @@
 
 	.merchantsSettled .list .item {
 		padding: 30rpx 0 10rpx;
-
 		position: relative;
 		margin: 0 20px;
 
@@ -1972,7 +1968,6 @@
 		width: 588rpx;
 		margin: 0 auto;
 		height: 86rpx;
-
 		border-radius: 25px;
 		text-align: center;
 		line-height: 86rpx;
@@ -1989,7 +1984,6 @@
 		pointer-events: all;
 	}
 
-
 	.settlementAgreement {
 		width: 100vw;
 		height: 100vh;
@@ -2014,7 +2008,6 @@
 		transform: translate(-50%, -50%);
 		overflow: hidden;
 
-
 		.content {
 			height: 900rpx;
 			overflow-y: scroll;
@@ -2045,19 +2038,14 @@
 		font-weight: bold;
 	}
 
-
 	.settlementAgreement .setAgCount .contenta {
-
 		color: #333;
 		font-size: 26rpx;
 		line-height: 22px;
 		text-align: justify;
 		text-justify: distribute-all-lines;
 		height: 76%;
-
 		overflow-y: scroll;
-
-
 	}
 
 	.setAgCountbtn {
@@ -2079,14 +2067,12 @@
 			font-family: PingFang SC-Medium, PingFang SC;
 			font-weight: 500;
 			color: #737373;
-
 		}
 
 		.setAgCountbtnb {
 			margin-top: 40rpx;
 			padding-left: 20rpx;
 			padding-right: 20rpx;
-
 			text-align: center;
 			line-height: 74rpx;
 			background: #cecece;
@@ -2096,7 +2082,6 @@
 			font-family: PingFang SC-Medium, PingFang SC;
 			font-weight: 500;
 			color: #fff;
-
 		}
 
 		.setAgCountbtnc {
@@ -2112,7 +2097,6 @@
 			font-family: PingFang SC-Medium, PingFang SC;
 			font-weight: 500;
 			color: #fff;
-
 		}
 
 		.border {
@@ -2131,17 +2115,12 @@
 			font-weight: bold;
 			font-size: 34rpx;
 		}
-
 	}
 
-
-
-
 	.left-content {
 		width: 680rpx;
 		height: 100%;
 		display: flex;
-
 		background-color: #ffffff;
 
 		.left-content-left {
@@ -2157,8 +2136,6 @@
 			}
 
 			.content-top_img {
-
-
 				width: 96rpx;
 				height: 96rpx;
 				border-radius: 50%;
@@ -2170,7 +2147,6 @@
 					width: 100%;
 					height: 100%;
 				}
-
 			}
 		}
 
@@ -2215,7 +2191,6 @@
 				font-size: 25rpx;
 			}
 		}
-
 	}
 
 	.conter-img {
@@ -2224,7 +2199,6 @@
 		margin: 0 auto;
 		margin-top: 60rpx;
 
-
 		image {
 			width: 100%;
 			height: 100%;
@@ -2233,12 +2207,11 @@
 	}
 
 	.content {
-		padding-top: 80rpx;
+		padding-top: 100rpx;
 
 		.content-top {
 			display: flex;
 			justify-content: space-between;
-
 		}
 
 		.content-tops {
@@ -2353,7 +2326,6 @@
 			padding-top: 46rpx;
 
 			.content-order {
-
 				display: flex;
 				justify-content: space-around;
 
@@ -2375,7 +2347,6 @@
 						font-family: SF Pro Display-Semibold, SF Pro Display;
 						font-weight: 600;
 						color: #333333;
-
 					}
 				}
 			}
@@ -2401,7 +2372,6 @@
 				}
 
 				.tools-two {
-
 					display: grid;
 					grid-template-columns: repeat(4, 1fr);
 					padding: 0 44rpx;
@@ -2421,7 +2391,6 @@
 							}
 						}
 					}
-
 				}
 			}
 
@@ -2442,12 +2411,10 @@
 						width: 46rpx;
 						height: 5rpx;
 						background: #F84221;
-
 						margin: 0 auto;
 					}
 				}
 
-
 				.content-list-one {
 					padding: 25rpx 25rpx;
 					padding-bottom: 100rpx;
@@ -2464,7 +2431,6 @@
 							height: 49rpx;
 							line-height: 49rpx;
 
-
 							.list-one_left-a {
 								width: 49rpx;
 								height: 49rpx;
@@ -2479,7 +2445,6 @@
 							.list-one_left-c {
 								width: 26rpx;
 								height: 26rpx;
-
 								margin-top: 5rpx;
 
 								image {
@@ -2491,14 +2456,12 @@
 
 						.list-one_right {
 							display: flex;
-
 							font-size: 26rpx;
 							font-family: PingFang SC-Regular, PingFang SC;
 							font-weight: 400;
 							align-items: center;
 
 							.list-one_right-a {
-
 								color: #333333;
 							}
 
@@ -2512,24 +2475,18 @@
 							}
 
 							.list-one_right-b {
-
 								color: #F84221;
 							}
 						}
 					}
 
 					.list-two {
-
 						display: flex;
-
-
 						margin-top: 26rpx;
 
 						.list-two_left {
 							width: 175rpx;
 							height: 175rpx;
-
-
 							image {
 								width: 100%;
 								height: 100%;
@@ -2568,8 +2525,6 @@
 										font-weight: 400;
 										color: #F84221;
 										margin-top: -10rpx;
-
-
 									}
 								}
 							}
@@ -2589,12 +2544,9 @@
 									font-family: PingFang SC-Regular, PingFang SC;
 									font-weight: 400;
 									margin-top: -10rpx;
-
 								}
 							}
 						}
-
-
 					}
 
 					.list-three {
@@ -2607,7 +2559,6 @@
 							.title-img {
 								width: 28rpx;
 								height: 28rpx;
-
 								margin-top: 5rpx;
 								margin-right: 10rpx;
 
@@ -2622,11 +2573,9 @@
 							PingFang SC;
 							font-weight: 400;
 							color: #333333;
-
 						}
 					}
 
-
 					.list-four {
 						display: flex;
 						position: absolute;
@@ -2643,7 +2592,6 @@
 						border-radius: 30rpx 30rpx;
 						opacity: 1;
 						font-size: 26rpx;
-
 						font-family: PingFang SC-Regular, PingFang SC;
 						font-weight: 400;
 						color: #737373 !important;
@@ -2663,9 +2611,7 @@
 						font-weight: 400;
 						color: #F84221 !important;
 					}
-
 				}
-
 			}
 		}
 	}