@pisell/private-materials 3.2.22 → 3.2.23

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

@@ -36,14 +36,12 @@ var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
-var import_hooks = require("../../hooks");
 var import_context = require("../../context");
+var import_hooks = require("../../hooks");
 var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 var Guest = () => {
   const [openOption, setOpenOption] = (0, import_react.useState)(false);
-  const [holderItem, setHolderItem] = (0, import_react.useState)(null);
-  const [removeOpen, setRemoveOpen] = (0, import_react.useState)(false);
   const { carts, appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
   const lists = (0, import_react.useMemo)(() => {
@@ -80,7 +78,6 @@ var Guest = () => {
         {
           size: "large",
           onClick: () => {
-            setHolderItem(item);
             setOpenOption(true);
           }
         },
@@ -93,7 +90,6 @@ var Guest = () => {
         menu: {
           items: _options,
           onClick: (e) => {
-            setHolderItem(item);
             handleClick(e, item);
           }
         },
@@ -104,6 +100,11 @@ var Guest = () => {
     );
   };
   const handleAddGuest = () => {
+    if (accountLists.length >= 6) {
+      return (0, import_materials.PisellToast)({
+        content: import_utils.locales.getText("pisell2.appointment.max.guest")
+      });
+    }
     const guest = {
       id: (0, import_utils.getUniqueId)(),
       username: `Guest${accountLists.length + 1}`,

package/lib/components/appointmentBooking/components/Header/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

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

@@ -33,13 +33,35 @@ __export(Header_exports, {
 });
 module.exports = __toCommonJS(Header_exports);
 var import_react = __toESM(require("react"));
+var import_utils = require("@pisell/utils");
 var import_progressBar = __toESM(require("../../../eventBooking/components/progressBar"));
 var import_context = require("../../context");
 var import_index = require("./index.less");
 var Header = () => {
   var _a, _b;
-  const { currentStep, appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
+  const { currentStep, appointmentBooking, resources } = (0, import_context.useAppointmentBookingContext)();
+  const stepName = (0, import_react.useMemo)(() => {
+    var _a2, _b2, _c, _d, _e;
+    const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
+    if (key === "select-resource") {
+      const name = ((_d = (_c = (_b2 = resources == null ? void 0 : resources[0]) == null ? void 0 : _b2.resources) == null ? void 0 : _c[0]) == null ? void 0 : _d.title) || "";
+      return import_utils.locales.getText("pisell2.event.select.category")(name);
+    }
+    return (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.description;
+  }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, resources]);
   const handleBack = () => {
+    var _a2;
+    const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
+    const types = {
+      "select-time": "time",
+      "select-resource": "resource"
+    };
+    if (types[key]) {
+      appointmentBooking.deleteCartItemInfo(types[key]);
+    }
+    if (key === "select-date") {
+      appointmentBooking.clearDateRange();
+    }
     appointmentBooking.back();
   };
   const handleClose = () => {
@@ -48,8 +70,8 @@ var Header = () => {
   return /* @__PURE__ */ import_react.default.createElement(
     import_progressBar.default,
     {
-      title: (_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.title,
-      description: (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.description,
+      title: (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.title,
+      description: stepName,
       showBack: (currentStep == null ? void 0 : currentStep.index) > 0,
       onBack: () => handleBack(),
       onClose: () => handleClose()

package/lib/components/appointmentBooking/components/Resource/index.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const Resource: ({ onChange }: any) => JSX.Element;
+declare const Resource: () => JSX.Element;
 export default Resource;

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

@@ -38,32 +38,32 @@ var import_resourceDisplay = __toESM(require("../../../eventBooking/components/r
 var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_context = require("../../context");
+var import_guests = __toESM(require("../../assets/guests.svg"));
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
-var Resource = ({ onChange }) => {
+var Resource = () => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)(0);
   const { appointmentBooking, resources, carts, resourceOtherParams } = (0, import_context.useAppointmentBookingContext)();
-  const {
-    getResourceList,
-    getResourceTimeSlot,
-    autoSelectAllProductResources
-  } = (0, import_hooks.useAppointmentBookingResource)();
+  const { getResourceList, autoSelectAllProductResources } = (0, import_hooks.useAppointmentBookingResource)();
   console.log(resources, carts, appointmentBooking, "lists, products");
   (0, import_react.useEffect)(() => {
+    var _a, _b, _c;
     const _resources = getResourceList();
-    autoSelectAllProductResources("resources");
+    const code = (_c = (_b = (_a = _resources == null ? void 0 : _resources[0]) == null ? void 0 : _a.resources) == null ? void 0 : _b[0]) == null ? void 0 : _c.code;
+    autoSelectAllProductResources(code);
   }, []);
   (0, import_react.useEffect)(() => {
     var _a;
-    console.log(resourceOtherParams == null ? void 0 : resourceOtherParams.errorList, "errorListerrorListerrorList");
     if (((_a = resourceOtherParams == null ? void 0 : resourceOtherParams.errorList) == null ? void 0 : _a.length) > 0) {
-      return;
+      return (0, import_materials.PisellToast)({
+        content: import_utils.locales.getText("pisell2.appointment.no.available.time")
+      });
     }
   }, [resourceOtherParams == null ? void 0 : resourceOtherParams.errorList]);
   const anyResource = [
     {
       id: 0,
-      image: "https://cdn-partners-api.fresha.com/employee-avatars/processed/399178/medium/3b77991b-0ee2-4d0f-9d6f-a7501b39afcd-tempImageHYe20U.jpg",
+      image: import_guests.default,
       title: "Any professional",
       subtitle: "for maximum availability"
     }
@@ -71,7 +71,6 @@ var Resource = ({ onChange }) => {
   const currentResource = (0, import_react.useMemo)(() => {
     var _a, _b;
     if (resources.length && carts.length) {
-      console.log(resources, carts, "lists, products");
       if (carts.length === 1) {
         return (_b = (_a = resources[0]) == null ? void 0 : _a.resources) == null ? void 0 : _b[0];
       } else {
@@ -88,12 +87,11 @@ var Resource = ({ onChange }) => {
   const onClick = (e) => {
     var _a;
     setSelectedResource(e.id);
-    console.log(currentResource, e, "whcurrentResourcecurrentResource");
+    console.log(currentResource, e, carts, "whcurrentResourcecurrentResource");
     if (e.id) {
-      getResourceTimeSlot({
-        product: (_a = resources == null ? void 0 : resources[0]) == null ? void 0 : _a.product,
-        resources: currentResource == null ? void 0 : currentResource.renderList,
-        currentResourceId: e.id
+      return appointmentBooking.updateCart({
+        _id: (_a = carts == null ? void 0 : carts[0]) == null ? void 0 : _a._id,
+        resources: [e]
       });
     }
   };
@@ -111,7 +109,8 @@ var Resource = ({ onChange }) => {
             dataSource: item,
             direction: "vertical",
             children: !(item == null ? void 0 : item.image) ? (_a = item == null ? void 0 : item.title) == null ? void 0 : _a.charAt(0).toUpperCase() : null,
-            selected: selectedResource === (item == null ? void 0 : item.id)
+            selected: selectedResource === (item == null ? void 0 : item.id),
+            className: !item.id ? "appointment-resource-guest-card" : ""
           }
         );
       },

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

@@ -3,4 +3,9 @@
   .pisell-lowcode-card {
     min-height: 166px !important;
   }
+
+  .appointment-resource-guest-card .pisell-lowcode-avatar-image img {
+    width: 50%;
+    height: 50%;
+  }
 }

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

@@ -33,22 +33,36 @@ __export(Services_exports, {
 });
 module.exports = __toCommonJS(Services_exports);
 var import_react = __toESM(require("react"));
+var import_antd = require("antd");
 var import_SearchLg = __toESM(require("@pisell/icon/es/SearchLg"));
 var import_utils = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
-var import_antd = require("antd");
 var import_TabProduct = __toESM(require("../../../booking/components/TabProduct"));
 var import_utils2 = require("../../../booking/utils");
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_context = require("../../context");
+var import_hooks = require("../../hooks");
+var import_utils3 = require("../../utils");
 var import_index = require("./index.less");
 var Services = () => {
   const searchRef = (0, import_react.useRef)();
   const [search, setSearch] = (0, import_react.useState)("");
   const context = (0, import_useEngineContext.default)();
   const { utils } = context.appHelper || {};
-  const { appointmentBooking, products, setProducts } = (0, import_context.useAppointmentBookingContext)();
+  const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
+  const { products, setProducts } = (0, import_context.useAppointmentBookingContext)();
+  const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
+  const accountRef = (0, import_react.useRef)(accountLists);
+  const currentUser = (0, import_utils3.formatCurrentUser)();
   (0, import_react.useEffect)(() => {
+    console.log(accountLists, accountRef, "wh978896786");
+  }, [accountLists, accountRef]);
+  (0, import_react.useEffect)(() => {
+    var _a;
+    console.log(accountRef.current, currentUser, "accountRef");
+    if (!((_a = accountRef.current) == null ? void 0 : _a.length) && currentUser) {
+      appointmentBooking.addAccount([currentUser]);
+    }
     const { productModuleParams } = appointmentBooking.otherParams || {};
     appointmentBooking.loadProducts(productModuleParams).then((res) => {
       setProducts(res || []);
@@ -65,6 +79,11 @@ var Services = () => {
         const resources = ((_b = (_a = data == null ? void 0 : data.origin) == null ? void 0 : _a.product_resource) == null ? void 0 : _b.resources) || [];
         const activeStatus = resources.find((item2) => item2.status === 1);
         if (!activeStatus) {
+          return (0, import_materials.PisellToast)({
+            content: import_utils.locales.getText(
+              "pisell2.appointment.no.available.service"
+            )
+          });
         }
         const product = {
           ...data,

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

@@ -34,34 +34,31 @@ __export(TimeSlicing_exports, {
 module.exports = __toCommonJS(TimeSlicing_exports);
 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_index = require("./index.less");
 var Resource = ({ params }) => {
   const [selectedResource, setSelectedResource] = (0, import_react.useState)("");
-  const { times, resources, appointmentBooking, carts } = (0, import_context.useAppointmentBookingContext)();
+  const { times, resources, appointmentBooking, carts, setSelectedTime } = (0, import_context.useAppointmentBookingContext)();
   console.log(params, resources, times, "wh8765");
+  const getAutoSelect = async (val) => {
+    setSelectedTime(val);
+    const { errorList } = await appointmentBooking.autoSelectAllProductResources("sites", val);
+    const result = await appointmentBooking.submitTimeSlot(val);
+    console.log(errorList, result, "wh9896788");
+  };
+  (0, import_react.useEffect)(() => {
+    var _a;
+    if ((times == null ? void 0 : times.length) > 0) {
+      setSelectedResource((_a = times == null ? void 0 : times[0]) == null ? void 0 : _a.start_time);
+      getAutoSelect(times == null ? void 0 : times[0]);
+    }
+  }, [times]);
   const onClick = async (e) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     setSelectedResource(e == null ? void 0 : e.start_time);
-    const data = await appointmentBooking.autoSelectResource({
-      resourceProductData: resources == null ? void 0 : resources[0],
-      resources: (_c = (_b = (_a = resources == null ? void 0 : resources[0]) == null ? void 0 : _a.resources) == null ? void 0 : _b[1]) == null ? void 0 : _c.renderList,
-      timeSlots: e
-    });
-    if (data) {
-      const _resources = [
-        (_g = (_f = (_e = (_d = resources == null ? void 0 : resources[0]) == null ? void 0 : _d.resources) == null ? void 0 : _e[0]) == null ? void 0 : _f.renderList) == null ? void 0 : _g[0],
-        (_k = (_j = (_i = (_h = resources == null ? void 0 : resources[0]) == null ? void 0 : _h.resources) == null ? void 0 : _i[1]) == null ? void 0 : _j.renderList) == null ? void 0 : _k[0]
-      ];
-      const aa = await appointmentBooking.submitTimeSlot({
-        resourceProductData: resources == null ? void 0 : resources[0],
-        selectedResources: _resources,
-        timeSlots: e
-      });
-      console.log(data, _resources, aa, "wh9879676");
-    }
+    getAutoSelect(e);
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-time-slicing-wrap" }, times.map((item, index) => {
+  return (times == null ? void 0 : times.length) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-time-slicing-wrap" }, times.map((item, index) => {
     return /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
@@ -72,6 +69,11 @@ var Resource = ({ params }) => {
       /* @__PURE__ */ import_react.default.createElement("span", null, item == null ? void 0 : item.start_time),
       /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-chevron-right", className: `icon` })
     );
-  }));
+  })) : /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellEmpty,
+    {
+      description: import_utils.locales.getText("pisell2.appointment.booking.empty.time")
+    }
+  );
 };
 var TimeSlicing_default = Resource;

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

@@ -18,6 +18,10 @@
 
     &:hover {
       background-color: #f1f1f1;
+      cursor: pointer;
+    }
+    &.active {
+      background-color: #f1f1f1;
     }
   }
 }

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

@@ -42,6 +42,7 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_materials = require("@pisell/materials");
 var import_icons = require("@ant-design/icons");
 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 = {
@@ -65,6 +66,8 @@ var VoucherCard = (props) => {
   const [code, setCode] = (0, import_react.useState)("");
   const [discountList, setDisCountList] = (0, import_react.useState)([]);
   const productRef = (0, import_react.useRef)(products);
+  const { openLoginModal } = (0, import_hooks.useAppointmentBookingLogin)();
+  const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
   const cart = (_b = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _b.cart;
   const isUserLoggedIn = (0, import_react.useMemo)(() => {
     var _a2, _b2;
@@ -79,29 +82,30 @@ var VoucherCard = (props) => {
     });
   }, [discountList]);
   (0, import_react.useEffect)(() => {
-    const shopDiscount2 = pisellos.getModule("shopDiscount");
-    shopDiscount2.setCustomer(currentUser);
-  }, [currentUser.id]);
+    if (isUserLoggedIn) {
+      const shopDiscount2 = pisellos.getModule("shopDiscount");
+      shopDiscount2.setCustomer(currentUser);
+    }
+  }, [currentUser.id, isUserLoggedIn]);
   (0, import_react.useEffect)(() => {
     shopDiscount.setProductList(products);
   }, [products]);
-  (0, import_react.useEffect)(() => {
-    if (productRef.current === products) {
-      return;
-    }
-    const val = shopDiscount.calcDiscount(products);
-    console.log("input: ", products);
-    console.log("output: ", val);
-    productRef.current = val.productList;
+  const onCartChange = () => {
+    const products2 = cart == null ? void 0 : cart.getItems();
+    const val = shopDiscount.calcDiscount(products2);
     cart == null ? void 0 : cart.batchSetItems(val.productList);
-  }, [products]);
+  };
   (0, import_react.useEffect)(() => {
+    const val = shopDiscount.getDiscountList();
+    setDisCountList(val);
     pisellos.effects.on(
       ShopDiscountHooks.onLoadPrepareCalcResult,
       (result) => {
         cart == null ? void 0 : cart.batchSetItems(result.productList);
       }
     );
+    pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
+    pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(
       ShopDiscountHooks.onDiscountListChange,
       (discount) => {
@@ -127,11 +131,17 @@ var VoucherCard = (props) => {
         className: "login-btn",
         onClick: () => {
           if (!action) return;
-          action({
-            type: "pisell1.login",
-            data: {},
+          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
+                );
               }
             }
           });
@@ -178,7 +188,9 @@ var VoucherCard = (props) => {
               discountId: val.id,
               isSelected: val.isSelected
             });
-            (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a2.cart) == null ? void 0 : _b2.batchSetItems(detail.productList);
+            (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a2.cart) == null ? void 0 : _b2.batchSetItems(
+              detail.productList
+            );
           }
         }
       ) : null,

package/lib/components/appointmentBooking/context.d.ts

@@ -19,6 +19,8 @@ interface AppointmentBookingContextType {
     symbolic?: any;
     resourceOtherParams?: any;
     setResourceOtherParams: (val: any) => void;
+    selectedTime: any;
+    setSelectedTime: (val: any) => void;
 }
 export declare const AppointmentBookingProvider: ({ children, }: {
     children: ReactNode;

package/lib/components/appointmentBooking/context.js

@@ -52,6 +52,7 @@ var AppointmentBookingProvider = ({
   const [isLastStep, setIsLastStep] = (0, import_react.useState)(false);
   const [carts, setCarts] = (0, import_react.useState)([]);
   const [resourceOtherParams, setResourceOtherParams] = (0, import_react.useState)({});
+  const [selectedTime, setSelectedTime] = (0, import_react.useState)(null);
   const { appHelper } = (0, import_useEngineContext.default)();
   const symbolic = (_a = appHelper == null ? void 0 : appHelper.utils) == null ? void 0 : _a.getSymbolic();
   console.log(3234234, times, resources);
@@ -74,7 +75,9 @@ var AppointmentBookingProvider = ({
     appHelper,
     symbolic,
     resourceOtherParams,
-    setResourceOtherParams
+    setResourceOtherParams,
+    selectedTime,
+    setSelectedTime
   };
   return /* @__PURE__ */ import_react.default.createElement(AppointmentBookingContext.Provider, { value }, children);
 };

package/lib/components/appointmentBooking/hooks.d.ts

@@ -1,25 +1,61 @@
 export declare const useAppointmentBooking: () => any;
 export declare const useShopDiscount: () => any;
+/**
+ * @title: 监听步骤发生变化
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:11
+ */
 export declare const useAppointmentBookingStep: () => void;
+/**
+ * @title: 获取商品数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:12
+ */
 export declare const useAppointmentBookingProduct: () => void;
-export declare const useAppointmentBookingCart: () => {
-    cart: any;
-};
+/**
+ * @title: 更新购物车数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:12
+ */
+export declare const useAppointmentBookingCart: () => void;
+/**
+ * @title: 获取登录状态
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:14
+ */
 export declare const useAppointmentBookingLogin: () => {
     isLogin: boolean;
     openLoginModal: (params: {
         callback: any;
     }) => void;
 };
+/**
+ * @title: 获取账户
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:15
+ */
 export declare const useAppointmentBookingAccount: () => {
-    currentUser: {
-        id: any;
-        username: string;
-    };
     accountLists: any;
 };
+/**
+ * @title: 获取资源数据
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-15 11:29
+ */
 export declare const useAppointmentBookingResource: () => {
     getResourceTimeSlot: (params: any) => Promise<void>;
-    getResourceList: () => Promise<any>;
-    autoSelectAllProductResources: (code: string) => Promise<void>;
+    getResourceList: () => any;
+    autoSelectAllProductResources: (code: string) => Promise<any>;
 };

package/lib/components/appointmentBooking/hooks.js

@@ -39,11 +39,10 @@ __export(hooks_exports, {
   useShopDiscount: () => useShopDiscount
 });
 module.exports = __toCommonJS(hooks_exports);
+var import_react = require("react");
 var import_useEngineContext = require("../../hooks/useEngineContext");
 var import_useEngineContext2 = __toESM(require("../../hooks/useEngineContext"));
-var import_utils = require("@pisell/utils");
-var import_utils2 = require("./utils");
-var import_react = require("react");
+var import_utils = require("./utils");
 var import_context = require("./context");
 var useAppointmentBooking = () => {
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
@@ -76,33 +75,29 @@ var useAppointmentBookingProduct = () => {
   const { productModuleParams } = appointmentBooking.otherParams;
   (0, import_react.useEffect)(() => {
     appointmentBooking.loadProducts(productModuleParams).then((res) => {
-      console.log(res, "loadProductsloadProducts");
       setProducts(res || []);
     });
   }, []);
 };
 var useAppointmentBookingCart = () => {
-  var _a, _b;
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
   const { appointmentBooking, setCarts, setSummary } = (0, import_context.useAppointmentBookingContext)();
-  const cart = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.cart) == null ? void 0 : _b.store;
+  const getCartAndSummary = async () => {
+    const carts = await appointmentBooking.getCart();
+    setCarts(carts || []);
+    const summary = await appointmentBooking.getSummary();
+    setSummary(summary || {});
+    console.log(carts, summary, "appointmentBooking_cart:changed");
+  };
   (0, import_react.useEffect)(() => {
-    var _a2;
+    getCartAndSummary();
     pisellOS.effects.on(
       "appointmentBooking_cart:changed",
-      async (res) => {
-        const carts = await appointmentBooking.getCart();
-        setCarts(carts || []);
-        const summary = await appointmentBooking.getSummary();
-        setSummary(summary || {});
-        console.log(carts, summary, "appointmentBooking_cart:changed");
+      async () => {
+        getCartAndSummary();
       }
     );
-    (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.getCart) == null ? void 0 : _a2.call(appointmentBooking).then((data) => {
-      setCarts(data || []);
-    });
   }, []);
-  return { cart };
 };
 var useAppointmentBookingLogin = () => {
   var _a, _b;
@@ -113,71 +108,63 @@ var useAppointmentBookingLogin = () => {
     const { callback } = params || {};
     utils.action({
       type: "pisell1.login",
-      data: {},
+      data: {
+        type: "plugin"
+      },
       callback
     });
   };
   return { isLogin, openLoginModal };
 };
 var useAppointmentBookingAccount = () => {
-  var _a, _b;
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
-  const context = (0, import_useEngineContext2.default)();
-  const utils = context.appHelper.utils || {};
   const appointmentBooking = useAppointmentBooking();
   const [accountLists, setAccountLists] = (0, import_react.useState)([]);
-  let userInfo = (_b = (_a = utils.getStore().getState()) == null ? void 0 : _a.global) == null ? void 0 : _b.userInfo;
-  const localUserInfo = JSON.parse(utils.storage.get("customer") || "{}");
-  userInfo = (userInfo == null ? void 0 : userInfo.id) ? userInfo : localUserInfo;
-  let currentUserName = `${userInfo == null ? void 0 : userInfo.first_name} ${userInfo == null ? void 0 : userInfo.last_name}`;
-  currentUserName = (currentUserName == null ? void 0 : currentUserName.trim()) || (userInfo == null ? void 0 : userInfo.nickname) || "Me";
-  const currentUser = {
-    id: (userInfo == null ? void 0 : userInfo.id) || (0, import_utils.getUniqueId)(),
-    username: currentUserName
+  const getAccountLists = async () => {
+    var _a, _b, _c;
+    const data = await appointmentBooking.getAccounts();
+    setAccountLists(data || []);
+    console.log("currentUser4455777", appointmentBooking, (_c = (_b = (_a = appointmentBooking.store) == null ? void 0 : _a.accountList) == null ? void 0 : _b.store) == null ? void 0 : _c.accountList, data);
   };
   (0, import_react.useEffect)(() => {
     pisellOS.effects.on(
       "appointmentBooking_accountList:changed",
       async (res) => {
         if (res.path === "accounts") {
-          appointmentBooking.getAccounts().then((data) => {
-            setAccountLists(data || []);
-          });
+          getAccountLists();
         }
       }
     );
-    appointmentBooking.getAccounts().then((data) => {
-      setAccountLists(data || []);
-    });
+    getAccountLists();
   }, []);
-  return { currentUser, accountLists };
+  return { accountLists };
 };
 var useAppointmentBookingResource = () => {
   const { appointmentBooking, setResources, setTimes, setResourceOtherParams, resourceOtherParams } = (0, import_context.useAppointmentBookingContext)();
   const { resourceSort } = (appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || {};
-  console.log(appointmentBooking, "appointmentBooking22");
   const getResourceTimeSlot = async (params) => {
-    const data = await appointmentBooking.getResourceTimeSlot(params);
+    const data = await appointmentBooking.getTimeSlotByAllResources(params);
     setTimes(data || []);
   };
-  const getResourceList = async () => {
+  const getResourceList = () => {
     let resources = appointmentBooking.getResourcesList();
     resources = resources.map((item) => {
       return {
         ...item,
-        resources: (0, import_utils2.sortResources)((item == null ? void 0 : item.resources) || [], resourceSort)
+        resources: (0, import_utils.sortResources)((item == null ? void 0 : item.resources) || [], resourceSort)
       };
     });
     setResources(resources || []);
+    console.log(resources, "resourcesresources");
     return resources;
   };
   const autoSelectAllProductResources = async (code) => {
     let res = await appointmentBooking.autoSelectAllProductResources(code);
-    console.log(res, "autoSelectAllProductResources");
     setResourceOtherParams({
       ...resourceOtherParams,
       ...res
     });
+    return res;
   };
   return { getResourceTimeSlot, getResourceList, autoSelectAllProductResources };
 };

package/lib/components/appointmentBooking/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AppointmentBooking: () => JSX.Element;
 export default AppointmentBooking;