@pisell/private-materials 3.3.33 → 3.3.35

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

@@ -29,6 +29,7 @@ import "./index.less";
 var Layout = function Layout() {
   var _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6, _currentStep$step8;
   var stepRef = useRef();
+  var formRef = useRef();
   var _ref = useAppointmentBookingContext(),
     currentStep = _ref.currentStep,
     setResourceOtherParams = _ref.setResourceOtherParams,
@@ -37,17 +38,18 @@ var Layout = function Layout() {
     appointmentBooking = _ref.appointmentBooking,
     setLoading = _ref.setLoading,
     policyParams = _ref.policyParams,
-    closePolicy = _ref.closePolicy,
-    currentStepParams = _ref.currentStepParams;
+    closePolicy = _ref.closePolicy;
   var _useAppointmentBookin = useAppointmentBookingSetting(),
     isDateSelectedFirst = _useAppointmentBookin.isDateSelectedFirst,
-    isFormSubject = _useAppointmentBookin.isFormSubject;
+    isFormSubject = _useAppointmentBookin.isFormSubject,
+    isRetailTemplate = _useAppointmentBookin.isRetailTemplate;
   var _useAppointmentBookin2 = useAppointmentBookingLogin(),
     isLogin = _useAppointmentBookin2.isLogin;
   var _useAppointmentBookin3 = useAppointmentBookingAccount(),
     getHolders = _useAppointmentBookin3.getHolders;
   var _useAppointmentBookin4 = useAppointmentBookingStep(),
-    removeStep = _useAppointmentBookin4.removeStep;
+    removeStep = _useAppointmentBookin4.removeStep,
+    stepList = _useAppointmentBookin4.stepList;
   var _useShopDiscount = useShopDiscount(),
     shopDiscount = _useShopDiscount.shopDiscount;
 
@@ -59,7 +61,6 @@ var Layout = function Layout() {
     params = _useState2[0],
     setParams = _useState2[1];
   useEffect(function () {
-    appointmentBooking.removeStep('fill-form');
     return function () {
       var _shopDiscount$destroy;
       setIsAgreeDepositPolicy(false);
@@ -67,36 +68,24 @@ var Layout = function Layout() {
       shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$destroy = shopDiscount.destroy) === null || _shopDiscount$destroy === void 0 || _shopDiscount$destroy.call(shopDiscount);
     };
   }, []);
-  useEffect(function () {
-    var _currentStepParams$st;
-    if ((currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) < 0) return;
-    var resourceStepIndex = currentStepParams === null || currentStepParams === void 0 || (_currentStepParams$st = currentStepParams.stepLists) === null || _currentStepParams$st === void 0 ? void 0 : _currentStepParams$st.findIndex(function (item) {
-      return item.key === 'select-resource';
-    });
-
-    // 清空当前所选择的资源
-    if ((currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.index) < resourceStepIndex) {
-      appointmentBooking.setOtherData('current_selected_resources', null);
-    }
-  }, [currentStepParams]);
   useEffect(function () {
     try {
+      if (!(appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.otherParams) || isRetailTemplate) return;
       if (isFormSubject) {
         removeStep('select-guest');
       } else {
         appointmentBooking.addStep({
-          index: (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 1,
           key: 'select-guest',
           description: locales.getText('pisell2.appointment.add-guests')
         }, 'select-service');
       }
     } catch (error) {}
-  }, [isFormSubject]);
+  }, [isFormSubject, isRetailTemplate]);
   useEffect(function () {
-    if (isFormSubject && isLogin) {
+    if (isFormSubject && isLogin && !isRetailTemplate) {
       getHolders();
     }
-  }, [isFormSubject, isLogin]);
+  }, [isFormSubject, isLogin, isRetailTemplate]);
   useEffect(function () {
     if (!(currentStep !== null && currentStep !== void 0 && currentStep.step)) return;
 
@@ -112,38 +101,33 @@ var Layout = function Layout() {
       behavior: 'smooth'
     });
   }, [currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key]);
-  var components = {
-    // 选择服务
-    'select-service': Services,
-    // 添加客户
-    'select-guest': Guest,
-    // 选择时间
-    'select-date': Date,
-    // 时间切片
-    'select-time': TimeSlicing,
-    // 确认信息
-    'confirm-information': ConfirmInformation
-  };
   var Com = useMemo(function () {
     var _currentStep$step2;
     var key = currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key;
     if (!key) return null;
-    var Com;
-    if (key.startsWith('select-resource')) {
+    var components = {
+      // 选择服务
+      'select-service': Services,
+      // 添加客户
+      'select-guest': Guest,
+      // 选择时间
+      'select-date': Date,
       // 选择资源
-      Com = Resource;
-    } else if (key.startsWith('fill-form')) {
+      'select-resource': Resource,
+      // 时间切片
+      'select-time': TimeSlicing,
       // 填写表单
-      Com = Form;
-    } else {
-      Com = components[key];
-    }
+      'fill-form': Form,
+      // 确认信息
+      'confirm-information': ConfirmInformation
+    };
+    var Com = components[key];
     return /*#__PURE__*/React.createElement(Com, {
       onChange: setParams,
       params: params,
       ref: stepRef
     });
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key]);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key, stepRef]);
 
   /**
    * @title: 动态计算中间内容区域的高度
@@ -204,8 +188,8 @@ var Layout = function Layout() {
     if (isDateSelectedFirst && key === 'select-date') return false;
     return key !== 'confirm-information';
   }, [isDateSelectedFirst, currentStep === null || currentStep === void 0 || (_currentStep$step8 = currentStep.step) === null || _currentStep$step8 === void 0 ? void 0 : _currentStep$step8.key]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, null), /*#__PURE__*/React.createElement("div", {
-    className: "parallel-content-wrap ".concat(isMobile() ? 'parallel-content-mobile-wrap' : '')
+  return /*#__PURE__*/React.createElement(React.Fragment, null, !isRetailTemplate ? /*#__PURE__*/React.createElement(Header, null) : null, /*#__PURE__*/React.createElement("div", {
+    className: "parallel-content-wrap ".concat(isMobile() ? 'parallel-content-mobile-wrap' : '', " ").concat(isRetailTemplate ? 'parallel-content-retail-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "parallel-content-left"
   }, Com), isShowCartCom), isFooter ? /*#__PURE__*/React.createElement(Footer

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

@@ -1,5 +1,6 @@
 .parallel-content-wrap {
   width: 1000px;
+  max-width: 100%;
   display: flex;
   gap: 6px;
   // align-items: center;
@@ -13,7 +14,9 @@
 
   .parallel-content-left {
     flex: 1;
-    width: 634px;
+    // width: 634px;
+    width: auto;
+    min-width: 0;
     // padding: 16px 0;
 
     .appointment-resource-wrap {
@@ -37,6 +40,8 @@
     position: sticky;
     top: 93px;
     height: fit-content;
+    flex: 0 0 360px;
+    background-color: #fff;
   }
 }
 
@@ -89,3 +94,20 @@
     }
   }
 }
+
+.parallel-content-retail-wrap {
+  .pisell-product-select-wrapper {
+    .pisell-product-select-tabs-wrapper {
+      top: 0px !important;
+    }
+  }
+
+  .parallel-content-right {
+    top: 16px;
+    margin-top: 0;
+
+    .appointment-cart-item-wrap {
+      height: calc(100vh - 16px) !important;
+    }
+  }
+}

package/es/components/appointmentBooking/components/Deposit/index.d.ts

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

package/es/components/appointmentBooking/components/Footer/index.d.ts

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

package/es/components/appointmentBooking/components/Footer/index.js

@@ -17,11 +17,11 @@ var Footer = function Footer(_ref) {
   var _currentStep$step;
   var onNext = _ref.onNext,
     isOpen = _ref.isOpen;
-  var _useAppointmentBookin = useAppointmentBookingContext(),
-    carts = _useAppointmentBookin.carts,
-    currentStep = _useAppointmentBookin.currentStep,
-    isErrorHolder = _useAppointmentBookin.isErrorHolder,
-    setIsErrorHolder = _useAppointmentBookin.setIsErrorHolder;
+  var _ref2 = useAppointmentBookingContext(),
+    carts = _ref2.carts,
+    currentStep = _ref2.currentStep,
+    isErrorHolder = _ref2.isErrorHolder,
+    setIsErrorHolder = _ref2.setIsErrorHolder;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],

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

@@ -10,57 +10,122 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useMemo, useRef, useState, useImperativeHandle, forwardRef } from 'react';
+import React, { useMemo, useRef, useState, useImperativeHandle, forwardRef, useEffect } from 'react';
 import useComponents from "../../../../hooks/useComponents";
-import { updateBookingFormStorage, currentAppointmentBoard } from "../../utils";
+import { formatForms, formatCarts, updateLists, updateBookingFormStorage } from "../../utils";
 import { useAppointmentBookingContext } from "../../context";
-import { useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingStep } from "../../hooks";
+import { useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingStep, contextUtils } from "../../hooks";
+import PolicyModal from "../../deposit/components/PolicyModal";
 import "./index.less";
 var Form = /*#__PURE__*/forwardRef(function (props, ref) {
   var manualRef = useRef();
-  var _useState = useState(false),
+  var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
-    isClearData = _useState2[0],
-    setIsClearData = _useState2[1];
-  var _ref = useAppointmentBookingContext(),
-    appointmentBooking = _ref.appointmentBooking,
-    setLoading = _ref.setLoading,
-    currentStepParams = _ref.currentStepParams,
-    currentSelectedResourcesRef = _ref.currentSelectedResourcesRef;
-  var _useAppointmentBookin = useAppointmentBookingResource(),
-    getResourceList = _useAppointmentBookin.getResourceList;
-  var _useAppointmentBookin2 = useAppointmentBookingSetting(),
-    setOtherData = _useAppointmentBookin2.setOtherData,
-    getOtherData = _useAppointmentBookin2.getOtherData;
-  var _useAppointmentBookin3 = useAppointmentBookingStep(),
-    nextStep = _useAppointmentBookin3.nextStep;
+    currentFormIndex = _useState2[0],
+    setCurrentFormIndex = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showAgreement = _useState4[0],
+    setShowAgreement = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    agreementContent = _useState6[0],
+    setAgreementContent = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    formStatus = _useState8[0],
+    setFormStatus = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    isClearData = _useState10[0],
+    setIsClearData = _useState10[1];
+  var _useState11 = useState(0),
+    _useState12 = _slicedToArray(_useState11, 2),
+    formId = _useState12[0],
+    setFormId = _useState12[1];
+  var _useAppointmentBookin = useAppointmentBookingContext(),
+    carts = _useAppointmentBookin.carts,
+    appointmentBooking = _useAppointmentBookin.appointmentBooking,
+    setLoading = _useAppointmentBookin.setLoading;
+  var _useAppointmentBookin2 = useAppointmentBookingResource(),
+    getResourceList = _useAppointmentBookin2.getResourceList;
+  var _useAppointmentBookin3 = useAppointmentBookingSetting(),
+    setOtherData = _useAppointmentBookin3.setOtherData,
+    getOtherData = _useAppointmentBookin3.getOtherData;
+  var _useAppointmentBookin4 = useAppointmentBookingStep(),
+    nextStep = _useAppointmentBookin4.nextStep;
+  var utils = contextUtils();
   useImperativeHandle(ref, function () {
     return {
       next: function next() {
         var _manualRef$current, _manualRef$current$su;
-        debugger;
         setLoading(true);
         (_manualRef$current = manualRef.current) === null || _manualRef$current === void 0 || (_manualRef$current$su = _manualRef$current.submit) === null || _manualRef$current$su === void 0 || _manualRef$current$su.call(_manualRef$current);
       }
     };
   });
+  var key = 'booking_form';
+
+  // 获取本地存储
+  var formStorage = getOtherData('booking_form') || {};
+
+  /**
+   * @title: 获取资源列表
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-05-06 10:00
+   */
+  var resources = useMemo(function () {
+    var _resource = getResourceList();
+    return (_resource === null || _resource === void 0 ? void 0 : _resource.resources) || [];
+  }, []);
+  var forms = useMemo(function () {
+    var newCarts = formatCarts(carts, resources, utils);
+    if (!(newCarts !== null && newCarts !== void 0 && newCarts.length) || !(resources !== null && resources !== void 0 && resources.length)) return [];
+    return formatForms(newCarts) || [];
+  }, [carts, resources]);
+  useEffect(function () {
+    var _forms$currentFormInd;
+    if (!(forms !== null && forms !== void 0 && forms.length)) return;
+    setFormId((forms === null || forms === void 0 || (_forms$currentFormInd = forms[currentFormIndex]) === null || _forms$currentFormInd === void 0 ? void 0 : _forms$currentFormInd.form_id) || 0);
+  }, [forms, currentFormIndex]);
   var _useComponents = useComponents({
       components: ['FormCard']
     }),
     _useComponents2 = _slicedToArray(_useComponents, 1),
     FormCard = _useComponents2[0];
-  var key = 'booking_form';
 
-  // 获取本地存储
-  var formStorage = getOtherData('booking_form') || {};
-  var appointmentBoard = useMemo(function () {
-    var _getResourceList = getResourceList(),
-      resources = _getResourceList.resources;
-    return currentAppointmentBoard(currentStepParams.key, resources, appointmentBooking);
-  }, [currentStepParams.key]);
-  var formId = useMemo(function () {
-    return (appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.resource_form_id) || 0;
-  }, [appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.resource_form_id]);
+  /**
+   * @title: 获取下一个表单
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-26 11:04
+   */
+  var goToNextForm = function goToNextForm() {
+    var nextIndex = currentFormIndex + 1;
+    if (nextIndex < forms.length) {
+      var _forms$nextIndex, _forms$nextIndex2;
+      setIsClearData(true);
+      setCurrentFormIndex(nextIndex);
+
+      // 如果下一个表单没有id但有协议，直接弹协议
+      if (!(forms !== null && forms !== void 0 && (_forms$nextIndex = forms[nextIndex]) !== null && _forms$nextIndex !== void 0 && _forms$nextIndex.form_id) && forms !== null && forms !== void 0 && (_forms$nextIndex2 = forms[nextIndex]) !== null && _forms$nextIndex2 !== void 0 && _forms$nextIndex2.policy_id) {
+        var _forms$nextIndex3;
+        setLoading(true);
+        setAgreementContent({
+          id: forms === null || forms === void 0 || (_forms$nextIndex3 = forms[nextIndex]) === null || _forms$nextIndex3 === void 0 ? void 0 : _forms$nextIndex3.policy_id
+        });
+        setShowAgreement(true);
+      } else {
+        setLoading(false);
+      }
+    } else {
+      nextStep();
+    }
+  };
 
   /**
    * @title: 更新表单状态
@@ -74,6 +139,10 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     if (status === 'error') {
       setLoading(false);
     }
+    var newFormStatus = updateLists(formStatus, 'id', formId, {
+      status: status
+    });
+    setFormStatus(newFormStatus);
   };
 
   /**
@@ -85,13 +154,15 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-04-28 11:32
    */
   var setFormStorage = function setFormStorage(values) {
+    var _forms$currentFormInd2;
+    var cart_id = forms === null || forms === void 0 || (_forms$currentFormInd2 = forms[currentFormIndex]) === null || _forms$currentFormInd2 === void 0 ? void 0 : _forms$currentFormInd2.cart_id;
     var oldData = getOtherData(key);
-    var newData = updateBookingFormStorage(oldData, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, values);
+    var newData = updateBookingFormStorage(oldData, cart_id, values);
     setOtherData(key, _objectSpread({}, newData));
 
     // 更新表单购物车
     appointmentBooking.updateCart({
-      _id: appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.cart_id,
+      _id: cart_id,
       relationForms: [{
         form_id: formId,
         form_record_ids: [values === null || values === void 0 ? void 0 : values.form_record_id]
@@ -109,40 +180,69 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-04-28 11:34
    */
   var handleFormFinish = function handleFormFinish(status, values) {
-    try {
-      setIsClearData(false);
-      updateFormStatus(status);
-      if (status === 'success') {
-        setFormStorage(values);
-        nextStep();
+    setIsClearData(false);
+    updateFormStatus(status);
+    if (status === 'success') {
+      var _forms$currentFormInd3;
+      setFormStorage(values);
+
+      // 判断当前表单是否有协议
+      if (forms !== null && forms !== void 0 && (_forms$currentFormInd3 = forms[currentFormIndex]) !== null && _forms$currentFormInd3 !== void 0 && _forms$currentFormInd3.policy_id) {
+        var _forms$currentFormInd4;
+        setAgreementContent({
+          id: forms === null || forms === void 0 || (_forms$currentFormInd4 = forms[currentFormIndex]) === null || _forms$currentFormInd4 === void 0 ? void 0 : _forms$currentFormInd4.policy_id
+        });
+        setShowAgreement(true);
+      } else {
+        goToNextForm();
       }
-    } catch (error) {
-      setLoading(false);
     }
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "appointment-form-wrap"
-  }, /*#__PURE__*/React.createElement(FormCard, {
-    id: formId,
-    ref: manualRef,
-    isGetLastData: false,
-    setting: {
-      isHidden: 1
-    },
-    formWrapStyle: {
-      padding: '16px'
+  var handleAgreementOk = function handleAgreementOk() {
+    setShowAgreement(false);
+    goToNextForm();
+  };
+  var formCom = useMemo(function () {
+    var _forms$currentFormInd5;
+    if (!formId) return;
+    return /*#__PURE__*/React.createElement("div", {
+      className: "appointment-form-wrap"
+    }, /*#__PURE__*/React.createElement(FormCard, {
+      id: formId,
+      ref: manualRef,
+      isGetLastData: false,
+      setting: {
+        isHidden: 1
+      },
+      formWrapStyle: {
+        padding: '16px'
+      },
+      isV2API: true,
+      isShowSkeleton: true,
+      onSubmit: function onSubmit(status, values) {
+        handleFormFinish(status, values);
+      },
+      onFinishFailed: function onFinishFailed(e) {
+        updateFormStatus('error');
+      },
+      onFormValueChange: function onFormValueChange(values) {},
+      defaultValues: (formStorage === null || formStorage === void 0 ? void 0 : formStorage[forms === null || forms === void 0 || (_forms$currentFormInd5 = forms[currentFormIndex]) === null || _forms$currentFormInd5 === void 0 ? void 0 : _forms$currentFormInd5.cart_id]) || {},
+      isClearData: false
+    }));
+  }, [currentFormIndex, formId]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, formCom, showAgreement ? /*#__PURE__*/React.createElement(PolicyModal, {
+    open: showAgreement,
+    onCancel: function onCancel() {
+      return setShowAgreement(false);
     },
-    isV2API: true,
-    isShowSkeleton: true,
-    onSubmit: function onSubmit(status, values) {
-      handleFormFinish(status, values);
+    onConfirm: function onConfirm() {
+      return handleAgreementOk();
     },
-    onFinishFailed: function onFinishFailed(e) {
-      updateFormStatus('error');
+    item: agreementContent,
+    onChange: function onChange() {
+      return setLoading(false);
     },
-    onFormValueChange: function onFormValueChange(values) {},
-    defaultValues: (formStorage === null || formStorage === void 0 ? void 0 : formStorage[currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key]) || {},
-    isClearData: false
-  })));
+    isHideCheckout: false
+  }) : null);
 });
 export default Form;

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

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