From bf41dd6b1e41aa9faf96329abca209568acd44d1 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Sat, 10 Aug 2024 16:32:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundle/pages/apply_refund/apply_refund.vue |  4 +-
 components/order-goods/order-goods.vue     | 63 +++++++++++-----------
 2 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/bundle/pages/apply_refund/apply_refund.vue b/bundle/pages/apply_refund/apply_refund.vue
index 80cd080..f9d14b8 100644
--- a/bundle/pages/apply_refund/apply_refund.vue
+++ b/bundle/pages/apply_refund/apply_refund.vue
@@ -11,14 +11,14 @@
 		</view>
 		<view class="opt-box m-t-20 bg-white">
 			<view v-show="!hiddenOpt">
-<!-- 				<view class="opt-item flex row-between border-line" @tap="onlyRefund">
+			<!-- 	<view class="opt-item flex row-between border-line" @tap="onlyRefund">
 					<view>
 						<view class="lg">仅退款</view>
 						<view class="muted xs m-t-10">未收到货，与卖家协商同意无需退货只需退款</view>
 					</view>
 					<u-icon class="m-l-10" name="arrow-right" size="28" />
 				</view> -->
-				<view class="opt-item flex row-between" @tap="allRefunds">
+				<view class="opt-item flex row-between" @tap="allRefunds"  v-if="goods.order_status == 2 || goods.order_status == 3">
 					<view>
 						<view class="lg">退货退款</view>
 						<view class="muted xs m-t-10">已收到货，需退还收到的实物</view>
diff --git a/components/order-goods/order-goods.vue b/components/order-goods/order-goods.vue
index db686d8..f29921d 100644
--- a/components/order-goods/order-goods.vue
+++ b/components/order-goods/order-goods.vue
@@ -67,36 +67,31 @@
 					</view>
 				</view>
 			</view>
-			<view class="goods-footer flex" v-if="link && item.comment_btn || item.refund_btn">
-				<view class="flex-1"></view>
-				<router-link v-if="item.comment_btn" class="m-r-20"
-					:to="{path: '/bundle/pages/goods_reviews/goods_reviews', query:{id: item.id}}">
-					<button size="xs" class="plain br60" hover-class="none">
-						评价晒图
-					</button>
-				</router-link>
-
-				<!--                <router-link v-if="item.refund_btn && !item.p_id"
-                    :to="{path: '/bundle/pages/apply_refund/apply_refund', query:{id: item.id, order_id: item.order_id, item_id: item.item_id}}">
-                    <button size="xs" class="plain br60" hover-class="none">
-                        申请退款
-                    </button>
-                </router-link> -->
-			</view>
-			<view class="goods-footer flex">
-				<view class="flex-1"></view>
-				<router-link v-if="(orderStatus == 1) && !item.p_id && !item.after_sale_id"
-					:to="{path: '/bundle/pages/apply_refund/apply_refund', query:{id: item.id, order_id: item.order_id, item_id: item.item_id}}">
-					<button size="xs" class="plain br60" hover-class="none">
-						申请退款
-					</button>
-				</router-link>
-				<router-link v-if="(orderStatus == 1) && !item.p_id && item.after_sale_id"
-					:to="{path: '/bundle/pages/after_sales_detail/after_sales_detail', query:{id: item.after_sale_id}}">
-					<button size="xs" class="plain br60" hover-class="none">
-						已申请退款
-					</button>
-				</router-link>
+			<view class="flex footer-block">
+				<view class="goods-footer flex p-r-0" v-if="link && item.comment_btn || item.refund_btn">
+					<view class="flex-1"></view>
+					<router-link v-if="item.comment_btn"
+						:to="{path: '/bundle/pages/goods_reviews/goods_reviews', query:{id: item.id}}">
+						<button size="xs" class="plain br60" hover-class="none">
+							评价晒图
+						</button>
+					</router-link>
+				</view>
+				<view class="goods-footer flex">
+					<view class="flex-1"></view>
+					<router-link v-if="(orderStatus == 3) && !item.p_id && !item.after_sale_id"
+						:to="{path: '/bundle/pages/apply_refund/apply_refund', query:{id: item.id, order_id: item.order_id, item_id: item.item_id}}">
+						<button size="xs" class="plain br60" hover-class="none">
+							申请退款
+						</button>
+					</router-link>
+					<router-link v-if="(orderStatus == 3) && !item.p_id && item.after_sale_id"
+						:to="{path: '/bundle/pages/after_sales_detail/after_sales_detail', query:{id: item.after_sale_id}}">
+						<button size="xs" class="plain br60" hover-class="none">
+							已申请退款
+						</button>
+					</router-link>
+				</view>
 			</view>
 		</view>
 	</view>
@@ -196,5 +191,13 @@
 				font-size: 26rpx;
 			}
 		}
+		
+		.p-r-0 {
+			padding-right: 0;
+		}
+		
+		.footer-block {
+			justify-content: flex-end;
+		}
 	}
 </style>
\ No newline at end of file