Merge branch 'feature_v2.4.0_ui_fuqj' of https://gitlab.x-peng.com/robotaxi...

ai-coding

2026-07-23 a37b094ad45c54603a2da39adec75376ff7c6b50

Merge branch 'feature_v2.4.0_ui_fuqj' of https://gitlab.x-peng.com/robotaxi1/xp-robotaxi-miniprogram into feature_v2.4.0_ui_fuqj

 src/pages/robotaxi/home/components/home-map-panel.tsx

@@ -168,7 +168,7 @@
          <View className="split-line"></View>
          <Image onClick={props.onOpenService} className="map-entry-icon" src='https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/contact-service-20260716.png' />
        </View>
        <Image onClick={props.onToCoupon} className="map-entry-icon entry-coupon" src='https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/coupon-20260722.png' />
        <Image onClick={props.onToCoupon} className="map-entry-icon entry-coupon" src='https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/coupon-20260723.png' />
      </View>
      <MapPointer
        showToolTip={props.showToolTip}

 src/robotaxi/pages/begin-route/components/css-folder/passenger-notice.less

@@ -14,7 +14,7 @@
        left: 0;
        right: 0;
        bottom: 0;
        background: rgba(0, 0, 0, 0.5);
        background: rgba(0, 0, 0, 0.8);
    }

    .passenger-content {
@@ -48,7 +48,7 @@
            line-height: 48px;
            text-align: center;
            letter-spacing: normal;
            color: rgba(0, 0, 0, 0.9);
            color: @black-text-main;
        }

        &-desc-wrap {

 src/robotaxi/pages/begin-route/hooks/use-view-delegates.tsx

@@ -396,15 +396,9 @@
        slot="callout"
        marker-id={item.id}
        key={calloutKey}
        className="waiting-callout"
        className={`waiting-callout ${deps.tripStatus === TripStatus.Publishing ? 'waiting-callout-publishing' : ''}`}
      >
        <CoverView className="waiting-callout-content">
          {deps.tripStatus === TripStatus.CallingCar && (
            <CoverImage
              className="site-status-end-img"
              src="https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/start-site-20260722.png"
            />
          )}
          {deps.tripStatus === TripStatus.CallingCar && (
            <CoverView className="waiting-callout-bg waiting-timedown-bg">
              <CoverImage
@@ -448,7 +442,15 @@
        slot="callout"
        marker-id={item.id}
        key={calloutKey}
        className="custom-callout"
        className={`
          custom-callout
          ${
            [TripStatus.VehicleApproaching, TripStatus.InService].includes(deps.tripStatus)
            ? 'site-status-callout-box'
            : ''
          }
          ${deps.tripStatus === TripStatus.VehicleArrivedPickup ? 'arrived-pickup-callout-box' : ''}`
        }
        style={item.id === 1 ? calloutRepaintStyle : undefined}
      >
        {item.isRouteSummaryBubble ? (

 src/robotaxi/pages/begin-route/index.less

@@ -119,6 +119,13 @@
    align-items: center;
    justify-content: center;
    flex-direction: column;
    transform: translateY(6px);
    &.site-status-callout-box {
      transform: translateY(13px);
    }
    &.arrived-pickup-callout-box {
      transform: translateY(24px);
    }
}

.pd-6-10 {
@@ -128,7 +135,7 @@
.waiting-callout-content {
    z-index: 2;
    position: absolute;
    top: 240px;
    top: 218px;
    left: 50%;
    transform: translateX(-50%);
    display: flex;
@@ -455,6 +462,10 @@
    overflow: visible; // 确保辐射动画不被裁剪
    min-width: 700px;
    height: 600px;
    transform: translateY(-34px);
    &.waiting-callout-publishing {
      transform: translateY(16px);
    }
}

.waiting-radar {
@@ -519,19 +530,15 @@
    font-weight: 400;
    background: @black-text-main;
    padding: 20px;
    line-height: 48px;
    display: flex;
}

.waiting-timedown-bg {
  padding: 3px 0 0 20px;
  min-width: 102px;
  min-width: 112px;
  height: 80px;
  .waiting-callout-bg-text {
    padding: 0;
  }
  .waiting-callout-txt {
    line-height: 32px;
  }
}


 src/robotaxi/pages/begin-route/index.tsx

@@ -1614,7 +1614,7 @@
  const shareOrderId = getOrderId(orderId);

  const onShareAppMessage = () => ({
    title: `已乘坐小鹏Robotaxi出发，${vehicleInfo?.plateNumber || ''}，实时伴我出行～`,
    title: `已乘坐小鹏Robotaxi出发，${!!vehicleInfo?.plateNumber ? `${vehicleInfo?.plateNumber }，` : ''}实时伴我出行～`,
    path: `/robotaxi/pages/share-trip/index?orderId=${shareOrderId}`
  });

@@ -2279,7 +2279,7 @@
    onCouponEntry: handleCouponEntry,
    onPersonalCenterEntry: handlePersonalCenterEntry,
    personalCenter: 'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/personal-center-20260716.png',
    coupon: 'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/coupon-20260722.png',
    coupon: 'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/coupon-20260723.png',
    contactService: 'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/contact-service-20260716.png',
    shouldShowOrigin,
    originBoxHidden,

 src/robotaxi/pages/select-map-site/index.less

@@ -63,6 +63,9 @@
            color: rgba(0, 0, 0, 0.3);
            text-align: left;
        }
        .search-input {
          color: @black-text-main;
        }
    }
}

@@ -396,11 +399,11 @@
            color: #141E27;
            display: flex;
            align-items: center;
            height: 112px;
            height: 120px;
            padding-left: 40px;
            padding-right: 40px;
            border-radius: 40px;
            background: transparent;
            background: rgba(204, 208, 215, 0.25);

            .collect-icon {
                flex-shrink: 0;
@@ -411,8 +414,7 @@
        }

        .site-active {
            height: 120px;
            background: rgba(204, 208, 215, 0.25);
          background: rgba(223, 179, 105, 0.2);
        }

        .no-service {
@@ -432,7 +434,7 @@
            align-items: center;
            border-radius: 1000px;
            box-sizing: border-box;
            border: 1px solid #141E27;
            border: 2px solid #141E27;
            font-size: 28px;
            letter-spacing: normal;
            color: #141E27;

 src/robotaxi/pages/select-map-site/index.tsx

@@ -63,7 +63,7 @@
      toCoupon={selectMapSite.toCoupon}
      toPersonalCenter={selectMapSite.toPersonalCenter}
      personalCenter='https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/personal-center-20260716.png'
      coupon='https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/coupon-20260722.png'
      coupon='https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/coupon-20260723.png'
      contactService='https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/contact-service-20260716.png'
      nearbyLoading={selectMapSite.nearbyLoading}
      isAndroid={selectMapSite.isAndroid}

 src/robotaxi/pages/site-search/index.less

@@ -204,6 +204,7 @@
    grid-template-columns: repeat(2, 1fr);
    grid-gap: 14px 16px;
    margin-bottom: 16px;
    margin-top: 16px;

    view {
      border-radius: 12px;

 src/robotaxi/pages/site-search/index.tsx

@@ -177,7 +177,7 @@
          endSite: item,
          minDistance: resolvedDistanceConfig?.minDistance
        });
        

        if (isSameSite || isTooClose) {
          setTipType(ORDER_DISTANCE_TIP_TYPE_MIN_DISTANCE);
          setShowTipPopup(true);
@@ -378,14 +378,14 @@
  ) => {
    if (item?.operationStatus === 2) {
      Taro.showToast({
        title: '当前点位暂未开放，请重新选点',
        title: '当前站点暂未开放',
        icon: 'none',
      })
      return
    }
    if (!isNonOperational) {
      Taro.showToast({
        title: '当前点位暂未开放，请重新选点',
        title: '当前站点暂未开放',
        icon: 'none',
      })
      return
@@ -594,32 +594,6 @@
          <Text className='fast-item-text'>地图选点</Text>
        </View>
      </View>
      {/* 历史记录 */}
      {
        (sortedHistorySite.length > 0 && !searchValue) &&
        <View className='history-card'>
          <View className='card-header'>历史记录</View>
          <View className='card-content list-content' id='history-card-content' key={`history-${showAllHistory ? 'expanded' : 'collapsed'}`}>
            {
              renderSiteItems(visibleHistory, (item, index = 0) => {
                if (pageType === 'start') {
                  reportHistoryPickupSelectEvent(item, index, visibleHistory.length);
                }
                if (pageType === 'end') {
                  reportHistoryDropoffSelectEvent(item, index, visibleHistory.length);
                }
                onChangeSelectSite(item, true, HISTORY_CONFIRM_RIDE_SOURCE_TYPE);
              }, true, true)
            }
          </View>
          {sortedHistorySite.length > MAX_SHOW_HISTORY && (
            <View className='show-more' hoverClass='none' onClick={toggleHistoryShow}>
              <Text className='more-text'>{showAllHistory ? '收起' : '展示更多'}</Text>
              <Image className={`more-icon ${showAllHistory ? 'rotate-up' : ''}`} src="https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/arrow.png"></Image>
            </View>
          )}
        </View>
      }
      {/* 推荐站点 */}
      {
        recommendList.length > 0 &&
@@ -658,6 +632,32 @@
          </View>
        </View>
      }
      {/* 历史记录 */}
      {
        (sortedHistorySite.length > 0 && !searchValue) &&
        <View className='history-card'>
          <View className='card-header'>历史记录</View>
          <View className='card-content list-content' id='history-card-content' key={`history-${showAllHistory ? 'expanded' : 'collapsed'}`}>
            {
              renderSiteItems(visibleHistory, (item, index = 0) => {
                if (pageType === 'start') {
                  reportHistoryPickupSelectEvent(item, index, visibleHistory.length);
                }
                if (pageType === 'end') {
                  reportHistoryDropoffSelectEvent(item, index, visibleHistory.length);
                }
                onChangeSelectSite(item, true, HISTORY_CONFIRM_RIDE_SOURCE_TYPE);
              }, true, true)
            }
          </View>
          {sortedHistorySite.length > MAX_SHOW_HISTORY && (
            <View className='show-more' hoverClass='none' onClick={toggleHistoryShow}>
              <Text className='more-text'>{showAllHistory ? '收起' : '展示更多'}</Text>
              <Image className={`more-icon ${showAllHistory ? 'rotate-up' : ''}`} src="https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/arrow.png"></Image>
            </View>
          )}
        </View>
      }
      {/* 非营运区域 */}
      {
        nonOperationalSite.length > 0 &&

 src/utils/Robotaxi-public-method.ts

@@ -520,9 +520,9 @@
    ...site,
    name: site.name,
    // id: index + 1,
    iconPath: 'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/site-poi.png',
    width: 15,
    height: 15,
    iconPath: 'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/golden-site-20260708.png',
    width: 18,
    height: 18,
    anchor: { x: 0.5, y: 0.5 }
  }));
};