Merge origin/featue_v2.4.0_fuqj into feature_v2.5.0_fuqj [ai-coding] [符启基]

ai-coding

2026-08-03 00ee522f81296c202aa797de87c8cbe8debdd07c

Merge origin/featue_v2.4.0_fuqj into feature_v2.5.0_fuqj
[ai-coding] [符启基]

 src/robotaxi/components/coupon-select-popup/index.less

@@ -20,7 +20,7 @@
    left: 0;
    width: 100%;
    height: 100%;
    background: rgba(0, 0, 0, 0.4);
    background: rgba(0, 0, 0, 0.8);
    z-index: 1;
  }

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

    .coupon-detail-content {

 src/robotaxi/components/customer-service/index.less

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

  .customer-service-content {
@@ -41,4 +41,4 @@
      background: #ffffff;
    }
  }
}
}

 src/robotaxi/components/tip-popup/index.less

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

    .tip-content {

 src/robotaxi/pages/begin-route/components/calling-car-modules/bluetooth-operate-card.tsx

@@ -28,7 +28,7 @@
            {shouldRenderRight && (
                <View className="bluetooth-operate-card-right">
                    {/* {!!actionText && <View>{actionText}</View>} */}
                    <Image src="https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/blue-right-icon-20260706.png" />
                    <Image src="https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/bluetooth-arrow-20260706.png" />
                </View>
            )}
        </View>

 src/robotaxi/pages/begin-route/components/css-folder/announcements-popup.less

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

    .announcements-content {
@@ -48,4 +48,4 @@
            height: 313px;
        }
    }
}
}

 src/robotaxi/pages/begin-route/components/css-folder/calling-car.less

@@ -854,7 +854,7 @@
    font-weight: normal;
    line-height: 40px;
    letter-spacing: normal;
    color: #6d7fd9;
    color:  @black-text-main;
    image {
      flex-shrink: 0;
      width: 24px;

 src/robotaxi/pages/begin-route/components/css-folder/cancel-popup.less

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

    .cancel-content {
@@ -105,6 +105,7 @@
                line-height: 48px;
                letter-spacing: normal;
                color: #141E27;
                font-weight: 500;
                .cancel-site-box-divider {
                  margin: 34px 32px 40px 0px;
                  border-top: 1px solid rgba(204, 208, 215, 0.25);

 src/robotaxi/pages/begin-route/components/css-folder/credit-pay-popup.less

@@ -7,7 +7,7 @@
.credit-pay-mask {
  position: absolute;
  inset: 0;
  background: rgba(0, 0, 0, 0.45);
  background: rgba(0, 0, 0, 0.8);
}

.credit-pay-content {

 src/robotaxi/pages/begin-route/components/css-folder/evaluate-popup.less

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

    .evaluate-content {
@@ -68,7 +68,7 @@
        }

        .evaluate-rating-switcher {
           

            padding: 0 49px;
            display: flex;
            flex-direction: column;
@@ -257,7 +257,7 @@
                    flex-direction: column;
                    align-items: center;
                    justify-content: center;
                    background: rgba(0, 0, 0, 0.4);
                    background: rgba(0, 0, 0, 0.8);
                    color: #FFF;
                    gap: 8px;


 src/robotaxi/pages/begin-route/components/css-folder/fragrance-control.less

@@ -132,7 +132,7 @@
      left: 0;
      width: 100%;
      height: 100%;
      background: rgba(0, 0, 0, 0.4);
      background: rgba(0, 0, 0, 0.8);
      z-index: 102;
    }


 src/robotaxi/pages/begin-route/components/css-folder/no-route-popup.less

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

    .no-route-content {

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

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

    .over-content {

 src/robotaxi/pages/begin-route/components/css-folder/pickup-exception-popup.less

@@ -1,3 +1,5 @@
@import '../../../../style/ui-variables.less';

.pickup-exception-popup {
  position: fixed;
  inset: 0;
@@ -7,7 +9,7 @@
.pickup-exception-mask {
  position: absolute;
  inset: 0;
  background: rgba(0, 0, 0, 0.6);
  background: rgba(0, 0, 0, 0.8);
}

.pickup-exception-content {
@@ -15,9 +17,9 @@
  left: 0;
  right: 0;
  bottom: 0;
  background: #ffffff;
  border-radius: 32px 32px 0 0;
  padding: 48px 40px 80px;
  background: @gary-theme;
  border-radius: 60px 60px 0 0;
  padding: 48px 48px 80px 48px;
  box-sizing: border-box;
}

@@ -39,7 +41,7 @@
  font-weight: 500;
  line-height: 44px;
  letter-spacing: normal;
  color: rgba(0, 0, 0, 0.9);
  color: @black-text-main;
}

.pickup-exception-desc {
@@ -48,7 +50,7 @@
  font-weight: normal;
  letter-spacing: normal;
  /* 文字色/黑色/辅助文字 40% */
  color: rgba(0, 0, 0, 0.4);
  color: @black-text-04;
  margin-top: 8px;
}

@@ -56,9 +58,9 @@
  position: relative;
  width: 100%;
  height: 358px;
  border-radius: 16px;
  border-radius: 32px;
  overflow: hidden;
  background: #D8D8D8;
  background: @gary-theme;
  margin-top: 48px;
}

@@ -86,7 +88,7 @@

.pickup-exception-message {
  margin-top: 32px;
  color: rgba(0, 0, 0, 0.9);
  color: @black-text-main;
  font-size: 28px;
  line-height: 44px;
  text-align: center;
@@ -100,9 +102,8 @@
  line-height: 88px;
  text-align: center;
  color: #ffffff;
  border-radius: 16px;
  background: linear-gradient(96deg, #8475FF 1%, #7DD6FF 103%);
  border-radius: 2000px;
  background: @black-text-main;
  font-size: 28px;
  font-weight: 500;
  border-radius: 16px;
}

 src/robotaxi/pages/begin-route/components/css-folder/temperature-control.less

@@ -26,7 +26,7 @@
      left: 0;
      width: 100%;
      height: 100%;
      background: rgba(0, 0, 0, 0.4);
      background: rgba(0, 0, 0, 0.8);
      z-index: 102;
    }


 src/robotaxi/pages/begin-route/components/pickup-exception-popup.tsx

@@ -117,7 +117,7 @@
    if (Array.isArray(linePoints) && linePoints.length > 1) {
      nextPolylines.push({
        points: linePoints,
        color: '#7B91FF',
        color: '#DFB369',
        width: 6,
        dottedLine: true,
        arrowLine: false

 src/robotaxi/pages/begin-route/components/route-preference-popup/index.less

@@ -21,7 +21,7 @@
        left: 0;
        width: 100%;
        height: 100%;
        background: rgba(0, 0, 0, 0.4);
        background: rgba(0, 0, 0, 0.8);
        z-index: 102;
    }

@@ -96,4 +96,4 @@
            }
        }
    }
}
}

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

@@ -224,14 +224,13 @@
    width: 24px;
    height: 24px;
    display: block;
    margin-right: 8px;
    margin-right: 4px;
}

.site-countdown-time {
    font-family: @font-xpsans-bold;
    font-size: 24px;
    font-weight: normal;
    line-height: 32px;
    text-align: center;
    letter-spacing: 0.04em;
    color: #FFD181;

 src/robotaxi/pages/coupon/index.less

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

    .privacy-content {

 src/robotaxi/pages/feedback/index.less

@@ -214,7 +214,7 @@
    align-items: center;
    justify-content: center;
    gap: 8px;
    background: rgba(0, 0, 0, 0.4);
    background: rgba(0, 0, 0, 0.8);
    color: #FFFFFF;

    &-text {

 src/robotaxi/pages/order/detail/index.less

@@ -1,3 +1,5 @@
@import '../../../style/ui-variables.less';

.order-detail-page {
  background: #F2F3F7;
  min-height: 100vh;
@@ -237,7 +239,7 @@
          width: 8px;
          height: 8px;
          z-index: 0;
          background: #8CB654;
          background: @gold-light;
          border-radius: 50%;
          margin-right: 16px;
          flex-shrink: 0;
@@ -254,11 +256,11 @@
        }

        .first-icon {
          background: #6D7FD9;
          background: @black-text-main;
        }

      }
    }
  }

}
}

 src/robotaxi/pages/order/detail/index.tsx

@@ -193,14 +193,14 @@
    }
    const polylineData = [{
    points: routePath,
    color: '#6D7BC1',
    color: '#59B688',
    width: 10,
    dottedLine: false,
    arrowLine: false,
  },
  {
    points: routePath,
    color: '#7B91FF',
    color: '#59B688',
    width: 8,
    dottedLine: false,
    arrowLine: true,

 src/robotaxi/pages/select-map-site/hooks/use-select-map-site-walking-route.ts

@@ -51,7 +51,7 @@
      }
      deps.setPolyline([{
        points: displayPoints,
        color: '#6D7FD9',
        color: '#DFB369',
        width: deps.isAndroid ? 4 : 6,
        dottedLine: true,
        arrowLine: false,

 src/robotaxi/pages/share-trip/hooks/use-map-markers.ts

@@ -4,7 +4,7 @@

// 接驾态（前往上车点）/到达终点态 上车点三角图标（与 begin-route 对齐）
const PICKUP_APPROACHING_ICON_URL =
    'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/up-triangle-2026022.png';
    'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/up-triangle-20260722.png';
// 送驾态（前往目的地）/到达终点态 下车点三角图标（与 begin-route 对齐）
const DROPOFF_INSERVICE_ICON_URL =
    'https://s.xiaopeng.com/xp-fe/robot-taxi/imgs/v2/down-triangle-20260722.png';
@@ -136,6 +136,16 @@
        const isPickupArrivedDest = [TripStatus.ArrivedDestination, TripStatus.TripFinished, TripStatus.CancelOnlyPickup].includes(deps.tripStatus);
        const isPickupTriangle = isPickupApproaching || isPickupArrivedDest;
        const pickupNameLabelConfig = isPickupApproaching ? SITE_NAME_LABEL_BASE : SITE_NAME_LABEL_BELOW_LG;
        const isVehicleArrivedPickup = deps.tripStatus === TripStatus.VehicleArrivedPickup;
        const getCustomCalloutAnchorY = () => {
          if (isPickupApproaching)  {
            return 12;
          }
          if (isVehicleArrivedPickup && deps.isAndroid) {
            return 8;
          }
          return 6;
        }
        return {
            id: 1,
            latitude: pickupSite.latitude,
@@ -171,7 +181,7 @@
                  }
                : {
                      customCallout: {
                          anchorY: [TripStatus.Publishing, TripStatus.CallingCar].includes(deps.tripStatus) ? 150 : -5,
                          anchorY: getCustomCalloutAnchorY(),
                          anchorX: 0,
                          display: 'ALWAYS'
                      }
@@ -229,7 +239,7 @@
                  }
                : {
                      customCallout: {
                          anchorY: -5,
                          anchorY: 6,
                          anchorX: 0,
                          display: 'ALWAYS'
                      }
@@ -356,7 +366,6 @@
            deps.isAndroid && [
                TripStatus.PublishRoute,
                TripStatus.VehicleApproaching,
                TripStatus.VehicleArrivedPickup,
                TripStatus.TripFinished,
                TripStatus.PaymentSuccess,
                TripStatus.CancelOnlyPickup

 src/robotaxi/pages/share-trip/hooks/use-view-delegates.tsx

@@ -84,7 +84,7 @@
      : durationDisplay
  ), [durationDisplay]);
  const shouldHideAndroidMarkerCallout = deps.isAndroid
    && [TripStatus.PublishRoute, TripStatus.VehicleArrivedPickup, TripStatus.TripFinished, TripStatus.PaymentSuccess, TripStatus.CancelOnlyPickup].includes(deps.tripStatus);
    && [TripStatus.PublishRoute, TripStatus.TripFinished, TripStatus.PaymentSuccess, TripStatus.CancelOnlyPickup].includes(deps.tripStatus);
  const androidCarCalloutContent = useMemo(() => (
    <AndroidCarCalloutContent
      routeDistance={deps.routeDistance}

 src/robotaxi/pages/share-trip/index.less

@@ -226,8 +226,8 @@
  // 车型图：参考 calling-car 的 calling-car-vehicle-pic，浮于背景图顶部右侧
  .calling-car-vehicle-pic {
    position: absolute;
    top: 24px;
    right: 24px;
    top: -4px;
    right: 116px;
    width: 342px;
    height: 294px;
    z-index: 10;

 src/robotaxi/pages/site-search/components/favorite-popup/index.less

@@ -20,7 +20,7 @@
    left: 0;
    width: 100%;
    height: 100%;
    background: rgba(0, 0, 0, 0.4);
    background: rgba(0, 0, 0, 0.8);
    z-index: 1;
  }

@@ -148,4 +148,4 @@
      z-index: 11;
    }
  }
}
}