@pisell/private-materials 6.1.7 → 6.1.8

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

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/appointmentBooking/components/Deposit/index.tsx
 var Deposit_exports = {};
 __export(Deposit_exports, {
+  DepositContent: () => DepositContent,
   default: () => Deposit_default
 });
 module.exports = __toCommonJS(Deposit_exports);
@@ -38,9 +39,13 @@ var import_deposit = __toESM(require("../../deposit"));
 var import_context = require("../../context");
 var import_utils = require("@pisell/utils");
 var import_index = require("./index.less");
-var Deposit = () => {
-  const { setIsAgreeDepositPolicy, isAgreeDepositPolicy, summary } = (0, import_context.useAppointmentBookingContext)();
-  const { deposit } = summary;
+var DepositContent = (props) => {
+  const {
+    isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy,
+    deposit,
+    depositProtocolRequest
+  } = props;
   return /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-wrap" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-deposit-top" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.appointment.deposit")), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellText.Amount,
     {
@@ -54,8 +59,35 @@ var Deposit = () => {
       total: deposit == null ? void 0 : deposit.total,
       protocols: deposit == null ? void 0 : deposit.protocols,
       isAgreePolicy: isAgreeDepositPolicy,
-      onChange: (value) => setIsAgreeDepositPolicy(value)
+      onChange: (value) => setIsAgreeDepositPolicy(value),
+      depositProtocolRequest
     }
   ));
 };
+var Deposit = () => {
+  const {
+    setIsAgreeDepositPolicy,
+    isAgreeDepositPolicy,
+    summary,
+    appointmentBooking
+  } = (0, import_context.useAppointmentBookingContext)();
+  const { deposit } = summary;
+  const depositProtocolRequest = (id) => {
+    var _a;
+    return (_a = appointmentBooking == null ? void 0 : appointmentBooking.getProtocol) == null ? void 0 : _a.call(appointmentBooking, id);
+  };
+  return /* @__PURE__ */ import_react.default.createElement(
+    DepositContent,
+    {
+      isAgreeDepositPolicy: !!isAgreeDepositPolicy,
+      setIsAgreeDepositPolicy,
+      deposit,
+      depositProtocolRequest
+    }
+  );
+};
 var Deposit_default = Deposit;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  DepositContent
+});

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

@@ -87,7 +87,12 @@ var Form = (0, import_react.forwardRef)((props, ref) => {
     setOtherData(key, { ...newData });
     appointmentBooking.updateCart({
       _id: appointmentBoard == null ? void 0 : appointmentBoard.cart_id,
-      relationForms: (0, import_utils2.updateRelationForms)(carts, appointmentBoard, values)
+      relationForms: (0, import_utils2.updateRelationForms)(
+        carts,
+        appointmentBoard,
+        values,
+        currentStepParams == null ? void 0 : currentStepParams.key
+      )
     });
   };
   const handleFormFinish = (status, values) => {

package/lib/components/appointmentBooking/components/Form/utils.d.ts

@@ -5,4 +5,4 @@
  * @Author: WangHan
  * @Date: 2025-05-26 16:58
  */
-export declare const updateRelationForms: (carts: any[], currentCart: any, values: any) => any;
+export declare const updateRelationForms: (carts: any[], currentCart: any, values: any, currentStepKey?: string) => any;

package/lib/components/appointmentBooking/components/Form/utils.js

@@ -22,24 +22,21 @@ __export(utils_exports, {
   updateRelationForms: () => updateRelationForms
 });
 module.exports = __toCommonJS(utils_exports);
-var updateRelationForms = (carts, currentCart, values) => {
-  var _a, _b;
+var updateRelationForms = (carts, currentCart, values, currentStepKey) => {
+  var _a;
   if (!(currentCart == null ? void 0 : currentCart.cart_id)) return [];
   const cartItem = carts == null ? void 0 : carts.find(
     (item) => (item == null ? void 0 : item._id) === (currentCart == null ? void 0 : currentCart.cart_id)
   );
   let oldLists = ((_a = cartItem == null ? void 0 : cartItem._origin) == null ? void 0 : _a.relation_forms) || [];
-  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_id: values == null ? void 0 : values.form_record_id };
-  const exist = oldLists.find((item) => item.form_id === (newData == null ? void 0 : newData.form_id));
-  if (exist) {
-    if (!((_b = exist == null ? void 0 : exist.form_record_ids) == null ? void 0 : _b.includes(newData.form_record_id))) {
-      exist.form_record_ids.push(newData.form_record_id);
-    }
+  const newData = { form_id: Number(values == null ? void 0 : values.form_id), form_record_ids: [values == null ? void 0 : values.form_record_id], cartId: currentCart == null ? void 0 : currentCart.cart_id, currentStepKey };
+  const existIndex = oldLists.findIndex(
+    (item) => item.cartId === newData.cartId && item.form_id === newData.form_id && item.currentStepKey === newData.currentStepKey
+  );
+  if (existIndex > -1) {
+    oldLists[existIndex].form_record_ids = newData.form_record_ids;
   } else {
-    oldLists.push({
-      form_id: newData.form_id,
-      form_record_ids: [newData.form_record_id]
-    });
+    oldLists = oldLists.concat(newData);
   }
   return oldLists;
 };

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

@@ -99,6 +99,7 @@ var Header = () => {
     if (key.startsWith("fill-form")) {
       const form_key = "booking_form";
       let booking_form = getOtherData(form_key);
+      removeStep(key);
       setOtherData(form_key, { ...booking_form, [key]: {} });
     }
     appointmentBooking.back();

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

@@ -166,12 +166,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/deposit/components/PolicyModal/index.js

@@ -36,7 +36,6 @@ 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_context = require("../../../context");
 var import_index = require("./index.less");
 var DepositModal = (props) => {
   const {
@@ -45,9 +44,10 @@ var DepositModal = (props) => {
     item,
     onChange,
     onConfirm,
-    isHideCheckout = true
+    isHideCheckout = true,
+    depositProtocolRequest
+    // 定金协议请求
   } = props;
-  const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const [policy, setPolicy] = (0, import_react.useState)(null);
   const [loading, setLoading] = (0, import_react.useState)(false);
   const [disabled, setDisabled] = (0, import_react.useState)(false);
@@ -55,9 +55,13 @@ var DepositModal = (props) => {
     setDisabled(!isHideCheckout);
   }, [isHideCheckout]);
   const getPolicy = async (id) => {
+    if (!depositProtocolRequest) {
+      console.error("depositProtocolRequest is not defined");
+      return;
+    }
     setLoading(true);
     try {
-      const { data } = await appointmentBooking.getProtocol(id);
+      const { data } = await (depositProtocolRequest == null ? void 0 : depositProtocolRequest(id));
       setPolicy(data);
       onChange && onChange(data);
     } catch (error) {

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

@@ -48,7 +48,8 @@ var Deposit = (props) => {
     title,
     isAgreePolicy = true,
     isShowTitle = true,
-    onChange
+    onChange,
+    depositProtocolRequest
   } = props;
   const context = (0, import_useEngineContext.default)();
   const [visible, setVisible] = (0, import_react.useState)(false);
@@ -102,7 +103,8 @@ var Deposit = (props) => {
     {
       open: visible,
       onCancel: () => setVisible(false),
-      item: policyItem
+      item: policyItem,
+      depositProtocolRequest
     }
   ));
 };

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

@@ -433,7 +433,10 @@ var Addons = (0, import_model.Provider)((props) => {
     {
       loading,
       header: import_utils3.locales.getText("pisell2.text.addons"),
-      footer
+      footer,
+      state,
+      dispatch,
+      source: "addons"
     },
     !state.bookingId ? /* @__PURE__ */ import_react.default.createElement(import_emptyBooking.default, null) : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, state.addons.value.length ? /* @__PURE__ */ import_react.default.createElement("div", { className: "", style: { margin: "0 -32px" } }, state.addons.value.map((d) => {
       return /* @__PURE__ */ import_react.default.createElement(

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

@@ -0,0 +1,29 @@
+import React from 'react';
+import './index.less';
+interface ActionButtonsProps {
+    /** booking 状态对象，包含 service、addons 等数据 */
+    state: {
+        service?: {
+            value?: any[];
+        };
+        addons?: {
+            value?: any[];
+        };
+        disabledEdit?: boolean;
+        channelDisabledEdit?: boolean;
+        shop_discount?: string;
+        bookingDetail?: {
+            [key: string]: any;
+        };
+        [key: string]: any;
+    };
+    /** dispatch 函数，用于触发状态更新 */
+    dispatch: (action: {
+        type: string;
+        payload?: any;
+    }) => void;
+    /** 是否禁用所有按钮 */
+    disabled?: boolean;
+}
+declare const ActionButtons: React.FC<ActionButtonsProps>;
+export default ActionButtons;