From 256913d2ae7a62ef63a30e5b03b67a46a26af723 Mon Sep 17 00:00:00 2001
From: yangrz <yangrz@vip.qq.com>
Date: Wed, 21 Feb 2024 23:12:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8D=95=E7=8B=AC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=80=80=E6=AC=BE=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agentApp/pages/merchant-index/index.vue | 32 +++++++++++++++++++------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/agentApp/pages/merchant-index/index.vue b/agentApp/pages/merchant-index/index.vue
index e13cac2..ea26cdc 100644
--- a/agentApp/pages/merchant-index/index.vue
+++ b/agentApp/pages/merchant-index/index.vue
@@ -64,11 +64,11 @@
 							<view class="order-time">订单时间：{{order.paid_at}}</view>
 						</view>
 					</view>
-					<view class="order-status" v-if="order.settle_status==0">
-						<button class="refund-button" v-if="order.order_status==1"
-							@click="orderRefund(order)">退款</button>
-						<button class="refunded-button-style" v-if="order.order_status==2">退款中...</button>
-						<button class="refunded-button-style" v-if="order.order_status==3">退款成功</button>
+					<view class="order-status">
+						<button class="refund-button" v-if="order.refund_status==0" @click="orderRefund(order)">退款</button>
+						<button class="refunded-button-style" v-if="order.refund_status==1">退款中...</button>
+						<text class="refunded-style-success" v-if="order.refund_status==2">退款成功</text>
+						<text class="refunded-style-reject" v-if="order.refund_status==3">退款失败：{{order.refund_fail_reason}}</text>
 					</view>
 					<view class="divider-style"></view>
 				</view>
@@ -357,9 +357,9 @@
 
 				.order-status {
 					display: flex;
-					justify-content: space-around;
+					justify-content: right;
 					align-items: center;
-					padding: 30rpx 0;
+					padding: 30rpx 20rpx;
 					border-top: 1rpx solid #eeeeee;
 
 					button.refund-button {
@@ -390,6 +390,24 @@
 						margin-left: 500rpx;
 						border: 1rpx solid #E5E5E5;
 					}
+					
+					.refunded-style-success {
+						height: 48rpx;
+						line-height: 44rpx;
+						font-family: PingFangSC-Regular, sans-serif;
+						font-size: 24rpx;
+						color: #38a800 !important;
+						margin: 0;
+					}
+					
+					.refunded-style-reject {
+						height: 48rpx;
+						line-height: 44rpx;
+						font-family: PingFangSC-Regular, sans-serif;
+						font-size: 24rpx;
+						color: #e30000 !important;
+						margin: 0;
+					}
 				}
 
 				.divider-style {