@pisell/private-materials 3.2.22 → 3.2.25

package/es/components/appointmentBooking/assets/guests.svg

@@ -0,0 +1 @@
+<svg fill="currentColor" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path d="M30.6 18.8a1 1 0 0 1-1.4-.2A6.45 6.45 0 0 0 24 16a1 1 0 0 1 0-2 3 3 0 1 0-2.905-3.75 1 1 0 0 1-1.937-.5 5 5 0 1 1 8.217 4.939 8.5 8.5 0 0 1 3.429 2.71A1 1 0 0 1 30.6 18.8m-6.735 7.7a1 1 0 1 1-1.73 1 7.125 7.125 0 0 0-12.27 0 1 1 0 1 1-1.73-1 9 9 0 0 1 4.217-3.74 6 6 0 1 1 7.296 0 9 9 0 0 1 4.217 3.74M16 22a4 4 0 1 0 0-8 4 4 0 0 0 0 8m-7-7a1 1 0 0 0-1-1 3 3 0 1 1 2.905-3.75 1 1 0 0 0 1.938-.5 5 5 0 1 0-8.218 4.939 8.5 8.5 0 0 0-3.425 2.71A1 1 0 1 0 2.8 18.6 6.45 6.45 0 0 1 8 16a1 1 0 0 0 1-1"></path></svg>

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

@@ -11,22 +11,13 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from 'react';
 import { locales } from '@pisell/utils';
 import { Button, PisellToast } from '@pisell/materials';
-// import {
-//   useCart,
-//   useHolder,
-//   useStep,
-//   useCheckout,
-//   useSales,
-//   useCustomer,
-// } from '../../../../../Sales';
-import { formatValues } from "../../../../Sales/Checkout/utils";
-// import OrderProductModal from '../../OrderProductModal/index';
-// import EmptyHolderModal from '../../EmptyHolderModal';
 import useEngineContext from "../../../../../hooks/useEngineContext";
-import { useAppointmentBookingLogin } from "../../../hooks";
+import { useAppointmentBookingLogin, useAppointmentBookingResource, useAppointmentBookingAccount, useShopDiscount } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
+import { formatCustomer, isEmptyCartsResourceId } from "../../../utils";
 import "./index.less";
 var ContinueButton = function ContinueButton() {
+  var _currentStep$step2;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var _useState = useState(false),
@@ -36,54 +27,51 @@ var ContinueButton = function ContinueButton() {
   var _useAppointmentBookin = useAppointmentBookingLogin(),
     isLogin = _useAppointmentBookin.isLogin,
     openLoginModal = _useAppointmentBookin.openLoginModal;
-  var _useAppointmentBookin2 = useAppointmentBookingContext(),
-    currentStep = _useAppointmentBookin2.currentStep,
-    isLastStep = _useAppointmentBookin2.isLastStep,
-    carts = _useAppointmentBookin2.carts,
-    appointmentBooking = _useAppointmentBookin2.appointmentBooking;
-  var data = {};
-  var createBooking = {
-    loading: false
-  };
-  var checkBeforeBooking = {
-    loading: false
-  };
+  var _useAppointmentBookin2 = useAppointmentBookingAccount(),
+    accountLists = _useAppointmentBookin2.accountLists;
+  var shopDiscount = useShopDiscount();
+  var _useAppointmentBookin3 = useAppointmentBookingContext(),
+    currentStep = _useAppointmentBookin3.currentStep,
+    isLastStep = _useAppointmentBookin3.isLastStep,
+    carts = _useAppointmentBookin3.carts,
+    appointmentBooking = _useAppointmentBookin3.appointmentBooking,
+    resourceOtherParams = _useAppointmentBookin3.resourceOtherParams,
+    summary = _useAppointmentBookin3.summary;
+  var _useAppointmentBookin4 = useAppointmentBookingResource(),
+    getResourceTimeSlot = _useAppointmentBookin4.getResourceTimeSlot,
+    getResourceList = _useAppointmentBookin4.getResourceList;
+  var disabled = useMemo(function () {
+    var _currentStep$step;
+    var key = currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key;
+    if (!carts.length) return true;
+
+    // 选择资源部分需要判断是否有不可用的资源
+    // if (
+    //   key === 'select-resource' &&
+    //   resourceOtherParams?.errorList?.length > 0
+    // ) {
+    //   return true;
+    // }
+
+    // 如果是选择服务页面，则判断是否账户下有空的购物车
+    // if (key === 'select-service' && isEmptyGuest(carts, accountLists)) {
+    //   return true;
+    // }
+
+    return false;
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key, carts, accountLists, resourceOtherParams === null || resourceOtherParams === void 0 ? void 0 : resourceOtherParams.errorList]);
 
   /**
-   * @title: 下单
+   * @title: 清空数据
    * @description:
    * @return {*}
    * @Author: WangHan
-   * @Date: 2025-02-10 17:54
+   * @Date: 2025-04-16 17:55
    */
-  var handleCheckout = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var value, result, _result$err;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            value = formatValues(data); // 如果检测成功，则直接下单
-            // const result = await onCheckout(value);
-            result = {
-              success: true
-            }; // 清空数据
-            if (result !== null && result !== void 0 && result.success) {
-              // removeSessionStorage();
-            } else {
-              PisellToast({
-                content: (result === null || result === void 0 || (_result$err = result.err) === null || _result$err === void 0 ? void 0 : _result$err.message) || ''
-              });
-            }
-          case 3:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function handleCheckout() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+  var clearData = function clearData() {
+    appointmentBooking.destroy();
+    shopDiscount.destroy();
+  };
 
   /**
    * @title: 下一步
@@ -93,50 +81,83 @@ var ContinueButton = function ContinueButton() {
    * @Date: 2025-02-08 18:57
    */
   var handleNextStep = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var res;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _currentStep$step3, _currentStep$step4;
+      var res, _freeResult$data, _ref2, order_id, total_amount, freeResult, _utils$history, url, _freeResult$data2;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isLastStep) {
-              _context2.next = 16;
+              _context.next = 24;
               break;
             }
             setLoading(true);
-            _context2.prev = 2;
-            _context2.next = 5;
+            _context.prev = 2;
+            _context.next = 5;
             return appointmentBooking.submitOrder();
           case 5:
-            res = _context2.sent;
-            console.log(isLastStep, isLogin, res, 'wh9896788');
+            res = _context.sent;
+            if (!((summary === null || summary === void 0 ? void 0 : summary.total) > 0)) {
+              _context.next = 10;
+              break;
+            }
+            // 拉起支付弹窗
             utils.action({
               type: 'pisell1.payment',
-              data: res === null || res === void 0 ? void 0 : res.data,
-              callback: function callback(e) {
-                console.log(e, 'wh9896788');
-                // checkoutCallback.current && checkoutCallback.current(e);
-              }
+              data: res === null || res === void 0 ? void 0 : res.data
             });
+            _context.next = 16;
+            break;
+          case 10:
+            // 免费领取
+            _ref2 = (res === null || res === void 0 ? void 0 : res.data) || {}, order_id = _ref2.order_id, total_amount = _ref2.total_amount;
+            _context.next = 13;
+            return appointmentBooking.getFreeProduct(order_id);
+          case 13:
+            freeResult = _context.sent;
+            console.log(freeResult, 'freeResult');
+            if (freeResult !== null && freeResult !== void 0 && (_freeResult$data = freeResult.data) !== null && _freeResult$data !== void 0 && _freeResult$data.status) {
+              url = "/payment-finish/success?order_id=".concat(order_id, "&amount=").concat(Number(total_amount));
+              utils === null || utils === void 0 || (_utils$history = utils.history) === null || _utils$history === void 0 || _utils$history.replace(url);
+            } else {
+              PisellToast({
+                content: freeResult === null || freeResult === void 0 || (_freeResult$data2 = freeResult.data) === null || _freeResult$data2 === void 0 ? void 0 : _freeResult$data2.message
+              });
+            }
+          case 16:
+            clearData();
             setLoading(false);
-            _context2.next = 15;
+            _context.next = 23;
             break;
-          case 11:
-            _context2.prev = 11;
-            _context2.t0 = _context2["catch"](2);
-            console.log(isLastStep, isLogin, _context2.t0, 'wh9896788');
+          case 20:
+            _context.prev = 20;
+            _context.t0 = _context["catch"](2);
             setLoading(false);
-          case 15:
-            return _context2.abrupt("return");
-          case 16:
-            return _context2.abrupt("return", appointmentBooking.next());
-          case 17:
+          case 23:
+            return _context.abrupt("return");
+          case 24:
+            if ((currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key) === 'select-resource') {
+              getResourceTimeSlot();
+            }
+            if ((currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key) === 'select-time') {
+              // getResourceTimeSlot('resources');
+              // const { errorList } =
+              //   await appointmentBooking.autoSelectAllProductResources(
+              //     'sites',
+              //     selectedTime
+              //   );
+              // const result = await appointmentBooking.submitTimeSlot(selectedTime);
+              // console.log(errorList, result, 'wh9896788');
+            }
+            return _context.abrupt("return", appointmentBooking.next());
+          case 27:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2, null, [[2, 11]]);
+      }, _callee, null, [[2, 20]]);
     }));
     return function handleNextStep() {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
@@ -148,32 +169,53 @@ var ContinueButton = function ContinueButton() {
    * @Date: 2025-01-16 16:30
    */
   var handleContinue = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _currentStep$step5;
+      var key;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            key = currentStep === null || currentStep === void 0 || (_currentStep$step5 = currentStep.step) === null || _currentStep$step5 === void 0 ? void 0 : _currentStep$step5.key;
+            console.log(currentStep, isLastStep, isLogin, 'wh9896788222');
+            // 如果当前是确认信息页面，则到结算页面
             if (!isLastStep) {
-              _context3.next = 3;
+              _context2.next = 5;
               break;
             }
             if (isLogin) {
-              _context3.next = 3;
+              _context2.next = 5;
               break;
             }
-            return _context3.abrupt("return", openLoginModal({
+            return _context2.abrupt("return", openLoginModal({
               callback: function callback(status) {
+                var _utils$store;
+                var user = (_utils$store = utils.store) === null || _utils$store === void 0 || (_utils$store = _utils$store.getState()) === null || _utils$store === void 0 || (_utils$store = _utils$store.global) === null || _utils$store === void 0 ? void 0 : _utils$store.userInfo;
+                var currentUser = formatCustomer(user);
+                var meAccount = accountLists === null || accountLists === void 0 ? void 0 : accountLists.find(function (d) {
+                  return !(d !== null && d !== void 0 && d.isGuest);
+                });
                 if (status === 'success') {
+                  appointmentBooking.setLoginAccount(meAccount === null || meAccount === void 0 ? void 0 : meAccount.id, currentUser);
                   handleNextStep();
                 }
               }
             }));
-          case 3:
+          case 5:
+            if (!(key === 'select-resource' && isEmptyCartsResourceId(carts))) {
+              _context2.next = 8;
+              break;
+            }
+            PisellToast({
+              content: locales.getText('pisell2.appointment.no.available.time')
+            });
+            return _context2.abrupt("return");
+          case 8:
             handleNextStep();
-          case 4:
+          case 9:
           case "end":
-            return _context3.stop();
+            return _context2.stop();
         }
-      }, _callee3);
+      }, _callee2);
     }));
     return function handleContinue() {
       return _ref3.apply(this, arguments);
@@ -195,21 +237,8 @@ var ContinueButton = function ContinueButton() {
       return locales.getText('pisell2.event.close.continue');
     }
   }, [isLastStep]);
-
-  /**
-   * @title: 确认按钮loading
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2025-01-21 23:03
-   */
-  var confirmLoading = useMemo(function () {
-    if (!isLastStep) return false;
-    return (createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading) || (checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading);
-  }, [isLastStep, createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading, checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
-    disabled: !(carts !== null && carts !== void 0 && carts.length),
+    disabled: disabled,
     size: "large",
     type: "primary",
     onClick: function onClick() {

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

@@ -18,8 +18,9 @@ var Total = function Total(_ref) {
     totalTaxFee = summary.totalTaxFee,
     isPriceIncludeTax = summary.isPriceIncludeTax,
     total = summary.total;
+  console.log(summary, 'summarysummary');
   return /*#__PURE__*/React.createElement("div", {
-    className: "event-total-wrap ".concat(className)
+    className: "appointment-total-wrap ".concat(className)
   }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("div", {
     className: "gst-wrap"
   }, /*#__PURE__*/React.createElement("span", null, taxTitle, isFooter ? ': ' : ''), /*#__PURE__*/React.createElement(PisellText.Amount, {

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

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

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

@@ -1,26 +1,36 @@
+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 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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useMemo } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import ShoppingCart from "../../../../shoppingCart";
 import ContinueButton from "../ContinueButton";
-import { useAppointmentBookingAccount, useAppointmentBooking } from "../../../hooks";
+import { useAppointmentBooking } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
-import Total from "./Total";
-import { formatHolder, formatCarts } from "../../../utils";
+import { useAppointmentBookingAccount, useAppointmentBookingResource } from "../../../hooks";
+import { formatHolder, formatCarts, formatCurrentUser } from "../../../utils";
 import VoucherCard from "../../Voucher";
+import Total from "./Total";
 import "./index.less";
-var CartItem = function CartItem() {
+var CartItem = function CartItem(_ref) {
   var _currentStep$step, _currentStep$step2;
+  var onConfirm = _ref.onConfirm;
   var appointmentBooking = useAppointmentBooking();
-  var appointmentBookingAccount = useAppointmentBookingAccount();
   var _useAppointmentBookin = useAppointmentBookingContext(),
     carts = _useAppointmentBookin.carts,
-    summary = _useAppointmentBookin.summary,
     isLastStep = _useAppointmentBookin.isLastStep,
     currentStep = _useAppointmentBookin.currentStep,
-    resources = _useAppointmentBookin.resources;
-  var accountLists = appointmentBookingAccount.accountLists,
-    currentUser = appointmentBookingAccount.currentUser;
-  console.log(summary, carts, formatCarts(carts, resources), 'accountLists');
+    resources = _useAppointmentBookin.resources,
+    setResourceOtherParams = _useAppointmentBookin.setResourceOtherParams,
+    resourceOtherParams = _useAppointmentBookin.resourceOtherParams;
+  var _useAppointmentBookin2 = useAppointmentBookingAccount(),
+    accountLists = _useAppointmentBookin2.accountLists;
+  var _useAppointmentBookin3 = useAppointmentBookingResource(),
+    getResourceList = _useAppointmentBookin3.getResourceList;
+  var currentUser = formatCurrentUser();
   var holderIds = useMemo(function () {
     return accountLists.map(function (item) {
       return item.id;
@@ -29,28 +39,38 @@ var CartItem = function CartItem() {
   var holders = useMemo(function () {
     return formatHolder(accountLists);
   }, [accountLists]);
-  var handleClickCard = function handleClickCard(e, type, key) {
-    console.log(e, type, key, 'wh9988767');
-
+  var handleClickCard = function handleClickCard(e, type, val) {
     // 更改备注
     if (type === 'note') {
-      return appointmentBooking.updateCart(e === null || e === void 0 ? void 0 : e._id, {
-        products: e
-      });
+      return appointmentBooking.updateCart(_objectSpread({
+        _id: e === null || e === void 0 ? void 0 : e._id
+      }, val));
     }
 
     // 删除购物车下某个商品
     if (type === 'delete') {
-      // return appointmentBooking.updateCart(e?._id, { products: e });
+      return appointmentBooking.deleteCart(e === null || e === void 0 ? void 0 : e._id);
     }
 
     // 删除购物车
     if (type === 'delete_holders') {
-      return appointmentBooking.removeAccount(key);
+      return appointmentBooking.removeAccount(val);
+    }
+
+    // 更改资源
+    if (type === 'change_resource') {
+      // 清空资源分配失败数据
+      setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), {}, {
+        errorList: null
+      }));
+      return appointmentBooking.updateCart({
+        _id: e === null || e === void 0 ? void 0 : e._id,
+        resources: [val]
+      });
     }
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "cart-item-wrap ".concat(isMobile() ? 'cart-mobile-item-wrap' : '')
+    className: "appointment-cart-item-wrap ".concat(isMobile() ? 'appointment-cart-mobile-item-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "content"
   }, /*#__PURE__*/React.createElement(ShoppingCart, {
@@ -60,7 +80,8 @@ var CartItem = function CartItem() {
       holders: holders,
       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.index) < 2
+      isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-service',
+      isShowPackageNote: false
     },
     collapseParams: {
       activeKey: holderIds,
@@ -69,11 +90,12 @@ var CartItem = function CartItem() {
     platform: "h5",
     emptyText: locales.getText('pisell2.event.empty.service'),
     isOpenGroup: !!(holderIds !== null && holderIds !== void 0 && holderIds.length),
+    isHideClearCart: true,
     onChange: function onChange(e, type, key) {
       return handleClickCard(e, type, key);
     }
   })), /*#__PURE__*/React.createElement("div", {
-    className: "event-footer"
+    className: "appointment-footer"
   }, /*#__PURE__*/React.createElement(VoucherCard, {
     currentUser: currentUser,
     products: carts

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

@@ -1,8 +1,11 @@
-.cart-item-wrap {
-  height: 100%;
+.appointment-cart-item-wrap {
+  height: calc(100vh - 100px);
   .content {
     background: #fff;
-    padding: 20px;
+    padding: 0 16px;
+    max-height: calc(100% - 240px);
+    overflow-y: auto;
+
     .pisell-lowcode__shopping-cart-content {
       .ant-card-body {
         padding: 0;
@@ -10,9 +13,9 @@
     }
   }
 
-  .event-footer {
+  .appointment-footer {
     background: #fff;
-    padding: 20px;
+    padding: 10px 16px 0;
     display: flex;
     flex-direction: column;
     gap: 14px;
@@ -20,7 +23,7 @@
   }
 }
 
-.event-total-wrap {
+.appointment-total-wrap {
   color: var(--Text-Text_1, #1b1b1b);
   font-size: 20px;
   font-weight: 600;
@@ -64,17 +67,19 @@
   }
 }
 
-.cart-mobile-item-wrap {
+.appointment-cart-mobile-item-wrap {
   display: flex;
   flex-direction: column;
   position: relative;
+  height: 100%;
 
   .content {
     flex: 1;
     overflow-y: auto;
-    padding: 0 0 140px;
+    padding: 0 0 210px;
+    max-height: 100%;
   }
-  .event-footer {
+  .appointment-footer {
     z-index: 10;
     position: fixed;
     bottom: 0;

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

@@ -18,8 +18,9 @@ var Cart = function Cart(_ref) {
       padding: '20px'
     },
     destroyOnClose: true,
-    className: "event-cart-modal",
-    footer: null
+    className: "appointment-cart-modal",
+    footer: null,
+    forceRender: true
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       flex: 1,

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

@@ -1,2 +1,2 @@
-.event-cart-modal {
+.appointment-cart-modal {
 }

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

@@ -1,3 +1,9 @@
+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 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; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
@@ -14,30 +20,36 @@ import Date from "../Date";
 import Resource from "../Resource";
 import TimeSlicing from "../TimeSlicing";
 import Guest from "../Guest";
-import { useAppointmentBookingStep, useAppointmentBookingCart } from "../../hooks";
 import { useAppointmentBookingContext } from "../../context";
+import { useAppointmentBookingCart, useAppointmentBookingStep } from "../../hooks";
 import "./index.less";
 var Layout = function Layout() {
-  var _currentStep$step2, _currentStep$step4, _currentStep$step5;
-  var appointmentBookingStep = useAppointmentBookingStep();
-  var appointmentBookingCart = useAppointmentBookingCart();
+  var _currentStep$step, _currentStep$step3, _currentStep$step4;
   var _useAppointmentBookin = useAppointmentBookingContext(),
-    currentStep = _useAppointmentBookin.currentStep;
+    currentStep = _useAppointmentBookin.currentStep,
+    setResourceOtherParams = _useAppointmentBookin.setResourceOtherParams,
+    resourceOtherParams = _useAppointmentBookin.resourceOtherParams;
+
+  // 不要删除
+  useAppointmentBookingCart();
+  useAppointmentBookingStep();
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     params = _useState2[0],
     setParams = _useState2[1];
   useEffect(function () {
-    var _currentStep$step;
-    console.log(currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key, 'whcurrentStep?.step?.key');
+    // 清空资源分配失败数据
+    setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), {}, {
+      errorList: null
+    }));
     window.scrollTo({
       top: 0,
       behavior: 'smooth'
     });
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key]);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key]);
   var Com = useMemo(function () {
-    var _currentStep$step3;
-    var key = currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key;
+    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 components = {
       // 选择服务
@@ -56,7 +68,7 @@ var Layout = function Layout() {
       onChange: setParams,
       params: params
     });
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key]);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key]);
 
   /**
    * @title: 动态计算中间内容区域的高度
@@ -70,7 +82,7 @@ var Layout = function Layout() {
       var _header$getBoundingCl, _footer$getBoundingCl;
       var header = document.querySelector('.event-progress-bar');
       var footer = document.querySelector('.pisell-section-footers-wrapper');
-      var content = document.querySelector('.event-content-mobile-wrap');
+      var content = document.querySelector('.parallel-content-mobile-wrap');
       var headerHeight = (header === null || header === void 0 || (_header$getBoundingCl = header.getBoundingClientRect()) === null || _header$getBoundingCl === void 0 ? void 0 : _header$getBoundingCl.height) || 0;
       var footerHeight = (footer === null || footer === void 0 || (_footer$getBoundingCl = footer.getBoundingClientRect()) === null || _footer$getBoundingCl === void 0 ? void 0 : _footer$getBoundingCl.height) || 0;
       var windowHeight = window.innerHeight;
@@ -80,7 +92,7 @@ var Layout = function Layout() {
         content.style.overflowY = 'auto';
       }
     }
-  }, [currentStep === null || currentStep === void 0 || (_currentStep$step5 = currentStep.step) === null || _currentStep$step5 === void 0 ? void 0 : _currentStep$step5.key]);
+  }, [currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.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", {