@pisell/private-materials 3.3.10 → 3.3.13

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

@@ -1,5 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -28,13 +27,15 @@ import { useAppointmentBookingCart, useAppointmentBookingStep, useAppointmentBoo
 import "./index.less";
 var Layout = function Layout() {
   var _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6, _currentStep$step7;
+  var stepRef = useRef();
   var formRef = useRef();
   var _useAppointmentBookin = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin.currentStep,
     setResourceOtherParams = _useAppointmentBookin.setResourceOtherParams,
     resourceOtherParams = _useAppointmentBookin.resourceOtherParams,
     setIsAgreeDepositPolicy = _useAppointmentBookin.setIsAgreeDepositPolicy,
-    appointmentBooking = _useAppointmentBookin.appointmentBooking;
+    appointmentBooking = _useAppointmentBookin.appointmentBooking,
+    setLoading = _useAppointmentBookin.setLoading;
   var _useAppointmentBookin2 = useAppointmentBookingSetting(),
     getLoadAllSchedule = _useAppointmentBookin2.getLoadAllSchedule,
     isDateSelectedFirst = _useAppointmentBookin2.isDateSelectedFirst,
@@ -45,7 +46,7 @@ var Layout = function Layout() {
     getHolders = _useAppointmentBookin4.getHolders;
   var _useAppointmentBookin5 = useAppointmentBookingStep(),
     removeStep = _useAppointmentBookin5.removeStep,
-    addStep = _useAppointmentBookin5.addStep;
+    stepList = _useAppointmentBookin5.stepList;
 
   // 不要删除
   useAppointmentBookingCart();
@@ -60,15 +61,17 @@ var Layout = function Layout() {
     };
   }, []);
   useEffect(function () {
-    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');
-    }
+    try {
+      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]);
   useEffect(function () {
     if (isFormSubject && isLogin) {
@@ -76,6 +79,11 @@ var Layout = function Layout() {
     }
   }, [isFormSubject, isLogin]);
   useEffect(function () {
+    if (!(currentStep !== null && currentStep !== void 0 && currentStep.step)) return;
+
+    // 清空底部按钮的loading
+    setLoading(false);
+
     // 清空资源分配失败数据
     setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), {}, {
       errorList: null
@@ -85,12 +93,6 @@ 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]);
-
-  // 传递 submit 方法给 Footer
-  var handleFormSubmit = function handleFormSubmit() {
-    var _formRef$current, _formRef$current$subm;
-    (_formRef$current = formRef.current) === null || _formRef$current === void 0 || (_formRef$current$subm = _formRef$current.submit) === null || _formRef$current$subm === void 0 || _formRef$current$subm.call(_formRef$current);
-  };
   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;
@@ -107,20 +109,17 @@ var Layout = function Layout() {
       // 时间切片
       'select-time': TimeSlicing,
       // 填写表单
-      'fill-form': function fillForm(props) {
-        return /*#__PURE__*/React.createElement(Form, _extends({
-          ref: formRef
-        }, props));
-      },
+      'fill-form': Form,
       // 确认信息
       'confirm-information': ConfirmInformation
     };
     var Com = components[key];
     return /*#__PURE__*/React.createElement(Com, {
       onChange: setParams,
-      params: params
+      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: 动态计算中间内容区域的高度
@@ -157,15 +156,23 @@ var Layout = function Layout() {
     return /*#__PURE__*/React.createElement("div", {
       className: "parallel-content-right"
     }, /*#__PURE__*/React.createElement(CartItem, {
-      onContinue: handleFormSubmit
+      onNext: function onNext() {
+        var _stepRef$current, _stepRef$current$next;
+        return stepRef === null || stepRef === void 0 || (_stepRef$current = stepRef.current) === null || _stepRef$current === void 0 || (_stepRef$current$next = _stepRef$current.next) === null || _stepRef$current$next === void 0 ? void 0 : _stepRef$current$next.call(_stepRef$current);
+      }
     }));
   }, [isDateSelectedFirst, currentStep === null || currentStep === void 0 || (_currentStep$step6 = currentStep.step) === null || _currentStep$step6 === void 0 ? void 0 : _currentStep$step6.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' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "parallel-content-left"
-  }, Com), isShowCartCom), isMobile() && (currentStep === null || currentStep === void 0 || (_currentStep$step7 = currentStep.step) === null || _currentStep$step7 === void 0 ? void 0 : _currentStep$step7.key) !== 'confirm-information' ? /*#__PURE__*/React.createElement(Footer, {
-    onContinue: handleFormSubmit
+  }, Com), isShowCartCom), isMobile() && (currentStep === null || currentStep === void 0 || (_currentStep$step7 = currentStep.step) === null || _currentStep$step7 === void 0 ? void 0 : _currentStep$step7.key) !== 'confirm-information' ? /*#__PURE__*/React.createElement(Footer
+  // isOpen={params?.isOpen}
+  , {
+    onNext: function onNext() {
+      var _stepRef$current2, _stepRef$current2$nex;
+      return stepRef === null || stepRef === void 0 || (_stepRef$current2 = stepRef.current) === null || _stepRef$current2 === void 0 || (_stepRef$current2$nex = _stepRef$current2.next) === null || _stepRef$current2$nex === void 0 ? void 0 : _stepRef$current2$nex.call(_stepRef$current2);
+    }
   }) : null);
 };
 export default Layout;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const CalendarDate: (props: any) => JSX.Element;
-export default CalendarDate;
+declare const Date: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
+export default Date;

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

@@ -13,7 +13,7 @@ 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, { useState, useEffect } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
 import { Skeleton } from 'antd';
 import Dayjs from 'dayjs';
 import isSameOrBefore from 'dayjs/plugin/isSameOrBefore';
@@ -22,9 +22,10 @@ import classNames from 'classnames';
 import { locales, isMobile } from '@pisell/utils';
 import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons';
 import { useAppointmentBookingContext } from "../../context";
+import { Toast } from "../../utils";
 import { useAppointmentBookingSetting } from "../../hooks";
 import "./index.less";
-var CalendarDate = function CalendarDate(props) {
+var Date = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -50,6 +51,38 @@ var CalendarDate = function CalendarDate(props) {
     customPageId = _useAppointmentBookin2.customPageId,
     getLoadAllSchedule = _useAppointmentBookin2.getLoadAllSchedule,
     channel = _useAppointmentBookin2.channel;
+  useImperativeHandle(ref, function () {
+    return {
+      next: function () {
+        var _next2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var data;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return appointmentBooking.getDateRange();
+              case 2:
+                data = _context.sent;
+                if (data !== null && data !== void 0 && data.length) {
+                  _context.next = 5;
+                  break;
+                }
+                return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unselect.date')));
+              case 5:
+                appointmentBooking.next();
+              case 6:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function next() {
+          return _next2.apply(this, arguments);
+        }
+        return next;
+      }()
+    };
+  });
   var weekListText = [locales.getText('pisell2.appointment.sunday'), locales.getText('pisell2.appointment.monday'), locales.getText('pisell2.appointment.tuesday'), locales.getText('pisell2.appointment.wednesday'), locales.getText('pisell2.appointment.thursday'), locales.getText('pisell2.appointment.friday'), locales.getText('pisell2.appointment.saturday')];
 
   // 计算开始渲染的列
@@ -62,22 +95,22 @@ var CalendarDate = function CalendarDate(props) {
   useEffect(function () {
     // 设置当前显示的月份
     var getCurrentMonthData = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var _data$;
         var data;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              _context.next = 2;
+              _context2.next = 2;
               return appointmentBooking.getDateRange();
             case 2:
-              data = _context.sent;
+              data = _context2.sent;
               setCurrentMonth(Dayjs(data === null || data === void 0 || (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.date) || Dayjs());
             case 4:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee);
+        }, _callee2);
       }));
       return function getCurrentMonthData() {
         return _ref.apply(this, arguments);
@@ -141,56 +174,56 @@ var CalendarDate = function CalendarDate(props) {
    * @Date: 2025-04-24 18:31
    */
   var getDateData = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             console.log(isDateSelectedFirst, customPageId, params, channel, 'wh7868');
             // 先选日期
             if (!isDateSelectedFirst) {
-              _context2.next = 3;
+              _context3.next = 3;
               break;
             }
-            return _context2.abrupt("return", appointmentBooking.loadScheduleAvailableDate(_objectSpread(_objectSpread({}, params), {}, {
+            return _context3.abrupt("return", appointmentBooking.loadScheduleAvailableDate(_objectSpread(_objectSpread({}, params), {}, {
               custom_page_id: customPageId,
               channel: channel
             })));
           case 3:
-            _context2.next = 5;
+            _context3.next = 5;
             return appointmentBooking.getAvailableDate(params);
           case 5:
-            return _context2.abrupt("return", _context2.sent);
+            return _context3.abrupt("return", _context3.sent);
           case 6:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function getDateData(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
   var getDates = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(date) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(date) {
       var startDate, endDate, params, data, selected, _selected$, firstAvailableDate, baseMonthData, updatedDates;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.prev = 0;
+            _context4.prev = 0;
             startDate = Dayjs(date).startOf('month').format('YYYY-MM-DD');
             endDate = Dayjs(date).endOf('month').format('YYYY-MM-DD');
             params = {
               startDate: startDate,
               endDate: endDate
             };
-            _context3.next = 6;
+            _context4.next = 6;
             return getDateData(params);
           case 6:
-            data = _context3.sent;
-            _context3.next = 9;
+            data = _context4.sent;
+            _context4.next = 9;
             return appointmentBooking.getDateRange();
           case 9:
-            selected = _context3.sent;
+            selected = _context4.sent;
             console.log(data, selected, customPageId, 'getDates');
             if ((selected === null || selected === void 0 ? void 0 : selected.length) > 0) {
               setCurrentDate(selected === null || selected === void 0 || (_selected$ = selected[0]) === null || _selected$ === void 0 ? void 0 : _selected$.date);
@@ -225,19 +258,19 @@ var CalendarDate = function CalendarDate(props) {
             // }
             setLoading(false);
             setDateMonthList(updatedDates);
-            _context3.next = 23;
+            _context4.next = 23;
             break;
           case 18:
-            _context3.prev = 18;
-            _context3.t0 = _context3["catch"](0);
+            _context4.prev = 18;
+            _context4.t0 = _context4["catch"](0);
             setLoading(false);
             setDateMonthList([]);
-            console.log(_context3.t0, 'wh978968234234');
+            console.log(_context4.t0, 'wh978968234234');
           case 23:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, null, [[0, 18]]);
+      }, _callee4, null, [[0, 18]]);
     }));
     return function getDates(_x2) {
       return _ref3.apply(this, arguments);
@@ -341,5 +374,5 @@ var CalendarDate = function CalendarDate(props) {
       className: classNames('day-text')
     }, Dayjs(day.date).format('D')));
   })))));
-};
-export default CalendarDate;
+});
+export default Date;

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

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

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

@@ -15,17 +15,20 @@ import Total from "../Cart/Item/Total";
 import "./index.less";
 var Footer = function Footer(_ref) {
   var _currentStep$step;
-  var onContinue = _ref.onContinue;
+  var onNext = _ref.onNext,
+    isOpen = _ref.isOpen;
   var _useAppointmentBookin = useAppointmentBookingContext(),
     carts = _useAppointmentBookin.carts,
-    currentStep = _useAppointmentBookin.currentStep;
+    currentStep = _useAppointmentBookin.currentStep,
+    isErrorHolder = _useAppointmentBookin.isErrorHolder,
+    setIsErrorHolder = _useAppointmentBookin.setIsErrorHolder;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
   useEffect(function () {
-    setOpen(false);
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key]);
+    setOpen(isErrorHolder || false);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key, isErrorHolder]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SectionFooters, {
     className: "section-footer-wrap",
     left: /*#__PURE__*/React.createElement(Total, {
@@ -46,16 +49,15 @@ var Footer = function Footer(_ref) {
       src: shoppingCartSvg,
       preview: false
     }))), /*#__PURE__*/React.createElement(ContinueButton, {
-      onContinue: onContinue,
-      onIsErrorResource: function onIsErrorResource(val) {
-        return setOpen(val || false);
-      }
+      onNext: onNext
     }))
   }), /*#__PURE__*/React.createElement(Cart, {
     open: open,
     onCancel: function onCancel() {
-      return setOpen(false);
-    }
+      setOpen(false);
+      setIsErrorHolder(false);
+    },
+    onNext: onNext
   }));
 };
 export default Footer;

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

@@ -37,24 +37,52 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     setFormStatus = _useState8[1];
   var _useAppointmentBookin = useAppointmentBookingContext(),
     carts = _useAppointmentBookin.carts,
-    appointmentBooking = _useAppointmentBookin.appointmentBooking;
+    appointmentBooking = _useAppointmentBookin.appointmentBooking,
+    setLoading = _useAppointmentBookin.setLoading;
   var _useAppointmentBookin2 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin2.getResourceList;
   var _useAppointmentBookin3 = useAppointmentBookingSetting(),
     setOtherData = _useAppointmentBookin3.setOtherData,
     getOtherData = _useAppointmentBookin3.getOtherData;
+  useImperativeHandle(ref, function () {
+    return {
+      next: function next() {
+        var _manualRef$current, _manualRef$current$su;
+        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';
+
+  /**
+   * @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) || [];
   }, []);
+
+  /**
+   * @title: 获取本地存储表单
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-05-06 10:00
+   */
   var formStorage = useMemo(function () {
     return getOtherData(key);
   }, []);
   var newCarts = formatCarts(carts, resources);
   var forms = useMemo(function () {
     if (!(newCarts !== null && newCarts !== void 0 && newCarts.length) || !(resources !== null && resources !== void 0 && resources.length)) return [];
-    return formatForms(newCarts);
+    return formatForms(newCarts) || [];
   }, [newCarts, resources]);
   var currentForm = useMemo(function () {
     return forms === null || forms === void 0 ? void 0 : forms[currentFormIndex];
@@ -80,6 +108,7 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
       // 如果下一个表单没有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
         });
@@ -99,6 +128,9 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-04-26 18:39
    */
   var updateFormStatus = function updateFormStatus(status) {
+    if (status === 'error') {
+      setLoading(false);
+    }
     var newFormStatus = updateLists(formStatus, 'id', currentForm === null || currentForm === void 0 ? void 0 : currentForm.form_id, {
       status: status
     });
@@ -157,14 +189,6 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     setShowAgreement(false);
     goToNextForm();
   };
-  useImperativeHandle(ref, function () {
-    return {
-      submit: function submit() {
-        var _manualRef$current, _manualRef$current$su;
-        (_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);
-      }
-    };
-  });
   return /*#__PURE__*/React.createElement(React.Fragment, null, currentForm !== null && currentForm !== void 0 && currentForm.form_id ? /*#__PURE__*/React.createElement("div", {
     className: "appointment-form-wrap"
   }, /*#__PURE__*/React.createElement(FormCard, {
@@ -189,12 +213,15 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     onFormValueChange: function onFormValueChange(values) {
       console.log(values, 'onFormValueChange');
     },
-    defaultValues: formStorage === null || formStorage === void 0 ? void 0 : formStorage[currentForm === null || currentForm === void 0 ? void 0 : currentForm.id],
-    isClearData: false
+    defaultValues: (formStorage === null || formStorage === void 0 ? void 0 : formStorage[currentForm === null || currentForm === void 0 ? void 0 : currentForm.id]) || {},
+    isClearData: !(formStorage !== null && formStorage !== void 0 && formStorage[currentForm === null || currentForm === void 0 ? void 0 : currentForm.id])
   })) : null, showAgreement ? /*#__PURE__*/React.createElement(PolicyModal, {
     open: showAgreement,
     onCancel: handleAgreementOk,
-    item: agreementContent
+    item: agreementContent,
+    onChange: function onChange() {
+      return setLoading(false);
+    }
   }) : null);
 });
 export default Form;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const Guest: () => JSX.Element;
+declare const Guest: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
 export default Guest;

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

@@ -4,7 +4,7 @@ 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, useState } from 'react';
+import React, { useMemo, useState, forwardRef, useImperativeHandle } from 'react';
 import { Dropdown } from 'antd';
 import { Button, Iconfont, PisellCard, PisellAvatar, PisellToast } from '@pisell/materials';
 import { locales, isMobile, getUniqueId } from '@pisell/utils';
@@ -13,7 +13,7 @@ import { useAppointmentBookingContext } from "../../context";
 import { useAppointmentBookingAccount } from "../../hooks";
 import { formatGuest } from "../../utils";
 import "./index.less";
-var Guest = function Guest() {
+var Guest = /*#__PURE__*/forwardRef(function (props, ref) {
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     openOption = _useState2[0],
@@ -28,6 +28,13 @@ var Guest = function Guest() {
     appointmentBooking = _useAppointmentBookin.appointmentBooking;
   var _useAppointmentBookin2 = useAppointmentBookingAccount(),
     accountLists = _useAppointmentBookin2.accountLists;
+  useImperativeHandle(ref, function () {
+    return {
+      next: function next() {
+        appointmentBooking.next();
+      }
+    };
+  });
   var lists = useMemo(function () {
     var _lists = formatGuest(accountLists, carts);
     return _lists;
@@ -172,5 +179,5 @@ var Guest = function Guest() {
       setOpenOption(false);
     }
   }) : null);
-};
+});
 export default Guest;

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

@@ -23,7 +23,8 @@ var Header = function Header() {
     checkSkipResourceStep = _useIsSkipResourceSte.checkSkipResourceStep;
   var _useAppointmentBookin2 = useAppointmentBookingStep(),
     getStepIndex = _useAppointmentBookin2.getStepIndex,
-    stepList = _useAppointmentBookin2.stepList;
+    stepList = _useAppointmentBookin2.stepList,
+    updateStep = _useAppointmentBookin2.updateStep;
   var _useAppointmentBookin3 = useAppointmentBookingSetting(),
     setOtherData = _useAppointmentBookin3.setOtherData;
   var _useAppointmentBookin4 = useAppointmentBookingProduct(),
@@ -60,7 +61,7 @@ var Header = function Header() {
   var handleBack = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _currentStep$step4;
-      var key, types, _carts$, type, isHasForm, shouldCheckSkip, skipResourceStep, targetIndex;
+      var key, types, _carts$, type, resourceStep;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -101,30 +102,37 @@ var Header = function Header() {
               setOtherData('booking_form', {});
             }
 
-            // 5. 判断是否需要跳过资源步骤
-            isHasForm = stepList === null || stepList === void 0 ? void 0 : stepList.some(function (item) {
-              return item.key === 'fill-form';
-            });
-            shouldCheckSkip = isHasForm && key === 'fill-form' || key === 'select-time';
-            if (!shouldCheckSkip) {
-              _context.next = 22;
-              break;
-            }
-            _context.next = 17;
-            return checkSkipResourceStep();
-          case 17:
-            skipResourceStep = _context.sent;
-            if (!skipResourceStep) {
-              _context.next = 22;
-              break;
+            // // 5. 判断是否需要跳过资源步骤
+            // const isHasForm = stepList?.some((item: any) => item.key === 'fill-form');
+            // const shouldCheckSkip =
+            //   (isHasForm && key === 'fill-form') || key === 'select-time';
+
+            // if (shouldCheckSkip) {
+            //   const skipResourceStep = await checkSkipResourceStep(true);
+            //   if (skipResourceStep) {
+            //     appointmentBooking.deleteCartItemInfo('resource');
+            //     const targetIndex = getStepIndex('prev', 2);
+            //     return appointmentBooking.gotoStep(targetIndex);
+            //   }
+            // }
+
+            // 如果前一步是资源步骤，并且被跳过了，则清空资源
+            resourceStep = stepList[(currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) - 1];
+            if (resourceStep !== null && resourceStep !== void 0 && resourceStep.isSkip && (resourceStep === null || resourceStep === void 0 ? void 0 : resourceStep.key) === 'select-resource') {
+              appointmentBooking.deleteCartItemInfo('resource');
             }
-            appointmentBooking.deleteCartItemInfo('resource');
-            targetIndex = getStepIndex('prev', 2);
-            return _context.abrupt("return", appointmentBooking.gotoStep(targetIndex));
-          case 22:
+
             // 6. 默认回退一步
             appointmentBooking.back();
-          case 23:
+
+            // 再次将步骤更新为false
+            if (resourceStep !== null && resourceStep !== void 0 && resourceStep.isSkip && (resourceStep === null || resourceStep === void 0 ? void 0 : resourceStep.key) === 'select-resource') {
+              updateStep(resourceStep === null || resourceStep === void 0 ? void 0 : resourceStep.key, {
+                index: currentStep === null || currentStep === void 0 ? void 0 : currentStep.index,
+                isSkip: false
+              });
+            }
+          case 16:
           case "end":
             return _context.stop();
         }

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

@@ -1,3 +1,7 @@
+import React from 'react';
 import './index.less';
-declare const Resource: () => JSX.Element;
+interface ResourceProps {
+    onChange?: (val: any) => void;
+}
+declare const Resource: React.ForwardRefExoticComponent<ResourceProps & React.RefAttributes<any>>;
 export default Resource;