@pisell/private-materials 6.3.15 → 6.4.1

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

@@ -0,0 +1,83 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/booking/components/voucherModal/index.tsx
+var voucherModal_exports = {};
+__export(voucherModal_exports, {
+  default: () => voucherModal_default
+});
+module.exports = __toCommonJS(voucherModal_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_voucher = __toESM(require("../voucher"));
+var import_index = require("./index.less");
+var VoucherModal = ({
+  visible,
+  onClose,
+  state,
+  dispatch,
+  source
+}) => {
+  var _a, _b, _c;
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_antd.Modal,
+    {
+      title: null,
+      open: visible,
+      onCancel: onClose,
+      footer: null,
+      width: 600,
+      className: `pisell-voucher-modal ${!visible ? "pisell-voucher-modal--hidden" : ""}`,
+      forceRender: true
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-voucher-modal-content" }, /* @__PURE__ */ import_react.default.createElement(
+      import_voucher.default,
+      {
+        state: {
+          ...state,
+          service: {
+            ...state.service || {},
+            value: ((_a = state.service) == null ? void 0 : _a.value) || []
+          },
+          addons: {
+            ...state.addons || {},
+            value: ((_b = state.addons) == null ? void 0 : _b.value) || []
+          },
+          client: {
+            ...state.client || {},
+            value: ((_c = state.client) == null ? void 0 : _c.value) || {}
+          }
+        },
+        dispatch,
+        source,
+        isInModal: true
+      }
+    ))
+  );
+};
+var voucherModal_default = VoucherModal;

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

@@ -0,0 +1,23 @@
+.pisell-voucher-modal {
+  .ant-modal-body {
+    padding: 0;
+  }
+
+  .pisell-voucher-modal-content {
+    max-height: 70vh;
+    overflow-y: auto;
+  }
+
+  // 隐藏状态下的样式优化
+  &.pisell-voucher-modal--hidden {
+    // 当弹窗隐藏时，可以通过一些样式来优化性能
+    // 例如暂停动画、降低 GPU 使用等
+    .pisell-voucher-modal-content {
+      // 暂停内容中的动画和过渡效果
+      * {
+        animation-play-state: paused !important;
+        transition: none !important;
+      }
+    }
+  }
+}

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

@@ -16,5 +16,5 @@ export interface BookingDashboardProps extends React.HTMLAttributes<HTMLDivEleme
         departed: string | number;
     }, dataList: string[]) => void;
 }
-declare const BookingDashboard: (props: BookingDashboardProps) => JSX.Element;
+declare const BookingDashboard: React.ForwardRefExoticComponent<BookingDashboardProps & React.RefAttributes<unknown>>;
 export default BookingDashboard;

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

@@ -57,7 +57,7 @@ var formatCapacityToChildrenData = (data) => {
   return Object.values(map).filter((item) => !!item.value).sort((a, b) => b.label.localeCompare(a.label));
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
-var BookingDashboard = (props) => {
+var BookingDashboard = (0, import_react.forwardRef)((props, ref) => {
   const {
     otherParams = {},
     backgroundColors,
@@ -267,6 +267,11 @@ var BookingDashboard = (props) => {
       clearInterval(timer);
     };
   }, [JSON.stringify(otherParams), refreshKey]);
+  (0, import_react.useImperativeHandle)(ref, () => ({
+    refresh: () => {
+      getData();
+    }
+  }));
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellStatisticList,
     {
@@ -277,5 +282,5 @@ var BookingDashboard = (props) => {
       valueColor
     }
   );
-};
+});
 var dashboard_default = BookingDashboard;

package/lib/components/booking/deposit/ClientItem/index.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_utils = require("@pisell/utils");
 var import_classnames = __toESM(require("classnames"));
-var import_User01 = __toESM(require("@pisell/icon/src/User01"));
+var import_User01 = __toESM(require("@pisell/icon/es/User01"));
 var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 var ClientItem = (props) => {

package/lib/components/booking/deposit/DepositItem/index.js

@@ -37,7 +37,7 @@ var import_antd = require("antd");
 var import_icons = require("@ant-design/icons");
 var import_utils = require("@pisell/utils");
 var import_ClientItem = __toESM(require("../ClientItem"));
-var import_Edit05 = __toESM(require("@pisell/icon/src/Edit05"));
+var import_Edit05 = __toESM(require("@pisell/icon/es/Edit05"));
 var import_index = require("./index.less");
 var statusTagColor = {
   unpaid: "#B2DDFF",

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

@@ -51,7 +51,15 @@ var Deposit = (props) => {
   const [modal, contextHolder] = import_antd.Modal.useModal();
   const editDepositModalRef = (0, import_react.useRef)();
   const context = (0, import_useEngineContext.default)();
-  const { isTerminal, interaction, action, storage } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const {
+    isTerminal,
+    interaction,
+    action,
+    storage,
+    pisellosAllModule,
+    getData
+  } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
+  const { ScheduleModule } = pisellosAllModule;
   const isTeam = (0, import_react.useMemo)(() => {
     return storage.get("channel") === "android_team_portal" || storage.get("channel") === "ios_team_portal";
   }, []);
@@ -102,8 +110,38 @@ var Deposit = (props) => {
       }
     });
   };
+  const getDataFromHost = () => {
+    try {
+      const is_price_include_tax = getData("is_price_include_tax");
+      const tax_rate = getData("tax_rate") || "10";
+      const tax_title = getData("tax_title") || "GST";
+      const surcharge_list = getData("surcharge_list");
+      const schedule_list = getData("schedule_list");
+      let scheduleById = {};
+      if (Array.isArray(schedule_list)) {
+        for (let item of schedule_list) {
+          scheduleById[item.id] = item;
+        }
+      }
+      return {
+        is_price_include_tax,
+        tax_rate,
+        tax_title,
+        surcharge_list,
+        schedule_list,
+        scheduleById
+      };
+    } catch (error) {
+      console.error(error);
+      return {};
+    }
+  };
   const total = (0, import_react.useMemo)(() => {
-    return (0, import_amount.getSumTotal)(globalState, false);
+    return (0, import_amount.getSumTotal)(globalState, {
+      isEdit: false,
+      ScheduleModule,
+      ...getDataFromHost()
+    });
   }, [globalState]);
   const depositList = (0, import_react.useMemo)(() => {
     if (!bookingId) return [];

package/lib/components/booking/forms/forms.js

@@ -147,7 +147,7 @@ var Forms = (0, import_model.Provider)((props) => {
         "div",
         {
           className: "pisell-lowcode__booking-field-wrap",
-          style: { padding: hideTitle ? 0 : "12px 0 0" },
+          style: { padding: hideTitle ? 0 : "0" },
           key: d.form_id
         },
         hideTitle ? null : /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-field-title" }, d.form.title),

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

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<any>;
+    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
 };
 export default useSendModal;

package/lib/components/booking/hooks/useIsBooking4Shop.js

@@ -39,11 +39,11 @@ var useIsBooking4Shop = (state) => {
   var _a;
   const context = (0, import_useEngineContext.default)();
   return (0, import_react.useMemo)(() => {
-    var _a2, _b, _c, _d, _e, _f;
+    var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
     return (0, import_utils.isBooking4Shop)(
-      (_e = (_d = (_c = (_b = (_a2 = context.appHelper.utils.store) == null ? void 0 : _a2.getState) == null ? void 0 : _b.call(_a2)) == null ? void 0 : _c.global) == null ? void 0 : _d.globalConfig) == null ? void 0 : _e.id,
+      ((_c = (_b = (_a2 = context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
       state.renderType,
-      (_f = context.appHelper.utils) == null ? void 0 : _f.businessUtils
+      (_i = context.appHelper.utils) == null ? void 0 : _i.businessUtils
     );
   }, [state.renderType, (_a = context.appHelper.utils) == null ? void 0 : _a.businessUtils]);
 };

package/lib/components/booking/hooks/useQuotation.js

@@ -145,8 +145,10 @@ var useQuotation = (state, dispatch) => {
   cartValueRef.current = state.service.value;
   const getCartQuotation = async (params) => {
     if (!cartValueRef.current.length) return;
+    const ids = cartValueRef.current.filter((item) => !item.isCustomItem).map((item) => item.product_id);
+    if (!ids.length) return;
     const data = await (0, import_serve.getProductPrice)({
-      ids: cartValueRef.current.map((item) => item.product_id),
+      ids,
       schedule_date: params == null ? void 0 : params.schedule_date,
       customer_id: params == null ? void 0 : params.customer_id
     });

package/lib/components/booking/info/addServiceVariant/index.js

@@ -38,7 +38,7 @@ var import_addService2 = __toESM(require("../../info2/service/addService"));
 var import_utils = require("../utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var AddServiceVariant = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const { globalState, setGlobalState } = props;
   const context = (0, import_useEngineContext.default)();
   const stateRef = (0, import_react.useRef)(globalState);
@@ -57,9 +57,9 @@ var AddServiceVariant = (props) => {
   };
   let Cpt = import_addService.default;
   if ((0, import_utils.isBooking4Shop)(
-    (_e = (_d = (_c = (_b = (_a = context.appHelper.utils.store) == null ? void 0 : _a.getState) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.global) == null ? void 0 : _d.globalConfig) == null ? void 0 : _e.id,
-    (_f = props == null ? void 0 : props.globalState) == null ? void 0 : _f.renderType,
-    (_g = context.appHelper.utils) == null ? void 0 : _g.businessUtils
+    ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id),
+    (_i = props == null ? void 0 : props.globalState) == null ? void 0 : _i.renderType,
+    (_j = context.appHelper.utils) == null ? void 0 : _j.businessUtils
   )) {
     Cpt = import_addService2.default;
   }

package/lib/components/booking/info/client/index.js

@@ -232,7 +232,13 @@ var Client = () => {
           type: "setClient",
           payload: {
             clients: [
-              ...((_e2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _e2.customer) ? [{ ...(_f2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _f2.customer, id: customer_id, waiver_form: waiverForm }] : [],
+              ...((_e2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _e2.customer) ? [
+                {
+                  ...(_f2 = params2 == null ? void 0 : params2[0]) == null ? void 0 : _f2.customer,
+                  id: customer_id,
+                  waiver_form: waiverForm
+                }
+              ] : [],
               ...((_g2 = state.client) == null ? void 0 : _g2.clients) || []
             ]
           }
@@ -329,9 +335,28 @@ var Client = () => {
               src: import_utils.image.ali(item.cover, 100) || void 0,
               icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
             }
-          ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, getNickname(item)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, item.email ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.email) : null, item.phone ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.phone) : null), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-waiver", title: (0, import_utils3.getWaiverTitle)(item.waiver_form) }, (item.waiver_form || []).map((item2) => {
-            return /* @__PURE__ */ import_react.default.createElement("span", null, item2.form_title, ":", item2.is_filled ? /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-list-item-waiver-filled" }, import_utils.locales.getText("pisell2.text.filled")) : /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-list-item-waiver-not-filled" }, import_utils.locales.getText("pisell2.text.not-filled")), "; ");
-          }))), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-loading" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: franchiseeLoading === item.id })));
+          ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-name" }, getNickname(item)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-info-desc" }, item.email ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.email) : null, item.phone ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, item.phone) : null), /* @__PURE__ */ import_react.default.createElement(
+            "div",
+            {
+              className: "pisell-lowcode__booking-client-list-item-info-waiver",
+              title: (0, import_utils3.getWaiverTitle)(item.waiver_form)
+            },
+            (item.waiver_form || []).map((item2) => {
+              return /* @__PURE__ */ import_react.default.createElement("span", null, item2.form_title, ":", item2.is_filled ? /* @__PURE__ */ import_react.default.createElement(
+                "span",
+                {
+                  className: "pisell-lowcode__booking-client-list-item-waiver-filled"
+                },
+                import_utils.locales.getText("pisell2.text.filled")
+              ) : /* @__PURE__ */ import_react.default.createElement(
+                "span",
+                {
+                  className: "pisell-lowcode__booking-client-list-item-waiver-not-filled"
+                },
+                import_utils.locales.getText("pisell2.text.not-filled")
+              ), ";", " ");
+            })
+          )), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-list-item-loading" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: franchiseeLoading === item.id })));
         },
         searchChange,
         searchValue: params.search,
@@ -362,21 +387,34 @@ var Client = () => {
         icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
       }
     ),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_d = state.client.value) == null ? void 0 : _d.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_e = state.client.value) == null ? void 0 : _e.email) : null, ((_f = state.client.value) == null ? void 0 : _f.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_g = state.client.value) == null ? void 0 : _g.phone) : null, !!((_i = (_h = state.client.value) == null ? void 0 : _h.waiver_form) == null ? void 0 : _i.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils3.getWaiverTitle)((_j = state.client.value) == null ? void 0 : _j.waiver_form) }, (_m = (_l = (_k = state.client.value) == null ? void 0 : _k.waiver_form) == null ? void 0 : _l.map) == null ? void 0 : _m.call(_l, (item) => {
-      return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-waiver-colon" }, ":"), item.is_filled ? /* @__PURE__ */ import_react.default.createElement(
-        "span",
-        {
-          className: "pisell-lowcode__booking-client-waiver-filled"
-        },
-        import_utils.locales.getText("pisell2.text.filled")
-      ) : /* @__PURE__ */ import_react.default.createElement(
-        "span",
-        {
-          className: "pisell-lowcode__booking-client-waiver-not-filled"
-        },
-        import_utils.locales.getText("pisell2.text.not-filled")
-      ), `; `);
-    })))), !(state == null ? void 0 : state.disableEventBookingEdit) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-right" }, isWalkIn ? /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__booking-client-add-icon" }) : /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-left" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-name" }, getNickname(state.client.value)), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in")) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, ((_d = state.client.value) == null ? void 0 : _d.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-email" }, (_e = state.client.value) == null ? void 0 : _e.email) : null, ((_f = state.client.value) == null ? void 0 : _f.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-phone" }, (_g = state.client.value) == null ? void 0 : _g.phone) : null, !!((_i = (_h = state.client.value) == null ? void 0 : _h.waiver_form) == null ? void 0 : _i.length) && /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: "pisell-lowcode__booking-client-waiver",
+        title: (0, import_utils3.getWaiverTitle)((_j = state.client.value) == null ? void 0 : _j.waiver_form)
+      },
+      (_m = (_l = (_k = state.client.value) == null ? void 0 : _k.waiver_form) == null ? void 0 : _l.map) == null ? void 0 : _m.call(_l, (item) => {
+        return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement(
+          "span",
+          {
+            className: "pisell-lowcode__booking-client-waiver-colon"
+          },
+          ":"
+        ), item.is_filled ? /* @__PURE__ */ import_react.default.createElement(
+          "span",
+          {
+            className: "pisell-lowcode__booking-client-waiver-filled"
+          },
+          import_utils.locales.getText("pisell2.text.filled")
+        ) : /* @__PURE__ */ import_react.default.createElement(
+          "span",
+          {
+            className: "pisell-lowcode__booking-client-waiver-not-filled"
+          },
+          import_utils.locales.getText("pisell2.text.not-filled")
+        ), `; `);
+      })
+    ))), !(state == null ? void 0 : state.disableEventBookingEdit) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-right" }, isWalkIn ? /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__booking-client-add-icon" }) : /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,
       {
         menu: {

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

@@ -1 +1,3 @@
 export declare const getWaiverTitle: (waiverForm: any[]) => string;
+export declare const setClientVariantClose: (fn: any) => void;
+export declare const getClientVariantClose: () => (() => void) | null;

package/lib/components/booking/info/clientVariant/utils.js

@@ -19,7 +19,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/info/clientVariant/utils.ts
 var utils_exports = {};
 __export(utils_exports, {
-  getWaiverTitle: () => getWaiverTitle
+  getClientVariantClose: () => getClientVariantClose,
+  getWaiverTitle: () => getWaiverTitle,
+  setClientVariantClose: () => setClientVariantClose
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
@@ -28,7 +30,16 @@ var getWaiverTitle = (waiverForm) => {
     return `${item.form_title || ""}:${item.is_filled ? import_utils.locales.getText("pisell2.text.filled") : import_utils.locales.getText("pisell2.text.not-filled")}`;
   }).join(";");
 };
+var clientVariantClose;
+var setClientVariantClose = (fn) => {
+  clientVariantClose = fn;
+};
+var getClientVariantClose = () => {
+  return clientVariantClose;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getWaiverTitle
+  getClientVariantClose,
+  getWaiverTitle,
+  setClientVariantClose
 });

package/lib/components/booking/info/clientVariant/vertical/index.js

@@ -54,7 +54,7 @@ var import_useAddHolder = __toESM(require("../../hooks/useAddHolder"));
 var import_utils5 = require("../utils");
 var import_useGetHolderList = __toESM(require("../../hooks/useGetHolderList"));
 var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P;
   const { globalState, setGlobalState } = props;
   const modalRef = (0, import_react.useRef)();
   const state = globalState;
@@ -377,6 +377,7 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
       setSearch: (_b2 = modalRef.current) == null ? void 0 : _b2.setSearch
     };
   });
+  (0, import_utils5.setClientVariantClose)((_z = modalRef.current) == null ? void 0 : _z.close);
   const isOpenDeleteProduct = (0, import_react.useMemo)(() => {
     if (!(0, import_utils3.isDayBooking)(state)) return false;
     const pets = (0, import_utils3.getPets)(state);
@@ -444,11 +445,11 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
         import_antd.Avatar,
         {
           className: "pisell-lowcode__booking-client-avatar",
-          src: import_utils.image.ali((_z = state.client.value) == null ? void 0 : _z.cover, 100),
+          src: import_utils.image.ali((_A = state.client.value) == null ? void 0 : _A.cover, 100),
           size: 64,
           icon: /* @__PURE__ */ import_react.default.createElement(import_User01.default, { className: "pisell-lowcode__booking-client-list-item-avatar-icon" })
         }
-      ), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, import_utils.locales.getText("pisell2.text.add-client")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in"))) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, getNickname(state.client.value)), ((_A = state.client.value) == null ? void 0 : _A.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_B = state.client.value) == null ? void 0 : _B.email) : null, ((_C = state.client.value) == null ? void 0 : _C.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_D = state.client.value) == null ? void 0 : _D.phone) : null, !!((_F = (_E = state.client.value) == null ? void 0 : _E.waiver_form) == null ? void 0 : _F.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils5.getWaiverTitle)((_G = state.client.value) == null ? void 0 : _G.waiver_form) }, (_J = (_I = (_H = state.client.value) == null ? void 0 : _H.waiver_form) == null ? void 0 : _I.map) == null ? void 0 : _J.call(_I, (item) => {
+      ), isWalkIn ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-info-desc" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, import_utils.locales.getText("pisell2.text.add-client")), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, import_utils.locales.getText("pisell2.text.leave-empty-for-walk-in"))) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-title" }, getNickname(state.client.value)), ((_B = state.client.value) == null ? void 0 : _B.email) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_C = state.client.value) == null ? void 0 : _C.email) : null, ((_D = state.client.value) == null ? void 0 : _D.phone) ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-desc-item" }, (_E = state.client.value) == null ? void 0 : _E.phone) : null, !!((_G = (_F = state.client.value) == null ? void 0 : _F.waiver_form) == null ? void 0 : _G.length) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-waiver", title: (0, import_utils5.getWaiverTitle)((_H = state.client.value) == null ? void 0 : _H.waiver_form) }, (_K = (_J = (_I = state.client.value) == null ? void 0 : _I.waiver_form) == null ? void 0 : _J.map) == null ? void 0 : _K.call(_J, (item) => {
         return /* @__PURE__ */ import_react.default.createElement("span", null, item.form_title, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-client-waiver-colon" }, ":"), item.is_filled ? /* @__PURE__ */ import_react.default.createElement(
           "span",
           {
@@ -513,7 +514,7 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
         showHeader: !state.isBookingCreatePage,
         modalOpen: state.modalOpen,
         loading,
-        autoFocus: !((_M = (_L = (_K = context == null ? void 0 : context.appHelper) == null ? void 0 : _K.utils) == null ? void 0 : _L.isTerminal) == null ? void 0 : _M.call(_L)),
+        autoFocus: !((_N = (_M = (_L = context == null ? void 0 : context.appHelper) == null ? void 0 : _L.utils) == null ? void 0 : _M.isTerminal) == null ? void 0 : _N.call(_M)),
         ref: modalRef,
         onClose: handleClose,
         handleSelectClient: _handleSelectClient,
@@ -523,8 +524,8 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
         formData: state.pet.formData,
         searchChange,
         options: renderList,
-        holder: (_N = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _N.holder,
-        client: (_O = state == null ? void 0 : state.client) == null ? void 0 : _O.value,
+        holder: (_O = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _O.holder,
+        client: (_P = state == null ? void 0 : state.client) == null ? void 0 : _P.value,
         loadMore,
         showPet: (boardConfig == null ? void 0 : boardConfig.type) === "form",
         handleAddPet,

package/lib/components/booking/info/hooks/useInfoHolder.d.ts

@@ -5,5 +5,6 @@ declare const useInfoHolder: (state: any, dispatch: any) => {
     dispatchService: (type: string, payload: any) => void;
     handleAction: (dataSource: any) => void;
     showAddTimeModal: boolean;
+    editNormalServiceRef: import("react").MutableRefObject<any>;
 };
 export default useInfoHolder;

package/lib/components/booking/info/hooks/useInfoHolder.js

@@ -38,9 +38,11 @@ var import_useHolderConfig = __toESM(require("./useHolderConfig"));
 var import_utils = require("../utils");
 var import_useGetHolderList = __toESM(require("./useGetHolderList"));
 var import_utils2 = require("../../info2/service/addService/utils");
+var import_utilsByBooking = require("../../info2/utilsByBooking");
 var useInfoHolder = (state, dispatch) => {
   var _a, _b, _c, _d;
   const detailRef = (0, import_react.useRef)();
+  const editNormalServiceRef = (0, import_react.useRef)(null);
   const { holder, isFormSubject, appointment_subject } = (0, import_useHolderConfig.default)(state);
   const getHolders = (0, import_useGetHolderList.default)(state, dispatch);
   (0, import_react.useEffect)(() => {
@@ -55,13 +57,16 @@ var useInfoHolder = (state, dispatch) => {
     };
   }, [(_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.information_tab]);
   const showAddTimeModal = (0, import_react.useMemo)(() => {
-    return (0, import_utils.isOpenAddTime)(state) && !state.isBookingTicket2;
+    return (0, import_utils.isOpenAddTime)(state);
   }, [state, appointment_card.quick_time]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((cacheItem, type) => {
-    var _a2, _b2;
-    console.time("handleEdit");
-    console.log(performance.now() - window.pp1, "打开商品4");
-    (_b2 = (_a2 = detailRef.current) == null ? void 0 : _a2.init) == null ? void 0 : _b2.call(_a2, cacheItem, false, type === "edit_product");
+    var _a2, _b2, _c2;
+    const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(cacheItem);
+    if (isNoSpecAndPackage) {
+      (_a2 = editNormalServiceRef.current) == null ? void 0 : _a2.init(cacheItem);
+    } else {
+      (_c2 = (_b2 = detailRef.current) == null ? void 0 : _b2.init) == null ? void 0 : _c2.call(_b2, cacheItem, false, type === "edit_product");
+    }
   });
   const dispatchService = (type, payload) => {
     dispatch({
@@ -87,7 +92,8 @@ var useInfoHolder = (state, dispatch) => {
     handleEdit,
     dispatchService,
     handleAction,
-    showAddTimeModal
+    showAddTimeModal,
+    editNormalServiceRef
   };
 };
 var useInfoHolder_default = useInfoHolder;

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

@@ -39,15 +39,16 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var import_utils = require("./utils");
 var import_antd = require("antd");
 var APP = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const context = (0, import_useEngineContext.default)();
   const { globalState } = props;
+  const shopId = ((_c = (_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getData) == null ? void 0 : _c.call(_b, "shop_id")) || ((_h = (_g = (_f = (_e = (_d = context.appHelper.utils.store) == null ? void 0 : _d.getState) == null ? void 0 : _e.call(_d)) == null ? void 0 : _f.global) == null ? void 0 : _g.globalConfig) == null ? void 0 : _h.id);
   const isBooking4 = (0, import_utils.isBooking4Shop)(
-    (_e = (_d = (_c = (_b = (_a = context.appHelper.utils.store) == null ? void 0 : _a.getState) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.global) == null ? void 0 : _d.globalConfig) == null ? void 0 : _e.id,
+    shopId,
     globalState == null ? void 0 : globalState.renderType,
-    (_f = context.appHelper.utils) == null ? void 0 : _f.businessUtils
+    (_i = context.appHelper.utils) == null ? void 0 : _i.businessUtils
   );
-  if (!((_k = (_j = (_i = (_h = (_g = context.appHelper.utils.store) == null ? void 0 : _g.getState) == null ? void 0 : _h.call(_g)) == null ? void 0 : _i.global) == null ? void 0 : _j.globalConfig) == null ? void 0 : _k.id)) {
+  if (!shopId) {
     return /* @__PURE__ */ import_react.default.createElement("div", { style: { padding: 16 } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, null));
   }
   if (isBooking4 && (!(globalState == null ? void 0 : globalState.bookingId) || (globalState == null ? void 0 : globalState.isParallelResourcesBooking))) {

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

@@ -4,6 +4,22 @@
   .booking-info {
     padding-bottom: 16px;
 
+    .booking-info-client-line {
+      display: flex;
+      flex-direction: row;
+      gap: 10px;
+
+      .booking-info-client-line-code {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 64px;
+        height: 64px;
+        border-radius: 8px;
+        background: #5d3f9f;
+        cursor: pointer;
+      }
+    }
   }
 
   // &::before {
@@ -22,11 +38,11 @@
   }
 }
 .create-booking-page-info-wrap-create {
-  background: var(--Success-50, #ECFDF3);
+  background: var(--Success-50, #ecfdf3);
 }
 .create-booking-page-info-wrap {
   position: initial !important;
-  padding: 0 16px !important;
+  padding: 0 10px !important;
   .booking-info-create-new {
     margin-top: 10px;
     color: var(--Base-Black, #000);
@@ -34,4 +50,4 @@
     font-weight: 600;
     line-height: 32px;
   }
-}
+}