@pisell/private-materials 3.2.33 → 3.2.35

package/es/components/Sales/Event/index.js

@@ -87,13 +87,13 @@ export var EventProvider = function EventProvider(_ref) {
     setEventData({
       currentEventItem: eventItem
     });
-    // if (currentCartItem) {
-    //   updateCurrentCartItem({ eventItem: eventItem });
-    // } else {
-    //   createCartItemFromEvent(eventItem);
-    // }
-    // 每次添加商品时都需要直接创建购物车，防止第一步创建的购物车数据和缓存数据冲突
-    createCartItemFromEvent(eventItem);
+    if (currentCartItem) {
+      updateCurrentCartItem({
+        eventItem: eventItem
+      });
+    } else {
+      createCartItemFromEvent(eventItem);
+    }
   };
   var contextValue = {
     eventData: eventData,

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

@@ -14,7 +14,7 @@ import { Button, PisellToast } from '@pisell/materials';
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { useAppointmentBookingLogin, useAppointmentBookingResource, useAppointmentBookingAccount, useShopDiscount, useIsSkipResourceStep, useAppointmentBookingStep } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
-import { formatCustomer, isEmptyCartsResourceId } from "../../../utils";
+import { formatCustomer, isEmptyCartsResourceId, formatCarts, hasResourceFormId } from "../../../utils";
 import "./index.less";
 var ContinueButton = function ContinueButton() {
   var _currentStep$step;
@@ -36,7 +36,12 @@ var ContinueButton = function ContinueButton() {
     carts = _useAppointmentBookin3.carts,
     appointmentBooking = _useAppointmentBookin3.appointmentBooking,
     resourceOtherParams = _useAppointmentBookin3.resourceOtherParams,
-    summary = _useAppointmentBookin3.summary;
+    summary = _useAppointmentBookin3.summary,
+    isAgreeDepositPolicy = _useAppointmentBookin3.isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy = _useAppointmentBookin3.setIsAgreeDepositPolicy,
+    resources = _useAppointmentBookin3.resources,
+    currentResource = _useAppointmentBookin3.currentResource,
+    setCurrentResource = _useAppointmentBookin3.setCurrentResource;
   var _useAppointmentBookin4 = useAppointmentBookingResource(),
     getResourceTimeSlot = _useAppointmentBookin4.getResourceTimeSlot,
     getResourceList = _useAppointmentBookin4.getResourceList,
@@ -44,11 +49,13 @@ var ContinueButton = function ContinueButton() {
   var _useIsSkipResourceSte = useIsSkipResourceStep(),
     checkSkipResourceStep = _useIsSkipResourceSte.checkSkipResourceStep;
   var _useAppointmentBookin5 = useAppointmentBookingStep(),
-    getStepIndex = _useAppointmentBookin5.getStepIndex;
+    getStepIndex = _useAppointmentBookin5.getStepIndex,
+    stepList = _useAppointmentBookin5.stepList;
   var disabled = useMemo(function () {
     if (!carts.length) return true;
     return false;
   }, [currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key, carts, accountLists, resourceOtherParams === null || resourceOtherParams === void 0 ? void 0 : resourceOtherParams.errorList]);
+  console.log(formatCarts(carts, resources), 'wh98987');
 
   /**
    * @title: 清空数据
@@ -61,6 +68,12 @@ var ContinueButton = function ContinueButton() {
     var _shopDiscount$destroy;
     appointmentBooking.destroy();
     shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$destroy = shopDiscount.destroy) === null || _shopDiscount$destroy === void 0 || _shopDiscount$destroy.call(shopDiscount);
+    setIsAgreeDepositPolicy(false);
+  };
+  var goPaymentFinish = function goPaymentFinish(order_id, amount) {
+    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);
   };
 
   /**
@@ -73,68 +86,75 @@ var ContinueButton = function ContinueButton() {
   var handleNextStep = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _currentStep$step2;
-      var res, _ref2, order_id, total_amount, freeResult, _utils$history, url;
+      var deposit, _yield$appointmentBoo, data, _ref2, is_deposit, deposit_amount, total_amount, order_id, _total, freeResult;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!isLastStep) {
-              _context.next = 24;
+              _context.next = 29;
               break;
             }
+            deposit = summary.deposit;
             setLoading(true);
-            _context.prev = 2;
-            _context.next = 5;
+            _context.prev = 3;
+            _context.next = 6;
             return appointmentBooking.submitOrder();
-          case 5:
-            res = _context.sent;
-            if (!((summary === null || summary === void 0 ? void 0 : summary.total) > 0)) {
-              _context.next = 10;
+          case 6:
+            _yield$appointmentBoo = _context.sent;
+            data = _yield$appointmentBoo.data;
+            _ref2 = data || {}, is_deposit = _ref2.is_deposit, deposit_amount = _ref2.deposit_amount, total_amount = _ref2.total_amount, order_id = _ref2.order_id; // 如果有定金，则支付定金金额，否则订单金额
+            _total = is_deposit ? deposit_amount : total_amount;
+            if (!(_total > 0)) {
+              _context.next = 14;
               break;
             }
             // 拉起支付弹窗
             utils.action({
               type: 'pisell1.payment',
-              data: res === null || res === void 0 ? void 0 : res.data
+              data: data
             });
-            _context.next = 16;
+            _context.next = 21;
             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;
+          case 14:
+            if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit)) {
+              _context.next = 16;
+              break;
+            }
+            return _context.abrupt("return", goPaymentFinish(order_id, _total));
+          case 16:
+            _context.next = 18;
             return appointmentBooking.getFreeProduct(order_id);
-          case 13:
+          case 18:
             freeResult = _context.sent;
             console.log(freeResult, 'freeResult');
             if (freeResult !== null && freeResult !== void 0 && freeResult.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);
+              goPaymentFinish(order_id, total_amount);
             } else {
               PisellToast({
                 content: freeResult === null || freeResult === void 0 ? void 0 : freeResult.message
               });
             }
-          case 16:
+          case 21:
             clearData();
             setLoading(false);
-            _context.next = 23;
+            _context.next = 28;
             break;
-          case 20:
-            _context.prev = 20;
-            _context.t0 = _context["catch"](2);
+          case 25:
+            _context.prev = 25;
+            _context.t0 = _context["catch"](3);
             setLoading(false);
-          case 23:
+          case 28:
             return _context.abrupt("return");
-          case 24:
+          case 29:
             if ((currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-resource') {
               getResourceTimeSlot();
             }
             return _context.abrupt("return", appointmentBooking.next());
-          case 26:
+          case 31:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 20]]);
+      }, _callee, null, [[3, 25]]);
     }));
     return function handleNextStep() {
       return _ref.apply(this, arguments);
@@ -151,7 +171,7 @@ var ContinueButton = function ContinueButton() {
   var handleContinue = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _currentStep$step3;
-      var key, skipResourceStep, index;
+      var key, _summary$deposit, skipResourceStep, index;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -159,11 +179,19 @@ var ContinueButton = function ContinueButton() {
             console.log(currentStep, isLastStep, isLogin, accountLists, 'wh9896788222');
             // 如果当前是确认信息页面，则到结算页面
             if (!isLastStep) {
+              _context2.next = 7;
+              break;
+            }
+            if (!(summary !== null && summary !== void 0 && (_summary$deposit = summary.deposit) !== null && _summary$deposit !== void 0 && _summary$deposit.hasDeposit && !isAgreeDepositPolicy)) {
               _context2.next = 5;
               break;
             }
+            return _context2.abrupt("return", PisellToast({
+              content: locales.getText('pisell2.appointment.deposit.agree.policy')
+            }));
+          case 5:
             if (isLogin) {
-              _context2.next = 5;
+              _context2.next = 7;
               break;
             }
             return _context2.abrupt("return", openLoginModal({
@@ -180,17 +208,17 @@ var ContinueButton = function ContinueButton() {
                 }
               }
             }));
-          case 5:
+          case 7:
             if (!(key === 'select-date')) {
-              _context2.next = 15;
+              _context2.next = 17;
               break;
             }
-            _context2.next = 8;
+            _context2.next = 10;
             return checkSkipResourceStep();
-          case 8:
+          case 10:
             skipResourceStep = _context2.sent;
             if (!skipResourceStep) {
-              _context2.next = 15;
+              _context2.next = 17;
               break;
             }
             index = getStepIndex('next', 2);
@@ -198,18 +226,35 @@ var ContinueButton = function ContinueButton() {
             autoSelectAllProductResources();
             appointmentBooking.gotoStep(index);
             return _context2.abrupt("return");
-          case 15:
-            if (!(key === 'select-resource' && isEmptyCartsResourceId(carts))) {
-              _context2.next = 18;
+          case 17:
+            if (!(key === 'select-resource')) {
+              _context2.next = 23;
+              break;
+            }
+            if (!isEmptyCartsResourceId(carts)) {
+              _context2.next = 21;
               break;
             }
             PisellToast({
               content: locales.getText('pisell2.appointment.no.available.time')
             });
             return _context2.abrupt("return");
-          case 18:
+          case 21:
+            console.log(23423232344, hasResourceFormId(formatCarts(carts, resources)));
+
+            // 验证资源是否挂接了表单
+            if (hasResourceFormId(formatCarts(carts, resources))) {
+              appointmentBooking.addStep({
+                // index: stepList - 2,
+                key: 'fill-form',
+                description: locales.getText('pisell2.appointment.fill-form')
+              });
+            } else {
+              appointmentBooking.removeStep('fill-form');
+            }
+          case 23:
             handleNextStep();
-          case 19:
+          case 24:
           case "end":
             return _context2.stop();
         }

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

@@ -17,10 +17,11 @@ var Total = function Total(_ref) {
   var taxTitle = summary.taxTitle,
     totalTaxFee = summary.totalTaxFee,
     isPriceIncludeTax = summary.isPriceIncludeTax,
-    total = summary.total;
+    total = summary.total,
+    deposit = summary.deposit;
   console.log(summary, 'summarysummary');
   return /*#__PURE__*/React.createElement("div", {
-    className: "appointment-total-wrap ".concat(className)
+    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", {
     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: ({ onConfirm }: any) => JSX.Element;
+declare const CartItem: () => JSX.Element;
 export default CartItem;

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

@@ -10,15 +10,15 @@ import ShoppingCart from "../../../../shoppingCart";
 import ContinueButton from "../ContinueButton";
 import { useAppointmentBooking } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
-import { useAppointmentBookingAccount, useAppointmentBookingResource } from "../../../hooks";
+import { useAppointmentBookingAccount, useAppointmentBookingResource, useAppointmentBookingSetting, useAppointmentBookingLogin } from "../../../hooks";
 import { formatHolder, formatCarts, formatCurrentUser } from "../../../utils";
 import VoucherCard from "../../Voucher";
 import Total from "./Total";
+import Deposit from "../../Deposit";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import "./index.less";
-var CartItem = function CartItem(_ref) {
-  var _context$appHelper, _businessUtils$getApp, _currentStep$step, _currentStep$step2;
-  var onConfirm = _ref.onConfirm;
+var CartItem = function CartItem() {
+  var _context$appHelper, _currentStep$step, _currentStep$step2, _currentStep$step3;
   var appointmentBooking = useAppointmentBooking();
   var _useAppointmentBookin = useAppointmentBookingContext(),
     carts = _useAppointmentBookin.carts,
@@ -26,27 +26,39 @@ var CartItem = function CartItem(_ref) {
     currentStep = _useAppointmentBookin.currentStep,
     resources = _useAppointmentBookin.resources,
     setResourceOtherParams = _useAppointmentBookin.setResourceOtherParams,
-    resourceOtherParams = _useAppointmentBookin.resourceOtherParams;
+    resourceOtherParams = _useAppointmentBookin.resourceOtherParams,
+    summary = _useAppointmentBookin.summary;
   var _useAppointmentBookin2 = useAppointmentBookingAccount(),
-    accountLists = _useAppointmentBookin2.accountLists;
+    accountLists = _useAppointmentBookin2.accountLists,
+    getHolders = _useAppointmentBookin2.getHolders;
   var _useAppointmentBookin3 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin3.getResourceList;
+  var _useAppointmentBookin4 = useAppointmentBookingSetting(),
+    isFormSubject = _useAppointmentBookin4.isFormSubject;
+  var _useAppointmentBookin5 = useAppointmentBookingLogin(),
+    isLogin = _useAppointmentBookin5.isLogin;
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     businessUtils = _context$appHelper$ut.businessUtils;
   var currentUser = formatCurrentUser();
+  var deposit = summary.deposit;
+  console.log(deposit, accountLists, 'deposit');
   var holderIds = useMemo(function () {
+    if (isFormSubject) return [];
     return accountLists.map(function (item) {
       return item.id;
     });
-  }, [accountLists]);
+  }, [accountLists, isFormSubject]);
   var holders = useMemo(function () {
+    if (isFormSubject) return [];
     return formatHolder(accountLists);
-  }, [accountLists]);
+  }, [accountLists, isFormSubject]);
 
   // 是否安装商品券应用
-  var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
-  console.log('has goodpass app:', hasGoodPassApp);
+  var hasGoodPassApp = useMemo(function () {
+    var _businessUtils$getApp;
+    return !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
+  }, []);
   var handleClickCard = function handleClickCard(e, type, val) {
     // 更改备注
     if (type === 'note') {
@@ -71,25 +83,31 @@ var CartItem = function CartItem(_ref) {
       setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), {}, {
         errorList: null
       }));
-      return appointmentBooking.updateCart({
+      appointmentBooking.updateCart({
         _id: e === null || e === void 0 ? void 0 : e._id,
         resources: [val]
       });
+      getResourceList();
+      return;
     }
   };
+  console.log((currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key) === 'select-resource', holders, 'select-resource');
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "appointment-cart-item-wrap ".concat(isMobile() ? 'appointment-cart-mobile-item-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "content"
   }, /*#__PURE__*/React.createElement(ShoppingCart, {
     productParams: {
-      products: formatCarts(carts, resources),
+      products: formatCarts(carts, resources, accountLists),
       hideAddBtn: false,
       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.key) === 'select-service',
-      isShowPackageNote: false
+      isShowChangeResource: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-resource',
+      isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key) === 'select-service',
+      isShowPackageNote: false,
+      isShowChangeHolder: isFormSubject && isLogin,
+      isShowHolder: isFormSubject,
+      isShowAddHolderButton: true
     },
     collapseParams: {
       activeKey: holderIds,
@@ -107,6 +125,6 @@ var CartItem = function CartItem(_ref) {
   }, hasGoodPassApp ? /*#__PURE__*/React.createElement(VoucherCard, {
     currentUser: currentUser,
     products: carts
-  }) : null, /*#__PURE__*/React.createElement(Total, null), /*#__PURE__*/React.createElement(ContinueButton, null))));
+  }) : null, /*#__PURE__*/React.createElement(Total, null), (carts === null || carts === void 0 ? void 0 : carts.length) > 0 && deposit !== null && deposit !== void 0 && deposit.hasDeposit ? /*#__PURE__*/React.createElement(Deposit, null) : null, /*#__PURE__*/React.createElement(ContinueButton, null))));
 };
 export default CartItem;

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

@@ -74,26 +74,32 @@
   }
 }
 
+.appointment-total-deposit-wrap {
+  color: var(--Text-Text_1, #1b1b1b);
+  font-size: 20px;
+  font-weight: 600;
+  line-height: 28px;
+}
+
 .appointment-cart-mobile-item-wrap {
+  height: 100%;
   display: flex;
   flex-direction: column;
-  position: relative;
-  height: 100%;
+  overflow: hidden;
 
   .content {
     flex: 1;
     overflow-y: auto;
-    padding: 0 0 210px;
-    max-height: 100%;
+    padding: 16px 16px 0;
   }
+
   .appointment-footer {
-    z-index: 10;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
+    background: #fff;
     border-top: 1px solid #eaecf0;
     padding: 14px 24px 24px;
     margin-top: 0;
+    position: relative;
+    flex: none;
+    z-index: 10;
   }
 }

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

@@ -15,17 +15,12 @@ var Cart = function Cart(_ref) {
       return _onCancel();
     },
     bodyStyle: {
-      padding: '20px'
+      padding: 0
     },
     destroyOnClose: true,
     className: "appointment-cart-modal",
     footer: null,
     forceRender: true
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      flex: 1,
-      overflowY: 'auto'
-    }
-  }, /*#__PURE__*/React.createElement(CartItem, null)));
+  }, /*#__PURE__*/React.createElement(CartItem, null));
 };
 export default Cart;

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

@@ -0,0 +1,3 @@
+import './index.less';
+declare const ConfirmInformation: () => JSX.Element;
+export default ConfirmInformation;

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

@@ -0,0 +1,16 @@
+import React from 'react';
+import { locales, isMobile } from '@pisell/utils';
+import CartItem from "../Cart/Item";
+import "./index.less";
+var ConfirmInformation = function ConfirmInformation() {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "appointment-confirm-information-wrap"
+  }, isMobile() ? /*#__PURE__*/React.createElement(CartItem, null) : /*#__PURE__*/React.createElement("div", {
+    className: "appointment-confirm-information-content"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: "tips"
+  }, locales.getText('pisell2.appointment.tips')), /*#__PURE__*/React.createElement("span", {
+    className: "tips-content"
+  }, locales.getText('pisell2.appointment.tips.content')('确认'))));
+};
+export default ConfirmInformation;

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

@@ -0,0 +1,24 @@
+.appointment-confirm-information-wrap {
+  padding-top: 20px;
+
+  .appointment-confirm-information-content {
+    display: flex;
+    flex-direction: column;
+
+    .tips {
+      margin-top: 24px;
+      color: var(--Gray-900, #101828);
+      font-size: 18px;
+      font-style: normal;
+      font-weight: 600;
+    }
+
+    .tips-content {
+      margin-top: 4px;
+      color: var(--Gray-900, #101828);
+      font-size: 16px;
+      font-style: normal;
+      font-weight: 400;
+    }
+  }
+}

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

@@ -20,15 +20,25 @@ import Date from "../Date";
 import Resource from "../Resource";
 import TimeSlicing from "../TimeSlicing";
 import Guest from "../Guest";
+import Form from "../Form";
+import ConfirmInformation from "../ConfirmInformation";
 import { useAppointmentBookingContext } from "../../context";
-import { useAppointmentBookingCart, useAppointmentBookingStep } from "../../hooks";
+import { useAppointmentBookingCart, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingLogin, useAppointmentBookingAccount } from "../../hooks";
 import "./index.less";
 var Layout = function Layout() {
-  var _currentStep$step, _currentStep$step3, _currentStep$step4;
+  var _currentStep$step, _currentStep$step3, _currentStep$step4, _currentStep$step6;
   var _useAppointmentBookin = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin.currentStep,
     setResourceOtherParams = _useAppointmentBookin.setResourceOtherParams,
     resourceOtherParams = _useAppointmentBookin.resourceOtherParams;
+  var _useAppointmentBookin2 = useAppointmentBookingSetting(),
+    getLoadAllSchedule = _useAppointmentBookin2.getLoadAllSchedule,
+    isDateSelectedFirst = _useAppointmentBookin2.isDateSelectedFirst,
+    isFormSubject = _useAppointmentBookin2.isFormSubject;
+  var _useAppointmentBookin3 = useAppointmentBookingLogin(),
+    isLogin = _useAppointmentBookin3.isLogin;
+  var _useAppointmentBookin4 = useAppointmentBookingAccount(),
+    getHolders = _useAppointmentBookin4.getHolders;
 
   // 不要删除
   useAppointmentBookingCart();
@@ -37,6 +47,17 @@ var Layout = function Layout() {
     _useState2 = _slicedToArray(_useState, 2),
     params = _useState2[0],
     setParams = _useState2[1];
+  useEffect(function () {
+    if (isFormSubject && isLogin) {
+      getHolders();
+    }
+  }, [isFormSubject, isLogin]);
+  useEffect(function () {
+    // 如果先选择日期，则先调用日历接口
+    if (isDateSelectedFirst) {
+      getLoadAllSchedule();
+    }
+  }, [isDateSelectedFirst]);
   useEffect(function () {
     // 清空资源分配失败数据
     setResourceOtherParams(_objectSpread(_objectSpread({}, resourceOtherParams), {}, {
@@ -61,7 +82,11 @@ var Layout = function Layout() {
       // 选择资源
       'select-resource': Resource,
       // 时间切片
-      'select-time': TimeSlicing
+      'select-time': TimeSlicing,
+      // 填写表单
+      'fill-form': Form,
+      // 确认信息
+      'confirm-information': ConfirmInformation
     };
     var Com = components[key];
     return /*#__PURE__*/React.createElement(Com, {
@@ -93,12 +118,23 @@ var Layout = function Layout() {
       }
     }
   }, [currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key]);
+  var isShowCartCom = useMemo(function () {
+    var _currentStep$step5;
+    var key = currentStep === null || currentStep === void 0 || (_currentStep$step5 = currentStep.step) === null || _currentStep$step5 === void 0 ? void 0 : _currentStep$step5.key;
+    if (isMobile()) return null;
+
+    // 先选择日期，并且当前步骤是选择日期，则不显示购物车
+    if (isDateSelectedFirst && key === 'select-date') {
+      return null;
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      className: "parallel-content-right"
+    }, /*#__PURE__*/React.createElement(CartItem, null));
+  }, [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), !isMobile() ? /*#__PURE__*/React.createElement("div", {
-    className: "parallel-content-right"
-  }, /*#__PURE__*/React.createElement(CartItem, null)) : null), isMobile() ? /*#__PURE__*/React.createElement(Footer, null) : null);
+  }, Com), isShowCartCom), isMobile() ? /*#__PURE__*/React.createElement(Footer, null) : null);
 };
 export default Layout;