From e37868b878fd85c708ef479469f725a9d2dec5dc Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 23 Jul 2026 09:34:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=90=88=E4=BD=9C=E5=95=86=E5=AE=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BA=97=E9=93=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/tabbar/individualOrder.vue     |  3 ++-
 src/sheep/components/order/order-car.vue | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/tabbar/individualOrder.vue b/src/pages/tabbar/individualOrder.vue
index 72b011b..cd56b60 100644
--- a/src/pages/tabbar/individualOrder.vue
+++ b/src/pages/tabbar/individualOrder.vue
@@ -35,7 +35,8 @@
 			<view class="h-20rpx" />
 			<view class="card rounded-24rpx bg-white p-20rpx pb-0rpx mb-20rpx" v-for="(v, index) in pageHook.list"
 				:key="v.id">
-				<order-car visibleUser :visibleMch="false" :cardetail="v" :footerOperate="['refund', 'qrCodeDetail']" />
+				<order-car visibleUser :visibleMchOrderStatus="false" :cardetail="v"
+					:footerOperate="['refund', 'qrCodeDetail']" />
 			</view>
 		</z-paging>
 	</crud-layout>
diff --git a/src/sheep/components/order/order-car.vue b/src/sheep/components/order/order-car.vue
index 1e1c60e..26de2c7 100644
--- a/src/sheep/components/order/order-car.vue
+++ b/src/sheep/components/order/order-car.vue
@@ -20,6 +20,8 @@ export type Props = {
     goodsCollapsed?: boolean
     // 是否显示商户信息
     visibleMch?: boolean
+    // 是否显示商户订单状态
+    visibleMchOrderStatus?: boolean
     // 是否显示用户信息
     visibleUser?: boolean
     // 是否显示底部边框
@@ -36,6 +38,7 @@ const props = withDefaults(defineProps<Props>(), {
     cardetail: {},
     goodsCollapsed: true,
     visibleMch: true,
+    visibleMchOrderStatus: true,
     visibleUser: false,
     visibleBottomBorder: false,
     isLast: false,
@@ -167,7 +170,9 @@ const doCancel = (v: any) => {
                 :src="filePath(props.cardetail.logoPic) || '/static/logo/zax.png'" mode="aspectFill" />
             <view class="flex-1 ml-20rpx">
                 <view class="flex-row items-center justify-between">
-                    <view class="sub-text-26">{{ props.cardetail.merchantName }}</view>
+                    <view v-if="props.visibleMchOrderStatus" class="sub-text-26">
+                        {{ props.cardetail.merchantName }}
+                    </view>
                     <view class="w-100rpx flex-row-center">
                         <order-status-tag :cardetail="props.cardetail" />
                     </view>
@@ -180,7 +185,8 @@ const doCancel = (v: any) => {
                         </text>
                         <text v-else class="ml-10rpx color-blue">正在下单</text>
                     </view>
-                    <view class="w-100rpx flex-row-center mt-10rpx" v-if="props.cardetail.refundStatus">
+                    <view class="w-100rpx flex-row-center mt-10rpx"
+                        v-if="props.cardetail.refundStatus && props.visibleMchOrderStatus">
                         {{ hooks.useEnum("hardwareRefundStatusEnum", props.cardetail.refundStatus) }}
                     </view>
                 </view>