@pisell/private-materials 3.2.39 → 3.3.0

package/es/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

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

@@ -1,3 +1,8 @@
+import React from 'react';
 import './index.less';
-declare const ContinueButton: () => JSX.Element;
+interface ContinueButtonProps {
+    onContinue?: () => void;
+    onIsErrorResource?: (isError: boolean) => void;
+}
+declare const ContinueButton: React.FC<ContinueButtonProps>;
 export default ContinueButton;

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

@@ -1,5 +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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -10,14 +15,17 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 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 { Button } from '@pisell/materials';
 import useEngineContext from "../../../../../hooks/useEngineContext";
-import { useAppointmentBookingLogin, useAppointmentBookingResource, useAppointmentBookingAccount, useShopDiscount, useIsSkipResourceStep, useAppointmentBookingStep } from "../../../hooks";
+import { useAppointmentBookingLogin, useAppointmentBookingResource, useAppointmentBookingAccount, useShopDiscount, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBooking } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
-import { formatCustomer, isEmptyCartsResourceId } from "../../../utils";
+import { formatCarts, hasResourceFormId, Toast } from "../../../utils";
+import { checkLogin, checkHolder, checkResource, handleContinueStep } from "../utils";
 import "./index.less";
-var ContinueButton = function ContinueButton() {
-  var _currentStep$step;
+var ContinueButton = function ContinueButton(_ref) {
+  var _appointmentBooking$s2;
+  var onContinue = _ref.onContinue,
+    onIsErrorResource = _ref.onIsErrorResource;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var _useState = useState(false),
@@ -28,27 +36,35 @@ var ContinueButton = function ContinueButton() {
     isLogin = _useAppointmentBookin.isLogin,
     openLoginModal = _useAppointmentBookin.openLoginModal;
   var _useAppointmentBookin2 = useAppointmentBookingAccount(),
-    accountLists = _useAppointmentBookin2.accountLists;
+    accountLists = _useAppointmentBookin2.accountLists,
+    getHolders = _useAppointmentBookin2.getHolders,
+    checkAccount = _useAppointmentBookin2.checkAccount;
   var shopDiscount = useShopDiscount();
   var _useAppointmentBookin3 = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin3.currentStep,
-    isLastStep = _useAppointmentBookin3.isLastStep,
     carts = _useAppointmentBookin3.carts,
     appointmentBooking = _useAppointmentBookin3.appointmentBooking,
     resourceOtherParams = _useAppointmentBookin3.resourceOtherParams,
-    summary = _useAppointmentBookin3.summary;
+    summary = _useAppointmentBookin3.summary,
+    isAgreeDepositPolicy = _useAppointmentBookin3.isAgreeDepositPolicy,
+    resources = _useAppointmentBookin3.resources,
+    setResourceOtherParams = _useAppointmentBookin3.setResourceOtherParams,
+    stepParams = _useAppointmentBookin3.stepParams,
+    setCarts = _useAppointmentBookin3.setCarts;
   var _useAppointmentBookin4 = useAppointmentBookingResource(),
-    getResourceTimeSlot = _useAppointmentBookin4.getResourceTimeSlot,
-    getResourceList = _useAppointmentBookin4.getResourceList,
-    autoSelectAllProductResources = _useAppointmentBookin4.autoSelectAllProductResources;
-  var _useIsSkipResourceSte = useIsSkipResourceStep(),
-    checkSkipResourceStep = _useIsSkipResourceSte.checkSkipResourceStep;
+    getResourceTimeSlot = _useAppointmentBookin4.getResourceTimeSlot;
   var _useAppointmentBookin5 = useAppointmentBookingStep(),
-    getStepIndex = _useAppointmentBookin5.getStepIndex;
-  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]);
+    removeStep = _useAppointmentBookin5.removeStep,
+    addStep = _useAppointmentBookin5.addStep;
+  var _useAppointmentBookin6 = useAppointmentBookingSetting(),
+    isFormSubject = _useAppointmentBookin6.isFormSubject,
+    formName = _useAppointmentBookin6.formName;
+  var appointmentBooking2 = useAppointmentBooking();
+  var newCarts = formatCarts(carts, resources);
+  var stepList = useMemo(function () {
+    var _appointmentBooking$s;
+    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: 清空数据
@@ -63,6 +79,52 @@ var ContinueButton = function ContinueButton() {
     shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$destroy = shopDiscount.destroy) === null || _shopDiscount$destroy === void 0 || _shopDiscount$destroy.call(shopDiscount);
   };
 
+  /**
+   * @title: 支付成功回调
+   * @description:
+   * @param {number} order_id
+   * @param {any} amount
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-28 13:44
+   */
+  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);
+    clearData();
+    setLoading(false);
+  };
+
+  /**
+   * @title: 检测holder主体数据是否选择
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-28 11:41
+   */
+  var handleCheckAccount = function handleCheckAccount() {
+    var result = checkHolder({
+      isFormSubject: isFormSubject,
+      checkAccount: checkAccount,
+      carts: carts
+    });
+    if (result) {
+      setCarts(result);
+    }
+    return !!result;
+  };
+  var handleCheckResource = function handleCheckResource() {
+    var result = checkResource({
+      carts: carts,
+      resources: resources
+    });
+    if (result) {
+      setCarts(result);
+    }
+    return !!result;
+  };
+
   /**
    * @title: 下一步
    * @description:
@@ -71,73 +133,147 @@ var ContinueButton = function ContinueButton() {
    * @Date: 2025-02-08 18:57
    */
   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 _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _currentStep$step;
+      var loginOk, _summary$deposit, deposit, _yield$appointmentBoo, data, _ref3, 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;
+            console.log(currentStep, stepList, appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.getCurrentStep(), appointmentBooking2 === null || appointmentBooking2 === void 0 ? void 0 : appointmentBooking2.getCurrentStep(), (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2 === (stepList === null || stepList === void 0 ? void 0 : stepList.length), 'whcurrentStepcurrentStep');
+            if (!((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2 === (stepList === null || stepList === void 0 ? void 0 : stepList.length))) {
+              _context.next = 9;
+              break;
+            }
+            _context.next = 4;
+            return handleLoginCheck();
+          case 4:
+            loginOk = _context.sent;
+            if (loginOk) {
+              _context.next = 7;
+              break;
+            }
+            return _context.abrupt("return");
+          case 7:
+            if (!handleCheckAccount()) {
+              _context.next = 9;
+              break;
+            }
+            return _context.abrupt("return");
+          case 9:
+            if (!((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 1 >= (stepList === null || stepList === void 0 ? void 0 : stepList.length))) {
+              _context.next = 40;
+              break;
+            }
+            if (!(summary !== null && summary !== void 0 && (_summary$deposit = summary.deposit) !== null && _summary$deposit !== void 0 && _summary$deposit.hasDeposit && !isAgreeDepositPolicy)) {
+              _context.next = 12;
               break;
             }
+            return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.deposit.agree.policy')));
+          case 12:
+            deposit = summary.deposit;
             setLoading(true);
-            _context.prev = 2;
-            _context.next = 5;
+            _context.prev = 14;
+            _context.next = 17;
             return appointmentBooking.submitOrder();
-          case 5:
-            res = _context.sent;
-            if (!((summary === null || summary === void 0 ? void 0 : summary.total) > 0)) {
-              _context.next = 10;
+          case 17:
+            _yield$appointmentBoo = _context.sent;
+            data = _yield$appointmentBoo.data;
+            _ref3 = data || {}, is_deposit = _ref3.is_deposit, deposit_amount = _ref3.deposit_amount, total_amount = _ref3.total_amount, order_id = _ref3.order_id; // 如果有定金，则支付定金金额，否则订单金额
+            _total = is_deposit ? deposit_amount : total_amount;
+            if (!(_total > 0)) {
+              _context.next = 26;
               break;
             }
             // 拉起支付弹窗
             utils.action({
               type: 'pisell1.payment',
-              data: res === null || res === void 0 ? void 0 : res.data
+              data: _objectSpread(_objectSpread({}, data), {}, {
+                total_amount: _total
+              })
             });
-            _context.next = 16;
+            setTimeout(function () {
+              clearData();
+              setLoading(false);
+            }, 200);
+            _context.next = 34;
             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 26:
+            if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit)) {
+              _context.next = 29;
+              break;
+            }
+            goPaymentFinish(order_id, _total);
+            return _context.abrupt("return");
+          case 29:
+            _context.next = 31;
             return appointmentBooking.getFreeProduct(order_id);
-          case 13:
+          case 31:
             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
-              });
+              Toast(freeResult === null || freeResult === void 0 ? void 0 : freeResult.message);
             }
-          case 16:
-            clearData();
-            setLoading(false);
-            _context.next = 23;
+          case 34:
+            _context.next = 39;
             break;
-          case 20:
-            _context.prev = 20;
-            _context.t0 = _context["catch"](2);
-            setLoading(false);
-          case 23:
+          case 36:
+            _context.prev = 36;
+            _context.t0 = _context["catch"](14);
+            setTimeout(function () {
+              setLoading(false);
+            }, 50);
+          case 39:
             return _context.abrupt("return");
-          case 24:
-            if ((currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-resource') {
+          case 40:
+            if ((currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.key) === 'select-resource') {
               getResourceTimeSlot();
             }
             return _context.abrupt("return", appointmentBooking.next());
-          case 26:
+          case 42:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 20]]);
+      }, _callee, null, [[14, 36]]);
     }));
     return function handleNextStep() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  /**
+   * @title: 触发登录
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-28 17:09
+   */
+  var handleLoginCheck = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return checkLogin({
+              isLogin: isLogin,
+              openLoginModal: openLoginModal,
+              isFormSubject: isFormSubject,
+              utils: utils,
+              accountLists: accountLists,
+              appointmentBooking: appointmentBooking,
+              getHolders: getHolders
+            });
+          case 2:
+            return _context2.abrupt("return", _context2.sent);
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleLoginCheck() {
+      return _ref4.apply(this, arguments);
     };
   }();
 
@@ -149,87 +285,69 @@ var ContinueButton = function ContinueButton() {
    * @Date: 2025-01-16 16:30
    */
   var handleContinue = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _currentStep$step3;
-      var key, skipResourceStep, index, selected;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _currentStep$step2, key, index, loginOk;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            key = currentStep === null || currentStep === void 0 || (_currentStep$step3 = currentStep.step) === null || _currentStep$step3 === void 0 ? void 0 : _currentStep$step3.key;
-            console.log(currentStep, isLastStep, isLogin, accountLists, 'wh9896788222');
-            // 如果当前是确认信息页面，则到结算页面
-            if (!isLastStep) {
-              _context2.next = 5;
-              break;
-            }
-            if (isLogin) {
-              _context2.next = 5;
-              break;
-            }
-            return _context2.abrupt("return", openLoginModal({
-              callback: function callback(status) {
-                var _utils$store, _utils$store$getState, _utils$storage;
-                var user = (utils === null || utils === void 0 || (_utils$store = utils.store) === null || _utils$store === void 0 || (_utils$store$getState = _utils$store.getState) === null || _utils$store$getState === void 0 || (_utils$store$getState = _utils$store$getState.call(_utils$store)) === null || _utils$store$getState === void 0 || (_utils$store$getState = _utils$store$getState.global) === null || _utils$store$getState === void 0 ? void 0 : _utils$store$getState.userInfo) || JSON.parse((utils === null || utils === void 0 || (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('customer')) || {});
-                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 5:
-            if (!(key === 'select-date')) {
-              _context2.next = 21;
+            _context3.prev = 0;
+            key = currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key;
+            index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 1;
+            if (!((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2 === (stepList === null || stepList === void 0 ? void 0 : stepList.length))) {
+              _context3.next = 11;
               break;
             }
-            _context2.next = 8;
-            return checkSkipResourceStep();
-          case 8:
-            skipResourceStep = _context2.sent;
-            if (!skipResourceStep) {
-              _context2.next = 15;
+            _context3.next = 6;
+            return handleLoginCheck();
+          case 6:
+            loginOk = _context3.sent;
+            if (loginOk) {
+              _context3.next = 9;
               break;
             }
-            index = getStepIndex('next', 2);
-            getResourceList();
-            autoSelectAllProductResources();
-            appointmentBooking.gotoStep(index);
-            return _context2.abrupt("return");
-          case 15:
-            _context2.next = 17;
-            return appointmentBooking.getDateRange();
-          case 17:
-            selected = _context2.sent;
-            if (selected !== null && selected !== void 0 && selected.length) {
-              _context2.next = 21;
-              break;
-            }
-            PisellToast({
-              content: locales.getText('pisell2.appointment.no.available.time')
-            });
-            return _context2.abrupt("return");
-          case 21:
-            if (!(key === 'select-resource' && isEmptyCartsResourceId(carts))) {
-              _context2.next = 24;
+            return _context3.abrupt("return");
+          case 9:
+            if (!handleCheckAccount()) {
+              _context3.next = 11;
               break;
             }
-            PisellToast({
-              content: locales.getText('pisell2.appointment.no.available.time')
+            return _context3.abrupt("return");
+          case 11:
+            handleContinueStep(key, {
+              handleCheckResource: handleCheckResource,
+              currentStep: currentStep,
+              hasResourceFormId: hasResourceFormId,
+              addStep: addStep,
+              removeStep: removeStep,
+              resourceOtherParams: resourceOtherParams,
+              setResourceOtherParams: setResourceOtherParams,
+              newCarts: newCarts,
+              getResourceTimeSlot: getResourceTimeSlot,
+              appointmentBooking: appointmentBooking,
+              summary: summary,
+              isAgreeDepositPolicy: isAgreeDepositPolicy,
+              setLoading: setLoading,
+              utils: utils,
+              clearData: clearData,
+              goPaymentFinish: goPaymentFinish,
+              onContinue: onContinue,
+              onIsErrorResource: onIsErrorResource,
+              stepList: stepList
             });
-            return _context2.abrupt("return");
-          case 24:
-            handleNextStep();
-          case 25:
+            _context3.next = 17;
+            break;
+          case 14:
+            _context3.prev = 14;
+            _context3.t0 = _context3["catch"](0);
+            console.log(_context3.t0, 'handleContinue_error');
+          case 17:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3, null, [[0, 14]]);
     }));
     return function handleContinue() {
-      return _ref3.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -242,14 +360,14 @@ var ContinueButton = function ContinueButton() {
    * @Date: 2025-01-17 16:10
    */
   var continueText = useMemo(function () {
-    if (isLastStep) {
+    if ((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 1 === (stepList === null || stepList === void 0 ? void 0 : stepList.length)) {
       return locales.getText('pisell2.event.checkout');
     } else {
       return locales.getText('pisell2.event.close.continue');
     }
-  }, [isLastStep]);
+  }, [currentStep === null || currentStep === void 0 ? void 0 : currentStep.index, stepList]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
-    disabled: disabled,
+    disabled: !(carts !== null && carts !== void 0 && carts.length),
     size: "large",
     type: "primary",
     onClick: function onClick() {

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, {
@@ -30,8 +31,8 @@ var Total = function Total(_ref) {
     className: classNames('event-total', _defineProperty({}, ['total-gst-wrap'], !isPriceIncludeTax && Number(totalTaxFee) > 0))
   }, /*#__PURE__*/React.createElement("div", {
     className: "left"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.event.total'), isFooter ? ': ' : ''), isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
-    value: total,
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, deposit !== null && deposit !== void 0 && deposit.hasDeposit && isFooter ? locales.getText('pisell2.appointment.deposit') : locales.getText('pisell2.event.total'), isFooter ? ': ' : ''), isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
+    value: deposit !== null && deposit !== void 0 && deposit.hasDeposit ? deposit === null || deposit === void 0 ? void 0 : deposit.total : total,
     showCurrencySymbol: true,
     className: "event-amount"
   }) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("span", {

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: ({ onContinue }: any) => JSX.Element;
 export default CartItem;