@pisell/private-materials 6.3.15 → 6.4.1

package/lib/components/booking/components/footer/index.less

@@ -1,6 +1,6 @@
 .pisell-lowcode__booking-footer-total {
   width: 100%;
-  padding-bottom: 16px;
+  padding-bottom: 8px;
   display: flex;
   align-items: flex-start;
   justify-content: space-between;
@@ -15,7 +15,8 @@
     display: flex;
     flex-direction: column;
 
-    .pisell-lowcode__booking-footer-left-total {}
+    .pisell-lowcode__booking-footer-left-total {
+    }
 
     .pisell-lowcode__booking-footer-left-arrears {
       font-size: 14px;
@@ -121,6 +122,29 @@
     align-items: center;
     justify-content: center;
     flex: 1;
+    position: relative;
+
+    &.note-button {
+      .note-indicator {
+        position: absolute;
+        top: 0; // 不使用负数偏移
+        right: 0; // 不使用负数偏移
+        transform: translate(12%, -12%); // 向外溢出约 2-3px
+        width: 24px;
+        height: 24px;
+        border-radius: 50%;
+        background-color: #7F56DA; // 紫色
+        color: #fff;
+        font-weight: 700;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        line-height: 1;
+        font-size: 30px;
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+        pointer-events: none;
+      }
+    }
   }
 
   .pisell-lowcode__booking-footer-buttons-item-primary {

package/lib/components/booking/components/footer/utils.js

@@ -47,22 +47,23 @@ var import_status = require("../../info/service2/status");
 var import_utils4 = require("../../info/service2/utils");
 var import_utils5 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
+var import_utils6 = require("../../../../plus/clientName/utils");
 var formatNote = (data) => {
   var _a;
   return ((_a = data.notes) == null ? void 0 : _a.orderNote) || "";
 };
 var formatCustomer = (data) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   let id = (_b = (_a = data.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id;
   if ((0, import_utils2.isWalkIn)(id)) {
     id = 1;
   }
   return {
     customer_id: id,
-    customer_name: (_d = (_c = data.client) == null ? void 0 : _c.value) == null ? void 0 : _d.name,
-    email: (_f = (_e = data.client) == null ? void 0 : _e.value) == null ? void 0 : _f.email,
-    phone: ((_h = (_g = data.client) == null ? void 0 : _g.value) == null ? void 0 : _h.phone) || ((_j = (_i = data.client) == null ? void 0 : _i.value) == null ? void 0 : _j.mobile),
-    country_calling_code: (_l = (_k = data.client) == null ? void 0 : _k.value) == null ? void 0 : _l.country_calling_code
+    customer_name: (0, import_utils6.getClientName)((_c = data.client) == null ? void 0 : _c.value),
+    email: (_e = (_d = data.client) == null ? void 0 : _d.value) == null ? void 0 : _e.email,
+    phone: ((_g = (_f = data.client) == null ? void 0 : _f.value) == null ? void 0 : _g.phone) || ((_i = (_h = data.client) == null ? void 0 : _h.value) == null ? void 0 : _i.mobile),
+    country_calling_code: (_k = (_j = data.client) == null ? void 0 : _j.value) == null ? void 0 : _k.country_calling_code
   };
 };
 var formatProductOption = (option) => {
@@ -73,8 +74,8 @@ var formatProductOption = (option) => {
     return {
       "num": d.num,
       "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
-      "option_group_id": d.option_group_id
-      // "add_price": Number(d?.add_price),
+      "option_group_id": d.option_group_id,
+      "custom_add_price": Number(d == null ? void 0 : d.add_price)
     };
   });
 };
@@ -107,8 +108,10 @@ var formatProductBundle = (bundle) => {
       "num": d.num,
       "extension_id": d.extension_id,
       "extension_type": d.extension_type,
-      // "price": Number(d?.price),
-      // "price_type": d?.price_type,
+      "price": Number(d == null ? void 0 : d.price),
+      // checkout 2.0 新增
+      "price_type": d == null ? void 0 : d.price_type,
+      // checkout 2.0 新增
       "option": formatProductOption(d.option)
     };
   });
@@ -125,7 +128,7 @@ var formatRelationDetails = (list) => {
   return (list || []).map((item) => {
     return {
       num: item.product_quantity,
-      price: item.payment_price || 0,
+      price: item.original_price || 0,
       product_id: item.product_id,
       is_charge_tax: item.is_charge_tax,
       order_detail_id: item.order_detail_id
@@ -211,6 +214,14 @@ var formatProductPrice = (item) => {
   }
   return price;
 };
+var formatOriginalPrice = (item) => {
+  var _a;
+  return Number((_a = item._extend) == null ? void 0 : _a.origin_total);
+};
+var formatSellingPrice = (item) => {
+  var _a;
+  return Number((_a = item._extend) == null ? void 0 : _a.total);
+};
 var formatMetaData = (item) => {
   var _a, _b, _c, _d, _e;
   let metadata = {};
@@ -241,32 +252,40 @@ var getSourceProductPrice = (item) => {
   return price;
 };
 var formatProducts = (item, quantity) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
   const discount_amount = origin_total - total;
   const discount_list = (item == null ? void 0 : item.discount_list) || [];
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
   const notManualDiscount = discount_list.filter((item2) => item2.type !== "product");
+  if (item.isCustomItem) {
+    item.product_id = 0;
+  }
   return {
+    "name": item.name,
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
     "source_product_price": getSourceProductPrice(item),
-    "product_id": (item == null ? void 0 : item.product_id) || item.id,
+    "product_id": (item == null ? void 0 : item.product_id) || item.product_id === 0 ? item.product_id : item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || "",
     "is_charge_tax": item.is_charge_tax,
-    "note": (item == null ? void 0 : item.note) || "",
+    "note": ((_a = item._extend) == null ? void 0 : _a.note) || "",
     "discountway": item._extend.discountway || "num",
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
+    "product_bundle": formatProductBundle((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option),
-    "product_variant_id": ((_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
+    "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0,
     "discount_list": notManualDiscount,
-    metadata: formatMetaData(item)
+    metadata: formatMetaData(item),
+    // checkout 需求新增字段
+    "calculated_original_price": formatOriginalPrice(item),
+    "calculated_selling_price": formatSellingPrice(item),
+    "tax_fee": item._extend.tax_fee
   };
 };
 var formatAppointmentProductLists = (data) => {
@@ -319,6 +338,14 @@ var formatBookings = (data, values) => {
   let bookings = [];
   list.forEach((item) => {
     var _a, _b, _c, _d;
+    if (item.isCustomItem) {
+      bookings.push({
+        ...item._extend,
+        product_id: 0
+        // 确保后端接收到的 product_id 为 0
+      });
+      return;
+    }
     let start_date = item._extend.startDate.format("YYYY-MM-DD");
     let end_date = item._extend.endDate.format("YYYY-MM-DD");
     let end_time = item._extend.endDate.format("HH:mm");
@@ -358,6 +385,7 @@ var formatBookings = (data, values) => {
       "number": item._extend.capacity ? (0, import_utilsByBooking.getSumCapacity)({ cacheItem: item }) : item._extend.number || 1,
       "resources": formatResource(item),
       "metadata": formatMetaData(item),
+      "note": item._extend.note,
       ...eventOtherParams || {},
       ...dayParams
     };
@@ -440,9 +468,9 @@ var formatValues = (state) => {
   if (!state.bookingId || isDay) {
     values.shop_note = formatNote(state);
   }
-  if (state.bookingId) {
-    values.shop_discount = state.bookingDetail.shop_discount;
-    values.shop_discount_reason = state.bookingDetail.shop_discount_reason;
+  if (state.shop_discount && Number(state.shop_discount) > 0) {
+    values.shop_discount = state.shop_discount;
+    values.shop_discount_reason = "";
   }
   if (state.contacts) {
     values.contacts = ((_a = state.contacts) == null ? void 0 : _a.value) || [];
@@ -477,20 +505,32 @@ var formatValues = (state) => {
 };
 var checkHolderIsError = (state) => {
   var _a, _b;
+  let errorRowKey = "";
   const holderError = state.service.value.some((item) => {
-    var _a2, _b2;
+    var _a2, _b2, _c, _d, _e, _f;
     if ((0, import_utils4.isNormalProductByDurationSchedule)(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
+      errorRowKey = (0, import_utils4.genRowKey)((_b2 = (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.other) == null ? void 0 : _b2.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_b2 = (_a2 = item._extend) == null ? void 0 : _a2.holder_id) == null ? void 0 : _b2.length) !== item._extend.quantity) {
+    if (item._extend.quantity > 1 && ((_d = (_c = item._extend) == null ? void 0 : _c.holder_id) == null ? void 0 : _d.length) !== item._extend.quantity) {
+      errorRowKey = (0, import_utils4.genRowKey)((_f = (_e = item == null ? void 0 : item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.rowKey);
       return true;
     }
     return false;
   });
   const clientId = (_b = (_a = state.client) == null ? void 0 : _a.value) == null ? void 0 : _b.id;
+  if (holderError) {
+    const dom = document.getElementById(errorRowKey);
+    if (dom) {
+      dom.scrollIntoView({
+        behavior: "smooth",
+        block: "start"
+      });
+    }
+  }
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {
     (0, import_materials.PisellToast)({
       content: import_utils5.locales.getText("pisell2.text.please-select-the-customer-first")

package/lib/components/booking/components/tabPane/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const TabPane: React.FC<any>;
 export default TabPane;

package/lib/components/booking/components/tabPane/index.js

@@ -37,14 +37,46 @@ var import_authWrap = __toESM(require("../authWrap"));
 var import_antd = require("antd");
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_voucher = __toESM(require("../voucher"));
+var import_actionButtons = __toESM(require("../actionButtons"));
 var TabPane = ({
   children,
   header,
   footer,
   style,
   loading,
-  bodyClassName
+  bodyClassName,
+  // 新增 props 用于传递 booking 相关数据
+  state,
+  dispatch,
+  source
 }) => {
+  var _a, _b, _c, _d, _e, _f;
+  const context = (0, import_useEngineContext.default)();
+  const { businessUtils } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const hasGoodPassApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "goodpass"));
+  const hasDiscountCardApp = !!((_c = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _c.call(businessUtils, "discountcard"));
+  const paymentRefundedStatus = (0, import_react.useMemo)(() => {
+    var _a2;
+    return ["partially_refunded", "refunded"].includes(
+      (_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.payment_status
+    );
+  }, [state == null ? void 0 : state.bookingDetail]);
+  const voucherBaseCondition = (hasGoodPassApp || hasDiscountCardApp) && ["addons", "info"].includes(source) && !paymentRefundedStatus;
+  const shouldShowTerminalVoucher = voucherBaseCondition && (state == null ? void 0 : state.isBookingTicket2);
+  const shouldShowFooterVoucher = voucherBaseCondition && !(state == null ? void 0 : state.isBookingTicket2);
+  const addNote = (noteValue) => {
+    if (dispatch) {
+      dispatch({
+        type: "setNotes",
+        payload: {
+          orderNote: noteValue,
+          edit: true
+        }
+      });
+    }
+  };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-tab-pane-wrap", style }, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -70,11 +102,32 @@ var TabPane = ({
       },
       children
     )
-  ), /* @__PURE__ */ import_react.default.createElement(
+  ), state && dispatch && (state == null ? void 0 : state.isBookingTicket2) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-tab-pane-voucher-section" }, /* @__PURE__ */ import_react.default.createElement(import_actionButtons.default, { state, dispatch })), /* @__PURE__ */ import_react.default.createElement(
     import_authWrap.default,
     {
-      show: !!footer,
-      trueRender: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-tab-pane-footer" }, footer)
+      show: !!footer || shouldShowFooterVoucher,
+      trueRender: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-tab-pane-footer" }, shouldShowFooterVoucher && state && dispatch && /* @__PURE__ */ import_react.default.createElement(
+        import_voucher.default,
+        {
+          state: {
+            ...state,
+            service: {
+              ...state.service || {},
+              value: ((_d = state.service) == null ? void 0 : _d.value) || []
+            },
+            addons: {
+              ...state.addons || {},
+              value: ((_e = state.addons) == null ? void 0 : _e.value) || []
+            },
+            client: {
+              ...state.client || {},
+              value: ((_f = state.client) == null ? void 0 : _f.value) || {}
+            }
+          },
+          dispatch,
+          source
+        }
+      ), footer)
     }
   )));
 };

package/lib/components/booking/components/tabPane/index.less

@@ -5,7 +5,6 @@
   position: relative;
   display: flex;
   flex-direction: column;
-
 }
 
 .pisell-lowcode__booking-tab-pane-title {
@@ -30,6 +29,8 @@
   flex: 1;
   overflow: auto;
   padding: 0 32px;
+  // 为 voucher-section 预留空间
+  padding-bottom: 120px;
 
   .pisell-lowcode__booking-tab-pane-label {
     font-size: 16px;
@@ -45,10 +46,83 @@
   }
 }
 
+// Voucher 和功能按钮区域
+.pisell-lowcode__booking-tab-pane-voucher-section {
+  display: flex;
+  flex-direction: column;
+  padding: 10px;
+  position: relative;
+  z-index: 3;
+  background-color: #1b1b1b;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+  
+  .pisell-lowcode__booking-footer-voucher-container {
+    background: var(--base-white, #FFF);
+    padding: 4px;
+    border-radius: 8px;
+  }
+  
+  // ActionButtons 在 voucher-section 中的样式
+  .pisell-lowcode__action-buttons {
+    margin-top: 8px;
+    // 确保按钮可见
+    .action-button {
+      // 重要：确保文字颜色在深色背景下可见
+      color: white !important;
+      
+      &:hover:not(:disabled) {
+        color: white !important;
+      }
+    }
+  }
+}
+
+// 订单备注区域
+.pisell-lowcode__booking-tab-pane-notes-section {
+  background-color: #1b1b1b;
+  position: relative;
+  z-index: 3;
+  
+  .pisell-lowcode__booking-notes {
+    background: var(--base-white, #FFF);
+    padding: 12px;
+    width: 100%;
+    
+    .pisell-lowcode__booking-notes-label {
+      font-weight: 500;
+      color: #333;
+      margin-bottom: 8px;
+    }
+    
+    .pisell-lowcode__booking-notes-input {
+      .pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        font-size: 16px;
+        line-height: 36px;
+      }
+      
+      // 备用选择器，以防万一
+      textarea.pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        resize: none;
+      }
+      
+      // 去掉外层包装容器的边框
+      .pisell-lowcode-input-textarea-affix-wrapper {
+        border-width: 1px;
+      }
+    }
+  }
+}
+
 .pisell-lowcode__booking-tab-pane-footer {
-  position: sticky;
-  bottom: 0;
-  left: 0;
+  //position: sticky;
+  //bottom: 0;
+  //left: 0;
   z-index: 2;
   display: block;
   // display: flex;

package/lib/components/booking/components/voucher/index.js

@@ -43,6 +43,8 @@ var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_index = require("./index.less");
 var import_ahooks = require("ahooks");
 var import_utils2 = require("./utils");
+var import_pisellos = require("../../../ticketBooking/hooks/pisellos");
+var import_utils3 = require("../../info/clientVariant/utils");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -57,8 +59,8 @@ var services = {};
 var VoucherCard = (props) => {
   var _a, _b, _c, _d;
   const context = (0, import_useEngineContext.default)();
-  const { state, dispatch, source } = props;
-  const [showDetail, setShowDetail] = (0, import_react.useState)(false);
+  const { state, dispatch, source, isInModal = false } = props;
+  const [showDetail, setShowDetail] = (0, import_react.useState)(isInModal ? true : false);
   const { pisellos } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const [code, setCode] = (0, import_react.useState)("");
   const [discountList, setDisCountList] = (0, import_react.useState)([]);
@@ -67,6 +69,18 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = pisellos.getModule("shopDiscount");
   services = state.service;
+  const changeCustomerToGlobalState = (0, import_ahooks.useMemoizedFn)((value) => {
+    dispatch({
+      type: "setClient",
+      payload: {
+        value,
+        edit: true
+      }
+    });
+  });
+  const { selectCustomer } = (0, import_pisellos.useCustomer)({
+    changeCustomerToGlobalState
+  });
   (0, import_ahooks.useDebounceEffect)(
     () => {
       if (isBooking4Shop) {
@@ -96,7 +110,8 @@ var VoucherCard = (props) => {
         price: value.price,
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,
         discount_list: value.discount_list,
-        origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total
+        origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total,
+        quantity: value._extend.quantity
       };
     });
     return val;
@@ -148,6 +163,19 @@ var VoucherCard = (props) => {
   (0, import_react.useEffect)(() => {
     run();
   }, [JSON.stringify(serviceMemo), JSON.stringify(addonsMemo), isBooking4Shop]);
+  (0, import_react.useEffect)(() => {
+    var _a2;
+    if (pisellos) {
+      (_a2 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a2.on("shopDiscount:onSelectedDiscountListChange", fn);
+      return () => {
+        var _a3;
+        (_a3 = pisellos == null ? void 0 : pisellos.effects) == null ? void 0 : _a3.off(
+          "shopDiscount:onSelectedDiscountListChange",
+          fn
+        );
+      };
+    }
+  }, []);
   const fn = (0, import_ahooks.useMemoizedFn)((result) => {
     var _a2;
     if (!(result == null ? void 0 : result.productList) || ((_a2 = result == null ? void 0 : result.productList) == null ? void 0 : _a2.some((item) => !item))) {
@@ -158,12 +186,11 @@ var VoucherCard = (props) => {
   (0, import_react.useEffect)(() => {
     if (!isBooking4Shop) return;
     const onScanCustomerChange = (customer) => {
-      dispatch({
-        type: "setClient",
-        payload: {
-          value: customer
-        }
-      });
+      const clientVariantClose = (0, import_utils3.getClientVariantClose)();
+      if (clientVariantClose) {
+        clientVariantClose();
+      }
+      selectCustomer(customer);
     };
     const onDiscountListChange = (discount) => {
       setDisCountList(discount);
@@ -180,7 +207,7 @@ var VoucherCard = (props) => {
     return () => {
       shopDiscount.clear();
       pisellos.effects.off(
-        ShopDiscountHooks.onCustomerChange,
+        ShopDiscountHooks.onScanCustomerChange,
         onScanCustomerChange
       );
       pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
@@ -191,6 +218,7 @@ var VoucherCard = (props) => {
     };
   }, [state.bookingId, isBooking4Shop, fn]);
   const productListToValue = (0, import_ahooks.useMemoizedFn)((list, edit) => {
+    var _a2;
     const { serviceList, addonsList } = (0, import_utils2.getServiceAddons)(list);
     serviceValueRef.current = serviceList;
     addonsValueRef.current = addonsList;
@@ -207,13 +235,15 @@ var VoucherCard = (props) => {
         ...other
       }
     });
-    dispatch({
-      type: "setAddons",
-      payload: {
-        value: addonsList,
-        ...other
-      }
-    });
+    if (!((_a2 = props == null ? void 0 : props.state) == null ? void 0 : _a2.isBookingTicket2)) {
+      dispatch({
+        type: "setAddons",
+        payload: {
+          value: addonsList,
+          ...other
+        }
+      });
+    }
   });
   const onScanCode = async () => {
     var _a2;
@@ -246,12 +276,11 @@ var VoucherCard = (props) => {
       return Number(b == null ? void 0 : b.isSelected) - Number(a == null ? void 0 : a.isSelected);
     });
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-voucher-container" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "voucher-title" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "voucher-title-left" }, import_utils.locales.getText("pisell2.text.goodpass")), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-voucher-container" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "voucher-title" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "voucher-title-left" }, import_utils.locales.getText("pisell2.text.goodpass")), !isInModal && /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       className: "voucher-title-right",
       onClick: () => {
-        console.log("showDetail: ", showDetail);
         setShowDetail(!showDetail);
       }
     },
@@ -269,13 +298,14 @@ var VoucherCard = (props) => {
     "div",
     {
       className: (0, import_classnames.default)("voucher-detail", {
-        show: showDetail
+        show: showDetail || isInModal
       })
     },
     (availableData == null ? void 0 : availableData.length) > 0 ? /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellGoodPassCard,
       {
         style: { width: "100%" },
+        isInModal: isInModal || false,
         dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
         mixedSort,
         onChange: (val) => {
@@ -284,7 +314,6 @@ var VoucherCard = (props) => {
             discountId: val.id,
             isSelected: val.isSelected
           });
-          console.log("setDiscountSelected:", detail);
           productListToValue(detail.productList, true);
         }
       }

package/lib/components/booking/components/voucher/index.less

@@ -4,7 +4,7 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 10px;
+    margin-bottom: 0px;
 
     .voucher-title-left {
       color: var(--base-black, #000);

package/lib/components/booking/components/voucherModal/index.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+import './index.less';
+interface VoucherModalProps {
+    /** 是否显示弹窗 */
+    visible: boolean;
+    /** 关闭弹窗回调 */
+    onClose: () => void;
+    /** booking 状态对象 */
+    state: any;
+    /** dispatch 函数 */
+    dispatch: (action: {
+        type: string;
+        payload?: any;
+    }) => void;
+    /** 数据源 */
+    source?: any;
+}
+declare const VoucherModal: React.FC<VoucherModalProps>;
+export default VoucherModal;