@pisell/private-materials 3.2.33 → 3.2.34

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

@@ -22,6 +22,7 @@ import classNames from 'classnames';
 import { locales, isMobile } from '@pisell/utils';
 import { CaretLeftOutlined, CaretRightOutlined } from '@ant-design/icons';
 import { useAppointmentBookingContext } from "../../context";
+import { useAppointmentBookingSetting } from "../../hooks";
 import "./index.less";
 var CalendarDate = function CalendarDate(props) {
   var _useState = useState(false),
@@ -46,6 +47,9 @@ var CalendarDate = function CalendarDate(props) {
     setCurrentMonth = _useState8[1];
   var _useAppointmentBookin = useAppointmentBookingContext(),
     appointmentBooking = _useAppointmentBookin.appointmentBooking;
+  var _useAppointmentBookin2 = useAppointmentBookingSetting(),
+    isDateSelectedFirst = _useAppointmentBookin2.isDateSelectedFirst,
+    customPageId = _useAppointmentBookin2.customPageId;
   var weekListText = [locales.getText('pisell2.appointment.sunday'), locales.getText('pisell2.appointment.monday'), locales.getText('pisell2.appointment.tuesday'), locales.getText('pisell2.appointment.wednesday'), locales.getText('pisell2.appointment.thursday'), locales.getText('pisell2.appointment.friday'), locales.getText('pisell2.appointment.saturday')];
 
   // 计算开始渲染的列
@@ -101,33 +105,72 @@ var CalendarDate = function CalendarDate(props) {
     var lastDate = Dayjs(newCurrentMonth).subtract(1, 'month');
     return lastDate.isBefore(Dayjs(), 'month');
   };
-  var getDates = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(date) {
-      var startDate, endDate, params, data, selected, firstAvailableDate, baseMonthData, updatedDates;
+
+  /**
+   * @title: 获取日期数据
+   * @description:
+   * @param {*} params
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-24 18:31
+   */
+  var getDateData = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.prev = 0;
+            console.log(isDateSelectedFirst, customPageId, 'wh7868');
+            // 先选日期
+            if (!isDateSelectedFirst) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return", appointmentBooking.loadScheduleAvailableDate(_objectSpread(_objectSpread({}, params), {}, {
+              custom_page_id: customPageId
+            })));
+          case 3:
+            _context.next = 5;
+            return appointmentBooking.getAvailableDate(params);
+          case 5:
+            return _context.abrupt("return", _context.sent);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getDateData(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var getDates = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(date) {
+      var startDate, endDate, params, data, selected, _selected$, firstAvailableDate, baseMonthData, updatedDates;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.prev = 0;
             startDate = Dayjs(date).startOf('month').format('YYYY-MM-DD');
             endDate = Dayjs(date).endOf('month').format('YYYY-MM-DD');
             params = {
               startDate: startDate,
               endDate: endDate
             };
-            _context.next = 6;
-            return appointmentBooking.getAvailableDate(params);
+            _context2.next = 6;
+            return getDateData(params);
           case 6:
-            data = _context.sent;
-            _context.next = 9;
+            data = _context2.sent;
+            _context2.next = 9;
             return appointmentBooking.getDateRange();
           case 9:
-            selected = _context.sent;
+            selected = _context2.sent;
+            console.log(data, selected, customPageId, 'getDates');
             if ((selected === null || selected === void 0 ? void 0 : selected.length) > 0) {
-              setCurrentDate(selected[0].date);
+              setCurrentDate(selected === null || selected === void 0 || (_selected$ = selected[0]) === null || _selected$ === void 0 ? void 0 : _selected$.date);
             } else {
               // 当前月则默认选中当前第一个可用的
               if (date.format('YYYY-MM') === Dayjs().format('YYYY-MM')) {
-                firstAvailableDate = data.find(function (d) {
+                firstAvailableDate = (data || []).find(function (d) {
                   return d.status === 'available';
                 });
                 setCurrentDate(firstAvailableDate === null || firstAvailableDate === void 0 ? void 0 : firstAvailableDate.date);
@@ -150,21 +193,22 @@ var CalendarDate = function CalendarDate(props) {
             });
             setLoading(false);
             setDateMonthList(updatedDates);
-            _context.next = 21;
+            _context2.next = 23;
             break;
-          case 17:
-            _context.prev = 17;
-            _context.t0 = _context["catch"](0);
+          case 18:
+            _context2.prev = 18;
+            _context2.t0 = _context2["catch"](0);
             setLoading(false);
-            console.log(_context.t0, 'wh978968234234');
-          case 21:
+            setDateMonthList([]);
+            console.log(_context2.t0, 'wh978968234234');
+          case 23:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[0, 17]]);
+      }, _callee2, null, [[0, 18]]);
     }));
-    return function getDates(_x) {
-      return _ref.apply(this, arguments);
+    return function getDates(_x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
   useEffect(function () {
@@ -199,6 +243,26 @@ var CalendarDate = function CalendarDate(props) {
     setCurrentMonth(newNextMonth);
     setLoading(true);
   };
+
+  /**
+   * @title: 点击某一天日期
+   * @description:
+   * @param {any} day
+   * @param {any} date
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-24 18:36
+   */
+  var handleClick = function handleClick(day, date) {
+    if (day !== null && day !== void 0 && day.disabled) return;
+    setCurrentDate(date);
+    appointmentBooking.setDateRange([day]);
+
+    // 先选择日期，则点击某一天后，则进入下一步
+    if (isDateSelectedFirst) {
+      appointmentBooking.next();
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "calendar-date-box ".concat(isMobile() ? 'calendar-date-mobile-box' : '')
   }, !dateMonthList.length ? /*#__PURE__*/React.createElement(Skeleton, {
@@ -238,9 +302,7 @@ var CalendarDate = function CalendarDate(props) {
       key: index,
       className: classNames('calendar-days-items', _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, 'disabledDate', day === null || day === void 0 ? void 0 : day.disabled), 'selectDate', currentDate === date), 'other-month-days', !isCurrentMonth), 'loading-item', loading)),
       onClick: function onClick() {
-        if (day !== null && day !== void 0 && day.disabled) return;
-        setCurrentDate(date);
-        appointmentBooking.setDateRange([day]);
+        return handleClick(day, date);
       }
     }, isCurrentMonth && /*#__PURE__*/React.createElement("div", {
       className: classNames('day-text')

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

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

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

@@ -0,0 +1,30 @@
+import React from 'react';
+import { PisellText } from '@pisell/materials';
+import AppointmentDeposit from "../../deposit";
+import { useAppointmentBookingContext } from "../../context";
+import { locales } from '@pisell/utils';
+import "./index.less";
+var Deposit = function Deposit() {
+  var _useAppointmentBookin = useAppointmentBookingContext(),
+    setIsAgreeDepositPolicy = _useAppointmentBookin.setIsAgreeDepositPolicy,
+    isAgreeDepositPolicy = _useAppointmentBookin.isAgreeDepositPolicy,
+    summary = _useAppointmentBookin.summary;
+  var deposit = summary.deposit;
+  return /*#__PURE__*/React.createElement("div", {
+    className: "appointment-deposit-wrap"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "appointment-deposit-top"
+  }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.appointment.deposit')), /*#__PURE__*/React.createElement(PisellText.Amount, {
+    value: deposit === null || deposit === void 0 ? void 0 : deposit.total,
+    showCurrencySymbol: true,
+    className: "amount"
+  })), /*#__PURE__*/React.createElement(AppointmentDeposit, {
+    total: deposit === null || deposit === void 0 ? void 0 : deposit.total,
+    protocols: deposit === null || deposit === void 0 ? void 0 : deposit.protocols,
+    isAgreePolicy: isAgreeDepositPolicy,
+    onChange: function onChange(value) {
+      return setIsAgreeDepositPolicy(value);
+    }
+  }));
+};
+export default Deposit;

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

@@ -0,0 +1,16 @@
+.appointment-deposit-wrap {
+  .appointment-deposit-top {
+    color: var(--Text-Text_1, #1b1b1b);
+    font-size: 20px;
+    font-weight: 600;
+    line-height: 28px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 14px;
+
+    .amount {
+      color: var(--Blue-600, #1570ef);
+    }
+  }
+}

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

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

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

@@ -0,0 +1,110 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useMemo, useRef, useState } from 'react';
+import useComponents from "../../../../hooks/useComponents";
+import { formatForms, formatCarts } from "../../utils";
+import { useAppointmentBookingContext } from "../../context";
+import PolicyModal from "../../deposit/components/PolicyModal";
+import "./index.less";
+var Form = function Form() {
+  var manualRef = useRef();
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentFormIndex = _useState2[0],
+    setCurrentFormIndex = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showAgreement = _useState4[0],
+    setShowAgreement = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    agreementContent = _useState6[0],
+    setAgreementContent = _useState6[1];
+  var _useAppointmentBookin = useAppointmentBookingContext(),
+    carts = _useAppointmentBookin.carts,
+    resources = _useAppointmentBookin.resources,
+    appointmentBooking = _useAppointmentBookin.appointmentBooking;
+  var forms = useMemo(function () {
+    return formatForms(formatCarts(carts, resources));
+  }, [carts, resources]);
+  var currentForm = useMemo(function () {
+    console.log(forms, 'formatFormsformatForms');
+    return forms[currentFormIndex];
+  }, [forms, currentFormIndex]);
+  var _useComponents = useComponents({
+      components: ['FormCard']
+    }),
+    _useComponents2 = _slicedToArray(_useComponents, 1),
+    FormCard = _useComponents2[0];
+
+  /**
+   * @title: 获取下一个表单
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-26 11:04
+   */
+  var goToNextForm = function goToNextForm() {
+    var nextIndex = currentFormIndex + 1;
+    if (nextIndex < forms.length) {
+      var _forms$nextIndex, _forms$nextIndex2;
+      setCurrentFormIndex(nextIndex);
+      // 如果下一个表单没有id但有协议，直接弹协议
+      if (!(forms !== null && forms !== void 0 && (_forms$nextIndex = forms[nextIndex]) !== null && _forms$nextIndex !== void 0 && _forms$nextIndex.form_id) && forms !== null && forms !== void 0 && (_forms$nextIndex2 = forms[nextIndex]) !== null && _forms$nextIndex2 !== void 0 && _forms$nextIndex2.policy_id) {
+        var _forms$nextIndex3;
+        setAgreementContent({
+          id: forms === null || forms === void 0 || (_forms$nextIndex3 = forms[nextIndex]) === null || _forms$nextIndex3 === void 0 ? void 0 : _forms$nextIndex3.policy_id
+        });
+        setShowAgreement(true);
+      }
+    } else {
+      // 所有表单和协议都处理完毕，进入下一主流程
+      appointmentBooking.next();
+    }
+  };
+  var handleFormFinish = function handleFormFinish(status, values) {
+    console.log(status, values, 'handleFormFinish');
+    if (status === 'success') {
+      // 判断当前表单是否有协议
+      if (currentForm !== null && currentForm !== void 0 && currentForm.policy_id) {
+        setAgreementContent({
+          id: currentForm.policy_id
+        });
+        setShowAgreement(true);
+      } else {
+        goToNextForm();
+      }
+    }
+  };
+  var handleAgreementOk = function handleAgreementOk() {
+    setShowAgreement(false);
+    goToNextForm();
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, currentForm !== null && currentForm !== void 0 && currentForm.form_id ? /*#__PURE__*/React.createElement("div", {
+    className: "appointment-form-wrap"
+  }, /*#__PURE__*/React.createElement(FormCard, {
+    id: currentForm === null || currentForm === void 0 ? void 0 : currentForm.form_id,
+    ref: manualRef,
+    isGetLastData: false,
+    setting: {},
+    formWrapStyle: {
+      padding: '16px'
+    },
+    isV2API: true,
+    isShowSkeleton: true,
+    onSubmit: function onSubmit(status, values) {
+      // callbackRef.current?.({ status, values });
+      // onClose();
+      handleFormFinish(status, values);
+    }
+  })) : null, showAgreement ? /*#__PURE__*/React.createElement(PolicyModal, {
+    open: showAgreement,
+    onCancel: handleAgreementOk,
+    item: agreementContent
+  }) : null);
+};
+export default Form;

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

@@ -0,0 +1,3 @@
+.appointment-form-wrap {
+  padding-bottom: 16px;
+}

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

@@ -10,7 +10,7 @@ import { useShopDiscount, useIsSkipResourceStep, useAppointmentBookingStep } fro
 import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
 var Header = function Header() {
-  var _currentStep$step3, _currentStep$step5;
+  var _currentStep$step3;
   var _useAppointmentBookin = useAppointmentBookingContext(),
     currentStep = _useAppointmentBookin.currentStep,
     appointmentBooking = _useAppointmentBookin.appointmentBooking,
@@ -115,8 +115,9 @@ var Header = function Header() {
     var utils = context.appHelper.utils || {};
     utils === null || utils === void 0 || (_utils$history = utils.history) === null || _utils$history === void 0 || _utils$history.replace('/');
   };
+  console.log(currentStep, 'wh98087');
   return /*#__PURE__*/React.createElement(ProgressBar, {
-    title: currentStep === null || currentStep === void 0 || (_currentStep$step5 = currentStep.step) === null || _currentStep$step5 === void 0 ? void 0 : _currentStep$step5.title,
+    title: "".concat(locales.getText('pisell2.appointment.step')((currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 1)),
     description: stepName,
     showBack: (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) > 0,
     onBack: function onBack() {

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

@@ -8,7 +8,7 @@ import React, { useState, useEffect, useMemo } from 'react';
 import { Skeleton } from 'antd';
 import ResourceDisplay from "../../../eventBooking/components/resourceDisplay";
 import { PisellCustomCheckboxGroup, PisellToast } from '@pisell/materials';
-import { useAppointmentBookingResource } from "../../hooks";
+import { useAppointmentBookingResource, useAppointmentBookingSetting } from "../../hooks";
 import { useAppointmentBookingContext } from "../../context";
 import guestsImg from "../../assets/guests.svg";
 import { isMobile, locales } from '@pisell/utils';
@@ -26,8 +26,11 @@ var Resource = function Resource() {
   var _useAppointmentBookin2 = useAppointmentBookingResource(),
     getResourceList = _useAppointmentBookin2.getResourceList,
     autoSelectAllProductResources = _useAppointmentBookin2.autoSelectAllProductResources;
+  var _useAppointmentBookin3 = useAppointmentBookingSetting(),
+    isDateSelectedFirst = _useAppointmentBookin3.isDateSelectedFirst;
   useEffect(function () {
     var _resources = getResourceList();
+    if (isDateSelectedFirst) return;
     autoSelectAllProductResources();
     getResourceList();
   }, []);

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

@@ -4,6 +4,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 _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); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -19,7 +22,7 @@ import TabProduct from "../../../booking/components/TabProduct";
 import { formatProductListByCategory } from "../../../booking/utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useAppointmentBookingContext } from "../../context";
-import { useAppointmentBooking } from "../../hooks";
+import { useAppointmentBooking, useAppointmentBookingSetting } from "../../hooks";
 import "./index.less";
 var Services = function Services() {
   var searchRef = useRef();
@@ -34,20 +37,93 @@ var Services = function Services() {
   var _useAppointmentBookin = useAppointmentBookingContext(),
     products = _useAppointmentBookin.products,
     setProducts = _useAppointmentBookin.setProducts;
+  var _useAppointmentBookin2 = useAppointmentBookingSetting(),
+    isDateSelectedFirst = _useAppointmentBookin2.isDateSelectedFirst;
+
+  /**
+   * @title: 获取商品列表
+   * @description:
+   * @return {*}
+   * @Author: WangHan
+   * @Date: 2025-04-24 18:43
+   */
+  var getLists = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _dates$, dates, _productList, _ref3, productModuleParams, productList;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!isDateSelectedFirst) {
+              _context.next = 12;
+              break;
+            }
+            _context.next = 3;
+            return appointmentBooking.getDateRange();
+          case 3:
+            dates = _context.sent;
+            console.log(dates, 'productList11');
+            if (!(!dates || !dates.length)) {
+              _context.next = 7;
+              break;
+            }
+            return _context.abrupt("return");
+          case 7:
+            _context.next = 9;
+            return appointmentBooking.loadProductByScheduleDate((_dates$ = dates[0]) === null || _dates$ === void 0 ? void 0 : _dates$.date);
+          case 9:
+            _productList = _context.sent;
+            console.log(_productList, 'productList11');
+            return _context.abrupt("return", _productList);
+          case 12:
+            // 先选择商品
+            _ref3 = appointmentBooking.otherParams || {}, productModuleParams = _ref3.productModuleParams;
+            _context.next = 15;
+            return appointmentBooking.loadProducts(productModuleParams);
+          case 15:
+            productList = _context.sent;
+            return _context.abrupt("return", productList);
+          case 17:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getLists() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
-    var _ref2 = appointmentBooking.otherParams || {},
-      productModuleParams = _ref2.productModuleParams;
-    appointmentBooking.loadProducts(productModuleParams).then(function (res) {
-      setProducts(res || []);
-    }).catch(function () {
+    // const { productModuleParams } = appointmentBooking.otherParams || {};
+
+    // appointmentBooking
+    //   .loadProducts(productModuleParams)
+    //   .then((res: any) => {
+    //     setProducts(res || []);
+    //   })
+    //   .catch(() => {
+    //     setProducts([]);
+    //   });
+
+    try {
+      getLists().then(function (res) {
+        console.log(res, 'getLists');
+        setProducts(res || []);
+      });
+    } catch (error) {
       setProducts([]);
-    });
+    }
   }, []);
   var handleSelectProduct = function handleSelectProduct(item) {
+    console.log(item, 'wwwss');
+    if (isDateSelectedFirst && !(item !== null && item !== void 0 && item.duration)) {
+      appointmentBooking.openProductDetail(item.id);
+    }
     utils === null || utils === void 0 || utils.action({
       type: 'pisell1.productDetail',
       data: {
-        detail: item
+        detail: _objectSpread(_objectSpread({}, item), {}, {
+          open_deposit: 1
+        })
       },
       callback: function callback(data) {
         var _data$origin;
@@ -63,8 +139,26 @@ var Services = function Services() {
         var product = _objectSpread(_objectSpread({}, data), {}, {
           options: (data === null || data === void 0 ? void 0 : data.option) || []
         });
+        console.log(data, 'wh987986');
         delete product.option;
-        appointmentBooking.storeProduct(product);
+
+        // 先选择日期流程
+        if (isDateSelectedFirst) {
+          appointmentBooking.addProductToCart({
+            product: _objectSpread({}, product),
+            date: {
+              startTime: '2025-04-27 09:00',
+              endTime: '2025-04-27 11:00'
+            }
+          });
+          appointmentBooking.getAvailableDate({
+            startDate: '2025-04-27',
+            endDate: '2025-04-27'
+          });
+          appointmentBooking.closeProductDetail();
+        } else {
+          appointmentBooking.storeProduct(product);
+        }
       }
     });
   };

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

@@ -21,6 +21,9 @@ interface AppointmentBookingContextType {
     setResourceOtherParams: (val: any) => void;
     selectedTime: any;
     setSelectedTime: (val: any) => void;
+    isAgreeDepositPolicy: boolean;
+    setIsAgreeDepositPolicy: (val: boolean) => void;
+    [key: string]: any;
 }
 export declare const AppointmentBookingProvider: ({ children, }: {
     children: ReactNode;

package/es/components/appointmentBooking/context.js

@@ -4,7 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { createContext, useContext, useState } from 'react';
+import React, { createContext, useContext, useState, useEffect } from 'react';
 import { useAppointmentBooking } from "./hooks";
 import useEngineContext from "../../hooks/useEngineContext";
 var AppointmentBookingContext = /*#__PURE__*/createContext(undefined);
@@ -30,7 +30,7 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     _useState8 = _slicedToArray(_useState7, 2),
     resources = _useState8[0],
     setResources = _useState8[1];
-  var _useState9 = useState(appointmentBooking.getCurrentStep()),
+  var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
     currentStep = _useState10[0],
     setCurrentStep = _useState10[1];
@@ -50,9 +50,21 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     _useState18 = _slicedToArray(_useState17, 2),
     selectedTime = _useState18[0],
     setSelectedTime = _useState18[1];
+  var _useState19 = useState(false),
+    _useState20 = _slicedToArray(_useState19, 2),
+    isAgreeDepositPolicy = _useState20[0],
+    setIsAgreeDepositPolicy = _useState20[1];
+  var _useState21 = useState(null),
+    _useState22 = _slicedToArray(_useState21, 2),
+    currentResource = _useState22[0],
+    setCurrentResource = _useState22[1];
   var _useEngineContext = useEngineContext(),
     appHelper = _useEngineContext.appHelper;
   var symbolic = appHelper === null || appHelper === void 0 || (_appHelper$utils = appHelper.utils) === null || _appHelper$utils === void 0 ? void 0 : _appHelper$utils.getSymbolic();
+  useEffect(function () {
+    var currentStep = appointmentBooking.getCurrentStep();
+    setCurrentStep(currentStep);
+  }, []);
   console.log(3234234, times, resources);
   var value = {
     appointmentBooking: appointmentBooking,
@@ -75,7 +87,11 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
     resourceOtherParams: resourceOtherParams,
     setResourceOtherParams: setResourceOtherParams,
     selectedTime: selectedTime,
-    setSelectedTime: setSelectedTime
+    setSelectedTime: setSelectedTime,
+    isAgreeDepositPolicy: isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy: setIsAgreeDepositPolicy,
+    currentResource: currentResource,
+    setCurrentResource: setCurrentResource
   };
   return /*#__PURE__*/React.createElement(AppointmentBookingContext.Provider, {
     value: value

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

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