@pisell/private-materials 3.3.16 → 3.3.18

package/es/components/Sales/Summary/utils.d.ts

@@ -25,7 +25,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/es/components/appointmentBooking/components/Cart/ContinueButton/index.js

@@ -29,7 +29,8 @@ var ContinueButton = function ContinueButton(_ref) {
     appointmentBooking = _useAppointmentBookin3.appointmentBooking,
     setCarts = _useAppointmentBookin3.setCarts,
     loading = _useAppointmentBookin3.loading,
-    setIsErrorHolder = _useAppointmentBookin3.setIsErrorHolder;
+    setIsErrorHolder = _useAppointmentBookin3.setIsErrorHolder,
+    isLastStep = _useAppointmentBookin3.isLastStep;
   var _useAppointmentBookin4 = useAppointmentBookingSetting(),
     isFormSubject = _useAppointmentBookin4.isFormSubject;
   var stepList = useMemo(function () {
@@ -37,19 +38,6 @@ var ContinueButton = function ContinueButton(_ref) {
     return appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s = appointmentBooking.store) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.step) === null || _appointmentBooking$s === void 0 || (_appointmentBooking$s = _appointmentBooking$s.store) === null || _appointmentBooking$s === void 0 ? void 0 : _appointmentBooking$s.stepList;
   }, [appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s2 = appointmentBooking.store) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.step) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.store) === null || _appointmentBooking$s2 === void 0 ? void 0 : _appointmentBooking$s2.stepList]);
 
-  /**
-   * @title: 清空数据
-   * @description:
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2025-04-16 17:55
-   */
-  var clearData = function clearData() {
-    var _shopDiscount$destroy;
-    appointmentBooking.destroy();
-    shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$destroy = shopDiscount.destroy) === null || _shopDiscount$destroy === void 0 || _shopDiscount$destroy.call(shopDiscount);
-  };
-
   /**
    * @title: 检测holder主体数据是否选择
    * @description:
@@ -164,12 +152,12 @@ var ContinueButton = function ContinueButton(_ref) {
    * @Date: 2025-01-17 16:10
    */
   var continueText = useMemo(function () {
-    if ((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 1 === (stepList === null || stepList === void 0 ? void 0 : stepList.length)) {
+    if (isLastStep) {
       return locales.getText('pisell2.event.checkout');
     } else {
       return locales.getText('pisell2.event.close.continue');
     }
-  }, [currentStep === null || currentStep === void 0 ? void 0 : currentStep.index, stepList]);
+  }, [isLastStep]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     disabled: !(carts !== null && carts !== void 0 && carts.length),
     size: "large",

package/es/components/appointmentBooking/components/Cart/Item/Total.js

@@ -19,7 +19,6 @@ var Total = function Total(_ref) {
     isPriceIncludeTax = summary.isPriceIncludeTax,
     total = summary.total,
     deposit = summary.deposit;
-  console.log(summary, 'summarysummary');
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-total-wrap ".concat(className, " ").concat(deposit !== null && deposit !== void 0 && deposit.hasDeposit ? 'appointment-total-deposit-wrap' : '')
   }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("div", {

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

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

package/es/components/appointmentBooking/components/Cart/Item/index.js

@@ -19,9 +19,10 @@ import VoucherCard from "../../Voucher";
 import Total from "./Total";
 import Deposit from "../../Deposit";
 import useEngineContext from "../../../../../hooks/useEngineContext";
+import { handleAddHolder } from "../utils";
 import "./index.less";
 var CartItem = function CartItem(_ref) {
-  var _context$appHelper, _businessUtils$getApp, _currentStep$step, _currentStep$step2, _currentStep$step3;
+  var _context$appHelper, _businessUtils$getApp, _currentStep$step, _currentStep$step2;
   var onNext = _ref.onNext;
   var appointmentBooking = useAppointmentBooking();
   var _useAppointmentBookin = useAppointmentBookingContext(),
@@ -31,7 +32,7 @@ var CartItem = function CartItem(_ref) {
     setResourceOtherParams = _useAppointmentBookin.setResourceOtherParams,
     resourceOtherParams = _useAppointmentBookin.resourceOtherParams,
     summary = _useAppointmentBookin.summary,
-    stepParams = _useAppointmentBookin.stepParams;
+    isLastStep = _useAppointmentBookin.isLastStep;
   var _useAppointmentBookin2 = useAppointmentBookingAccount(),
     accountLists = _useAppointmentBookin2.accountLists,
     getHolders = _useAppointmentBookin2.getHolders,
@@ -40,7 +41,8 @@ var CartItem = function CartItem(_ref) {
   var _useAppointmentBookin3 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin3.getResourceList;
   var _useAppointmentBookin4 = useAppointmentBookingSetting(),
-    isFormSubject = _useAppointmentBookin4.isFormSubject;
+    isFormSubject = _useAppointmentBookin4.isFormSubject,
+    bookingSubject = _useAppointmentBookin4.bookingSubject;
   var _useAppointmentBookin5 = useAppointmentBookingLogin(),
     isLogin = _useAppointmentBookin5.isLogin;
   var context = useEngineContext();
@@ -125,8 +127,10 @@ var CartItem = function CartItem(_ref) {
 
     // 添加holder
     if (type === 'add_holder') {
+      // 关联的表单id
+      var relationShipFormId = bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.relationship_form_id;
       return openForm({
-        form_id: form_id,
+        form_id: relationShipFormId || (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id),
         title: locales.getText('pisell2.event.create.form'),
         utils: utils,
         callback: function () {
@@ -136,18 +140,41 @@ var CartItem = function CartItem(_ref) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   if (!((res === null || res === void 0 ? void 0 : res.status) === 'success')) {
-                    _context.next = 5;
+                    _context.next = 12;
                     break;
                   }
-                  _context.next = 3;
+                  result = undefined; // 未关联表，则将接口返回的数据作为holder数据
+                  if (relationShipFormId) {
+                    _context.next = 8;
+                    break;
+                  }
+                  _context.next = 5;
                   return addAccount(res === null || res === void 0 ? void 0 : res.values, 'holder');
-                case 3:
+                case 5:
                   result = _context.sent;
-                  appointmentBooking.updateCart({
-                    _id: e === null || e === void 0 ? void 0 : e._id,
-                    account: result
+                  _context.next = 11;
+                  break;
+                case 8:
+                  _context.next = 10;
+                  return handleAddHolder({
+                    res: res,
+                    bookingSubject: bookingSubject,
+                    accountLists: accountLists,
+                    cartItem: e,
+                    getHolders: getHolders,
+                    appointmentBooking: appointmentBooking
                   });
-                case 5:
+                case 10:
+                  result = _context.sent;
+                case 11:
+                  // 更新购物车的holder数据
+                  if (result) {
+                    appointmentBooking.updateCart({
+                      _id: e === null || e === void 0 ? void 0 : e._id,
+                      account: result
+                    });
+                  }
+                case 12:
                 case "end":
                   return _context.stop();
               }
@@ -170,11 +197,11 @@ var CartItem = function CartItem(_ref) {
       products: formatCarts(carts, resources, accountLists),
       hideAddBtn: false,
       holders: holders,
-      disabledEdit: stepParams === null || stepParams === void 0 ? void 0 : stepParams.isLastStep,
+      disabledEdit: isLastStep,
       isShowChangeResource: (currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key) === 'select-resource',
       isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-service',
       isShowPackageNote: false,
-      isShowChangeHolder: (currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key) === 'confirm-information' ? false : isFormSubject && isLogin,
+      isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
       isShowHolder: isFormSubject,
       isShowAddHolderButton: true
     },

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

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

package/es/components/appointmentBooking/components/Cart/utils.d.ts

@@ -33,4 +33,24 @@ interface CheckResourceParams {
     carts: any[];
 }
 export declare type StepKey = 'select-resource' | 'fill-form' | 'select-time' | 'confirm-information' | 'select-service' | 'select-date' | 'select-guest';
+interface AddHolderParams {
+    res: any;
+    bookingSubject: any;
+    accountLists: any[];
+    cartItem: any;
+    getHolders: () => void;
+    appointmentBooking: any;
+}
+/**
+ * @title: 添加holder
+ * @description:
+ * @param {any} res
+ * @param {any} bookingSubject
+ * @param {any} accountLists
+ * @param {any} e
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-05-10 18:25
+ */
+export declare const handleAddHolder: ({ res, bookingSubject, accountLists, cartItem, getHolders, appointmentBooking }: AddHolderParams) => Promise<any>;
 export {};

package/es/components/appointmentBooking/components/Cart/utils.js

@@ -1,4 +1,10 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 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; }
@@ -101,4 +107,64 @@ export var checkResource = function checkResource(_ref4) {
   return false;
 };
 
-// 定义步骤 key 类型
+// 定义步骤 key 类型
+
+/**
+ * @title: 添加holder
+ * @description: 
+ * @param {any} res
+ * @param {any} bookingSubject
+ * @param {any} accountLists
+ * @param {any} e
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-05-10 18:25
+ */
+export var handleAddHolder = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var res, bookingSubject, accountLists, cartItem, getHolders, appointmentBooking, _res$values, result, relationShipForms, currentForm, form_record_id, oldAccount, newAccountLists, newAccount;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          res = _ref5.res, bookingSubject = _ref5.bookingSubject, accountLists = _ref5.accountLists, cartItem = _ref5.cartItem, getHolders = _ref5.getHolders, appointmentBooking = _ref5.appointmentBooking;
+          _context2.prev = 1;
+          result = undefined; // 所有被关联的表数据
+          relationShipForms = (res === null || res === void 0 || (_res$values = res.values) === null || _res$values === void 0 ? void 0 : _res$values.form_to_form_value) || []; // 找到当前的表数据
+          currentForm = relationShipForms.find(function (item) {
+            return item.form_id === (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id);
+          }); // 找到当前新创建的表
+          form_record_id = Math.max.apply(Math, _toConsumableArray((currentForm === null || currentForm === void 0 ? void 0 : currentForm.form_data_value) || []));
+          oldAccount = accountLists.find(function (item) {
+            return item.id === form_record_id;
+          }); // 重新获取holder列表
+          _context2.next = 9;
+          return getHolders();
+        case 9:
+          _context2.next = 11;
+          return appointmentBooking.getAccounts();
+        case 11:
+          newAccountLists = _context2.sent;
+          // 编辑已有的表单, 判断当前购物车中是否有holder数据，没有则更新列表的第一条数据
+          if (oldAccount) {
+            result = !(cartItem !== null && cartItem !== void 0 && cartItem.holder_id) ? _objectSpread({}, accountLists === null || accountLists === void 0 ? void 0 : accountLists[0]) : undefined;
+          } else {
+            // 创建表单
+            newAccount = newAccountLists.find(function (item) {
+              return item.id === form_record_id;
+            });
+            result = _objectSpread({}, newAccount || (newAccountLists === null || newAccountLists === void 0 ? void 0 : newAccountLists[0]));
+          }
+          return _context2.abrupt("return", result);
+        case 16:
+          _context2.prev = 16;
+          _context2.t0 = _context2["catch"](1);
+        case 18:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[1, 16]]);
+  }));
+  return function handleAddHolder(_x2) {
+    return _ref6.apply(this, arguments);
+  };
+}();

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

@@ -53,7 +53,6 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
     var _utils$history;
     var url = "/payment-finish/success?order_id=".concat(order_id, "&amount=").concat(Number(amount));
     utils === null || utils === void 0 || (_utils$history = utils.history) === null || _utils$history === void 0 || _utils$history.replace(url);
-    clearData();
     setLoading(false);
   };
 
@@ -96,10 +95,10 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
               type: 'pisell1.payment',
               data: _objectSpread(_objectSpread({}, data), {}, {
                 total_amount: _total
-              })
+              }),
+              callback: function callback(e) {}
             });
             setTimeout(function () {
-              clearData();
               setLoading(false);
             }, 200);
             _context.next = 24;

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

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

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

@@ -23,10 +23,11 @@ import Guest from "../Guest";
 import Form from "../Form";
 import ConfirmInformation from "../ConfirmInformation";
 import { useAppointmentBookingContext } from "../../context";
-import { useAppointmentBookingCart, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
+import PolicyModal from "../../deposit/components/PolicyModal";
+import { useAppointmentBookingCart, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingLogin, useAppointmentBookingAccount, useShopDiscount } from "../../hooks";
 import "./index.less";
 var Layout = function Layout() {
-  var _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6, _currentStep$step7;
+  var _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6, _currentStep$step8;
   var stepRef = useRef();
   var formRef = useRef();
   var _useAppointmentBookin = useAppointmentBookingContext(),
@@ -47,17 +48,30 @@ var Layout = function Layout() {
   var _useAppointmentBookin5 = useAppointmentBookingStep(),
     removeStep = _useAppointmentBookin5.removeStep,
     stepList = _useAppointmentBookin5.stepList;
+  var _useShopDiscount = useShopDiscount(),
+    shopDiscount = _useShopDiscount.shopDiscount;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    showAgreement = _useState2[0],
+    setShowAgreement = _useState2[1];
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    agreementContent = _useState4[0],
+    setAgreementContent = _useState4[1];
 
   // 不要删除
   useAppointmentBookingCart();
   useAppointmentBookingStep();
-  var _useState = useState({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    params = _useState2[0],
-    setParams = _useState2[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    params = _useState6[0],
+    setParams = _useState6[1];
   useEffect(function () {
     return function () {
+      var _shopDiscount$destroy;
       setIsAgreeDepositPolicy(false);
+      appointmentBooking.destroy();
+      shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$destroy = shopDiscount.destroy) === null || _shopDiscount$destroy === void 0 || _shopDiscount$destroy.call(shopDiscount);
     };
   }, []);
   useEffect(function () {
@@ -162,17 +176,46 @@ var Layout = function Layout() {
       }
     }));
   }, [isDateSelectedFirst, currentStep === null || currentStep === void 0 || (_currentStep$step6 = currentStep.step) === null || _currentStep$step6 === void 0 ? void 0 : _currentStep$step6.key]);
+
+  /**
+   * @title: 是否显示底部
+   * @description:
+   * @param {*} useMemo
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-05-10 17:42
+   */
+  var isFooter = useMemo(function () {
+    var _currentStep$step7;
+    if (!isMobile()) return false;
+    var key = currentStep === null || currentStep === void 0 || (_currentStep$step7 = currentStep.step) === null || _currentStep$step7 === void 0 ? void 0 : _currentStep$step7.key;
+
+    // 先选日期并且当前步骤是选择日期，则不显示底部
+    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]);
+  var handleAgreementOk = function handleAgreementOk() {
+    setShowAgreement(false);
+    // goToNextForm();
+  };
   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
+  }, Com), isShowCartCom), isFooter ? /*#__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, showAgreement ? /*#__PURE__*/React.createElement(PolicyModal, {
+    open: showAgreement,
+    onCancel: handleAgreementOk,
+    item: agreementContent,
+    onChange: function onChange() {
+      return setLoading(false);
+    }
   }) : null);
 };
 export default Layout;

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

@@ -69,6 +69,12 @@ var Date = /*#__PURE__*/forwardRef(function (props, ref) {
                 }
                 return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.unselect.date')));
               case 5:
+                // 判断选定的日期是否存在可用的预约
+                // const result = appointmentBooking.checkResourceListForDate();
+                // if (!result) {
+                //   return Toast(locales.getText('pisell2.appointment.unuse.date'));
+                // }
+
                 appointmentBooking.next();
               case 6:
               case "end":

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

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

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

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

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

@@ -10,7 +10,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, useRef, useState, useImperativeHandle, forwardRef } from 'react';
+import React, { useMemo, useRef, useState, useImperativeHandle, forwardRef, useEffect } from 'react';
 import useComponents from "../../../../hooks/useComponents";
 import { formatForms, formatCarts, updateLists, updateBookingFormStorage } from "../../utils";
 import { useAppointmentBookingContext } from "../../context";
@@ -35,6 +35,14 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     _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,
@@ -55,6 +63,9 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
   });
   var key = 'booking_form';
 
+  // 获取本地存储
+  var formStorage = getOtherData('booking_form') || {};
+
   /**
    * @title: 获取资源列表
    * @description:
@@ -67,25 +78,15 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     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) || [];
   }, [newCarts, resources]);
-  var currentForm = useMemo(function () {
-    return forms === null || forms === void 0 ? void 0 : forms[currentFormIndex];
+  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']
@@ -104,7 +105,9 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     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;
@@ -113,6 +116,8 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
           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 {
       appointmentBooking.next();
@@ -131,7 +136,7 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     if (status === 'error') {
       setLoading(false);
     }
-    var newFormStatus = updateLists(formStatus, 'id', currentForm === null || currentForm === void 0 ? void 0 : currentForm.form_id, {
+    var newFormStatus = updateLists(formStatus, 'id', formId, {
       status: status
     });
     setFormStatus(newFormStatus);
@@ -146,16 +151,18 @@ 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, currentForm === null || currentForm === void 0 ? void 0 : currentForm.id, values);
+    var newData = updateBookingFormStorage(oldData, cart_id, values);
     setOtherData(key, _objectSpread({}, newData));
 
     // 更新表单购物车
     appointmentBooking.updateCart({
-      _id: currentForm === null || currentForm === void 0 ? void 0 : currentForm.cart_id,
+      _id: cart_id,
       relationForms: [{
-        form_id: currentForm === null || currentForm === void 0 ? void 0 : currentForm.form_id,
-        form_record_ids: [currentForm === null || currentForm === void 0 ? void 0 : currentForm.id]
+        form_id: formId,
+        form_record_ids: [values === null || values === void 0 ? void 0 : values.form_record_id]
       }]
     });
   };
@@ -170,14 +177,17 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-04-28 11:34
    */
   var handleFormFinish = function handleFormFinish(status, values) {
+    setIsClearData(false);
     updateFormStatus(status);
     if (status === 'success') {
+      var _forms$currentFormInd3;
       setFormStorage(values);
 
       // 判断当前表单是否有协议
-      if (currentForm !== null && currentForm !== void 0 && currentForm.policy_id) {
+      if (forms !== null && forms !== void 0 && (_forms$currentFormInd3 = forms[currentFormIndex]) !== null && _forms$currentFormInd3 !== void 0 && _forms$currentFormInd3.policy_id) {
+        var _forms$currentFormInd4;
         setAgreementContent({
-          id: currentForm.policy_id
+          id: forms === null || forms === void 0 || (_forms$currentFormInd4 = forms[currentFormIndex]) === null || _forms$currentFormInd4 === void 0 ? void 0 : _forms$currentFormInd4.policy_id
         });
         setShowAgreement(true);
       } else {
@@ -189,33 +199,35 @@ var Form = /*#__PURE__*/forwardRef(function (props, ref) {
     setShowAgreement(false);
     goToNextForm();
   };
-  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, {
-    id: currentForm === null || currentForm === void 0 ? void 0 : currentForm.form_id,
-    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) {
-      console.log(e, 'updateFormStatus');
-      updateFormStatus('error');
-    },
-    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: !(formStorage !== null && formStorage !== void 0 && formStorage[currentForm === null || currentForm === void 0 ? void 0 : currentForm.id])
-  })) : null, showAgreement ? /*#__PURE__*/React.createElement(PolicyModal, {
+  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: handleAgreementOk,
     item: agreementContent,

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

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

package/es/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;