@pisell/private-materials 3.4.4 → 3.4.6

package/lib/components/appointmentBooking/components/Content/index.js

@@ -46,10 +46,14 @@ var import_Form = __toESM(require("../Form"));
 var import_ConfirmInformation = __toESM(require("../ConfirmInformation"));
 var import_context = require("../../context");
 var import_PolicyModal = __toESM(require("../../deposit/components/PolicyModal"));
+var import_utils2 = require("../Resource/utils");
 var import_hooks = require("../../hooks");
 var import_index = require("./index.less");
+var import_useComponents = __toESM(require("../../../../hooks/useComponents"));
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
+var import_utils3 = require("../../utils");
 var Layout = () => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const stepRef = (0, import_react.useRef)();
   const {
     currentStep,
@@ -68,9 +72,37 @@ var Layout = () => {
   const { getHolders } = (0, import_hooks.useAppointmentBookingAccount)();
   const { removeStep } = (0, import_hooks.useAppointmentBookingStep)();
   const { shopDiscount } = (0, import_hooks.useShopDiscount)();
+  const { customPageData } = (_a = (0, import_useEngineContext.default)().engine) == null ? void 0 : _a.props;
+  const [CustomComponent] = (0, import_useComponents.default)({
+    components: ["CustomComponent"]
+  });
+  console.log("CustomComponent:", CustomComponent, typeof CustomComponent, CustomComponent == null ? void 0 : CustomComponent.$$typeof);
   (0, import_hooks.useAppointmentBookingCart)();
   (0, import_hooks.useAppointmentBookingStep)();
   const [params, setParams] = (0, import_react.useState)({});
+  const utils = (0, import_hooks.contextUtils)();
+  const context = (0, import_useEngineContext.default)();
+  const { pubsub } = context.appHelper.utils;
+  (0, import_react.useEffect)(() => {
+    const handleLoginSuccess = async () => {
+      var _a2;
+      if (!isFormSubject) {
+        const user = JSON.parse(((_a2 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a2.get("customer")) || "{}");
+        const currentUser = (0, import_utils3.formatCustomer)(user);
+        const accountLists = await appointmentBooking.getAccounts();
+        const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
+        appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
+      } else {
+        if (!isRetailTemplate) {
+          getHolders();
+        }
+      }
+    };
+    pubsub.subscribe("pisell1.login.success", handleLoginSuccess);
+    return () => {
+      pubsub.unsubscribe("pisell1.login.success");
+    };
+  }, []);
   (0, import_react.useEffect)(() => {
     appointmentBooking.removeStep("fill-form");
     return () => {
@@ -115,6 +147,7 @@ var Layout = () => {
     }
   }, [isFormSubject, isLogin, isRetailTemplate]);
   (0, import_react.useEffect)(() => {
+    var _a2;
     if (!(currentStep == null ? void 0 : currentStep.step)) return;
     setLoading(false);
     setResourceOtherParams({
@@ -126,7 +159,10 @@ var Layout = () => {
       top: 0,
       behavior: "smooth"
     });
-  }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key]);
+    if (((_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key) === "confirm-information") {
+      (0, import_utils2.scrollToFirstErrorCard)(".pisell-lowcode-product-card-error");
+    }
+  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key]);
   const components = {
     // 选择服务
     "select-service": import_Services.default,
@@ -151,8 +187,14 @@ var Layout = () => {
     } else {
       Com2 = components[key];
     }
-    return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef });
-  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key]);
+    if (key === "select-service") {
+      return /* @__PURE__ */ import_react.default.createElement(CustomComponent, { block: customPageData == null ? void 0 : customPageData.block, customComponents: {
+        product_list: /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef })
+      } });
+    } else {
+      return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef });
+    }
+  }, [(_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2;
     if ((0, import_utils.isMobile)()) {
@@ -170,7 +212,7 @@ var Layout = () => {
         content.style.overflowY = "auto";
       }
     }
-  }, [(_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key]);
+  }, [(_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key]);
   const isShowCartCom = (0, import_react.useMemo)(() => {
     var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
@@ -182,14 +224,14 @@ var Layout = () => {
       var _a3, _b2;
       return (_b2 = (_a3 = stepRef == null ? void 0 : stepRef.current) == null ? void 0 : _a3.next) == null ? void 0 : _b2.call(_a3);
     } }));
-  }, [isDateSelectedFirst, (_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key]);
+  }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
   const isFooter = (0, import_react.useMemo)(() => {
     var _a2;
     if (!(0, import_utils.isMobile)()) return false;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (isDateSelectedFirst && key === "select-date") return false;
     return key !== "confirm-information";
-  }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
+  }, [isDateSelectedFirst, (_f = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _f.key]);
   const depositProtocolRequest = (id) => {
     var _a2;
     return (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a2.call(appointmentBooking, id);

package/lib/components/appointmentBooking/components/Content/index.less

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(100vh - 16px) !important;
+      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
     }
   }
 }

package/lib/components/appointmentBooking/components/Resource/index.js

@@ -154,6 +154,7 @@ var Resource = (0, import_react.forwardRef)((props, ref) => {
       const index = carts.findIndex(
         (n) => !(appointmentBooking == null ? void 0 : appointmentBooking.isTargetCartIdNormalProduct(n._id))
       );
+      e.like_status = "like";
       return appointmentBooking.updateCart({
         _id: (_a = carts == null ? void 0 : carts[index]) == null ? void 0 : _a._id,
         resources: (0, import_utils.updateCartResources)(carts == null ? void 0 : carts[index], e)

package/lib/components/appointmentBooking/components/Services/index.js

@@ -171,12 +171,17 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     }
     return (productListBlock == null ? void 0 : productListBlock.setting) || {};
   }, [context]);
+  const _isMobile = (0, import_react.useMemo)(() => {
+    if (typeof import_utils.isMobile === "function") return (0, import_utils.isMobile)();
+    return import_utils.isMobile;
+  }, import_utils.isMobile);
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     import_productSelect.default,
     {
       dataSource: products,
       onChange: handleSelectProduct,
-      scrollDom: (0, import_utils.isMobile)() ? ".parallel-content-wrap" : ".parallel-booking-wrap",
+      scrollDom: _isMobile ? ".parallel-content-wrap" : ".parallel-booking-wrap",
+      offsetDom: _isMobile ? "" : ".pisell-section-headers",
       loading: productLoading,
       emptyDescription: import_utils.locales.getText(
         "pisell2.appointment.booking.empty.service"

package/lib/components/appointmentBooking/components/TimeSlicing/index.js

@@ -36,8 +36,9 @@ var import_react = __toESM(require("react"));
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var import_context = require("../../context");
+var import_utils2 = require("../Resource/utils");
 var import_hooks = require("../../hooks");
-var import_utils2 = require("../../utils");
+var import_utils3 = require("../../utils");
 var import_index = require("./index.less");
 var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)("");
@@ -54,7 +55,7 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
     next: () => {
       const isUnSelectedTimes = appointmentBooking.checkCartItems("date");
       if ((isUnSelectedTimes == null ? void 0 : isUnSelectedTimes.length) > 0) {
-        (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.unselect.time"));
+        (0, import_utils3.Toast)(import_utils.locales.getText("pisell2.appointment.unselect.time"));
         return;
       }
       nextStep();
@@ -65,11 +66,14 @@ var TimeSlicing = (0, import_react.forwardRef)((props, ref) => {
   }, []);
   const getAutoSelect = async (val) => {
     setSelectedTime(val);
+    (0, import_utils2.scrollToFirstErrorCard)(".pisell-lowcode-product-card-error");
     const result = await appointmentBooking.submitTimeSlot(val);
   };
   (0, import_react.useEffect)(() => {
     var _a, _b, _c;
-    let appoimentBookingProductCart = carts.filter((item) => !appointmentBooking.isTargetCartIdNormalProduct(item == null ? void 0 : item._id));
+    let appoimentBookingProductCart = carts.filter(
+      (item) => !appointmentBooking.isTargetCartIdNormalProduct(item == null ? void 0 : item._id)
+    );
     if ((times == null ? void 0 : times.length) > 0 && (appoimentBookingProductCart == null ? void 0 : appoimentBookingProductCart.length) > 0) {
       const startTime = ((_a = appoimentBookingProductCart == null ? void 0 : appoimentBookingProductCart[0]) == null ? void 0 : _a.start_time) || ((_b = times == null ? void 0 : times[0]) == null ? void 0 : _b.start_time);
       setSelectedResource(startTime);

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -41,7 +41,6 @@ var import_utils = require("@pisell/utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
-var import_utils2 = require("../../utils");
 var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_index = require("./index.less");
 var ShopDiscountHooks = {
@@ -154,16 +153,6 @@ var VoucherCard = (props) => {
           if (!action) return;
           openLoginModal({
             callback: (status) => {
-              var _a2, _b2, _c;
-              const user = (_c = (_b2 = (_a2 = utils.store) == null ? void 0 : _a2.getState()) == null ? void 0 : _b2.global) == null ? void 0 : _c.userInfo;
-              const currentUser2 = (0, import_utils2.formatCustomer)(user);
-              const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-              if (status === "success") {
-                appointmentBooking.setLoginAccount(
-                  meAccount == null ? void 0 : meAccount.id,
-                  currentUser2
-                );
-              }
             }
           });
         }

package/lib/components/appointmentBooking/hooks.js

@@ -265,23 +265,12 @@ var useAppointmentBookingStep = () => {
       };
       const checkLogin = async () => {
         if (!isLogin) {
-          const accountLists = await appointmentBooking.getAccounts();
+          const { pubsub } = utils;
+          pubsub.once("pisell1.login.success", () => {
+            checkHolder();
+          });
           return openLoginModal({
             callback: (status) => {
-              var _a3;
-              if (status === "success") {
-                if (!isFormSubject) {
-                  const user = JSON.parse(((_a3 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a3.get("customer")) || "{}");
-                  const currentUser = (0, import_utils2.formatCustomer)(user);
-                  const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-                  appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
-                } else {
-                  if (!isRetailTemplate) {
-                    getHolders();
-                  }
-                }
-                checkHolder();
-              }
             }
           });
         } else {
@@ -390,7 +379,7 @@ var useAppointmentBookingLogin = () => {
     utils.action({
       type: "pisell1.login",
       data: {
-        type: "plugin"
+        // type: 'plugin'
       },
       callback
     });

package/lib/components/appointmentBooking/index.js

@@ -58,6 +58,17 @@ var AppointmentBooking = () => {
       }
     });
   }, []);
+  (0, import_react.useEffect)(() => {
+    const setRealVH = () => {
+      const vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty("--vh", `${vh}px`);
+    };
+    setRealVH();
+    window.addEventListener("resize", setRealVH);
+    return () => {
+      window.removeEventListener("resize", setRealVH);
+    };
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/appointmentBooking/index.less

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   background: #ffffff;
-  height: 100vh;
+  height: calc(var(--vh, 1vh) * 100);
   overflow-y: auto;
 
   .pisell-section-headers {

package/lib/components/booking/hooks/useIsBooking4Shop.d.ts

@@ -1 +1 @@
-export declare const useIsBooking4Shop: (state: any) => boolean;
+export declare const useIsBooking4Shop: (state: any) => any;

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

@@ -36,14 +36,16 @@ var import_react = require("react");
 var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var import_utils = require("../info/utils");
 var useIsBooking4Shop = (state) => {
+  var _a;
   const context = (0, import_useEngineContext.default)();
   return (0, import_react.useMemo)(() => {
-    var _a, _b, _c, _d, _e;
+    var _a2, _b, _c, _d, _e, _f;
     return (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,
-      state.renderType
+      (_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,
+      state.renderType,
+      (_f = context.appHelper.utils) == null ? void 0 : _f.businessUtils
     );
-  }, [state.renderType]);
+  }, [state.renderType, (_a = context.appHelper.utils) == null ? void 0 : _a.businessUtils]);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

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;
+  var _a, _b, _c, _d, _e, _f, _g;
   const { globalState, setGlobalState } = props;
   const context = (0, import_useEngineContext.default)();
   const stateRef = (0, import_react.useRef)(globalState);
@@ -58,7 +58,8 @@ 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
+    (_f = props == null ? void 0 : props.globalState) == null ? void 0 : _f.renderType,
+    (_g = context.appHelper.utils) == null ? void 0 : _g.businessUtils
   )) {
     Cpt = import_addService2.default;
   }

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

@@ -39,14 +39,15 @@ 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;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const context = (0, import_useEngineContext.default)();
   const { globalState } = props;
   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,
-    globalState == null ? void 0 : globalState.renderType
+    globalState == null ? void 0 : globalState.renderType,
+    (_f = context.appHelper.utils) == null ? void 0 : _f.businessUtils
   );
-  if (!((_j = (_i = (_h = (_g = (_f = context.appHelper.utils.store) == null ? void 0 : _f.getState) == null ? void 0 : _g.call(_f)) == null ? void 0 : _h.global) == null ? void 0 : _i.globalConfig) == null ? void 0 : _j.id)) {
+  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)) {
     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/utils.d.ts

@@ -21,7 +21,7 @@ export declare const isInterval: (time1: number, time2: number, interval?: numbe
  * @Date: 2024-08-13 19:36
  */
 export declare const formatServiceListByTime: (list: any[]) => any[];
-export declare const isBooking4Shop: (shopId: number, renderType?: string) => boolean;
+export declare const isBooking4Shop: (shopId: number, renderType?: string, businessUtils?: any) => any;
 declare type DataEntry = {
     total: number;
     origin_total: number;

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

@@ -100,7 +100,7 @@ var formatServiceListByTime = (list) => {
     return list;
   }
 };
-var isBooking4Shop = (shopId, renderType) => {
+var isBooking4Shop = (shopId, renderType, businessUtils) => {
   if (renderType === "eventBooking") {
     return false;
   }
@@ -147,7 +147,7 @@ var isBooking4Shop = (shopId, renderType) => {
     8918,
     6413
   ];
-  return booking4Shops.includes(shopId);
+  return booking4Shops.includes(shopId) || (businessUtils == null ? void 0 : businessUtils.getAppByModal("resourcekit"));
 };
 function generateDateRange(start, end) {
   const dateRange = [];

package/lib/components/booking/info2/service/addService/utils.js

@@ -286,15 +286,25 @@ var setDefaultCapacitys = ({ capacitys, cacheItem }) => {
   return [{ id: 0, value: 1, name: "" }];
 };
 var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
-  var _a;
+  var _a, _b;
   let _resources = [...((_a = cacheItem == null ? void 0 : cacheItem.product_resource) == null ? void 0 : _a.resources) || []];
-  const { extraResources = [] } = extraParams || {};
+  const {
+    extraResources = [],
+    resourcesOrigin = [],
+    resourceTab = {}
+  } = extraParams || {};
   _resources = _resources.filter((d) => d.status == 1);
   for (let item of _resources) {
     const form_id = item.id;
-    let extraResourceIds = extraResources.filter((_extraItem) => {
-      return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
-    }).map((_extraItem) => _extraItem.id);
+    const isAllResource = ((_b = resourceTab == null ? void 0 : resourceTab[item.code]) == null ? void 0 : _b.resource_display_scope) === "all";
+    let extraResourceIds = [];
+    if (isAllResource) {
+      extraResourceIds = (resourcesOrigin || []).filter((d) => d.form_code === item.code).map((d) => d.id);
+    } else {
+      extraResourceIds = extraResources.filter((_extraItem) => {
+        return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
+      }).map((_extraItem) => _extraItem.id);
+    }
     extraResourceIds = Array.from(new Set(extraResourceIds));
     item.optional_resource = (item.optional_resource || []).filter(
       (d) => item.default_resource.indexOf(d) == -1
@@ -304,11 +314,11 @@ var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
       if (resourcesOriginMap[d].combined_resource && resourcesOriginMap[d].combined_resource.status === 1) {
         resourcesOriginMap[d].combined_resource.resource_ids.forEach(
           (id) => {
-            var _a2, _b;
+            var _a2, _b2;
             if (resourcesOriginMap[id]) {
               combiningResources.push({
                 ...resourcesOriginMap[id],
-                relation_id: ((_a2 = resourcesOriginMap[id]) == null ? void 0 : _a2.relation_id) || ((_b = resourcesOriginMap[id]) == null ? void 0 : _b.id)
+                relation_id: ((_a2 = resourcesOriginMap[id]) == null ? void 0 : _a2.relation_id) || ((_b2 = resourcesOriginMap[id]) == null ? void 0 : _b2.id)
               });
             }
           }
@@ -322,7 +332,9 @@ var getResourceByIds = (resourcesOriginMap, cacheItem, extraParams) => {
         }
       };
     };
-    let optional_resource = [...item.optional_resource, ...extraResourceIds].map((d) => {
+    let optional_resource = Array.from(
+      /* @__PURE__ */ new Set([...item.optional_resource, ...extraResourceIds])
+    ).map((d) => {
       if (!resourcesOriginMap[d]) {
         return null;
       }
@@ -370,6 +382,7 @@ var getIsAutoClose = (cacheItem) => {
   );
 };
 var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
+  var _a, _b, _c, _d;
   const isNew = cacheItem.new || !cacheItem._extend.endDate;
   let _cacheItem = { ...cacheItem };
   const resourcesOriginMap = state.service.resourcesOriginMap || {};
@@ -388,7 +401,12 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
     _cacheItem._data.capacitys = cacheItem.capacity;
     _cacheItem._data.resourcesOrigin = getResourceByIds(
       resourcesOriginMap,
-      cacheItem
+      cacheItem,
+      {
+        //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+        resourceTab: (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.resource_tab,
+        resourcesOrigin: state.service.resourcesOrigin
+      }
     );
     _cacheItem._extend.capacity = setDefaultCapacitys({
       capacitys: _cacheItem._data.capacitys,
@@ -444,7 +462,10 @@ var getProductExtend = ({ cacheItem, state, isDisabledTime }) => {
         resourcesOriginMap,
         cacheItem,
         {
-          extraResources
+          extraResources,
+          //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+          resourceTab: (_d = (_c = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.resource_tab,
+          resourcesOrigin: state.service.resourcesOrigin
         }
       );
     }

package/lib/components/booking/info2/service/addTimeModal/index.js

@@ -389,7 +389,7 @@ var AddTimeModal = () => {
     goCheckout();
   };
   const handleSave = async (loadingType = "save") => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2, _c2, _d2, _e2, _f2;
     if (currentTime === null) {
       return;
     }
@@ -400,7 +400,8 @@ var AddTimeModal = () => {
     setLoading(loadingType);
     const api = (0, import_utils4.isBooking4Shop)(
       (_e2 = (_d2 = (_c2 = (_b2 = (_a2 = context.appHelper.utils.store) == null ? void 0 : _a2.getState) == null ? void 0 : _b2.call(_a2)) == null ? void 0 : _c2.global) == null ? void 0 : _d2.globalConfig) == null ? void 0 : _e2.id,
-      state.renderType
+      state.renderType,
+      (_f2 = context.appHelper.utils) == null ? void 0 : _f2.businessUtils
     ) ? import_serve.saveAddTimeProduct2 : import_serve.saveAddTimeProduct;
     try {
       await api({

package/lib/components/eventBooking/index.js

@@ -66,6 +66,17 @@ var Content = () => {
     }
     getResourceList.run(params);
   }, []);
+  (0, import_react.useEffect)(() => {
+    const setRealVH = () => {
+      const vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty("--vh", `${vh}px`);
+    };
+    setRealVH();
+    window.addEventListener("resize", setRealVH);
+    return () => {
+      window.removeEventListener("resize", setRealVH);
+    };
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/eventBooking/index.less

@@ -15,7 +15,7 @@
 
 .event-booking-mobile-wrap {
   background: #ffffff;
-  min-height: 100vh;
+  min-height: calc(var(--vh, 1vh) * 100);
   .pisell-section-headers-content {
     width: 100%;
   }