@pisell/private-materials 6.4.42 → 6.5.2

package/lib/components/checkout/components/PaymentResultToast/utils.js

@@ -19,11 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/checkout/components/PaymentResultToast/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  closeAllPaymentResultToasts: () => closeAllPaymentResultToasts,
   debounce: () => debounce,
-  getDefaultModalConfig: () => getDefaultModalConfig,
-  getToastCount: () => getToastCount,
-  hasActivePaymentResultToasts: () => hasActivePaymentResultToasts
+  getDefaultModalConfig: () => getDefaultModalConfig
 });
 module.exports = __toCommonJS(utils_exports);
 var debounce = (func, wait) => {
@@ -38,66 +35,15 @@ var debounce = (func, wait) => {
   };
 };
 var getDefaultModalConfig = () => ({
-  width: 501,
-  // 更新为DOM节点中的宽度
-  mask: false,
+  width: 680,
+  mask: true,
   maskClosable: false,
   // 默认值，会根据状态动态调整
   closable: true,
   zIndex: 1e3
 });
-var closeAllPaymentResultToasts = (options) => {
-  const { immediate = false } = options || {};
-  return new Promise((resolve) => {
-    try {
-      const toastElements = document.querySelectorAll("[data-toast-id]");
-      if (toastElements.length === 0) {
-        resolve();
-        return;
-      }
-      if (immediate) {
-        toastElements.forEach((element) => {
-          if (element.parentNode) {
-            element.parentNode.removeChild(element);
-          }
-        });
-        resolve();
-      } else {
-        toastElements.forEach((element) => {
-          element.classList.add("toast-exiting");
-        });
-        setTimeout(() => {
-          toastElements.forEach((element) => {
-            if (element.parentNode) {
-              element.parentNode.removeChild(element);
-            }
-          });
-          resolve();
-        }, 300);
-      }
-    } catch (error) {
-      console.warn("关闭 PaymentResultToast 时发生错误:", error);
-      resolve();
-    }
-  });
-};
-var getToastCount = () => {
-  try {
-    const toastElements = document.querySelectorAll("[data-toast-id]");
-    return toastElements.length;
-  } catch (error) {
-    console.warn("获取 PaymentResultToast 数量时发生错误:", error);
-    return 0;
-  }
-};
-var hasActivePaymentResultToasts = () => {
-  return getToastCount() > 0;
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  closeAllPaymentResultToasts,
   debounce,
-  getDefaultModalConfig,
-  getToastCount,
-  hasActivePaymentResultToasts
+  getDefaultModalConfig
 });

package/lib/components/checkout/components/ScrollableList/index.js

@@ -216,6 +216,7 @@ var ScrollableList = ({
     {
       style: {
         ...bottomGradientStyle,
+        width: "100%",
         border: "none",
         background: "linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #A78BE1 100%)",
         ...gradientStyle

package/lib/components/checkout/components/SearchAndClientModule/index.js

@@ -39,6 +39,7 @@ var import_materials = require("@pisell/materials");
 var import_components = require("../../../../pro/comprehensiveSearch/components");
 var import_cartClientCard = __toESM(require("../../../booking/info2/cartClientCard"));
 var import_pisellos = require("../../../ticketBooking/hooks/pisellos");
+var import_useToast = __toESM(require("../../../../hooks/useToast"));
 var import_index = require("./index.less");
 var SearchAndClientModule = (props) => {
   const { disabledSwitch, onSearch, onClientChange } = props;
@@ -123,20 +124,18 @@ var SearchAndClientModule = (props) => {
       return (_a = actions == null ? void 0 : actions.remove) == null ? void 0 : _a.call(actions);
     };
   }, [bookingTicket, handleSearch]);
-  const Toast = (0, import_materials.useToast)();
+  const Toast = (0, import_useToast.default)();
   const dropdownProps = (0, import_react.useMemo)(() => {
     const icon = /* @__PURE__ */ import_react.default.createElement(
-      import_materials.Icon,
+      import_materials.Iconfont,
       {
         type: "pisell2-switch-horizontal-01",
-        size: 24,
-        style: { color: "#667085" }
+        style: { fontSize: 24, color: "#7F56DA" }
       }
     );
     let _props = {
       buttonProps: {
-        icon,
-        size: "default"
+        icon
       }
     };
     if (disabledSwitch === true) {
@@ -144,7 +143,6 @@ var SearchAndClientModule = (props) => {
         open: false,
         buttonProps: {
           icon,
-          size: "default",
           onClick: () => {
             var _a;
             (_a = Toast == null ? void 0 : Toast.info) == null ? void 0 : _a.call(
@@ -163,7 +161,8 @@ var SearchAndClientModule = (props) => {
     {
       style: {
         display: "flex",
-        gap: 8
+        gap: 8,
+        marginBottom: 8
       }
     },
     /* @__PURE__ */ import_react.default.createElement(
@@ -179,13 +178,13 @@ var SearchAndClientModule = (props) => {
         searchButtonProps: {
           placement: "inside",
           style: {
-            height: 36,
+            height: 40,
             padding: 8,
-            minWidth: 76
+            minWidth: 55
           }
         },
         cameraButtonProps: {
-          icon: ["pisell2-camera-01", "pisell2-qr-code-02"]
+          icon: ["pisell2-camera-01", "pisell2-a-qr-code-02"]
         },
         onSearch: () => handleSearch.run(value)
       }
@@ -199,14 +198,13 @@ var SearchAndClientModule = (props) => {
         },
         clientCardProps: {
           style: {
-            width: 326,
-            minHeight: 48,
-            height: 48,
-            padding: "4px 8px",
-            borderColor: "#D0D5DD"
+            width: 240,
+            minHeight: 60,
+            height: 60,
+            borderColor: "#7F56DA"
           },
           avatar: {
-            size: "sm"
+            size: "md"
           },
           dropdown: dropdownProps
         }

package/lib/components/checkout/components/SearchAndClientModule/index.less

@@ -1,39 +1,18 @@
 .payment-modal-wrapper {
   .comprehensive-search__search-input-wrapper {
-    padding: 4px;
-    height: 48px;
+    padding: 4px 8px;
+    height: 60px;
+    border: 1px solid #475467;
 
-    .comprehensive-search__camera-activator {
+    .comprehensive-search__search-camera-wrapper {
       width: unset;
-      gap: 6px;
-
-      .comprehensive-search__camera-activator-icons-divider {
-        height: 16px;
+      height: unset;
+      .comprehensive-search__search-camera-divider {
+        height: 30px;
       }
       > span {
-        font-size: 16px;
+        font-size: 30px;
       }
     }
   }
-
-  .pisell-client-card__avatar-wrapper {
-    align-self: center !important;
-  }
-
-  .pisell-client-card__details {
-    gap: 0;
-
-    .pisell-client-card__name {
-      font-size: 14px;
-    }
-
-    .pisell-lowcode-tag {
-      font-size: 12px;
-    }
-
-    .pisell-client-card__contact {
-      font-size: 12px;
-      line-height: 18px;
-    }
-  }
 }

package/lib/components/checkout/components/WalletPassModule/components/WalletPassHeader/index.js

@@ -53,20 +53,10 @@ var WalletPassHeader = ({
     {
       className: "wallet-pass-module-customer-container",
       dangerouslySetInnerHTML: {
-        __html: ((_a = import_utils.locales.getText("wallet-pass-module-cards-vouchers-in-wallet")) == null ? void 0 : _a(
-          `<span class="theme-color wallet-pass-module-customer">${customerName}</span>`
-        )) || ""
+        __html: ((_a = import_utils.locales.getText("wallet-pass-module-cards-vouchers-in-wallet")) == null ? void 0 : _a(`<span class="theme-color wallet-pass-module-customer">${customerName}</span>`)) || ""
       }
     }
-  ), /* @__PURE__ */ import_react.default.createElement(
-    "span",
-    {
-      style: {
-        color: "#475467"
-      }
-    },
-    (_b = import_utils.locales.getText("wallet-pass-module-applied")) == null ? void 0 : _b(selectedCount)
-  ), /* @__PURE__ */ import_react.default.createElement(
+  ), /* @__PURE__ */ import_react.default.createElement("span", { className: (0, import_classnames.default)("theme-color") }, (_b = import_utils.locales.getText("wallet-pass-module-applied")) == null ? void 0 : _b(selectedCount)), /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       className: (0, import_classnames.default)("error-color", "pointer", "underline"),

package/lib/components/checkout/components/WalletPassModule/index.less

@@ -4,12 +4,12 @@
   }
 }
 .wallet-pass-module {
-  border: none;
-  margin-top: 8px;
-  padding: 0px;
+  padding: 8px;
   display: flex;
   flex-direction: column;
   gap: 8px;
+  border-radius: 8px;
+  border: 1px solid var(--00_Pisell-pp, #7f56da);
   background: #fff;
   --theme-color: #7f56da;
 }

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any[];
+    expiredWalletIds: any;
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

@@ -35,10 +35,10 @@ module.exports = __toCommonJS(useWalletPass_exports);
 var import_react = require("react");
 var import_ahooks = require("ahooks");
 var import_utils = require("@pisell/utils");
-var import_materials = require("@pisell/materials");
 var import_dayjs = __toESM(require("dayjs"));
 var import_useEngineContext = require("../../../hooks/useEngineContext");
 var import_utils2 = require("../components/WalletPassModule/utils");
+var import_useToast = __toESM(require("../../../hooks/useToast"));
 var import_usePaymentLogger = __toESM(require("./usePaymentLogger"));
 var import_utils3 = require("../../booking/utils");
 var useWalletPass = (props) => {
@@ -63,7 +63,7 @@ var useWalletPass = (props) => {
     return selectedWallet.map((item) => item.id);
   }, [selectedWallet]);
   const pisellos = (0, import_useEngineContext.usePisellOS)();
-  const Toast = (0, import_materials.useToast)();
+  const Toast = (0, import_useToast.default)();
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [error, setError] = (0, import_react.useState)(null);
   const [discountList, setDiscountList] = (0, import_react.useState)([]);

package/lib/components/checkout/index.d.ts

@@ -1,5 +1,5 @@
 export { default as PaymentModal } from './PaymentModal';
 export { PaymentProvider, usePaymentModal } from './PaymentProvider';
 export type { PaymentModalProps, PaymentModalData } from './PaymentModal';
-export { default as PaymentResultToast, PaymentResultToastProvider, usePaymentResultToast, showPaymentResultToastSuccess, showPaymentResultToastFailed, showPaymentResultToastWalletPassFailed, showPaymentResultToast, closePaymentResultToast, setTillButton } from './components/PaymentResultToast';
+export { default as PaymentResultToast, PaymentResultToastProvider, usePaymentResultToast, showPaymentResultToastSuccess, showPaymentResultToastFailed, showPaymentResultToastWalletPassFailed, showPaymentResultToast, closePaymentResultToast } from './components/PaymentResultToast';
 export type { ShowPaymentResultToastConfig, PaymentResultToastContextType, PaymentResultToastProps, PaymentResultToastConfig, ActionButtonProps, ActionButtonGroupList, StatusClassName } from './components/PaymentResultToast';

package/lib/components/checkout/index.js

@@ -34,7 +34,6 @@ __export(checkout_exports, {
   PaymentResultToast: () => import_PaymentResultToast.default,
   PaymentResultToastProvider: () => import_PaymentResultToast.PaymentResultToastProvider,
   closePaymentResultToast: () => import_PaymentResultToast.closePaymentResultToast,
-  setTillButton: () => import_PaymentResultToast.setTillButton,
   showPaymentResultToast: () => import_PaymentResultToast.showPaymentResultToast,
   showPaymentResultToastFailed: () => import_PaymentResultToast.showPaymentResultToastFailed,
   showPaymentResultToastSuccess: () => import_PaymentResultToast.showPaymentResultToastSuccess,
@@ -53,7 +52,6 @@ var import_PaymentResultToast = __toESM(require("./components/PaymentResultToast
   PaymentResultToast,
   PaymentResultToastProvider,
   closePaymentResultToast,
-  setTillButton,
   showPaymentResultToast,
   showPaymentResultToastFailed,
   showPaymentResultToastSuccess,

package/lib/components/checkout/index.less

@@ -1,38 +1,4 @@
 .payment-modal-wrapper {
-  .pisell-lowcode-modal-close {
-    display: none;
-  }
-
-  .pisell-lowcode-modal-header {
-    padding: 8px 16px !important;
-  }
-
-  // CustomHeader 样式
-  .payment-modal-custom-header {
-    display: grid;
-    grid-template-columns: 1fr 2fr 1fr;
-    align-items: center;
-    width: 100%;
-
-    .header__center {
-      text-align: center;
-      font-size: 20px;
-      height: 30px;
-      line-height: 30px;
-    }
-
-    .header__right {
-      display: flex;
-      justify-content: flex-end;
-
-      button span {
-        font-size: 16px;
-        font-weight: 600;
-        text-decoration: underline;
-      }
-    }
-  }
-
   // 控制模态框最大高度和自适应 - 现在通过JavaScript设置一致的百分比基准
   .pisell-lowcode-modal {
     // JavaScript设置: maxHeight: '90%' (基于视口)
@@ -52,29 +18,45 @@
 
   .pisell-lowcode-modal {
     .pisell-lowcode-modal-body {
-      padding: 16px !important;
+      padding: 0 24px 24px 24px!important;
     }
   }
-
+  
   // 根据 showCashPayment 状态调整下边距
-  // &.no-cash-payment {
-  //   .pisell-lowcode-modal {
-  //     .pisell-lowcode-modal-body {
-  //       padding: 16px 16px 88px 16px !important;
-  //     }
-  //   }
-  // }
+  &.no-cash-payment {
+    .pisell-lowcode-modal {
+      .pisell-lowcode-modal-body {
+        padding: 0 24px 88px 24px!important;
+      }
+    }
+  }
+  .comprehensive-search__search-input-wrapper {
+    padding: 4px 8px;
+    height: 60px;
+    border: 1px solid #475467;
+
+    .comprehensive-search__search-camera-wrapper {
+      width: unset;
+      height: unset;
+      .comprehensive-search__search-camera-divider {
+        height: 30px;
+      }
+      > span {
+        font-size: 30px;
+      }
+    }
+  }
 
   .payment-grid-layout {
     display: grid;
     grid-template-columns: minmax(0, 1fr) minmax(0, 1fr); // 强制等宽分配
-    grid-template-rows: auto auto;
+    grid-template-rows: 1fr 1fr;
     gap: 16px;
-    background-color: #f6f2ff;
+    background-color: #F6F2FF;
     padding: 16px 16px 0 16px;
     border-radius: 0 0 12px 12px;
     width: 100%; // 确保容器占满宽度
-
+    
     // 确保grid项不会溢出
     > div {
       min-width: 0; // 允许内容缩小
@@ -86,14 +68,14 @@
     display: flex;
     flex-direction: column;
     gap: 16px;
-    background-color: #f6f2ff;
+    background-color: #F6F2FF;
     padding: 16px 16px 0 16px;
     border-radius: 0 0 12px 12px;
     flex: 1; // 使用弹性高度而不是固定高度
     min-height: 350px; // 减少最小高度，给底部模块留空间
     max-height: calc(90% - 280px); // 设置最大高度，确保不会超出屏幕
     overflow: hidden; // 防止整体溢出
-
+    
     // 支付选项模块在弹性布局中的样式
     .payment-options-module-container {
       flex: 1; // 占用剩余空间
@@ -104,14 +86,14 @@
       flex-direction: column;
       padding-bottom: 20px;
     }
-
+    
     // 额外模块固定在底部
-    // .additional-module-container {
-    //   flex-shrink: 0; // 不允许缩小
-    //   min-height: 60px; // 确保额外模块有足够的显示空间
-    //   position: absolute;
-    //   bottom: 0;
-    //   width: calc(100% - 80px);
-    // }
+    .additional-module-container {
+      flex-shrink: 0; // 不允许缩小
+      min-height: 60px; // 确保额外模块有足够的显示空间
+      position: absolute;
+      bottom: 0;
+      width: calc(100% - 80px);
+    }
   }
 }

package/lib/components/checkout/locales.d.ts

@@ -1,7 +1,6 @@
 declare const _default: {
     en: {
         'order.total': string;
-        'order.start-new-order': string;
         'pisell2.subtotal.deposit': string;
         'pisell2.subtotal.total': string;
         'pisell2.subtotal.subtotal': string;
@@ -23,7 +22,6 @@ declare const _default: {
         'balance.due': string;
         'deposit.due': string;
         'partial.paid': string;
-        'split.payment': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -156,7 +154,6 @@ declare const _default: {
     };
     'zh-CN': {
         'order.total': string;
-        'order.start-new-order': string;
         'pisell2.subtotal.deposit': string;
         'pisell2.subtotal.total': string;
         'pisell2.subtotal.subtotal': string;
@@ -178,7 +175,6 @@ declare const _default: {
         'balance.due': string;
         'deposit.due': string;
         'partial.paid': string;
-        'split.payment': string;
         cash: string;
         rounding: string;
         'cash.payment': string;
@@ -311,7 +307,6 @@ declare const _default: {
     };
     'zh-HK': {
         'order.total': string;
-        'order.start-new-order': string;
         'pisell2.subtotal.deposit': string;
         'pisell2.subtotal.total': string;
         'pisell2.subtotal.subtotal': string;
@@ -333,7 +328,6 @@ declare const _default: {
         'balance.due': string;
         'deposit.due': string;
         'partial.paid': string;
-        'split.payment': string;
         cash: string;
         rounding: string;
         'cash.payment': string;

package/lib/components/checkout/locales.js

@@ -26,7 +26,6 @@ var locales_default = {
   "en": {
     // Order and Payment
     "order.total": "Total",
-    "order.start-new-order": "Start New Order",
     // Subtotal related
     "pisell2.subtotal.deposit": "Deposit",
     "pisell2.subtotal.total": "Total",
@@ -51,7 +50,6 @@ var locales_default = {
     "balance.due": "Balance Due",
     "deposit.due": "Deposit Due",
     "partial.paid": "Partial Paid",
-    "split.payment": "Pay\nPartially",
     // Cash Payment
     "cash": "Cash",
     "rounding": "Rounding",
@@ -136,7 +134,7 @@ var locales_default = {
     // Payment Result Toast
     "payment.result.success": "Payment Successful",
     "payment.result.failed": "Payment Failed",
-    "payment.result.paid": "Fully Paid",
+    "payment.result.paid": "Paid",
     "payment.result.partiallyPaid": "Partially Paid",
     "payment.result.amountDue": "Amount Due",
     "payment.result.changeDue": "Change Due",
@@ -213,7 +211,6 @@ var locales_default = {
   "zh-CN": {
     // Order and Payment
     "order.total": "订单总计",
-    "order.start-new-order": "开始新订单",
     // Subtotal related
     "pisell2.subtotal.deposit": "定金",
     "pisell2.subtotal.total": "总计",
@@ -238,7 +235,6 @@ var locales_default = {
     "balance.due": "应付金额",
     "deposit.due": "定金待支付金额",
     "partial.paid": "部分支付",
-    "split.payment": "部分付款",
     // Cash Payment
     "cash": "现金",
     "rounding": "舍入",
@@ -311,7 +307,7 @@ var locales_default = {
     // Payment Result Toast
     "payment.result.success": "支付成功",
     "payment.result.failed": "支付失败",
-    "payment.result.paid": "全额支付",
+    "payment.result.paid": "已支付",
     "payment.result.partiallyPaid": "部分支付",
     "payment.result.amountDue": "欠款金额",
     "payment.result.changeDue": "找零",
@@ -404,7 +400,6 @@ var locales_default = {
   "zh-HK": {
     // Order and Payment
     "order.total": "訂單總計",
-    "order.start-new-order": "開始新訂單",
     // Subtotal related
     "pisell2.subtotal.deposit": "定金",
     "pisell2.subtotal.total": "總計",
@@ -429,7 +424,6 @@ var locales_default = {
     "balance.due": "應付金額",
     "deposit.due": "定金待支付金額",
     "partial.paid": "部分支付",
-    "split.payment": "部分付款",
     // Cash Payment
     "cash": "現金",
     "rounding": "捨入",
@@ -518,7 +512,7 @@ var locales_default = {
     // Payment Result Toast
     "payment.result.success": "支付成功",
     "payment.result.failed": "支付失敗",
-    "payment.result.paid": "全額支付",
+    "payment.result.paid": "已支付",
     "payment.result.partiallyPaid": "部分支付",
     "payment.result.amountDue": "欠款金額",
     "payment.result.changeDue": "找零",

package/lib/components/checkout/payment-modal-utils.js

@@ -113,31 +113,31 @@ var calculateStatusClassName = (status) => {
   }
 };
 var calculateAutoCloseConfig = (status, hasChangeDue) => {
-  const autoCloseDelay = 30;
   switch (status) {
     case "paid":
       return {
         autoClose: true,
-        autoCloseDelay,
+        autoCloseDelay: hasChangeDue ? 30 : 5,
+        // 有找零30秒，无找零5秒
         maskClosable: true
       };
     case "partially_paid":
       return {
         autoClose: true,
-        autoCloseDelay,
+        autoCloseDelay: 5,
         maskClosable: true
       };
     case "failed":
     case "wallet-pass-redemption-failed":
       return {
         autoClose: false,
-        autoCloseDelay,
+        autoCloseDelay: 0,
         maskClosable: false
       };
     default:
       return {
         autoClose: false,
-        autoCloseDelay,
+        autoCloseDelay: 5,
         maskClosable: false
       };
   }

package/lib/components/checkout/utils/PaymentResultToastUtils.d.ts

@@ -7,7 +7,7 @@ export interface PaymentResultToastConfig {
     interaction: any;
     Toast: any;
     state: any;
-    onToastClose?: () => void;
+    onToastClose: () => void;
 }
 export interface PaymentResultToastParams {
     paymentStatus: string;
@@ -29,5 +29,5 @@ export declare const calculateAutoCloseConfig: (status: string, hasChangeDue: bo
     autoCloseDelay: number;
     maskClosable: boolean;
 };
-export declare const displayPaymentResultToast: (params: PaymentResultToastParams, config: PaymentResultToastConfig) => Promise<void>;
-export declare const createShowSuccessToast: (config: PaymentResultToastConfig, getActionButtons?: ((paymentStatus: string) => ActionButtonGroupList) | undefined) => (result: any) => Promise<void>;
+export declare const displayPaymentResultToast: (params: PaymentResultToastParams, config: PaymentResultToastConfig) => void;
+export declare const createShowSuccessToast: (config: PaymentResultToastConfig, getActionButtons?: ((paymentStatus: string) => ActionButtonGroupList) | undefined) => (result: any) => void;