From 672b6030de0f8f3db83e1dc0427601c32ace0d62 Mon Sep 17 00:00:00 2001
From: 卢春龙 <lucl@xiaopeng.com>
Date: 星期二, 16 六月 2026 14:37:02 +0800
Subject: [PATCH] Merge branch 'feature_v1.0_fix0616_zjk' into 'feature_v1.0'
---
src/robotaxi/pages/share-trip/components/share-trip-view.tsx | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/robotaxi/pages/share-trip/components/share-trip-view.tsx b/src/robotaxi/pages/share-trip/components/share-trip-view.tsx
index 1f25a53..a1cb61f 100644
--- a/src/robotaxi/pages/share-trip/components/share-trip-view.tsx
+++ b/src/robotaxi/pages/share-trip/components/share-trip-view.tsx
@@ -43,6 +43,7 @@
const hasRouteDuration = typeof routeDuration === 'number' && Number.isFinite(routeDuration);
const durationDisplay = hasRouteDuration ? formatDurationDisplay(routeDuration) : null; // 预计耗时展示文案
const shouldShowEndPointRow = tripData?.tripStatus !== TripStatus.VehicleArrivedPickup; // 到达上车点阶段与 begin-route 对齐，隐藏终点信息
+ const isCanceledTrip = tripData?.tripStatus === TripStatus.CancelOnlyPickup || Number(tripData?.rawOrderStatus) === 0;
if (isExpired) {
return (
@@ -117,8 +118,11 @@
乘客已上车，正在前往目的地
</View>
)}
+ {isCanceledTrip && (
+ <View className='calling-car-head-title'>乘客已取消行程</View>
+ )}
{tripData?.tripStatus >= TripStatus.ArrivedDestination && (
- <View className='calling-car-head-title'>已到达目的地</View>
+ !isCanceledTrip && <View className='calling-car-head-title'>已到达目的地</View>
)}
</View>
<View className='car-card'>
@@ -151,7 +155,7 @@
<View
className={`car-card-temp-title ${
tripData?.tripStatus === TripStatus.InService
- || tripData?.tripStatus >= TripStatus.ArrivedDestination
+ || (tripData?.tripStatus >= TripStatus.ArrivedDestination && !isCanceledTrip)
? 'disabled-text'
: ''
}`}
@@ -160,7 +164,7 @@
</View>
</View>
{(tripData?.tripStatus === TripStatus.InService
- || tripData?.tripStatus >= TripStatus.ArrivedDestination)
+ || (tripData?.tripStatus >= TripStatus.ArrivedDestination && !isCanceledTrip))
&& tripData?.boardingTime && (
<View className='car-card-temp-time disabled-text'>
{tripData.boardingTime} 上车
@@ -173,7 +177,7 @@
<View className='dot end'></View>
<View
className={`car-card-temp-title ${
- tripData?.tripStatus >= TripStatus.ArrivedDestination
+ tripData?.tripStatus >= TripStatus.ArrivedDestination && !isCanceledTrip
? 'disabled-text'
: ''
}`}
@@ -182,6 +186,7 @@
</View>
</View>
{tripData?.tripStatus >= TripStatus.ArrivedDestination
+ && !isCanceledTrip
&& tripData?.getoffTime && (
<View className='car-card-temp-time disabled-text'>
{tripData.getoffTime} 到达
--
Gitblit v1.7.1