@pisell/private-materials 6.2.32 → 6.3.2

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

@@ -48,24 +48,21 @@ var import_amount = require("./amount");
 var import_index = require("./index.less");
 var import_serve2 = require("./serve");
 var import_utils3 = require("./utils");
-var import_noteModal = __toESM(require("../../../../plus/noteModal"));
+var import_voucher = __toESM(require("../voucher"));
 var import__ = require("../../../../index");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_utils4 = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
-var import_useScanManager = __toESM(require("../../../ticketBooking/hooks/pisellos/useScanManager"));
 var Footer = (props) => {
-  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, _l, _m;
   const { state, buttons, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [checkoutLoading, setCheckoutLoading] = (0, import_react.useState)(false);
-  const [noteModalOpen, setNoteModalOpen] = (0, import_react.useState)(false);
   const [isShowPaymentLink, setIsShowPaymentLink] = (0, import_react.useState)(false);
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const appointmentProductRef = (0, import_react.useRef)(null);
   const context = (0, import_useEngineContext.default)();
-  const { disableAllScanListeners } = (0, import_useScanManager.default)();
   const { isTerminal, interaction, store, storage, businessUtils } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   (0, import_react.useEffect)(() => {
     store == null ? void 0 : store.dispatch({
@@ -196,22 +193,19 @@ var Footer = (props) => {
     }
     return false;
   }, [state, params]);
-  const isDisabledCheckOutForNegativeOrder = (0, import_react.useMemo)(() => {
-    return total.expectAmount < 0 && state.isBookingTicket2;
-  }, [total, state.isBookingTicket2]);
-  const goCheckout = async (order_id, isNewOrder) => {
+  const hasGoodPassApp = !!((_h = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _h.call(businessUtils, "goodpass"));
+  const hasDiscountCardApp = !!((_i = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _i.call(businessUtils, "discountcard"));
+  console.log("has goodpass app:", hasGoodPassApp);
+  const goCheckout = async (order_id) => {
     var _a2, _b2;
     if (!order_id) return;
     if (isTerminal == null ? void 0 : isTerminal()) {
-      disableAllScanListeners();
       return (_b2 = (_a2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _a2.postMessageToApp) == null ? void 0 : _b2.call(_a2, {
         module: "booking",
         key: "booking_checkout",
         data: {
           order_id,
-          callbackType: "pisell2",
-          // 是新创建订单传递newOrder terminal内会执行弃单逻辑 编辑订单时不走弃单逻辑
-          newOrder: isNewOrder
+          callbackType: "pisell2"
         }
       });
     }
@@ -226,7 +220,6 @@ var Footer = (props) => {
     });
   };
   const handleCheckout = async () => {
-    const isNewOrder = !state.bookingId;
     if (isEdit) {
       if ((0, import_utils2.isDayBooking)(state)) {
         const isHasDayProducts = handleDaySubmit();
@@ -236,10 +229,10 @@ var Footer = (props) => {
         type: "checkout",
         messageShow: !(isTerminal == null ? void 0 : isTerminal())
       });
-      goCheckout((res == null ? void 0 : res.order_id) || state.bookingId, isNewOrder);
+      goCheckout((res == null ? void 0 : res.order_id) || state.bookingId);
       return;
     }
-    return goCheckout(state.bookingId, isNewOrder);
+    return goCheckout(state.bookingId);
   };
   const handleSaveAddons = async () => {
     try {
@@ -299,7 +292,7 @@ var Footer = (props) => {
     }
     try {
       let callbackData = null;
-      let values = (0, import_utils3.formatValues)({ ...state, ...saveOtherValue }, context);
+      let values = (0, import_utils3.formatValues)({ ...state, ...saveOtherValue });
       const api = state.bookingId ? editApi : createApi;
       (0, import_utils4.sendWarningLog)({
         title: "saveBooking",
@@ -403,7 +396,7 @@ var Footer = (props) => {
           onClick: () => {
             handleCheckout();
           },
-          disabled: isDisabled || isDisabledCheckOutForNegativeOrder
+          disabled: isDisabled
         },
         import_utils.locales.getText("pisell2.text.checkout")
       )
@@ -531,32 +524,6 @@ var Footer = (props) => {
       )
     );
   }, [loading, isDisabled, isEdit, infoEdit, addonsEdit, state]);
-  const handleNote = () => {
-    setNoteModalOpen(true);
-  };
-  const handleNoteConfirm = (noteValue) => {
-    dispatch({
-      type: "setNotes",
-      payload: {
-        orderNote: noteValue,
-        edit: true
-      }
-    });
-    setNoteModalOpen(false);
-  };
-  const handleNoteDelete = () => {
-    dispatch({
-      type: "setNotes",
-      payload: {
-        orderNote: "",
-        edit: true
-      }
-    });
-    setNoteModalOpen(false);
-  };
-  const handleNoteCancel = () => {
-    setNoteModalOpen(false);
-  };
   const completeButton = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
@@ -615,27 +582,6 @@ var Footer = (props) => {
       )
     );
   }, []);
-  const noteButton = (0, import_react.useMemo)(() => {
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_antd.ConfigProvider,
-      {
-        theme: {
-          token: {
-            colorPrimary: "#0d7fa9"
-          }
-        }
-      },
-      /* @__PURE__ */ import_react.default.createElement(
-        import_antd.Button,
-        {
-          className: "pisell-lowcode__booking-footer-buttons-item",
-          type: "primary",
-          onClick: handleNote
-        },
-        import_utils.locales.getText("pisell2.ticket-booking.note")
-      )
-    );
-  }, []);
   let buttonMap = {
     checkout: checkoutButton,
     save: saveButton,
@@ -643,8 +589,7 @@ var Footer = (props) => {
     refund: refundButton,
     paymentLink: paymentLinkButton,
     rebook: rebookButton,
-    clearAll: clearAllButton,
-    note: noteButton
+    clearAll: clearAllButton
   };
   const isShowClearAll = (0, import_react.useMemo)(() => {
     if (!state.bookingId) {
@@ -697,8 +642,8 @@ var Footer = (props) => {
     }
     if (source === "info") {
       let arr = [];
-      if (state.isBookingTicket2) {
-        arr.push(buttonMap.note);
+      if (isShowClearAll) {
+        arr.push(buttonMap.clearAll);
       }
       if (isCheckout) {
         if (!isTeam) {
@@ -779,7 +724,7 @@ var Footer = (props) => {
     isShowPaymentLink,
     source,
     _buttons.length,
-    (_h = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _h.payment_status
+    (_j = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _j.payment_status
   ]);
   const isOnlyDeposit = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
@@ -871,7 +816,7 @@ var Footer = (props) => {
   }, [
     state.bookingId,
     state.bookingDetail,
-    (_i = state.addons) == null ? void 0 : _i.load,
+    (_k = state.addons) == null ? void 0 : _k.load,
     state.renderType
   ]);
   const menuChange = (e) => {
@@ -935,24 +880,16 @@ var Footer = (props) => {
           title: (_c2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _c2.tax_title
         }
       },
-      // 订单折扣（优惠券等）
+      // 订单折扣
       {
         hidden: !state.bookingId,
         key: "discount",
         value: total.shopDiscount
       },
-      // 手动折扣
-      {
-        hidden: !state.shop_discount || !!state.bookingId,
-        key: "shop_discount",
-        value: Number(state.shop_discount) || 0,
-        label: import_utils.locales.getText("pisell2.text.manual-price-adjustment")
-      },
       // 总计
       {
-        key: "expect_amount",
-        value: total.expectAmount,
-        label: import_utils.locales.getText("pisell2.subtotal.total")
+        key: "total",
+        value: total.expectAmount
       },
       // 舍入金额
       {
@@ -962,7 +899,7 @@ var Footer = (props) => {
         label: import_utils.locales.getText("pisell1.text.rounding")
       }
     ];
-  }, [total, (_j = state.bookingDetail) == null ? void 0 : _j.surcharge, state, state.bookingId]);
+  }, [total, (_l = state.bookingDetail) == null ? void 0 : _l.surcharge, state, state.bookingId]);
   const orderTotalList = (0, import_react.useMemo)(() => {
     return [
       // 订单已付金额
@@ -996,8 +933,8 @@ var Footer = (props) => {
         label: import_utils.locales.getText("pisell2.text.refunded-amount")
       }
     ];
-  }, [total, (_k = state.bookingDetail) == null ? void 0 : _k.surcharge, state, state.bookingId]);
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
+  }, [total, (_m = state.bookingDetail) == null ? void 0 : _m.surcharge, state, state.bookingId]);
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, (hasGoodPassApp || hasDiscountCardApp) && ["addons", "info"].includes(source) && !paymentRefundedStatus ? /* @__PURE__ */ import_react.default.createElement(import_voucher.default, { state, dispatch, source }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       className: "pisell-lowcode__booking-footer-right",
@@ -1066,16 +1003,6 @@ var Footer = (props) => {
       },
       actionMap.orderDetail.label
     )
-  ) : null, contextHolder, /* @__PURE__ */ import_react.default.createElement(import_AppointmentProductModal.default, { ref: appointmentProductRef }), noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
-    import_noteModal.default,
-    {
-      open: noteModalOpen,
-      title: import_utils.locales.getText("pisell2.text.add-order-notes"),
-      value: ((_l = state.notes) == null ? void 0 : _l.orderNote) || "",
-      onConfirm: handleNoteConfirm,
-      onDelete: handleNoteDelete,
-      onCancel: handleNoteCancel
-    }
-  ));
+  ) : null, contextHolder, /* @__PURE__ */ import_react.default.createElement(import_AppointmentProductModal.default, { ref: appointmentProductRef }));
 };
 var footer_default = Footer;

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

@@ -1,6 +1,6 @@
 .pisell-lowcode__booking-footer-total {
   width: 100%;
-  padding-bottom: 8px;
+  padding-bottom: 16px;
   display: flex;
   align-items: flex-start;
   justify-content: space-between;
@@ -15,8 +15,7 @@
     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;

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

@@ -125,7 +125,7 @@ var formatRelationDetails = (list) => {
   return (list || []).map((item) => {
     return {
       num: item.product_quantity,
-      price: item.original_price || 0,
+      price: item.payment_price || 0,
       product_id: item.product_id,
       is_charge_tax: item.is_charge_tax,
       order_detail_id: item.order_detail_id
@@ -241,34 +241,30 @@ var getSourceProductPrice = (item) => {
   return price;
 };
 var formatProducts = (item, quantity) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f;
   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.product_id === 0 ? item.product_id : item.id,
+    "product_id": (item == null ? void 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": ((_a = item._extend) == null ? void 0 : _a.note) || "",
+    "note": (item == null ? void 0 : item.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((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
+    "product_bundle": formatProductBundle((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "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,
+    "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,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -323,14 +319,6 @@ 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");
@@ -370,7 +358,6 @@ 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
     };
@@ -445,9 +432,9 @@ var formatValues = (state) => {
   if (!state.bookingId || isDay) {
     values.shop_note = formatNote(state);
   }
-  if (state.shop_discount && Number(state.shop_discount) > 0) {
-    values.shop_discount = state.shop_discount;
-    values.shop_discount_reason = "";
+  if (state.bookingId) {
+    values.shop_discount = state.bookingDetail.shop_discount;
+    values.shop_discount_reason = state.bookingDetail.shop_discount_reason;
   }
   if (state.contacts) {
     values.contacts = ((_a = state.contacts) == null ? void 0 : _a.value) || [];
@@ -482,32 +469,20 @@ var formatValues = (state) => {
 };
 var checkHolderIsError = (state) => {
   var _a, _b;
-  let errorRowKey = "";
   const holderError = state.service.value.some((item) => {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2;
     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 && ((_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);
+    if (item._extend.quantity > 1 && ((_b2 = (_a2 = item._extend) == null ? void 0 : _a2.holder_id) == null ? void 0 : _b2.length) !== item._extend.quantity) {
       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/reloadResourceModal/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

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

@@ -37,46 +37,14 @@ 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,
-  // 新增 props 用于传递 booking 相关数据
-  state,
-  dispatch,
-  source
+  bodyClassName
 }) => {
-  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",
     {
@@ -102,32 +70,11 @@ var TabPane = ({
       },
       children
     )
-  ), 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(
+  ), /* @__PURE__ */ import_react.default.createElement(
     import_authWrap.default,
     {
-      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)
+      show: !!footer,
+      trueRender: /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-tab-pane-footer" }, footer)
     }
   )));
 };

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

@@ -5,6 +5,7 @@
   position: relative;
   display: flex;
   flex-direction: column;
+
 }
 
 .pisell-lowcode__booking-tab-pane-title {
@@ -29,8 +30,6 @@
   flex: 1;
   overflow: auto;
   padding: 0 32px;
-  // 为 voucher-section 预留空间
-  padding-bottom: 120px;
 
   .pisell-lowcode__booking-tab-pane-label {
     font-size: 16px;
@@ -46,79 +45,6 @@
   }
 }
 
-// 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;

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

@@ -43,7 +43,6 @@ 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 ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -58,8 +57,8 @@ var services = {};
 var VoucherCard = (props) => {
   var _a, _b, _c, _d;
   const context = (0, import_useEngineContext.default)();
-  const { state, dispatch, source, isInModal = false } = props;
-  const [showDetail, setShowDetail] = (0, import_react.useState)(isInModal ? true : false);
+  const { state, dispatch, source } = props;
+  const [showDetail, setShowDetail] = (0, import_react.useState)(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)([]);
@@ -68,20 +67,6 @@ 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) {
@@ -111,8 +96,7 @@ 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,
-        quantity: value._extend.quantity
+        origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total
       };
     });
     return val;
@@ -174,7 +158,12 @@ var VoucherCard = (props) => {
   (0, import_react.useEffect)(() => {
     if (!isBooking4Shop) return;
     const onScanCustomerChange = (customer) => {
-      selectCustomer(customer);
+      dispatch({
+        type: "setClient",
+        payload: {
+          value: customer
+        }
+      });
     };
     const onDiscountListChange = (discount) => {
       setDisCountList(discount);
@@ -255,7 +244,7 @@ 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")), !isInModal && /* @__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")), /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       className: "voucher-title-right",
@@ -278,14 +267,13 @@ var VoucherCard = (props) => {
     "div",
     {
       className: (0, import_classnames.default)("voucher-detail", {
-        show: showDetail || isInModal
+        show: showDetail
       })
     },
     (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) => {

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

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