@pisell/private-materials 6.5.26 → 6.6.1

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

@@ -40,6 +40,7 @@ var import_utils2 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_serve = require("../info/service/serve");
 var import_decimal = __toESM(require("decimal.js"));
+var import_dayjs = __toESM(require("dayjs"));
 var formatBundleItemMap = (product) => {
   return product.bundle_group.reduce((pre, cur) => {
     const curObj = {};
@@ -70,15 +71,19 @@ var setNewCartValue = (cartValue, newProducts) => {
   let isBundleChange = false;
   let isNotFoundBundle = false;
   const notFoundProducts = [];
+  const multiDayPricesCache = /* @__PURE__ */ new Map();
   const value = cartValue.map((item) => {
-    var _a, _b, _c, _d;
-    const newProduct = newProducts.find((newItem2) => newItem2.id === item.product_id);
+    var _a, _b, _c, _d, _e, _f;
+    const itemScheduleDate = ((_a = item._extend) == null ? void 0 : _a.startDate) ? (0, import_dayjs.default)(item._extend.startDate).format("YYYY-MM-DD") : "";
+    const newProduct = newProducts.find(
+      (newItem2) => newItem2.id === item.product_id && newItem2.schedule_date === itemScheduleDate
+    );
     if (!newProduct) {
       return item;
     }
     let isChangePrice = newProduct.price != item.price;
     const bundleItemMap = formatBundleItemMap(newProduct);
-    const newBundle = (((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []).map((bundle) => {
+    const newBundle = (((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle) || []).map((bundle) => {
       if (!bundleItemMap[bundle.id]) {
         isNotFoundBundle = true;
         if (!notFoundProducts.some((p) => p._id === bundle._id)) {
@@ -102,6 +107,24 @@ var setNewCartValue = (cartValue, newProducts) => {
         // product_price: bundleItemMap[item.id].product_price,
       };
     });
+    if ((_d = item._extend) == null ? void 0 : _d.groupId) {
+      if (!multiDayPricesCache.has(item._extend.groupId)) {
+        const productPrices = newProducts.filter((p) => p.id === item.product_id);
+        const multiDayPrices = {};
+        productPrices.forEach((priceItem) => {
+          multiDayPrices[priceItem.schedule_date] = {
+            total: Number(priceItem.price),
+            origin_total: Number(priceItem.price),
+            num: 1,
+            quotation_id: priceItem.quotation_id || 0,
+            start_date: priceItem.schedule_date,
+            end_date: (0, import_dayjs.default)(priceItem.schedule_date).add(1, "day").format("YYYY-MM-DD")
+          };
+        });
+        multiDayPricesCache.set(item._extend.groupId, multiDayPrices);
+      }
+      item._extend.multiDayPrices = multiDayPricesCache.get(item._extend.groupId);
+    }
     if (!isChangePrice) {
       return item;
     } else {
@@ -119,7 +142,7 @@ var setNewCartValue = (cartValue, newProducts) => {
         bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
         other: {
           ...item._extend.other,
-          option: (_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option,
+          option: (_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option,
           bundle: newBundle
         }
       }
@@ -145,22 +168,31 @@ 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,
-      schedule_date: params == null ? void 0 : params.schedule_date,
-      customer_id: params == null ? void 0 : params.customer_id
+    if (!(params == null ? void 0 : params.customer_id)) {
+      return;
+    }
+    const queryData = cartValueRef.current.filter((item) => !item.isCustomItem).map((item) => {
+      var _a2;
+      return {
+        product_id: item.product_id,
+        schedule_date: ((_a2 = item._extend) == null ? void 0 : _a2.startDate) ? (0, import_dayjs.default)(item._extend.startDate).format("YYYY-MM-DD") : params == null ? void 0 : params.schedule_date
+        // 如果没有商品日期，使用传入的默认日期
+      };
+    });
+    if (!queryData.length) return;
+    const data = await (0, import_serve.getNormalAndMultiDayProductPrice)({
+      customer_id: params == null ? void 0 : params.customer_id,
+      data: queryData
     });
-    return data;
+    return data.data;
   };
   const currentDate = (0, import_react.useMemo)(() => {
     return state.date.value.format("YYYY-MM-DD");
   }, [state.date.value]);
   const updateCartQuotation = async (params) => {
     const data = await getCartQuotation(params);
-    if (!(data == null ? void 0 : data.data)) return;
-    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data.data);
+    if (!data || !data.length) return;
+    const { isChange, value: newCartValue, isNotFoundBundle, notFoundProducts } = setNewCartValue(cartValueRef.current, data);
     if (isNotFoundBundle) {
       setProducts(notFoundProducts);
       setOpen(true);

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

@@ -91,8 +91,13 @@ var Client = () => {
     }
     _setLoading(true);
     const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClientsEs;
+    const withKey = [...(resetParams == null ? void 0 : resetParams.with) || []];
+    if (!withKey.includes("contactsInfo")) {
+      withKey.push("contactsInfo");
+    }
     const data = await api({
       ...resetParams,
+      with: withKey,
       ...!state.isFranchisee ? { _config: { abort: true } } : {}
     });
     const list = ((data == null ? void 0 : data.list) || []).map((d) => {
@@ -328,6 +333,14 @@ var Client = () => {
         closeCallback: () => {
         },
         optionRender: (item) => {
+          var _a2, _b2, _c2, _d2, _e2;
+          console.log("render_optionRender", item);
+          let displayEmail = item == null ? void 0 : item.email;
+          let displayPhone = item == null ? void 0 : item.phone;
+          if (!displayEmail && !displayPhone) {
+            displayEmail = (_b2 = (_a2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _a2.value) == null ? void 0 : _b2.email;
+            displayPhone = (_e2 = (_d2 = (_c2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c2.value) == null ? void 0 : _d2.phone) == null ? void 0 : _e2.phone;
+          }
           return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
             import_antd.Avatar,
             {
@@ -335,7 +348,7 @@ 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(
+          ), /* @__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" }, displayEmail ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, displayEmail) : null, displayPhone ? /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, displayPhone) : null), /* @__PURE__ */ import_react.default.createElement(
             "div",
             {
               className: "pisell-lowcode__booking-client-list-item-info-waiver",

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

@@ -25,22 +25,11 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var getFranchiseeCustomerInfo = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params, {
-    cache: {
-      mode: "remote_local",
-      type: "indexDB"
-    }
-  });
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params);
   return data;
 };
 var getFranchiseeCustomerList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, {
-    abort: true,
-    cache: {
-      mode: "remote_local",
-      type: "indexDB"
-    }
-  });
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/select-list`, params, { abort: true });
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/info/clientVariant/hooks/useClientFn.js

@@ -52,7 +52,7 @@ var useClientFn = (_params) => {
     num: 5,
     total: 0,
     search: "",
-    with: ["formRecord"],
+    with: ["formRecord", "contactsInfo"],
     relation_form_id: (_d = (_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.appointment_subject) == null ? void 0 : _d.form_id
   });
   const paramsRef = (0, import_react.useRef)(params);
@@ -91,11 +91,16 @@ var useClientFn = (_params) => {
     }
     _setLoading(true);
     const api = state.isFranchisee ? import_serve.getFranchiseeCustomerList : state.apis.getClients;
+    const withKey = [...(resetParams == null ? void 0 : resetParams.with) || []];
+    if (!withKey.includes("contactsInfo")) {
+      withKey.push("contactsInfo");
+    }
     const data = await api({
       ...resetParams,
       ...resetParams.search ? { num: 10 } : {},
       ...state.isFranchisee ? { franchisee_customer_ids: customer_ids } : { customer_ids },
-      ...!state.isFranchisee && !returnResult ? { _config: { abort: true } } : {}
+      ...!state.isFranchisee && !returnResult ? { _config: { abort: true } } : {},
+      with: withKey
     });
     const list = ((data == null ? void 0 : data.list) || []).map((d) => {
       var _a3;

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

@@ -279,6 +279,7 @@ var SelectDrawer = (props, ref) => {
     }
     closeDrawer();
   };
+  console.log("options7777", options);
   return /* @__PURE__ */ import_react.default.createElement(
     import_drawer.default,
     {
@@ -292,7 +293,7 @@ var SelectDrawer = (props, ref) => {
           ref: searchRef,
           prefix: /* @__PURE__ */ import_react.default.createElement(import_SearchLg.default, null),
           style: { margin: "16px 0", height: 44 },
-          placeholder: import_utils.locales.getText("pisell2.text.search"),
+          placeholder: import_utils.locales.getText("pisell2.booking.text.search-placeholder"),
           value: search,
           allowClear: true,
           onChange: (e) => {
@@ -335,7 +336,13 @@ var SelectDrawer = (props, ref) => {
         }
       }
     ) : null), /* @__PURE__ */ import_react.default.createElement(import_antd.Spin, { spinning: !!loading, delay: 500 }, !!options.length ? options.map((item) => {
-      var _a;
+      var _a, _b, _c, _d, _e, _f;
+      let displayEmail = item == null ? void 0 : item.email;
+      let displayPhone = item == null ? void 0 : item.phone;
+      if (!displayEmail && !displayPhone) {
+        displayEmail = (_b = (_a = item == null ? void 0 : item.contacts_info) == null ? void 0 : _a.value) == null ? void 0 : _b.email;
+        displayPhone = (_e = (_d = (_c = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c.value) == null ? void 0 : _d.phone) == null ? void 0 : _e.phone;
+      }
       return /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
@@ -348,7 +355,7 @@ var SelectDrawer = (props, ref) => {
             onClick: () => handleClientClick(item),
             cover: item.cover,
             title: getNickname(item),
-            desc: [item.email, item.phone],
+            desc: [displayEmail, displayPhone],
             checked: item.id === client.id,
             style: showPet ? { marginBottom: 6 } : {},
             loading: franchiseeLoading === item.id,
@@ -396,7 +403,7 @@ var SelectDrawer = (props, ref) => {
             },
             style: { padding: 16 }
           },
-          /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__custom-select-create-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__custom-select-create-txt" }, `${import_utils.locales.getText("pisell2.text.create-new")} ${((_a = holder.form) == null ? void 0 : _a.title) || "-"}`))
+          /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_PlusCircle.default, { className: "pisell-lowcode__custom-select-create-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__custom-select-create-txt" }, `${import_utils.locales.getText("pisell2.text.create-new")} ${((_f = holder.form) == null ? void 0 : _f.title) || "-"}`))
         ), /* @__PURE__ */ import_react.default.createElement("div", null))
       );
     }) : /* @__PURE__ */ import_react.default.createElement(import_antd.Empty, { image: import_antd.Empty.PRESENTED_IMAGE_SIMPLE }), /* @__PURE__ */ import_react.default.createElement("div", null, loadMore)))

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

@@ -173,7 +173,11 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
   const handleAddPet = (_client, cb) => {
     var _a2, _b2, _c2;
     let _data = {
-      formDataConfig: isMinorAndWaiver ? { ...waiverForm, customer_id: _client.id, is_franchisor: (_b2 = (_a2 = state.pet.formData) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.is_franchisor } : { ...((_c2 = state.pet.formData) == null ? void 0 : _c2[0]) || {} }
+      formDataConfig: isMinorAndWaiver ? {
+        ...waiverForm,
+        customer_id: _client.id,
+        is_franchisor: (_b2 = (_a2 = state.pet.formData) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.is_franchisor
+      } : { ...((_c2 = state.pet.formData) == null ? void 0 : _c2[0]) || {} }
     };
     _data.customerId = _client.id;
     state.action({
@@ -278,7 +282,7 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
         } else {
           const val = await getClients(
             {
-              with: ["formRecord"],
+              with: ["formRecord", "contactsInfo"],
               relation_form_id: boardConfig == null ? void 0 : boardConfig.form_id,
               skip: 1,
               num: 20,
@@ -449,21 +453,34 @@ var VerticalClient = (0, import_react.forwardRef)((props, ref) => {
           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)), ((_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",
-          {
-            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")
-        ), ` ; `);
-      }))), !isWalkIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-action-wrap" }, !state.disabledEdit && /* @__PURE__ */ import_react.default.createElement(
+      ), 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",
+            {
+              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")
+          ), ` ; `);
+        })
+      )), !isWalkIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-client-action-wrap" }, !state.disabledEdit && /* @__PURE__ */ import_react.default.createElement(
         import_antd.Dropdown.Button,
         {
           menu: {

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

@@ -5,5 +5,6 @@ declare const useHolderConfig: (state: any) => {
     isCustomerSubject: boolean;
     isWalkInBol: boolean;
     isShowChangeHolder: boolean;
+    holderType: any;
 };
 export default useHolderConfig;

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

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(useHolderConfig_exports);
 var import_react = require("react");
 var import_utils = require("../../utils");
 var useHolderConfig = (state) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g;
   const appointment_subject = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.config) == null ? void 0 : _b2.basic) == null ? void 0 : _c2.appointment_subject) || {};
@@ -37,10 +37,14 @@ var useHolderConfig = (state) => {
   const isFormSubject = (0, import_react.useMemo)(() => {
     return appointment_subject.type === "form";
   }, [appointment_subject.type]);
+  const holderType = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c2;
+    return ((_c2 = (_b2 = (_a2 = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a2.holder) == null ? void 0 : _b2.form) == null ? void 0 : _c2.formType) || "minors";
+  }, [(_e = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _e.holder]);
   const isWalkInBol = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return (0, import_utils.isWalkIn)((_b2 = (_a2 = state == null ? void 0 : state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id);
-  }, [(_f = (_e = state == null ? void 0 : state.client) == null ? void 0 : _e.value) == null ? void 0 : _f.id]);
+  }, [(_g = (_f = state == null ? void 0 : state.client) == null ? void 0 : _f.value) == null ? void 0 : _g.id]);
   const isCustomerSubject = (0, import_react.useMemo)(() => {
     return appointment_subject.type === "customer";
   }, [appointment_subject.type]);
@@ -53,7 +57,8 @@ var useHolderConfig = (state) => {
     isFormSubject,
     isCustomerSubject,
     isWalkInBol,
-    isShowChangeHolder
+    isShowChangeHolder,
+    holderType
   };
 };
 var useHolderConfig_default = useHolderConfig;

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

@@ -54,6 +54,7 @@ var import_index = require("./index.less");
 var import_notes = __toESM(require("./notes"));
 var import_service2 = require("./service2");
 var import_utils3 = require("./service2/utils");
+var import_contactInfoMode = __toESM(require("../info2/service/contactInfoMode"));
 var defaultModules = {
   client: 1,
   date: 1,
@@ -64,7 +65,7 @@ var defaultModules = {
 };
 import_utils.locales.init(import_locales.default, (0, import_locales2.getLocale)());
 var Info = (0, import_model.Provider)((props) => {
-  var _a, _b, _c, _d, _e, _f, _g;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const { style, globalState, modules = defaultModules, slot } = props;
   const modal = (0, import_react.useContext)(import_model.Context);
   const context = (0, import_useEngineContext.default)();
@@ -90,7 +91,7 @@ var Info = (0, import_model.Provider)((props) => {
     }
   }, []);
   (0, import_react.useEffect)(() => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h, _i, _j, _k, _l, _m;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m;
     const isFranchisee = (_d2 = (_c2 = (_b2 = (_a2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _a2.utils) == null ? void 0 : _b2.businessUtils) == null ? void 0 : _c2.getAppByModal) == null ? void 0 : _d2.call(_c2, "franchisee");
     modal.dispatch({
       type: "setState",
@@ -99,7 +100,7 @@ var Info = (0, import_model.Provider)((props) => {
         ...globalState,
         isTerminal: (_g2 = (_f2 = (_e2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _e2.utils) == null ? void 0 : _f2.isTerminal) == null ? void 0 : _g2.call(_f2),
         isFranchisee,
-        timezone: (_m = (_l = (_k = (_j = (_i = (_h = context == null ? void 0 : context.appHelper) == null ? void 0 : _h.utils) == null ? void 0 : _i.store) == null ? void 0 : _j.getState()) == null ? void 0 : _k.global) == null ? void 0 : _l.globalConfig) == null ? void 0 : _m.timezone,
+        timezone: (_m = (_l2 = (_k2 = (_j2 = (_i2 = (_h2 = context == null ? void 0 : context.appHelper) == null ? void 0 : _h2.utils) == null ? void 0 : _i2.store) == null ? void 0 : _j2.getState()) == null ? void 0 : _k2.global) == null ? void 0 : _l2.globalConfig) == null ? void 0 : _m.timezone,
         isDayBooking: (globalState == null ? void 0 : globalState.renderType) === "dayBooking"
       }
     });
@@ -171,7 +172,7 @@ var Info = (0, import_model.Provider)((props) => {
       dispatch: modal.dispatch,
       source: "info"
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, modules.holder && !((_g = modal.state) == null ? void 0 : _g.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-info" }, createHeader, modules.client ? /* @__PURE__ */ import_react.default.createElement(import_client.default, null) : null, ((_k = (_j = (_i = (_h = (_g = modal == null ? void 0 : modal.state) == null ? void 0 : _g.bookingConfig) == null ? void 0 : _h.config) == null ? void 0 : _i.cart_settings_tab) == null ? void 0 : _j.display_contact_info) == null ? void 0 : _k.show_contact_info) === true ? /* @__PURE__ */ import_react.default.createElement(import_contactInfoMode.default, null) : null, modules.holder && !((_l = modal.state) == null ? void 0 : _l.disabledEdit) ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, params.type === "form" ? /* @__PURE__ */ import_react.default.createElement(import_pet.default, null) : null) : null, modules.date ? /* @__PURE__ */ import_react.default.createElement(import_date.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
       import_antd.Skeleton,
       {
         loading: globalState.loading,

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

@@ -38,6 +38,11 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
     setClient(state, payload) {
       state.setGlobalState({ client: { ...state.client, ...payload } });
     },
+    setContactsInfo(state, payload) {
+      state.setGlobalState({
+        contacts_info: { ...state.contacts_info, ...payload }
+      });
+    },
     setService(state, payload) {
       let obj = {};
       if (payload.value) {

package/lib/components/booking/info/pet/serve.js

@@ -24,12 +24,7 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var getFormDetail = async (id) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/form/${id}`, {
-    cache: {
-      mode: "remote_local",
-      type: "indexDB"
-    }
-  });
+  let { data } = await import_utils.request.getRequest().get(`/shop/form/${id}`);
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,2 @@
-declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
+declare const Lists: ({ onEdit, onChange, onAction, isParallelResource, isShowDelete, isShowAmountFooter }: any) => JSX.Element;
 export default Lists;

package/lib/components/booking/info/service/Lists.js

@@ -41,7 +41,7 @@ var import_useHolderConfig = __toESM(require("../hooks/useHolderConfig"));
 var import_ahooks = require("ahooks");
 var import_utils2 = require("../../info2/service/addService/utils");
 var import_useAddHolder = __toESM(require("../hooks/useAddHolder"));
-var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
+var Lists = ({ onEdit, onChange, onAction, isParallelResource, isShowDelete = true, isShowAmountFooter = true }) => {
   var _a;
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const { isShowChangeHolder } = (0, import_useHolderConfig.default)(state);
@@ -60,7 +60,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
       if (type === "view" || type === "edit_product") {
         let product = currentItem._origin;
         let cacheItem = { ...product, new: 0 };
-        if (isParallelResource && !(0, import_utils.isNormalProductByDurationSchedule)(products2)) {
+        if (isParallelResource) {
           cacheItem = (0, import_utils2.getProductExtend)({
             cacheItem,
             state
@@ -85,6 +85,8 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
       isShowNote: state.isBookingTicket2 ? true : (0, import_utils.isEventBooking)(state),
+      isShowDelete,
+      isShowAmountFooter,
       isShowPackageNote: false,
       accounts: [],
       isEdit: !!(state == null ? void 0 : state.bookingId),
@@ -109,7 +111,7 @@ var Lists = ({ onEdit, onChange, onAction, isParallelResource }) => {
     const p = (0, import_utils.formatProducts)(
       ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.value) || [],
       state,
-      false,
+      true,
       true,
       isParallelResource
     );

package/lib/components/booking/info/service/addTimeModal/serve.js

@@ -25,13 +25,7 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getAddTimeProducts = async (params, config) => {
-  let { data } = await import_utils.request.getRequest().post(`/shop/product/query`, params, {
-    ...config,
-    cache: {
-      mode: "remote_local",
-      type: "indexDB"
-    }
-  });
+  let { data } = await import_utils.request.getRequest().post(`/shop/product/query`, params, config);
   return data;
 };
 var saveAddTimeProduct = async ({ orderId, params }) => {

package/lib/components/booking/info/service/serve.d.ts

@@ -18,3 +18,17 @@ export declare const getProductPrice: (params: {
     customer_id: number;
     schedule_date: string;
 }) => Promise<any>;
+declare type MultiDayProductPriceParams = {
+    customer_id: number;
+    data: {
+        product_id: number;
+        schedule_date: string;
+    }[];
+};
+/**
+ * 获取普通商品和跨日预约的价格
+ * @param params
+ * @returns
+ */
+export declare const getNormalAndMultiDayProductPrice: (params: MultiDayProductPriceParams) => Promise<any>;
+export {};

package/lib/components/booking/info/service/serve.js

@@ -19,33 +19,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/booking/info/service/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
+  getNormalAndMultiDayProductPrice: () => getNormalAndMultiDayProductPrice,
   getProductDetail: () => getProductDetail,
   getProductPrice: () => getProductPrice,
   postMultiDay: () => postMultiDay
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
-var getProductDetail = async (id, params) => import_utils.request.getRequest().get(`/shop/product/query/${id}`, params, {
-  cache: {
-    mode: "remote_local",
-    type: "indexDB"
-  }
-});
+var getProductDetail = async (id, params) => import_utils.request.getRequest().get(`/shop/product/query/${id}`, params);
 var postMultiDay = async (id, params) => import_utils.request.getRequest().post(`/shop/product/multi-day/detail/${id}`, params, {
-  useCache: true,
-  cache: {
-    mode: "remote_local",
-    type: "indexDB"
-  }
-});
-var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params, {
-  cache: {
-    mode: "remote_local",
-    type: "indexDB"
-  }
+  useCache: true
 });
+var getProductPrice = async (params) => import_utils.request.getRequest().post(`/shop/product/query/price`, params);
+var getNormalAndMultiDayProductPrice = async (params) => {
+  return import_utils.request.getRequest().post(`/shop/product/query/shelf/price`, params);
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  getNormalAndMultiDayProductPrice,
   getProductDetail,
   getProductPrice,
   postMultiDay

package/lib/components/booking/info/service2/Group/utils.js

@@ -31,6 +31,7 @@ module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("../../../utils");
 var import_distributeDiscount = require("../../service/serviceManager/distributeDiscount");
+var import_utils3 = require("../../../../ticketBooking/utils");
 var getGroupTotalPrice = (items) => {
   return items.reduce((prev, next) => {
     prev.duration += next._extend.duration;
@@ -98,6 +99,7 @@ var createBookingItemsByGroup = (item, isBatchEdit) => {
     cacheItem._extend.total = totalPrice;
     cacheItem._extend.origin_total = totalPrice;
     cacheItem._extend.items = void 0;
+    cacheItem._serviceKey = (0, import_utils3.genServiceKey)(cacheItem);
     bookings.push(cacheItem);
   }
   if (isBatchEdit) {

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

@@ -67,39 +67,7 @@ export declare const genRowKey: (key: string) => string;
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
-    _origin: any;
-    id: any;
-    _id: any;
-    name: any;
-    title: any;
-    price: any;
-    total: number;
-    origin_total: number;
-    num: any;
-    image: any;
-    isShowNote: boolean;
-    note: any;
-    like_status: any;
-    bundle: any;
-    options: any;
-    errorMessage: string;
-    product_option_string: any;
-    discount_reason: any;
-    resource_id: any;
-    relation_form_name: any;
-    holder_title: any;
-    start_date: any;
-    end_date: any;
-    holder_id: any;
-    isNormalProduct: boolean;
-    isCustomItem: any;
-    vouchersApplicable: any;
-    locale: any;
-    symbol: any;
-    relation_products: any;
-    items: any[];
-}[];
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => any[];
 /**
  * @title: 禁用日期
  * @description: