lucl
2026-06-24 eea20658c414b846ed4567875a813770e2cd8dfc
Merge branch 'feature_v2.0' into lucl/auto-scale-v5
2个文件已修改
22 ■■■■■ 已修改文件
src/robotaxi/pages/share-trip/components/share-trip-view.tsx 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/robotaxi/pages/share-trip/hooks/use-map-markers.ts 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/robotaxi/pages/share-trip/components/share-trip-view.tsx
@@ -1,5 +1,6 @@
import { View, Image, Map } from '@tarojs/components';
import { formatDurationDisplay, safeParse } from '../../../../utils/Robotaxi-public-method';
import { safeParse } from '../../../../utils/Robotaxi-public-method';
import { formatRemainingDurationDisplay } from '../../../utils/format';
import { TripStatus } from '../../../constants/trip-status';
type Props = {
@@ -41,7 +42,8 @@
  handleContactService,
}: Props) {
  const hasRouteDuration = typeof routeDuration === 'number' && Number.isFinite(routeDuration);
  const durationDisplay = hasRouteDuration ? formatDurationDisplay(routeDuration) : null; // 预计耗时展示文案
  // 与 begin-route 对齐:分钟按向下取整,秒按四舍五入。
  const durationDisplay = hasRouteDuration ? formatRemainingDurationDisplay(routeDuration) : null; // 预计耗时展示文案
  const isCanceledTrip = tripData?.tripStatus === TripStatus.CancelOnlyPickup || Number(tripData?.rawOrderStatus) === 0;
  if (isExpired) {
src/robotaxi/pages/share-trip/hooks/use-map-markers.ts
@@ -93,10 +93,10 @@
            latitude: pickupSite.latitude,
            longitude: pickupSite.longitude,
            iconPath: "https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/start-icon.png",
            width: 20,
            height: 36,
            anchor: { x: 0.5, y: 1 },
            zIndex: 1,
            width: 21,
      height: 31.5,
      anchor: { x: 0.5, y: 1 },
      zIndex: 1,
            name: pickupSite?.name || '上车点',
            ...(useAndroidNativeTrip1Callout
                ? {
@@ -137,10 +137,10 @@
            latitude: dropoffSite.latitude,
            longitude: dropoffSite.longitude,
            iconPath: 'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/end-icon.png',
            width: 20,
            height: 36,
            anchor: { x: 0.5, y: 1 },
            zIndex: 1,
            width: 21,
      height: 31.5,
      anchor: { x: 0.5, y: 1 },
      zIndex: 1,
            name: dropoffName,
            ...(useAndroidNativeTrip1Callout || deps.tripStatus === TripStatus.InService
                ? {