@pisell/private-materials 3.2.30 → 3.2.32

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/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);
-    }
+    // if (currentCartItem) {
+    //   updateCurrentCartItem({ eventItem: eventItem });
+    // } else {
+    //   createCartItemFromEvent(eventItem);
+    // }
+    // 每次添加商品时都需要直接创建购物车，防止第一步创建的购物车数据和缓存数据冲突
+    createCartItemFromEvent(eventItem);
   };
   var contextValue = {
     eventData: eventData,

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

@@ -12,12 +12,12 @@ import React, { useMemo, useState } from 'react';
 import { locales } from '@pisell/utils';
 import { Button, PisellToast } from '@pisell/materials';
 import useEngineContext from "../../../../../hooks/useEngineContext";
-import { useAppointmentBookingLogin, useAppointmentBookingResource, useAppointmentBookingAccount, useShopDiscount } from "../../../hooks";
+import { useAppointmentBookingLogin, useAppointmentBookingResource, useAppointmentBookingAccount, useShopDiscount, useIsSkipResourceStep, useAppointmentBookingStep } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
 import { formatCustomer, isEmptyCartsResourceId } from "../../../utils";
 import "./index.less";
 var ContinueButton = function ContinueButton() {
-  var _currentStep$step2;
+  var _currentStep$step;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var _useState = useState(false),
@@ -39,27 +39,16 @@ var ContinueButton = function ContinueButton() {
     summary = _useAppointmentBookin3.summary;
   var _useAppointmentBookin4 = useAppointmentBookingResource(),
     getResourceTimeSlot = _useAppointmentBookin4.getResourceTimeSlot,
-    getResourceList = _useAppointmentBookin4.getResourceList;
+    getResourceList = _useAppointmentBookin4.getResourceList,
+    autoSelectAllProductResources = _useAppointmentBookin4.autoSelectAllProductResources;
+  var _useIsSkipResourceSte = useIsSkipResourceStep(),
+    checkSkipResourceStep = _useIsSkipResourceSte.checkSkipResourceStep;
+  var _useAppointmentBookin5 = useAppointmentBookingStep(),
+    getStepIndex = _useAppointmentBookin5.getStepIndex;
   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]);
+  }, [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]);
 
   /**
    * @title: 清空数据
@@ -83,7 +72,7 @@ var ContinueButton = function ContinueButton() {
    */
   var handleNextStep = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _currentStep$step3, _currentStep$step4;
+      var _currentStep$step2;
       var res, _ref2, order_id, total_amount, freeResult, _utils$history, url;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -137,21 +126,11 @@ var ContinueButton = function ContinueButton() {
           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') {
+            if ((currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.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 26:
           case "end":
             return _context.stop();
         }
@@ -171,13 +150,13 @@ var ContinueButton = function ContinueButton() {
    */
   var handleContinue = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _currentStep$step5;
-      var key;
+      var _currentStep$step3;
+      var key, skipResourceStep, index;
       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');
+            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;
@@ -202,17 +181,35 @@ var ContinueButton = function ContinueButton() {
               }
             }));
           case 5:
+            if (!(key === 'select-date')) {
+              _context2.next = 15;
+              break;
+            }
+            _context2.next = 8;
+            return checkSkipResourceStep();
+          case 8:
+            skipResourceStep = _context2.sent;
+            if (!skipResourceStep) {
+              _context2.next = 15;
+              break;
+            }
+            index = getStepIndex('next', 2);
+            getResourceList();
+            autoSelectAllProductResources();
+            appointmentBooking.gotoStep(index);
+            return _context2.abrupt("return");
+          case 15:
             if (!(key === 'select-resource' && isEmptyCartsResourceId(carts))) {
-              _context2.next = 8;
+              _context2.next = 18;
               break;
             }
             PisellToast({
               content: locales.getText('pisell2.appointment.no.available.time')
             });
             return _context2.abrupt("return");
-          case 8:
+          case 18:
             handleNextStep();
-          case 9:
+          case 19:
           case "end":
             return _context2.stop();
         }

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

@@ -12,10 +12,12 @@ import { useAppointmentBooking } from "../../../hooks";
 import { useAppointmentBookingContext } from "../../../context";
 import { useAppointmentBookingAccount, useAppointmentBookingResource } from "../../../hooks";
 import { formatHolder, formatCarts, formatCurrentUser } from "../../../utils";
+import VoucherCard from "../../Voucher";
 import Total from "./Total";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 import "./index.less";
 var CartItem = function CartItem(_ref) {
-  var _currentStep$step, _currentStep$step2;
+  var _context$appHelper, _businessUtils$getApp, _currentStep$step, _currentStep$step2;
   var onConfirm = _ref.onConfirm;
   var appointmentBooking = useAppointmentBooking();
   var _useAppointmentBookin = useAppointmentBookingContext(),
@@ -29,6 +31,9 @@ var CartItem = function CartItem(_ref) {
     accountLists = _useAppointmentBookin2.accountLists;
   var _useAppointmentBookin3 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin3.getResourceList;
+  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 holderIds = useMemo(function () {
     return accountLists.map(function (item) {
@@ -38,6 +43,10 @@ var CartItem = function CartItem(_ref) {
   var holders = useMemo(function () {
     return formatHolder(accountLists);
   }, [accountLists]);
+
+  // 是否安装商品券应用
+  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 handleClickCard = function handleClickCard(e, type, val) {
     // 更改备注
     if (type === 'note') {
@@ -95,6 +104,9 @@ var CartItem = function CartItem(_ref) {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "appointment-footer"
-  }, /*#__PURE__*/React.createElement(Total, null), /*#__PURE__*/React.createElement(ContinueButton, null))));
+  }, hasGoodPassApp ? /*#__PURE__*/React.createElement(VoucherCard, {
+    currentUser: currentUser,
+    products: carts
+  }) : null, /*#__PURE__*/React.createElement(Total, null), /*#__PURE__*/React.createElement(ContinueButton, null))));
 };
 export default CartItem;

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

@@ -59,6 +59,10 @@
       }
     }
 
+    .appointment-service-search-wrap {
+      padding: 20px 20px 0 !important;
+    }
+
     .provider-information-wrap {
       width: 100%;
     }

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

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

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

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

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

@@ -1,8 +1,12 @@
+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 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); }); }; }
 import React, { useMemo } from 'react';
 import { locales } from '@pisell/utils';
 import ProgressBar from "../../../eventBooking/components/progressBar";
 import { useAppointmentBookingContext } from "../../context";
-import { useShopDiscount } from "../../hooks";
+import { useShopDiscount, useIsSkipResourceStep, useAppointmentBookingStep } from "../../hooks";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
 var Header = function Header() {
@@ -10,9 +14,14 @@ var Header = function Header() {
   var _useAppointmentBookin = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin.currentStep,
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
-    resources = _useAppointmentBookin.resources;
+    resources = _useAppointmentBookin.resources,
+    setTimes = _useAppointmentBookin.setTimes;
   var shopDiscount = useShopDiscount();
   var context = useEngineContext();
+  var _useIsSkipResourceSte = useIsSkipResourceStep(),
+    checkSkipResourceStep = _useIsSkipResourceSte.checkSkipResourceStep;
+  var _useAppointmentBookin2 = useAppointmentBookingStep(),
+    getStepIndex = _useAppointmentBookin2.getStepIndex;
 
   /**
    * @title: 获取资源名称
@@ -42,25 +51,55 @@ var Header = function Header() {
    * @Author: WangHan
    * @Date: 2025-01-18 22:28
    */
-  var handleBack = function handleBack() {
-    var _currentStep$step4;
-    var key = currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key;
+  var handleBack = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _currentStep$step4;
+      var key, types, skipResourceStep, index;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            key = currentStep === null || currentStep === void 0 || (_currentStep$step4 = currentStep.step) === null || _currentStep$step4 === void 0 ? void 0 : _currentStep$step4.key; // 删除缓存
+            types = {
+              'select-time': 'time',
+              'select-resource': 'resource'
+            };
+            if (types[key]) {
+              appointmentBooking.deleteCartItemInfo(types[key]);
+            }
 
-    // 删除缓存
-    var types = {
-      'select-time': 'time',
-      'select-resource': 'resource'
+            // 清空选中的日期
+            if (key === 'select-date') {
+              appointmentBooking.clearDateRange();
+            }
+            if (!(key === 'select-time')) {
+              _context.next = 14;
+              break;
+            }
+            setTimes([]);
+            _context.next = 8;
+            return checkSkipResourceStep();
+          case 8:
+            skipResourceStep = _context.sent;
+            if (!skipResourceStep) {
+              _context.next = 14;
+              break;
+            }
+            appointmentBooking.deleteCartItemInfo('resource');
+            index = getStepIndex('prev', 2);
+            appointmentBooking.gotoStep(index);
+            return _context.abrupt("return");
+          case 14:
+            appointmentBooking.back();
+          case 15:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleBack() {
+      return _ref.apply(this, arguments);
     };
-    if (types[key]) {
-      appointmentBooking.deleteCartItemInfo(types[key]);
-    }
-
-    // 清空选中的日期
-    if (key === 'select-date') {
-      appointmentBooking.clearDateRange();
-    }
-    appointmentBooking.back();
-  };
+  }();
 
   /**
    * @title: 关闭页面

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

@@ -11,9 +11,9 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState, useMemo, useEffect } from 'react';
-import { Input } from 'antd';
+import { Input, Skeleton } from 'antd';
 import SearchLg from '@pisell/icon/es/SearchLg';
-import { locales } from '@pisell/utils';
+import { locales, isMobile } from '@pisell/utils';
 import { PisellEmpty, PisellToast } from '@pisell/materials';
 import TabProduct from "../../../booking/components/TabProduct";
 import { formatProductListByCategory } from "../../../booking/utils";
@@ -39,6 +39,8 @@ var Services = function Services() {
       productModuleParams = _ref2.productModuleParams;
     appointmentBooking.loadProducts(productModuleParams).then(function (res) {
       setProducts(res || []);
+    }).catch(function () {
+      setProducts([]);
     });
   }, []);
   var handleSelectProduct = function handleSelectProduct(item) {
@@ -93,7 +95,13 @@ var Services = function Services() {
     onChange: function onChange(e) {
       setSearch(e.target.value);
     }
-  })), (products === null || products === void 0 ? void 0 : products.length) > 0 ? /*#__PURE__*/React.createElement(TabProduct, {
+  })), !products ? /*#__PURE__*/React.createElement(Skeleton, {
+    loading: true,
+    active: true,
+    style: {
+      padding: isMobile() ? '20px' : 0
+    }
+  }) : (products === null || products === void 0 ? void 0 : products.length) > 0 ? /*#__PURE__*/React.createElement(TabProduct, {
     list: renderList,
     amountSymbol: '$',
     onChange: handleSelectProduct,

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

@@ -3,7 +3,7 @@
     top: 0;
     position: sticky;
     z-index: 2;
-    padding: 16px !important;
+    padding: 16px 0 !important;
     margin: 0;
     .pisell-lowcode-input-affix-wrapper {
       margin: 0 !important;

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

@@ -142,6 +142,7 @@ var VoucherCard = function VoucherCard(props) {
     };
   }();
   var renderLoginCard = function renderLoginCard() {
+    if (isUserLoggedIn) return null;
     return /*#__PURE__*/React.createElement("div", {
       className: "login-card"
     }, /*#__PURE__*/React.createElement(UserCircle, {
@@ -202,7 +203,7 @@ var VoucherCard = function VoucherCard(props) {
         });
         appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$s2 = appointmentBooking.store) === null || _appointmentBooking$s2 === void 0 || (_appointmentBooking$s2 = _appointmentBooking$s2.cart) === null || _appointmentBooking$s2 === void 0 || _appointmentBooking$s2.batchSetItems(detail.productList);
       }
-    }) : null, /*#__PURE__*/React.createElement("div", {
+    }) : null, renderLoginCard(), /*#__PURE__*/React.createElement("div", {
       className: "voucher-code-input-wrapper"
     }, /*#__PURE__*/React.createElement("div", {
       className: "voucher-code-input"
@@ -233,6 +234,6 @@ var VoucherCard = function VoucherCard(props) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-footer-voucher-container"
-  }, isUserLoggedIn ? renderVoucherInfo() : renderLoginCard());
+  }, renderVoucherInfo());
 };
 export default VoucherCard;

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

@@ -13,6 +13,7 @@
     font-size: 14px;
     font-style: normal;
     font-weight: 600;
+    margin-top: 6px;
 
     .text-wrapper {
       max-width: 200px;

package/es/components/appointmentBooking/context.d.ts

@@ -5,10 +5,10 @@ interface AppointmentBookingContextType {
     resources: any[];
     setTimes: (times: any[]) => void;
     setResources: (lists: any[]) => void;
-    products: any[];
+    products: any;
     carts: any[];
     summary: any;
-    setProducts: (val: any[]) => void;
+    setProducts: (val: any) => void;
     setCarts: (val: any[]) => void;
     setSummary: (val: any) => void;
     currentStep: any;

package/es/components/appointmentBooking/context.js

@@ -13,7 +13,7 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
   var children = _ref.children;
   var appointmentBooking = useAppointmentBooking();
   // 商品列表
-  var _useState = useState([]),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     products = _useState2[0],
     setProducts = _useState2[1];

package/es/components/appointmentBooking/hooks.d.ts

@@ -7,7 +7,9 @@ export declare const useShopDiscount: () => any;
  * @Author: WangHan
  * @Date: 2025-04-15 11:11
  */
-export declare const useAppointmentBookingStep: () => void;
+export declare const useAppointmentBookingStep: () => {
+    getStepIndex: (type: string, skipNumber?: number) => any;
+};
 /**
  * @title: 获取商品数据
  * @description:
@@ -62,3 +64,13 @@ export declare const useAppointmentBookingResource: () => {
     };
     autoSelectAllProductResources: (index?: number) => Promise<any>;
 };
+/**
+ * @title: 是否跳过资源选择步骤
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-21 11:47
+ */
+export declare const useIsSkipResourceStep: () => {
+    checkSkipResourceStep: () => Promise<boolean>;
+};

package/es/components/appointmentBooking/hooks.js

@@ -42,6 +42,8 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
     setCurrentStep = _useAppointmentBookin.setCurrentStep,
     setIsLastStep = _useAppointmentBookin.setIsLastStep;
   var stepList = (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) || [];
+
+  // 判断是否是最后一步
   var getCurrentAndLastStep = function getCurrentAndLastStep() {
     var _currentStep = appointmentBooking.getCurrentStep();
     setCurrentStep(_currentStep);
@@ -68,6 +70,24 @@ export var useAppointmentBookingStep = function useAppointmentBookingStep() {
       };
     }());
   }, []);
+
+  // 设置步骤
+  var getStepIndex = function getStepIndex(type) {
+    var skipNumber = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+    var currentStep = appointmentBooking.getCurrentStep();
+    var index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) || 1;
+    if (type === 'next') {
+      var nextIndex = index + skipNumber;
+      return nextIndex + 1 > stepList.length ? stepList.length - 1 : nextIndex;
+    }
+    if (type === 'prev') {
+      var prevIndex = index - skipNumber;
+      return prevIndex < 1 ? 1 : prevIndex;
+    }
+  };
+  return {
+    getStepIndex: getStepIndex
+  };
 };
 
 /**
@@ -335,4 +355,67 @@ export var useAppointmentBookingResource = function useAppointmentBookingResourc
     getResourceList: getResourceList,
     autoSelectAllProductResources: autoSelectAllProductResources
   };
+};
+
+/**
+ * @title: 是否跳过资源选择步骤
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-04-21 11:47
+ */
+export var useIsSkipResourceStep = function useIsSkipResourceStep() {
+  var _useAppointmentBookin5 = useAppointmentBookingAccount(),
+    accountLists = _useAppointmentBookin5.accountLists;
+  var _useAppointmentBookin6 = useAppointmentBookingResource(),
+    getResourceList = _useAppointmentBookin6.getResourceList,
+    autoSelectAllProductResources = _useAppointmentBookin6.autoSelectAllProductResources;
+  var checkSkipResourceStep = /*#__PURE__*/function () {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+      var _res$errorList, _resources$, res, _getResourceList3, resources;
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
+          case 0:
+            _context8.prev = 0;
+            if (!((accountLists === null || accountLists === void 0 ? void 0 : accountLists.length) === 1)) {
+              _context8.next = 13;
+              break;
+            }
+            _context8.next = 4;
+            return autoSelectAllProductResources();
+          case 4:
+            res = _context8.sent;
+            _getResourceList3 = getResourceList(), resources = _getResourceList3.resources; // 如果分配成功，并且只有一个资源则跳过资源选择步骤，默认选中该资源
+            if (!(!(res !== null && res !== void 0 && (_res$errorList = res.errorList) !== null && _res$errorList !== void 0 && _res$errorList.length) && (resources === null || resources === void 0 || (_resources$ = resources[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.resources) === null || _resources$ === void 0 || (_resources$ = _resources$[0]) === null || _resources$ === void 0 || (_resources$ = _resources$.renderList) === null || _resources$ === void 0 ? void 0 : _resources$.length) === 1)) {
+              _context8.next = 10;
+              break;
+            }
+            return _context8.abrupt("return", true);
+          case 10:
+            return _context8.abrupt("return", false);
+          case 11:
+            _context8.next = 14;
+            break;
+          case 13:
+            return _context8.abrupt("return", false);
+          case 14:
+            _context8.next = 19;
+            break;
+          case 16:
+            _context8.prev = 16;
+            _context8.t0 = _context8["catch"](0);
+            return _context8.abrupt("return", false);
+          case 19:
+          case "end":
+            return _context8.stop();
+        }
+      }, _callee8, null, [[0, 16]]);
+    }));
+    return function checkSkipResourceStep() {
+      return _ref10.apply(this, arguments);
+    };
+  }();
+  return {
+    checkSkipResourceStep: checkSkipResourceStep
+  };
 };

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

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

package/es/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/addons/model.js

@@ -1,9 +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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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 _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { miniRedux } from "@pisell/utils";
 var defaultState = {};
 var _miniRedux = miniRedux({

package/es/components/booking/components/TabProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];