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 @@ - + 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(), { 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" /> - {{ props.cardetail.merchantName }} + + {{ props.cardetail.merchantName }} + @@ -180,7 +185,8 @@ const doCancel = (v: any) => { 正在下单 - + {{ hooks.useEnum("hardwareRefundStatusEnum", props.cardetail.refundStatus) }}