@pisell/private-materials 3.3.83 → 3.3.84

package/es/hooks/useWindowSize.js

@@ -0,0 +1,26 @@
+import { useEffect } from 'react';
+export var useWindowSize = function useWindowSize() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _options$debounceMs = options.debounceMs,
+    debounceMs = _options$debounceMs === void 0 ? 100 : _options$debounceMs;
+  useEffect(function () {
+    var timeoutId;
+    var setRealVH = function setRealVH() {
+      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
+      var vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
+    };
+    var debouncedHandleResize = function debouncedHandleResize() {
+      clearTimeout(timeoutId);
+      timeoutId = setTimeout(setRealVH, debounceMs);
+    };
+
+    // 页面加载和窗口大小变化时都重新计算
+    debouncedHandleResize();
+    window.addEventListener('resize', debouncedHandleResize);
+    return function () {
+      window.removeEventListener('resize', debouncedHandleResize);
+      clearTimeout(timeoutId);
+    };
+  }, [debounceMs]);
+};

package/es/index.d.ts

@@ -43,3 +43,5 @@ export { default as AppointmentBooking } from './components/appointmentBooking';
 export { default as AppointmentDeposit } from './components/appointmentBooking/deposit';
 export { default as TicketBooking } from './components/ticketBooking';
 export { default as SubTotal } from './components/subTotal';
+export { default as StepController } from './components/stepController';
+export { default as EditBookingModal } from './components/booking/editBookingModal';

package/es/index.js

@@ -46,4 +46,6 @@ export { default as ShoppingCart } from "./components/shoppingCart";
 export { default as AppointmentBooking } from "./components/appointmentBooking";
 export { default as AppointmentDeposit } from "./components/appointmentBooking/deposit";
 export { default as TicketBooking } from "./components/ticketBooking";
-export { default as SubTotal } from "./components/subTotal";
+export { default as SubTotal } from "./components/subTotal";
+export { default as StepController } from "./components/stepController";
+export { default as EditBookingModal } from "./components/booking/editBookingModal";

package/lib/businessModel/SalesModel/Sales/index.js

@@ -35,6 +35,7 @@ __export(Sales_exports, {
 });
 module.exports = __toCommonJS(Sales_exports);
 var import_react = __toESM(require("react"));
+var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var defaultData = {};
 var SALES_MODEL_SESSION_STORAGE_KEY = "shop_h5_sales_model_data";
 var SalesContext = (0, import_react.createContext)(
@@ -45,14 +46,13 @@ var SalesProvider = (props) => {
   const dataRef = (0, import_react.useRef)({});
   const [data, setData] = (0, import_react.useState)(defaultData);
   const [hooks, setHooks] = (0, import_react.useState)(props.hooks);
+  const context = (0, import_useEngineContext.default)();
+  const utils = context.appHelper.utils || {};
   const _setData = (newData) => {
     dataRef.current = { ...dataRef.current, ...newData };
     console.log("sales_model_newData", dataRef.current);
     if (config == null ? void 0 : config.useSessionStorage) {
-      sessionStorage.setItem(
-        SALES_MODEL_SESSION_STORAGE_KEY,
-        JSON.stringify(dataRef.current || {})
-      );
+      setSessionStorage();
     }
     setData({ ...dataRef.current });
   };
@@ -60,14 +60,28 @@ var SalesProvider = (props) => {
     return dataRef.current;
   };
   const setSessionStorage = () => {
+    var _a, _b, _c;
+    const history = ((_a = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a.call(utils)) || {};
+    const cacheId = ((_c = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query) == null ? void 0 : _c.cacheId) || "";
+    const sessionData = { ...dataRef.current || {}, cacheId };
     sessionStorage.setItem(
-      SALES_MODEL_SESSION_STORAGE_KEY,
-      JSON.stringify(dataRef.current || {})
+      `${SALES_MODEL_SESSION_STORAGE_KEY}`,
+      JSON.stringify(sessionData || {})
     );
   };
   const getSessionStorage = () => {
-    const result = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
-    return JSON.parse(result || "{}");
+    var _a, _b, _c;
+    const history = ((_a = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a.call(utils)) || {};
+    const strResult = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
+    const result = strResult ? JSON.parse(strResult || "{}") : {};
+    const cacheId = ((_c = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query) == null ? void 0 : _c.cacheId) || "";
+    if (!cacheId && !(result == null ? void 0 : result.cacheId)) {
+      return result;
+    }
+    if (cacheId && (result == null ? void 0 : result.cacheId) === cacheId) {
+      return result;
+    }
+    return {};
   };
   const removeSessionStorage = () => {
     sessionStorage.removeItem(SALES_MODEL_SESSION_STORAGE_KEY);

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

@@ -90,7 +90,7 @@ var ResourceProvider = ({
     resourceMap.forEach((v) => renderData.push(v));
     return renderData;
   };
-  const getResourceList = (0, import_ahooks.useRequest)(import_serve.getResourceListApi, {
+  const getResourceList = (0, import_ahooks.useRequest)(import_serve.getSpecialResourceListApi, {
     manual: true,
     onSuccess: (res) => {
       const formatData = formatResourceList(res);

package/lib/components/Sales/Resource/serve.d.ts

@@ -3,3 +3,10 @@ export declare const getResourceListApi: (params: {
     shop_id: string;
     form_data_status: string;
 }) => Promise<any>;
+/**
+ * @title: 获取特殊资源列表
+ * @Author: xiangfeng.xue
+ */
+export declare const getSpecialResourceListApi: (params: {
+    event_item_ids?: string | number[];
+}) => Promise<any>;

package/lib/components/Sales/Resource/serve.js

@@ -19,14 +19,21 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/Sales/Resource/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
-  getResourceListApi: () => getResourceListApi
+  getResourceListApi: () => getResourceListApi,
+  getSpecialResourceListApi: () => getSpecialResourceListApi
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getResourceListApi = (params) => {
   return import_utils.request.getRequest().get("/h5/form/data/v1", params, { useCache: true });
 };
+var getSpecialResourceListApi = (params) => {
+  return import_utils.request.getRequest().get("/h5/eventbookingv2/item/specify-resources", params, {
+    useCache: true
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getResourceListApi
+  getResourceListApi,
+  getSpecialResourceListApi
 });

package/lib/components/appointmentBooking/components/Cart/Item/index.less

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(100vh - 100px);
+  height: calc(var(--vh, 1vh) * 100 - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  >div {
+  > div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

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/Header/index.js

@@ -74,7 +74,7 @@ var Header = () => {
     return ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.description) || "";
   }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, currentSelectedResources]);
   const handleBack = async () => {
-    var _a2, _b;
+    var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     const types = {
       "select-time": "time",
@@ -89,8 +89,7 @@ var Header = () => {
     }
     if (key === "select-service") {
       appointmentBooking.clearCart();
-      const type = await checkProductType((_b = carts == null ? void 0 : carts[0]) == null ? void 0 : _b.id);
-      if (type === "duration") {
+      if (appointmentBooking.isCartHasDurationProduct()) {
         appointmentBooking.deleteCartItemInfo("time");
       }
     }

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

@@ -74,9 +74,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     let type = "";
     if (!isRetailTemplate) {
       type = await checkProductType(item == null ? void 0 : item.id);
-      if (type === "session") {
-        appointmentBooking.openProductDetail(item.id);
-      }
+      appointmentBooking.openProductDetail(item.id);
     }
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
@@ -86,6 +84,10 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       },
       callback: async (data) => {
         var _a, _b;
+        if (data.isCancel) {
+          appointmentBooking.closeProductDetail();
+          return;
+        }
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
@@ -96,13 +98,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
           appointmentBooking.storeProduct(product);
           return;
         }
-        if (data == null ? void 0 : data.isCancel) {
-          if (type === "session") {
-            appointmentBooking.closeProductDetail();
-            appointmentBooking.getAvailableDate();
-          }
-          return;
-        }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
@@ -114,7 +109,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
-          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -132,16 +126,23 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             await appointmentBooking.getAvailableDate();
           }
         }
+        appointmentBooking.closeProductDetail();
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
-          if (type === "duration") {
-            const description = import_utils.locales.getText(
-              "pisell2.appointment.select.time"
-            );
-            appointmentBooking.addStep(
-              { index, key: "select-time", description },
-              "select-resource"
+          if (type === "duration" || appointmentBooking.isCartHasDurationProduct()) {
+            const stepList = appointmentBooking.getStepList();
+            const hasResourceStep = stepList == null ? void 0 : stepList.find(
+              (item2) => (item2 == null ? void 0 : item2.key) === "select-resource"
             );
+            if (hasResourceStep) {
+              const description = import_utils.locales.getText(
+                "pisell2.appointment.select.time"
+              );
+              appointmentBooking.addStep(
+                { index, key: "select-time", description },
+                "select-resource"
+              );
+            }
           } else {
             removeStep("select-time");
           }

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

@@ -140,7 +140,7 @@ var VoucherCard = (props) => {
       setCode("");
     } else {
       (0, import_materials.PisellToast)({
-        content: val.type === "server" ? import_utils.locales.getText("pisell2.text.goodpass.code-invalid") : import_utils.locales.getText("pisell2.text.goodpass.code-invalid-cart")
+        content: import_utils.locales.getText("pisell2.text.goodpass.code-invalid")
       });
     }
   };

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/appointmentBooking/locales.d.ts

@@ -114,7 +114,6 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
-        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };
@@ -233,7 +232,6 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
-        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };
@@ -352,7 +350,6 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
-        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };

package/lib/components/appointmentBooking/locales.js

@@ -138,7 +138,6 @@ var locales_default = {
     "pisell2.text.goodpass.code": "Code",
     "pisell2.text.goodpass.enter-code": "Enter Code",
     "pisell2.text.goodpass.code-invalid": "Current code is invalid",
-    "pisell2.text.goodpass.code-invalid-cart": "No eligible items in the cart",
     "pisell2.text.goodpass.login": "Login",
     "pisell2.text.goodpass.login-tip": " for member benefit Or use account credit"
   },
@@ -257,7 +256,6 @@ var locales_default = {
     "pisell2.text.goodpass.code": "券码",
     "pisell2.text.goodpass.enter-code": "请输入券码",
     "pisell2.text.goodpass.code-invalid": "当前券码不可用",
-    "pisell2.text.goodpass.code-invalid-cart": "当前购物车中无可用商品",
     "pisell2.text.goodpass.login": "登录",
     "pisell2.text.goodpass.login-tip": "以获取会员福利或使用账户积分"
   },
@@ -376,7 +374,6 @@ var locales_default = {
     "pisell2.text.goodpass.code": "券碼",
     "pisell2.text.goodpass.enter-code": "請輸入券碼",
     "pisell2.text.goodpass.code-invalid": "當前券碼不可用",
-    "pisell2.text.goodpass.code-invalid-cart": "當前購物車中無可用商品",
     "pisell2.text.goodpass.login": "登錄",
     "pisell2.text.goodpass.login-tip": "以獲取會員福利或使用賬戶積分"
   }

package/lib/components/booking/components/footer/utils.d.ts

@@ -27,6 +27,7 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
+export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
 /**
  * @title: 格式化商品单价
  * @description:

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

@@ -30,6 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   checkHolderIsError: () => checkHolderIsError,
+  checkResourcesFormat: () => checkResourcesFormat,
   checkSubResourcesCapacity: () => checkSubResourcesCapacity,
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
@@ -476,6 +477,7 @@ var checkHolderIsError = (state) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkHolderIsError,
+  checkResourcesFormat,
   checkSubResourcesCapacity,
   formatProductBundle,
   formatProductOption,

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

@@ -41,8 +41,8 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_materials = require("@pisell/materials");
 var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_index = require("./index.less");
-var import_utils2 = require("./utils");
 var import_ahooks = require("ahooks");
+var import_utils2 = require("./utils");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -67,17 +67,13 @@ var VoucherCard = (props) => {
   const isBooking4Shop = (0, import_useIsBooking4Shop.useIsBooking4Shop)(state);
   const shopDiscount = pisellos.getModule("shopDiscount");
   services = state.service;
-  (0, import_ahooks.useDebounceEffect)(
-    () => {
-      if (isBooking4Shop) {
-        shopDiscount.setCustomer(state.client.value);
-      }
-    },
-    [(_b = state.client.value) == null ? void 0 : _b.id, isBooking4Shop],
-    {
-      wait: 200
+  (0, import_ahooks.useDebounceEffect)(() => {
+    if (isBooking4Shop) {
+      shopDiscount.setCustomer(state.client.value);
     }
-  );
+  }, [(_b = state.client.value) == null ? void 0 : _b.id, isBooking4Shop], {
+    wait: 200
+  });
   (0, import_react.useEffect)(() => {
     if (isBooking4Shop) {
       shopDiscount.setProductList([
@@ -120,9 +116,7 @@ var VoucherCard = (props) => {
   }, [state.addons.value]);
   const disabled = (0, import_react.useMemo)(() => {
     var _a2;
-    if (["paid", "partially_paid"].includes(
-      (_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_status
-    ) && [...addonsMemo, ...serviceMemo].every((item) => item.booking_id)) {
+    if (["paid", "partially_paid"].includes((_a2 = state.bookingDetail) == null ? void 0 : _a2.payment_status) && [...addonsMemo, ...serviceMemo].every((item) => item.booking_id)) {
       return true;
     }
     return false;
@@ -179,15 +173,9 @@ var VoucherCard = (props) => {
     );
     return () => {
       shopDiscount.clear();
-      pisellos.effects.off(
-        ShopDiscountHooks.onCustomerChange,
-        onScanCustomerChange
-      );
+      pisellos.effects.off(ShopDiscountHooks.onCustomerChange, onScanCustomerChange);
       pisellos.effects.off(ShopDiscountHooks.onLoadPrepareCalcResult, fn);
-      pisellos.effects.off(
-        ShopDiscountHooks.onDiscountListChange,
-        onDiscountListChange
-      );
+      pisellos.effects.off(ShopDiscountHooks.onDiscountListChange, onDiscountListChange);
     };
   }, [state.bookingId, isBooking4Shop, fn]);
   const productListToValue = (0, import_ahooks.useMemoizedFn)((list, edit) => {
@@ -274,8 +262,8 @@ var VoucherCard = (props) => {
       import_materials.PisellGoodPassCard,
       {
         style: { width: "100%" },
-        mixedSort,
         dataSource: ((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length) ? availableData : [],
+        mixedSort,
         onChange: (val) => {
           const shopDiscount2 = pisellos.getModule("shopDiscount");
           const detail = shopDiscount2.setDiscountSelected({

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

@@ -0,0 +1,5 @@
+import React from 'react';
+import { EditBookingModalProps } from './type';
+import './index.less';
+declare const _default: React.ForwardRefExoticComponent<EditBookingModalProps & React.RefAttributes<unknown>>;
+export default _default;