@pisell/private-materials 6.11.24 → 6.11.26

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const StripePayment: () => import("react").JSX.Element;
 export default StripePayment;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const PageLoading: () => import("react").JSX.Element;
 export default PageLoading;

package/es/components/ticketBooking/utils/index.d.ts

@@ -47,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/es/plus/selectHolder/components/ErrorTip/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ErrorTip: ({ text }: any) => import("react").JSX.Element;
 export default ErrorTip;

package/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

package/lib/components/booking/utils.d.ts

@@ -173,10 +173,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/checkout/hooks/useWalletPass.js

@@ -210,6 +210,7 @@ var useWalletPass = (props) => {
   }, [selectedVouchers, allVouchersForCalculation, transformList, searchIdentificationCodeList, noApplicableVoucher, totalAmount, products]);
   (0, import_ahooks.useDebounceEffect)(() => {
     notifySelectChange(selectedWithDetails);
+    setWalletSelect(selectedWithDetails);
     setLoading(false);
   }, [selectedWithDetails], {
     wait: 200
@@ -218,7 +219,7 @@ var useWalletPass = (props) => {
     return (0, import_utils2.formatMachineCodeServer2CardList)(
       (0, import_utils.uniqueByKey)(
         mergeDataWithInitialOrder([
-          ...selectedWallet,
+          ...selectedWithDetails,
           ...displayVouchers,
           ...displayOtherVouchers
         ]),
@@ -226,7 +227,7 @@ var useWalletPass = (props) => {
       ),
       selectedVoucherIds
     );
-  }, [displayVouchers, displayOtherVouchers, selectedVoucherIds, selectedWallet]);
+  }, [displayVouchers, displayOtherVouchers, selectedVoucherIds, selectedWithDetails]);
   const fetchUserIdentificationCodes = (0, import_ahooks.useMemoizedFn)(async (params) => {
     setLoading(true);
     setError(null);
@@ -511,7 +512,7 @@ var useWalletPass = (props) => {
     return paymentModule.wallet.searchIdentificationCodeAsync({
       code: value,
       prepare_payments: paymentModule.wallet.formatWalletPassList2PreparePayments(
-        selectedWalletRef.current
+        selectedWithDetails
       )
     });
   });

package/lib/components/ecocup/components/AddCustomerModal/index.js

@@ -199,9 +199,9 @@ var AddCustomerModal = (props) => {
         label: import_utils.locales.getText(
           "pisell2.text.ecocup.add-customer-modal.membership"
         ),
-        defaultValue: "normal",
+        defaultValue: "regular",
         options: [
-          { label: "Normal", value: "normal" },
+          { label: "Regular", value: "regular" },
           { label: "Business", value: "business" },
           { label: "Admin", value: "admin" }
         ]

package/lib/components/ecocup/components/CupInfoCard/index.d.ts

@@ -1,8 +1,10 @@
 import React from 'react';
 import './index.less';
 interface IProps {
-    type: 'rentInfo' | 'markInfo' | 'belongInfo';
+    type: 'rentInfo' | 'markInfo' | 'belongInfo' | 'otherBelongInfo';
     data: Record<string, any>;
+    isMultipleShop?: boolean;
+    isMultipleTime?: boolean;
 }
 declare const CupInfoCard: (props: IProps) => React.JSX.Element;
 export default CupInfoCard;

package/lib/components/ecocup/components/CupInfoCard/index.js

@@ -37,7 +37,7 @@ var import_utils = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var import_index = require("./index.less");
 var CupInfoCard = (props) => {
-  const { type, data } = props;
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-info-card" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText(`pisell2.text.ecocup.cup-info-card.title.${type}`)), /* @__PURE__ */ import_react.default.createElement("div", null, (data == null ? void 0 : data.shop) || "-"), /* @__PURE__ */ import_react.default.createElement("div", null, (data == null ? void 0 : data.time) ? (0, import_dayjs.default)(data == null ? void 0 : data.time).format("HH:mm DD/MM/YYYY") : "-"));
+  const { type, data, isMultipleShop, isMultipleTime } = props;
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-info-card" }, /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText(`pisell2.text.ecocup.cup-info-card.title.${type}`)), isMultipleShop ? import_utils.locales.getText("pisell2.text.ecocup.cup-info-card.title.multiple-shop") : /* @__PURE__ */ import_react.default.createElement("div", null, (data == null ? void 0 : data.shop) || "-"), isMultipleTime ? import_utils.locales.getText("pisell2.text.ecocup.cup-info-card.title.multiple-time") : /* @__PURE__ */ import_react.default.createElement("div", null, (data == null ? void 0 : data.time) ? (0, import_dayjs.default)(data == null ? void 0 : data.time).format("HH:mm DD/MM/YYYY") : "-"));
 };
 var CupInfoCard_default = CupInfoCard;

package/lib/components/ecocup/components/CupStatusModal/hooks.d.ts

@@ -1,5 +1,36 @@
-import { ECupActionType } from '../../types';
+import { ECupActionType, ICup } from '../../types';
 export declare const useCupAction: () => {
     run: (this: unknown, cupId: string, action: ECupActionType) => Promise<boolean>;
     loading: boolean;
 };
+/**
+ * @description: 批量归还杯子
+ * @return {*}
+ */
+export declare const useBatchCupAction: () => {
+    run: (this: unknown, eco_cup_ids: string[] | number[]) => Promise<boolean>;
+    loading: boolean;
+};
+/**
+ * @description: 统计杯子列表中的客户、店铺、时间数量
+ * @param {ICup[]} cupList - 杯子列表
+ * @return {object} 返回统计信息和是否为多个的标识
+ */
+export declare const useCupListStatistics: (cupList: ICup[]) => {
+    hasMultipleCustomers: boolean;
+    hasMultipleShops: boolean;
+    hasMultipleTimes: boolean;
+    uniqueCustomer: import("../../types").ICustomer | undefined;
+    uniqueShop: {
+        id: string;
+        name: string;
+    } | undefined;
+    uniqueTime: string | undefined;
+} | {
+    hasMultipleCustomers: boolean;
+    hasMultipleShops: boolean;
+    hasMultipleTimes: boolean;
+    uniqueCustomer: null;
+    uniqueShop: null;
+    uniqueTime: null;
+};

package/lib/components/ecocup/components/CupStatusModal/hooks.js

@@ -19,7 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/ecocup/components/CupStatusModal/hooks.ts
 var hooks_exports = {};
 __export(hooks_exports, {
-  useCupAction: () => useCupAction
+  useBatchCupAction: () => useBatchCupAction,
+  useCupAction: () => useCupAction,
+  useCupListStatistics: () => useCupListStatistics
 });
 module.exports = __toCommonJS(hooks_exports);
 var import_react = require("react");
@@ -49,7 +51,65 @@ var useCupAction = () => {
     loading
   };
 };
+var useBatchCupAction = () => {
+  const { post } = (0, import_hooks.useRequest)();
+  const [loading, setLoading] = (0, import_react.useState)(false);
+  const run = (0, import_ahooks.useMemoizedFn)(async (eco_cup_ids) => {
+    try {
+      setLoading(true);
+      const res = await post("/shop/wallet/eco/cups-return", { eco_cup_ids });
+      if ((res == null ? void 0 : res.code) == 200) {
+        return true;
+      }
+      return false;
+    } catch (error) {
+      console.error(error);
+      return false;
+    } finally {
+      setLoading(false);
+    }
+  });
+  return {
+    run,
+    loading
+  };
+};
+var useCupListStatistics = (cupList) => {
+  return (0, import_react.useMemo)(() => {
+    var _a, _b, _c;
+    if (cupList.length === 0) {
+      return {
+        hasMultipleCustomers: false,
+        hasMultipleShops: false,
+        hasMultipleTimes: false,
+        uniqueCustomer: null,
+        uniqueShop: null,
+        uniqueTime: null
+      };
+    }
+    const customerIds = new Set(
+      cupList.map((cup) => cup == null ? void 0 : cup.customer_id).filter((id) => id)
+    );
+    const shopIds = new Set(
+      cupList.map((cup) => cup == null ? void 0 : cup.current_shop_id).filter((id) => id)
+    );
+    const times = new Set(
+      cupList.map((cup) => cup == null ? void 0 : cup.operated_at).filter((time) => time)
+    );
+    const result = {
+      hasMultipleCustomers: customerIds.size > 1,
+      hasMultipleShops: shopIds.size > 1,
+      hasMultipleTimes: times.size > 1,
+      uniqueCustomer: (_a = cupList[0]) == null ? void 0 : _a.customer,
+      uniqueShop: (_b = cupList[0]) == null ? void 0 : _b.current_shop,
+      uniqueTime: (_c = cupList[0]) == null ? void 0 : _c.operated_at
+    };
+    return result;
+  }, [cupList]);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  useCupAction
+  useBatchCupAction,
+  useCupAction,
+  useCupListStatistics
 });

package/lib/components/ecocup/components/CupStatusModal/index.js

@@ -40,12 +40,28 @@ var import_index = require("./index.less");
 var import_CupInfoCard = __toESM(require("../CupInfoCard"));
 var import_CustomerCard = __toESM(require("../CustomerCard"));
 var import_hooks = require("./hooks");
+var import_SearchBar = __toESM(require("../SearchBar"));
+var SCAN_LISTENER_KEY = "eco-cup-status-modal-scan-listener";
 var CupStatusModal = (props) => {
-  var _a;
+  var _a, _b, _c;
   const { visible, onCancel, onOk, data } = props;
   const { scanStatus, cupData } = data || {};
   const cupAction = (0, import_hooks.useCupAction)();
-  const isRed = scanStatus !== import_types.ECupScanStatus.OTHER_IN_STOCK && scanStatus !== import_types.ECupScanStatus.OTHER_RENT;
+  const [cupList, setCupList] = (0, import_react.useState)([]);
+  const batchCupAction = (0, import_hooks.useBatchCupAction)();
+  (0, import_react.useEffect)(() => {
+    if (!cupData) {
+      setCupList([]);
+      return;
+    }
+    const initialCups = Array.isArray(cupData) ? cupData : [cupData];
+    setCupList(initialCups);
+  }, [cupData]);
+  const otherRentStatus = (0, import_react.useMemo)(() => {
+    return scanStatus === import_types.ECupScanStatus.OTHER_RENT;
+  }, [scanStatus]);
+  const isRed = !otherRentStatus;
+  const cupStatistics = (0, import_hooks.useCupListStatistics)(cupList);
   const lineStyle = (0, import_react.useMemo)(() => {
     if (isRed) {
       return {
@@ -59,10 +75,13 @@ var CupStatusModal = (props) => {
     };
   }, [isRed]);
   const cupInfoCardType = (0, import_react.useMemo)(() => {
-    if (scanStatus === import_types.ECupScanStatus.OTHER_IN_STOCK || scanStatus === import_types.ECupScanStatus.IN_STOCK) {
+    if (scanStatus === import_types.ECupScanStatus.OTHER_IN_STOCK) {
+      return "otherBelongInfo";
+    }
+    if (scanStatus === import_types.ECupScanStatus.IN_STOCK) {
       return "belongInfo";
     }
-    if (scanStatus === import_types.ECupScanStatus.OTHER_RENT || scanStatus === import_types.ECupScanStatus.RENT) {
+    if (otherRentStatus || scanStatus === import_types.ECupScanStatus.RENT) {
       return "rentInfo";
     }
     if (scanStatus === import_types.ECupScanStatus.MISSING || scanStatus === import_types.ECupScanStatus.BROKEN) {
@@ -76,15 +95,18 @@ var CupStatusModal = (props) => {
   };
   const _onOk = async () => {
     if (cupAction == null ? void 0 : cupAction.loading) return;
-    const type = scanStatus === import_types.ECupScanStatus.OTHER_IN_STOCK ? import_types.ECupActionType.TRANSFER : scanStatus === import_types.ECupScanStatus.OTHER_RENT ? import_types.ECupActionType.RETURN : "";
+    const type = otherRentStatus ? import_types.ECupActionType.RETURN : "";
     if (!type) {
       onOk == null ? void 0 : onOk();
       return;
     }
-    const result = await cupAction.run(
-      (cupData == null ? void 0 : cupData.eco_cup_id) || (cupData == null ? void 0 : cupData.id),
-      type
-    );
+    let result;
+    if (otherRentStatus) {
+      const ids = cupList.map((cup) => (cup == null ? void 0 : cup.eco_cup_id) || (cup == null ? void 0 : cup.id));
+      result = await batchCupAction.run(ids);
+    } else {
+      result = await cupAction.run((cupData == null ? void 0 : cupData.eco_cup_id) || (cupData == null ? void 0 : cupData.id), type);
+    }
     if (result) {
       (0, import_materials.PisellToast)({
         content: import_utils.locales.getText(`pisell2.text.ecocup.toast.success-${type}`)
@@ -92,6 +114,39 @@ var CupStatusModal = (props) => {
       onOk == null ? void 0 : onOk();
     }
   };
+  const onSearchResult = (result) => {
+    var _a2;
+    if (cupList.find((c) => {
+      var _a3;
+      return (c == null ? void 0 : c.id) === ((_a3 = result == null ? void 0 : result.data) == null ? void 0 : _a3.id);
+    })) {
+      return;
+    }
+    if (((_a2 = result == null ? void 0 : result.data) == null ? void 0 : _a2.status) !== import_types.ECupStatus.RENT) {
+      return;
+    }
+    setCupList([...cupList, result == null ? void 0 : result.data]);
+  };
+  const removeCupFromList = (cupId) => {
+    setCupList(cupList.filter((cup) => (cup == null ? void 0 : cup.id) !== cupId));
+  };
+  const renderSearchBar = () => {
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-first-modal-search-bar" }, /* @__PURE__ */ import_react.default.createElement(
+      import_SearchBar.default,
+      {
+        scanListenerKey: SCAN_LISTENER_KEY,
+        searchType: "cup",
+        placeholder: import_utils.locales.getText(
+          "pisell2.text.ecocup.customer-first-modal.search-bar.placeholder"
+        ),
+        onSearchResult,
+        onCupStatusValidate: onSearchResult
+      }
+    ));
+  };
+  const showRemove = (0, import_react.useMemo)(() => {
+    return (cupList == null ? void 0 : cupList.length) > 1 && otherRentStatus;
+  }, [cupList.length, otherRentStatus]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -99,23 +154,30 @@ var CupStatusModal = (props) => {
       open: visible,
       onCancel: _onCancel,
       onOk: _onOk,
-      title: import_utils.locales.getText(
+      title: otherRentStatus ? import_utils.locales.getText(
+        `pisell2.text.ecocup.cup-status-modal.title-${scanStatus}`
+      )(cupList.length) : import_utils.locales.getText(
         `pisell2.text.ecocup.cup-status-modal.title-${scanStatus}`
       ),
-      cancelText: import_utils.locales.getText("pisell2.text.ecocup.button.dismiss"),
-      okText: isRed ? import_utils.locales.getText("pisell2.text.ecocup.button.confirm") : scanStatus === import_types.ECupScanStatus.OTHER_IN_STOCK ? import_utils.locales.getText("pisell2.text.ecocup.button.transfer") : import_utils.locales.getText("pisell2.text.ecocup.button.mark-as-return"),
+      cancelText: otherRentStatus ? import_utils.locales.getText("pisell2.text.ecocup.button.cancel") : import_utils.locales.getText("pisell2.text.ecocup.button.dismiss"),
+      okText: isRed ? import_utils.locales.getText("pisell2.text.ecocup.button.confirm") : import_utils.locales.getText("pisell2.text.ecocup.button.return"),
       okButtonProps: { loading: cupAction == null ? void 0 : cupAction.loading },
       cancelVisible: !isRed,
       width: 580
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content", style: { gap: otherRentStatus ? "20px" : "32px" } }, otherRentStatus ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content-search" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "tip-text" }, import_utils.locales.getText(
+      "pisell2.text.ecocup.cup-status-modal.search-bar.title"
+    )), renderSearchBar()) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content-cup-lists" }, cupList.map((cup, index) => /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
+        key: (cup == null ? void 0 : cup.id) || index,
         className: "pisell2-ecocup-cup-status-modal-content-cup",
-        style: { ...lineStyle }
+        style: {
+          ...lineStyle,
+          justifyContent: showRemove ? "space-between" : "center"
+        }
       },
-      /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "RestOutlined", size: 24 }),
-      /* @__PURE__ */ import_react.default.createElement(
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content-cup-info" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "RestOutlined", size: 24 }), /* @__PURE__ */ import_react.default.createElement(
         "span",
         {
           style: {
@@ -123,18 +185,37 @@ var CupStatusModal = (props) => {
           }
         },
         import_utils.locales.getText("pisell2.text.ecocup.cup-id")
-      ),
-      /* @__PURE__ */ import_react.default.createElement("span", null, (cupData == null ? void 0 : cupData.eco_cup_code) || (cupData == null ? void 0 : cupData.code) || "")
-    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content-info" }, /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1 } }, (cupData == null ? void 0 : cupData.current_shop) && cupInfoCardType ? /* @__PURE__ */ import_react.default.createElement(
+      ), /* @__PURE__ */ import_react.default.createElement("span", null, (cup == null ? void 0 : cup.eco_cup_code) || (cup == null ? void 0 : cup.code) || "")),
+      showRemove && /* @__PURE__ */ import_react.default.createElement(
+        import_materials.Button,
+        {
+          type: "primary",
+          icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-trash-01", size: 24, color: "#7F56DA" }),
+          onClick: () => removeCupFromList(cup == null ? void 0 : cup.id),
+          className: "info-remove"
+        },
+        import_utils.locales.getText("pisell2.text.ecocup.button.remove")
+      )
+    ))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content-info" }, /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1 } }, ((cupStatistics == null ? void 0 : cupStatistics.uniqueShop) || (cupStatistics == null ? void 0 : cupStatistics.hasMultipleShops)) && cupInfoCardType ? /* @__PURE__ */ import_react.default.createElement(
       import_CupInfoCard.default,
       {
         type: cupInfoCardType,
         data: {
-          shop: (_a = cupData == null ? void 0 : cupData.current_shop) == null ? void 0 : _a.name,
-          time: cupData == null ? void 0 : cupData.operated_at
+          shop: (_a = cupStatistics == null ? void 0 : cupStatistics.uniqueShop) == null ? void 0 : _a.name,
+          time: cupStatistics == null ? void 0 : cupStatistics.uniqueTime,
+          isMultipleTime: cupStatistics == null ? void 0 : cupStatistics.hasMultipleTimes,
+          isMultipleShop: cupStatistics == null ? void 0 : cupStatistics.hasMultipleShops
         }
       }
-    ) : null), /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1 } }, (cupData == null ? void 0 : cupData.status) === import_types.ECupStatus.RENT ? (cupData == null ? void 0 : cupData.customer) ? /* @__PURE__ */ import_react.default.createElement(import_CustomerCard.default, { ...(cupData == null ? void 0 : cupData.customer) || {} }) : null : (cupData == null ? void 0 : cupData.status) === import_types.ECupStatus.IN_STOCK ? null : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content-info-tip" }, import_utils.locales.getText("pisell2.text.ecocup.cup-status-modal.tip")))))
+    ) : null), /* @__PURE__ */ import_react.default.createElement("div", { style: { flex: 1 } }, ((_b = cupList == null ? void 0 : cupList[0]) == null ? void 0 : _b.status) === import_types.ECupStatus.RENT ? (cupStatistics == null ? void 0 : cupStatistics.uniqueCustomer) || (cupStatistics == null ? void 0 : cupStatistics.hasMultipleCustomers) ? /* @__PURE__ */ import_react.default.createElement(
+      import_CustomerCard.default,
+      {
+        ...(cupStatistics == null ? void 0 : cupStatistics.uniqueCustomer) || {},
+        isMultiple: cupStatistics == null ? void 0 : cupStatistics.hasMultipleCustomers
+      }
+    ) : null : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-cup-status-modal-content-info-tip" }, ((_c = cupList == null ? void 0 : cupList[0]) == null ? void 0 : _c.status) === import_types.ECupStatus.IN_STOCK ? import_utils.locales.getText(
+      "pisell2.text.ecocup.cup-status-modal.tip-in-stock"
+    ) : import_utils.locales.getText("pisell2.text.ecocup.cup-status-modal.tip")))))
   );
 };
 var CupStatusModal_default = CupStatusModal;

package/lib/components/ecocup/components/CupStatusModal/index.less

@@ -4,32 +4,70 @@
   flex-direction: column;
   gap: 32px;
 
+  &-cup-lists {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    gap: 4px;
+  }
+
   &-cup {
     height: 60px;
     padding: 0 16px;
     display: flex;
     flex-direction: row;
     align-items: center;
-    justify-content: center;
+    justify-content: space-between;
     border-radius: 8px;
     gap: 8px;
+    width: 100%;
+
+    .info-remove {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      border-radius: 8px;
+      border: 1px solid #7f56da;
+      background: #f6f2ff;
+      color: #7F56DA;
+    }
+  }
+
+  &-cup-info {
+    display: flex;
+    align-items: center;
+    gap: 8px;
 
-    & > span {
+    &>span {
       font-size: 20px;
       font-weight: 300;
     }
   }
 
+  &-search {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    .tip-text {
+      font-size: 14px;
+      font-weight: 500;
+      color: rgb(127, 86, 218);
+      text-align: center;
+    }
+  }
+
   &-info {
     display: flex;
     align-items: center;
-    justify-content: space-between;
-
-    &-tip {
-      flex: 1;
-      color: #d92d20;
-      font-size: 16px;
-      font-weight: 400;
+    gap: 8px;
+    &>div:nth-child(2) {
+      display: flex;
+      justify-content: flex-end;
     }
   }
-}
+
+  .comprehensive-search__search-section .comprehensive-search__search-button {
+    min-width: 60px !important;
+  }
+}

package/lib/components/ecocup/components/CustomerAndCupModal/index.js

@@ -147,7 +147,7 @@ var CustomerAndCupModal = (props) => {
       onCancel: _onCancel,
       onOk: _onOk,
       okText: import_utils.locales.getText("pisell2.text.ecocup.button.confirm"),
-      cancelText: import_utils.locales.getText("pisell2.text.ecocup.button.cancel"),
+      cancelText: import_utils.locales.getText("pisell2.text.ecocup.button.dismiss"),
       okButtonProps: {
         disabled: newCups.length === 0 || isOverMax || isLoading || !(customerData == null ? void 0 : customerData.id),
         loading: isLoading

package/lib/components/ecocup/components/CustomerCard/index.d.ts

@@ -1,7 +1,9 @@
 import React from 'react';
 import './index.less';
 import { ICustomer } from '../../types';
-interface IProps extends ICustomer {
+interface IProps extends Partial<ICustomer> {
+    /** 是否为多个客户，为 true 时显示 "Multiple customers" */
+    isMultiple?: boolean;
 }
 declare const CustomerCard: (props: IProps) => React.JSX.Element | null;
 export default CustomerCard;

package/lib/components/ecocup/components/CustomerCard/index.js

@@ -37,12 +37,22 @@ var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
 var CustomerCard = (props) => {
   var _a;
-  const { id, nickname, display_name, phone, country_calling_code, cover } = props;
-  if (!id && !nickname && !display_name && !phone) {
+  const {
+    id,
+    nickname,
+    display_name,
+    phone,
+    country_calling_code,
+    cover,
+    isMultiple
+  } = props;
+  if (!id && !nickname && !display_name && !phone && !isMultiple) {
     return null;
   }
   const phoneStr = phone ? `${country_calling_code} ${phone}` : "-";
   const name = display_name || nickname || "";
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-avatar" }, cover ? /* @__PURE__ */ import_react.default.createElement("img", { src: import_utils.image.ali(cover, 360), alt: "avatar" }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-avatar-text" }, ((_a = name == null ? void 0 : name.charAt(0)) == null ? void 0 : _a.toUpperCase()) || "")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-info-name" }, name || ""), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-info-phone" }, phoneStr || "")));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-avatar" }, isMultiple ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-avatar-text" }) : cover ? /* @__PURE__ */ import_react.default.createElement("img", { src: import_utils.image.ali(cover, 360), alt: "avatar" }) : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-avatar-text" }, ((_a = name == null ? void 0 : name.charAt(0)) == null ? void 0 : _a.toUpperCase()) || "")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-info-name" }, isMultiple ? import_utils.locales.getText(
+    "pisell2.text.ecocup.cup-info-card.title.multiple-customer"
+  ) : name || ""), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell2-ecocup-customer-card-info-phone" }, isMultiple ? "-" : phoneStr || ""), isMultiple ? /* @__PURE__ */ import_react.default.createElement("div", null, "-") : null));
 };
 var CustomerCard_default = CustomerCard;

package/lib/components/ecocup/components/PageHeader/index.d.ts

@@ -2,6 +2,8 @@ import React from 'react';
 import './index.less';
 interface CustomPageHeaderProps {
     title: string;
+    rightContent?: React.ReactNode;
+    isReturn?: boolean;
 }
 declare const CustomPageHeader: (props: CustomPageHeaderProps) => React.JSX.Element;
 export default CustomPageHeader;

package/lib/components/ecocup/components/PageHeader/index.js

@@ -41,19 +41,26 @@ var import_index = require("./index.less");
 var prefixCls = "ecocup-page-header";
 var CustomPageHeader = (props) => {
   var _a;
-  const { title } = props;
+  const { title, rightContent, isReturn = true } = props;
   const context = (0, import_useEngineContext.default)();
   const { history } = ((_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) || {};
   const app = (0, import_hooks.useGetApp)();
   const onBack = () => {
     var _a2, _b;
-    console.log("onBack", app, history);
+    if (!isReturn) return;
     if (app == null ? void 0 : app.history) {
       (_a2 = app.history) == null ? void 0 : _a2.goBack();
     } else {
       (_b = history == null ? void 0 : history.goBack) == null ? void 0 : _b.call(history);
     }
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: prefixCls, onClick: onBack }, /* @__PURE__ */ import_react.default.createElement(import_icons.LeftOutlined, { style: { fontSize: 18 } }), /* @__PURE__ */ import_react.default.createElement(import_materials.PageHeader, { title, showTitle: true }));
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: prefixCls, onClick: onBack }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-left-container` }, isReturn ? /* @__PURE__ */ import_react.default.createElement(import_icons.LeftOutlined, { style: { fontSize: 18 } }) : null, /* @__PURE__ */ import_react.default.createElement(import_materials.PageHeader, { title, showTitle: true })), /* @__PURE__ */ import_react.default.createElement(
+    "div",
+    {
+      className: `${prefixCls}-right-container`,
+      onClick: (e) => e.stopPropagation()
+    },
+    rightContent || ""
+  ));
 };
 var PageHeader_default = CustomPageHeader;

package/lib/components/ecocup/components/PageHeader/index.less

@@ -3,8 +3,8 @@
 .@{prefixCls} {
   display: flex;
   align-items: center;
-  gap: 16px;
-  width: max-content;
+  justify-content: space-between;
+  width: 100%;
   margin-bottom: 12px;
   cursor: pointer;
   color: #fff;
@@ -13,7 +13,19 @@
     margin: 0;
   }
 
-  .pisell-lowcode-page-header-title{
+  .pisell-lowcode-page-header-title {
     color: #fff !important;
   }
-}
+
+  &-left-container {
+    display: flex;
+    align-items: center;
+    gap: 16px;
+  }
+
+  &-right-container {
+    flex-shrink: 0;
+    display: flex;
+    justify-content: flex-end;
+  }
+}

package/lib/components/ecocup/components/SearchBar/index.d.ts

@@ -8,6 +8,7 @@ interface SearchBarProps {
     searchType?: 'customer' | 'cup';
     onSearchResult?: (v: any) => void;
     customerId?: string;
+    onCupStatusValidate?: (data: any) => void;
 }
 declare const SearchBar: (props: SearchBarProps) => React.JSX.Element;
 export default SearchBar;