@heycar/heycars-map 0.2.7 → 0.2.8

package/dist/types/interface.d.ts

@@ -32,4 +32,4 @@ export interface Route {
     distance: number;
     duration: number;
 }
-export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService";
+export type DriverStatus = "dispatching" | "book-dispatching" | "dispatched" | "driverStartService" | "book-driverStartService" | "book-dispatched" | "driverArrived" | "inService" | "canceled" | "endService" | "completed" | "canceling" | "banlanceRefund" | "waitBanlanceRefund" | "rechargePayed" | "waitRechargePay" | "payed" | "waitpay" | "refund" | "confirmed";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "type": "module",
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",

package/src/App.tsx

@@ -1,13 +1,13 @@
 import { defineComponent } from "vue-demi";
-import { DemoBusinessTaxiService } from "./components/Demo/DemoBusinessTaxiService";
+import { HeycarDemo } from "./components/Demo/HeycarDemo";
 
 export const App = defineComponent({
   setup() {
     // return () => <Hello class={"helloclass2"} qyc={2} style={{ color: "red" }} />;
     // return () => <ABusinessDemo />;
     // return () => <SearchDemo />;
-    return () => <DemoBusinessTaxiService />;
+    // return () => <DemoBusinessTaxiService />;
     // return () => <DemoBusinessQuoting />;
-    // return () => <HeycarDemo />;
+    return () => <HeycarDemo />;
   },
 });

package/src/business-components/AbsoluteAddressBox/AbsoluteAddressBox.tsx

@@ -0,0 +1,8 @@
+import { defineSetup } from "../../types/helper";
+import type { AddressBoxProps } from "../AddressBox";
+
+export const AbsoluteAddressBox = defineSetup((props: AddressBoxProps) => {
+  return () => {
+    return <div></div>;
+  };
+});

package/src/business-components/AbsoluteAddressBox/index.ts

@@ -0,0 +1 @@
+export * from "./AbsoluteAddressBox";

package/src/business-components/AddressBox/AddressBox.tsx

@@ -11,7 +11,7 @@ import { vec2lnglat } from "../../utils/transform";
 import { AAddressLocator, GAddressLocator } from "../AddressLocator";
 import * as css from "./AddressBox.css";
 
-interface AddressBoxProps {
+export interface AddressBoxProps {
   type: "box" | "locator";
   position: Point;
   title: string;

package/src/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.tsx

@@ -0,0 +1,157 @@
+import { computed, reactive, watchEffect } from "vue";
+import { HeycarMap, HeycarMapProps } from "../../components/MapProvider";
+import type { BusinessRecomendPlaceContext } from "../../hooks-business/useBusinessRecomendPlaceMap";
+import { useGeoLocation, UseGeoLocationProps } from "../../hooks/useGeoLocation";
+import { useHeycarMap } from "../../hooks/useHeycarMap";
+import { useMapDrag, UseMapDragProps } from "../../hooks/useMapDrag";
+import type { UseMapPlaceProps } from "../../hooks/useMapPlace";
+import { useMapRecomendPlace, UseMapRecomendPlaceProps } from "../../hooks/useMapRecomendPlace";
+import { useMapSupplier } from "../../hooks/useMapSupplier";
+import { defineLagecySetup } from "../../types/helper";
+import type { Place, Point } from "../../types/interface";
+import { AddressBox } from "../AddressBox";
+import { PassengerCircle } from "../PassengerCircle";
+import { PickupPoints } from "../PickupPoints";
+
+const RECOMMEND_PLACE_LIMIT = 30;
+
+export interface CenterPlaceSource {
+  source: "default" | "geo" | "drag" | "recomend" | "api";
+}
+export interface BusinessRecomendPlaceMapProps
+  extends Omit<HeycarMapProps, "center" | "zoom" | "mapRef">,
+    Pick<UseMapRecomendPlaceProps<CenterPlaceSource>, "getRecomendPlace"> {
+  title: string;
+  description: string;
+  geoDefaultPosition?: Point;
+  mapContext: BusinessRecomendPlaceContext;
+  onLoadGeoLocation?: UseGeoLocationProps["onLoad"];
+  onLoadDefaultGeoLocation?: UseGeoLocationProps["onLoadDefault"];
+  onChangeByDrag?: UseMapDragProps["onChange"];
+  onChangeGeoLocation?: UseGeoLocationProps["onChange"];
+  onChangePlace?: UseMapPlaceProps["onChange"];
+  onChangeRecomandPlace?: UseMapRecomendPlaceProps["onChange"];
+  onGeoError?: UseGeoLocationProps["onError"];
+}
+export const BusinessRecomendPlaceMap = defineLagecySetup(
+  (props: BusinessRecomendPlaceMapProps, { emit }) => {
+    const { geoDefaultPosition, getRecomendPlace, mapContext } = props;
+    const { mapRef, setMap, panTo } = useHeycarMap();
+    const { readyPromise } = useMapSupplier();
+    const centerPlace = reactive<Place>({
+      lng: geoDefaultPosition?.[0] ?? 0,
+      lat: geoDefaultPosition?.[1] ?? 0,
+      name: "",
+      cityName: undefined,
+    });
+    const centerPoint = computed<Point>(() => [centerPlace.lng, centerPlace.lat]);
+    const centerSource: CenterPlaceSource = { source: "geo" };
+    const setCenterPlaceByRecomand = (point: Point) => {
+      centerSource.source = "api";
+      centerPlace.lng = point[0];
+      centerPlace.lat = point[1];
+      updatePlace();
+    };
+    mapContext.setCenterPlaceByRecomand = setCenterPlaceByRecomand;
+    mapContext.panTo = panTo;
+    const setCenterByPlace = (place: Place) => {
+      centerSource.source = "api";
+      centerPlace.lng = place.lng;
+      centerPlace.lat = place.lat;
+      centerPlace.name = place.name;
+    };
+
+    const { geoPosition } = useGeoLocation({
+      geoDefaultPosition,
+      onLoad: async (value) => {
+        // geo 主入口
+        await readyPromise;
+        centerSource.source = "geo";
+        centerPlace.lng = value.position[0];
+        centerPlace.lat = value.position[1];
+        updatePlace();
+        emit("loadGeoLocation", value);
+      },
+      onLoadDefault: async (value) => {
+        // geo default position 主入口
+        await readyPromise;
+        centerSource.source = "geo";
+        centerPlace.lng = value.position[0];
+        centerPlace.lat = value.position[1];
+        updatePlace();
+        emit("loadDefaultGeoLocation", value);
+      },
+      onChange: (v) => emit("changeGeoLocation", v),
+      onError: (e) => emit("geoError", e),
+    });
+    const { isDragging } = useMapDrag({
+      mapRef,
+      onChange: (point) => {
+        centerSource.source = "drag";
+        centerPlace.lng = point[0];
+        centerPlace.lat = point[1];
+        updatePlace();
+        emit("changeByDrag", point);
+      },
+    });
+    const { updatePlace, updateRecomandPlace, placeCandidates } = useMapRecomendPlace({
+      pointRef: centerPoint,
+      context: centerSource,
+      getRecomendPlace,
+      getLimit: (context) => {
+        const source = context?.source;
+        switch (source) {
+          case "drag":
+          case "api":
+            return RECOMMEND_PLACE_LIMIT;
+          case "geo":
+          case "default":
+            return Infinity;
+          default:
+            throw new Error(`MyError: should not call getLimit on source: ${source}`);
+        }
+      },
+      onChangePlace: (place) => {
+        Object.assign(centerPlace, { ...place });
+        if (centerSource.source !== "recomend") {
+          updateRecomandPlace();
+        }
+        emit("changePlace", place);
+      },
+      onChange: (place) => {
+        centerSource.source = "recomend";
+        Object.assign(centerPlace, { ...place });
+        updatePlace();
+        emit("changeRecomandPlace", place);
+      },
+    });
+    watchEffect(() => {
+      mapContext.onChangeCenterPlace({ ...centerPlace });
+    });
+    watchEffect(() => {
+      mapContext.onChangeRecomendPlaces([...placeCandidates.value]);
+    });
+    return () => {
+      return (
+        <HeycarMap center={centerPoint.value} zoom={18} mapRef={setMap}>
+          <PassengerCircle position={geoPosition.value} />
+          <PickupPoints places={placeCandidates.value} onClick={setCenterByPlace} />
+          <AddressBox
+            position={centerPoint.value}
+            title={props.title}
+            description={props.description}
+            type={isDragging ? "locator" : "box"}
+          />
+        </HeycarMap>
+      );
+    };
+  }
+).props([
+  "description",
+  "fallback",
+  "geoDefaultPosition",
+  "getRecomendPlace",
+  "loading",
+  "mapContext",
+  "title",
+]);

package/src/business-components/BusinessRecomendPlaceMap/index.ts

@@ -0,0 +1 @@
+export * from "./BusinessRecomendPlaceMap";

package/src/business-components/BusinessTaxiServiceMap/BusinessTaxiServiceMap.tsx

@@ -323,16 +323,33 @@ export const BusinessTaxiServiceMap = defineLagecySetup((props: BusinessTaxiServ
             registerOverlay={registerOverlay}
             onMapMounted={setFitView}
           />
-        ) : driverStatus === "canceled" ? (
+        ) : driverStatus === "canceled" || driverStatus === "canceling" ? (
           <SectionCanceled from={from} to={to} registerOverlay={registerOverlay} />
-        ) : driverStatus === "endService" ? (
+        ) : driverStatus === "endService" ||
+          driverStatus === "completed" ||
+          driverStatus === "banlanceRefund" ||
+          driverStatus === "waitBanlanceRefund" ||
+          driverStatus === "rechargePayed" ||
+          driverStatus === "waitRechargePay" ||
+          driverStatus === "payed" ||
+          driverStatus === "waitpay" ||
+          driverStatus === "refund" ||
+          driverStatus === "confirmed" ? (
           <SectionEndService
             from={from}
             to={to}
             registerOverlay={registerOverlay}
             onMapMounted={setFitView}
           />
-        ) : null}
+        ) : (
+          // 匹配不到就显示灰色路线
+          <SectionEndService
+            from={from}
+            to={to}
+            registerOverlay={registerOverlay}
+            onMapMounted={setFitView}
+          />
+        )}
       </HeycarMap>
     );
   };

package/src/business-components/PlaceCircle/PlaceCircle.tsx

@@ -7,7 +7,7 @@ import {
 } from "../../components/GmapAdvancedMarkerView";
 import { useMapSupplier } from "../../hooks/useMapSupplier";
 import { AnchorType } from "../../types/amap/marker";
-import { createElement, defineLagecySetup, defineSetup } from "../../types/helper";
+import { createElement, defineSetup } from "../../types/helper";
 import type { Point } from "../../types/interface";
 import { createDom } from "../../utils/dom";
 import { vec2lnglat } from "../../utils/transform";
@@ -20,10 +20,7 @@ export interface PlaceCircleProps {
   hideIcon?: boolean;
   onClick?: (value: Point) => any;
 }
-export const APlaceCircle = defineLagecySetup(function APlaceCircle(
-  props: PlaceCircleProps,
-  { emit }
-) {
+export const APlaceCircle = defineSetup(function APlaceCircle(props: PlaceCircleProps, { emit }) {
   const textAlignRef = computed(() => props.textAlign ?? "right");
   const contentRef = computed(() => {
     const { hideIcon = false } = props;
@@ -46,20 +43,19 @@ export const APlaceCircle = defineLagecySetup(function APlaceCircle(
     console.log("on amap marker e = ", e);
     emit("click", props.position);
   };
-  return () => (
-    <AmapMarker
-      position={props.position}
-      content={props.label ? contentRef.value : contentWithoutLabelRef.value}
-      anchor={textAlignRef.value === "left" ? AnchorType.middleRight : AnchorType.middleLeft}
-      onClick={handleClick}
-    />
-  );
-}).props(["hideIcon", "label", "position", "textAlign"]);
+  return () => {
+    return (
+      <AmapMarker
+        position={props.position}
+        content={props.label ? contentRef.value : contentWithoutLabelRef.value}
+        anchor={textAlignRef.value === "left" ? AnchorType.middleRight : AnchorType.middleLeft}
+        onClick={handleClick}
+      />
+    );
+  };
+});
 
-export const GPlaceCircle = defineLagecySetup(function GPlaceCircle(
-  props: PlaceCircleProps,
-  { emit }
-) {
+export const GPlaceCircle = defineSetup(function GPlaceCircle(props: PlaceCircleProps, { emit }) {
   const textAlignRef = computed(() => props.textAlign ?? "right");
   const contentRef = computed(() => {
     const { hideIcon = false } = props;
@@ -96,7 +92,7 @@ export const GPlaceCircle = defineLagecySetup(function GPlaceCircle(
       onClick={handleClick}
     />
   );
-}).props(["hideIcon", "label", "position", "textAlign"]);
+});
 
 export const PlaceCircle = defineSetup(function PlaceCircle(props: PlaceCircleProps, { emit }) {
   const payload = useMapSupplier();

package/src/components/Demo/HeycarDemo.tsx

@@ -1,13 +1,11 @@
 import { computed } from "vue-demi";
-import { PickupPoints } from "../../business-components/PickupPoints";
-import { useBusinessMapAutoComplete } from "../../hooks-business/useBusinessMapAutoComplete";
 import {
-  useBusinessMapRecomendPlace,
-  UseBusinessMapRecomendPlaceProps,
-} from "../../hooks-business/useBusinessMapRecomendPlace";
-import { useHeycarMap } from "../../hooks/useHeycarMap";
-import { useMapFitView } from "../../hooks/useMapFitView";
-import { useMapGeometry } from "../../hooks/useMapGeometry";
+  BusinessRecomendPlaceMap,
+  BusinessRecomendPlaceMapProps,
+} from "../../business-components/BusinessRecomendPlaceMap";
+import { useBusinessMapAutoComplete } from "../../hooks-business/useBusinessMapAutoComplete";
+import { useBusinessRecomendPlaceMap } from "../../hooks-business/useBusinessRecomendPlaceMap";
+
 import { defineSetup } from "../../types/helper";
 import { HeycarMap, MapProvider } from "../MapProvider/MapProvider";
 import * as css from "./Demo.css";
@@ -64,8 +62,7 @@ const SomeAutoComplete = defineSetup(function SomeAutoComplete(props: { cityName
 });
 
 export const SomeHomePage = defineSetup(function SomeHomePage() {
-  const { mapRef, setMap } = useHeycarMap();
-  const getRecomendPlace: UseBusinessMapRecomendPlaceProps["getRecomendPlace"] = async (
+  const getRecomendPlace: BusinessRecomendPlaceMapProps["getRecomendPlace"] = async (
     place,
     context
   ) => {
@@ -78,103 +75,29 @@ export const SomeHomePage = defineSetup(function SomeHomePage() {
   };
   const {
     centerPlace,
-    centerPoint,
     placeCandidates,
-    isDragging,
-    geoLoading,
-    geoPosition,
+    panTo,
     setCenterPlaceByRecomand,
-    setCenterByPlace,
-  } = useBusinessMapRecomendPlace({
-    geoDefaultPosition: [0, 0],
-    mapRef,
-    recomendPlaceGeoLimit: 300,
-    recomendPlaceDragLimit: 30,
-    getRecomendPlace,
-    onChangeGeoLocation: (v) => console.log("onChangeGeoLocation: ", v),
-    onChangePlace: (v) => console.log("onChangePlace: ", v),
-    onChangeRecomandPlace: (v) => console.log("onChangeRecomandPlace: ", v),
-  });
-  const { registerFitVeiw, setFitView } = useMapFitView({
-    mapRef,
-    padding: [15, 15, 5, 15],
-    autoFitTimeout: 5000,
-  });
-  const { apiMapDistance } = useMapGeometry();
+    mapContext,
+    apiMapDistance,
+  } = useBusinessRecomendPlaceMap();
+
   (window as any).setCenterPlaceByRecomand = setCenterPlaceByRecomand;
-  (window as any).setFitView = setFitView;
   return () => {
     return (
       <div>
-        distance:{" "}
-        {apiMapDistance(centerPoint.value, [
-          centerPoint.value[0] + 0.01,
-          centerPoint.value[1] + 0.01,
-        ])}{" "}
-        <br />
-        geoLoading: {`${geoLoading.value}`} <br />
-        isDragging: {`${isDragging.value}`} <br />
-        geoPosition: {geoPosition.value[0]} | {geoPosition.value[1]} <br />
+        placeCandidates: {placeCandidates} <br />
         centerPlace: {centerPlace.lng} | {centerPlace.lat} | {centerPlace.name} |{" "}
         {centerPlace.cityName} <br />
-        <HeycarMap
+        <BusinessRecomendPlaceMap
           class={css.demo}
-          fallback={() => <div>error</div>}
-          loading={() => <div>loading</div>}
-          center={centerPoint.value}
-          zoom={centerPoint.value[0] === 0 ? 3 : 13}
-          mapRef={setMap}
-        >
-          {/* <StartEndPoint
-            registerOverlay={registerFitVeiw}
-            position={[121.4897065, 31.0842552]}
-            title={"start point"}
-            type="start"
-          /> */}
-          {/* <StartEndPoint
-            registerOverlay={registerFitVeiw}
-            position={[centerPoint.value[0] + 0.01, centerPoint.value[1] + 0.01]}
-            title={"end point"}
-            type="end"
-          /> */}
-          <PickupPoints places={placeCandidates.value} onClick={setCenterByPlace} />
-          {/* <AddressBox
-            type="box"
-            position={centerPoint.value}
-            title={"Martyrs Lawn"}
-            description={"您将在此处上车"}
-          /> */}
-          {/* <TaxiCar position={[121, 31]} angle={0} /> */}
-          {/* <PickupPoints
-            positions={[
-              [-1, -1],
-              [-2, -2],
-            ]}
-            labels={["place name 1", "place name 2"]}
-          /> */}
-          {/* <DrivingRoute
-            from={[121, 31]}
-            to={[121.6, 31.3]}
-            render={({ path, angle }) => [
-              <DrivingLine path={path} />,
-              <TaxiCar position={[121, 31]} angle={angle} />,
-            ]}
-          /> */}
-          {/* <PassengerCircle position={centerPoint.value} size="small" /> */}
-          {/* <PlaceCircle
-            position={centerPoint.value}
-            label={"some place"}
-            hideIcon
-            onClick={() => {
-              debugger;
-            }}
-          /> */}
-          {/* <WalkingRoute
-            from={centerPoint.value}
-            to={[centerPoint.value[0] + 0.01, centerPoint.value[1] + 0.01]}
-            render={({ path }) => <WalkingLine path={path} />}
-          /> */}
-        </HeycarMap>
+          title={centerPlace.name}
+          description={"some description"}
+          geoDefaultPosition={[121, 31]}
+          getRecomendPlace={getRecomendPlace}
+          mapContext={mapContext}
+          onGeoError={(e) => console.log("onGeoError e = ", e)}
+        />
       </div>
     );
   };

package/src/hooks/useGeoLocation.ts

@@ -6,9 +6,10 @@ export interface UseGeoLocationProps {
   onChange?: (value: { position: Point; coordinate: GeolocationCoordinates }) => any;
   onLoad?: (value: { position: Point; coordinate: GeolocationCoordinates }) => any;
   onLoadDefault?: (value: { position: Point }) => any;
+  onError?: (error: GeolocationPositionError) => any;
 }
 export const useGeoLocation = (props?: UseGeoLocationProps) => {
-  const { onChange, onLoad, onLoadDefault, geoDefaultPosition } = props ?? {};
+  const { onChange, onLoad, onLoadDefault, onError, geoDefaultPosition } = props ?? {};
   const loading = ref(false);
   const readyRef = ref(false);
   const errorRef = ref<GeolocationPositionError>();
@@ -44,6 +45,7 @@ export const useGeoLocation = (props?: UseGeoLocationProps) => {
           errorRef.value = error;
           const position = props?.geoDefaultPosition;
           if (position) onLoadDefault?.({ position });
+          onError?.(error);
           console.log("errorRef = ", errorRef);
         },
         // todo 要不要 timeout

package/src/hooks-business/useBusinessRecomendPlaceMap.ts

@@ -0,0 +1,45 @@
+import { reactive, ref } from "vue-demi";
+import { useMapGeometry } from "../hooks/useMapGeometry";
+import type { Place, Point } from "../types/interface";
+
+export interface BusinessRecomendPlaceContext {
+  panTo: (value: Point) => void;
+  setCenterPlaceByRecomand: (value: Point) => void;
+  onChangeCenterPlace: (value: Place) => void;
+  onChangeRecomendPlaces: (value: Place[]) => void;
+}
+
+export const useBusinessRecomendPlaceMap = () => {
+  const centerPlace = reactive<Place>({
+    lng: 0,
+    lat: 0,
+    name: "",
+    cityName: undefined,
+  });
+  const placeCandidates = ref<Place[]>([]);
+  const { apiMapDistance } = useMapGeometry();
+  const panTo = (value: Point) => mapContext.panTo(value);
+  const setCenterPlaceByRecomand = (value: Point) => mapContext.setCenterPlaceByRecomand(value);
+  const mapContext: BusinessRecomendPlaceContext = {
+    panTo: () => {
+      throw new Error("MyError: panTo used before assigned");
+    },
+    setCenterPlaceByRecomand: () => {
+      throw new Error("MyError: setCenterPlaceByRecomand used before assigned");
+    },
+    onChangeCenterPlace: (place: Place) => {
+      Object.assign(centerPlace, { ...place });
+    },
+    onChangeRecomendPlaces: (places: Place[]) => {
+      placeCandidates.value = [...places];
+    },
+  };
+  return {
+    mapContext,
+    centerPlace,
+    placeCandidates,
+    panTo,
+    setCenterPlaceByRecomand,
+    apiMapDistance,
+  };
+};

package/src/hooks-business/{useBusinessMapRecomendPlace.ts → useLagecyMapRecomendPlace.ts}

@@ -9,7 +9,7 @@ import type { MapShallowRef, Place, Point } from "../types/interface";
 interface CenterPlaceSource {
   source: "default" | "geo" | "drag" | "recomend" | "api";
 }
-export interface UseBusinessMapRecomendPlaceProps
+export interface UseLagecyMapRecomendPlace
   extends Pick<UseMapRecomendPlaceProps<CenterPlaceSource>, "getRecomendPlace"> {
   mapRef: MapShallowRef;
   defaultCenterPoint?: Point;
@@ -23,7 +23,7 @@ export interface UseBusinessMapRecomendPlaceProps
   onChangePlace?: UseMapPlaceProps["onChange"];
   onChangeRecomandPlace?: UseMapRecomendPlaceProps["onChange"];
 }
-export const useBusinessMapRecomendPlace = (props: UseBusinessMapRecomendPlaceProps) => {
+export const useLagecyMapRecomendPlace = (props: UseLagecyMapRecomendPlace) => {
   const {
     mapRef,
     geoDefaultPosition,
@@ -135,6 +135,7 @@ export const useBusinessMapRecomendPlace = (props: UseBusinessMapRecomendPlacePr
       onChangeRecomandPlace?.(place);
     },
   });
+
   return {
     isDragging,
     geoLoading,

package/src/index.ts

@@ -1,6 +1,7 @@
 import "./style.css";
 export { AddressBox } from "./business-components/AddressBox";
 export { BusinessQuotingMap } from "./business-components/BusinessQuotingMap";
+export { BusinessRecomendPlaceMap } from "./business-components/BusinessRecomendPlaceMap";
 export { BusinessTaxiServiceMap } from "./business-components/BusinessTaxiServiceMap";
 export { DrivingLine } from "./business-components/DrivingLine";
 export { DrivingRoute } from "./business-components/DrivingRoute";
@@ -14,8 +15,8 @@ export { WalkingRoute } from "./business-components/WalkingRoute";
 export { WaveCircle } from "./business-components/WaveCircle";
 export * from "./components/MapProvider";
 export * from "./hooks-business/useBusinessMapAutoComplete";
-export * from "./hooks-business/useBusinessMapRecomendPlace";
 export * from "./hooks-business/useBusinessQuotingMap";
+export * from "./hooks-business/useBusinessRecomendPlaceMap";
 export * from "./hooks-business/useBusinessTaxiServiceMap";
 export { useDrivingRoute } from "./hooks/useDrivingRoute";
 export { useGeoLocation } from "./hooks/useGeoLocation";

package/src/types/interface.ts

@@ -47,4 +47,14 @@ export type DriverStatus =
   | "driverArrived"
   | "inService"
   | "canceled"
-  | "endService";
+  | "endService"
+  | "completed"
+  | "canceling"
+  | "banlanceRefund"
+  | "waitBanlanceRefund"
+  | "rechargePayed"
+  | "waitRechargePay"
+  | "payed"
+  | "waitpay"
+  | "refund"
+  | "confirmed";