@pisell/private-materials 6.5.27 → 6.6.2

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

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

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

@@ -22,7 +22,8 @@ import { handleAddHolder } from "../utils";
 import "./index.less";
 var CartItem = function CartItem(_ref) {
   var _businessUtils$getApp, _businessUtils$getApp2, _currentStep$step, _currentStep$step2;
-  var onNext = _ref.onNext;
+  var onNext = _ref.onNext,
+    renderContactInfo = _ref.renderContactInfo;
   var appointmentBooking = useAppointmentBooking();
   var _ref2 = useAppointmentBookingContext(),
     carts = _ref2.carts,
@@ -226,7 +227,7 @@ var CartItem = function CartItem(_ref) {
     className: "appointment-cart-item-wrap ".concat(isMobile() ? 'appointment-cart-mobile-item-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "content"
-  }, /*#__PURE__*/React.createElement(ShoppingCart, {
+  }, renderContactInfo ? renderContactInfo() : null, /*#__PURE__*/React.createElement(ShoppingCart, {
     productParams: {
       products: products,
       hideAddBtn: false,
@@ -234,6 +235,7 @@ var CartItem = function CartItem(_ref) {
       disabledEdit: isLastStep,
       isShowChangeResource: currentStep === null || currentStep === void 0 || (_currentStep$step = currentStep.step) === null || _currentStep$step === void 0 || (_currentStep$step = _currentStep$step.key) === null || _currentStep$step === void 0 ? void 0 : _currentStep$step.startsWith('select-resource'),
       isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-service',
+      isShowAmountFooter: true,
       isShowPackageNote: false,
       isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
       isShowHolder: isFormSubject,

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

@@ -7,7 +7,13 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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, { forwardRef, useImperativeHandle, useEffect, useRef } from 'react';
+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, { forwardRef, useImperativeHandle, useEffect, useRef, useMemo } from 'react';
 import { locales, isMobile } from '@pisell/utils';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useAppointmentBookingContext } from "../../context";
@@ -16,6 +22,9 @@ import CartItem from "../Cart/Item";
 import { Toast } from "../../utils";
 import { getFormParams } from "./utils";
 import "./index.less";
+import ContactInfoModalContent from "../../../../plus/contactInfoModal/ContactInfoContent";
+import { Form } from 'antd';
+import useLoginUser from "../../../../hooks/useLoginUser";
 var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
   var _context$appHelper;
   // 用于跟踪是否已经订阅了事件，避免重复订阅
@@ -30,7 +39,84 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
     isAgreeDepositPolicy = _ref.isAgreeDepositPolicy,
     setLoading = _ref.setLoading;
   var _useAppointmentBookin = useAppointmentBookingSetting(),
-    isRetailTemplate = _useAppointmentBookin.isRetailTemplate;
+    isRetailTemplate = _useAppointmentBookin.isRetailTemplate,
+    bookingSetting = _useAppointmentBookin.bookingSetting;
+  console.log(bookingSetting, 'bookingSetting');
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var userInfo = useLoginUser();
+  var getContactsInfo = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var contacts_info, _appointmentBooking$g, res, transfromCountryCallingCode, _ref3, first_name, last_name, phone, email, _ref4, _first_name, _last_name, _phone, _email, country_calling_code, country_code;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            contacts_info = null;
+            _context.prev = 1;
+            _context.next = 4;
+            return appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$g = appointmentBooking.getContactInfo) === null || _appointmentBooking$g === void 0 ? void 0 : _appointmentBooking$g.call(appointmentBooking, {
+              key: 'contacts_info'
+            });
+          case 4:
+            res = _context.sent;
+            if ((res === null || res === void 0 ? void 0 : res.code) == 200 && res !== null && res !== void 0 && res.data) {
+              contacts_info = res === null || res === void 0 ? void 0 : res.data;
+            }
+            _context.next = 12;
+            break;
+          case 8:
+            _context.prev = 8;
+            _context.t0 = _context["catch"](1);
+            console.log('error', _context.t0);
+            contacts_info = null;
+          case 12:
+            transfromCountryCallingCode = function transfromCountryCallingCode(code) {
+              if (!code) {
+                return '';
+              }
+              return code !== null && code !== void 0 && code.startsWith('+') ? code : "+".concat(code);
+            };
+            if (contacts_info) {
+              _ref3 = contacts_info || {}, first_name = _ref3.first_name, last_name = _ref3.last_name, phone = _ref3.phone, email = _ref3.email;
+              form.setFieldsValue({
+                first_name: first_name,
+                last_name: last_name,
+                phone: {
+                  phone: phone === null || phone === void 0 ? void 0 : phone.phone,
+                  countryCallingCode: transfromCountryCallingCode(phone === null || phone === void 0 ? void 0 : phone.country_calling_code),
+                  countryCode: phone === null || phone === void 0 ? void 0 : phone.country_code
+                },
+                email: email
+              });
+            } else {
+              console.log('userInfo', userInfo);
+              // 从用户信息中获取
+              _ref4 = userInfo || {}, _first_name = _ref4.first_name, _last_name = _ref4.last_name, _phone = _ref4.phone, _email = _ref4.email, country_calling_code = _ref4.country_calling_code, country_code = _ref4.country_code;
+              form.setFieldsValue({
+                first_name: _first_name,
+                last_name: _last_name,
+                phone: {
+                  phone: _phone,
+                  countryCallingCode: transfromCountryCallingCode(country_calling_code),
+                  countryCode: country_code
+                },
+                email: _email
+              });
+            }
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[1, 8]]);
+    }));
+    return function getContactsInfo() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  useEffect(function () {
+    getContactsInfo();
+  }, []);
 
   /**
    * @title: 支付成功回调
@@ -50,7 +136,7 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     // 零售模版
     if (isRetailTemplate) {
-      handleForm();
+      handleForm(false);
     }
   }, [isRetailTemplate]);
 
@@ -62,46 +148,46 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-05-28 15:42
    */
   var handleForm = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(isSubmit) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(isSubmit, extraData) {
       var _utils$action;
       var carts, key, isRetailFormSubmit, _callback, params;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context2.next = 2;
+            _context3.next = 2;
             return appointmentBooking.getCart();
           case 2:
-            carts = _context2.sent;
+            carts = _context3.sent;
             // 零售模版是否填写过表单
             key = 'isRetailFormSubmit';
             isRetailFormSubmit = appointmentBooking.getOtherData(key);
             _callback = function callback() {
               // 如果下单按钮触发，则拉起支付
               if (isSubmit) {
-                onCheckout();
+                onCheckout(extraData);
               }
             }; // 如果已经填写过表单则不再次触发
             if (!isRetailFormSubmit) {
-              _context2.next = 8;
+              _context3.next = 8;
               break;
             }
-            return _context2.abrupt("return", _callback());
+            return _context3.abrupt("return", _callback());
           case 8:
             params = getFormParams(carts);
             utils === null || utils === void 0 || (_utils$action = utils.action) === null || _utils$action === void 0 || _utils$action.call(utils, {
               type: 'pisell1.goProductForm',
               data: params,
               callback: function () {
-                var _callback2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
+                var _callback2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(e) {
                   var _carts$;
-                  return _regeneratorRuntime().wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
+                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
                       case 0:
                         if (!((e === null || e === void 0 ? void 0 : e.type) !== 'close')) {
-                          _context.next = 5;
+                          _context2.next = 5;
                           break;
                         }
-                        _context.next = 3;
+                        _context2.next = 3;
                         return appointmentBooking.updateCart({
                           _id: carts === null || carts === void 0 || (_carts$ = carts[0]) === null || _carts$ === void 0 ? void 0 : _carts$._id,
                           relationForms: e
@@ -113,11 +199,11 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
                         setLoading(false);
                       case 6:
                       case "end":
-                        return _context.stop();
+                        return _context2.stop();
                     }
-                  }, _callee);
+                  }, _callee2);
                 }));
-                function callback(_x2) {
+                function callback(_x3) {
                   return _callback2.apply(this, arguments);
                 }
                 return callback;
@@ -125,12 +211,12 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
             });
           case 10:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
-    return function handleForm(_x) {
-      return _ref2.apply(this, arguments);
+    return function handleForm(_x, _x2) {
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -142,39 +228,39 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-05-08 17:32
    */
   var handleNext = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(extraData) {
       var _deposit$protocols;
       var deposit;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             deposit = summary.deposit; // 如果未同意定金政策，则提示
             if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit && (deposit === null || deposit === void 0 || (_deposit$protocols = deposit.protocols) === null || _deposit$protocols === void 0 ? void 0 : _deposit$protocols.length) > 0 && !isAgreeDepositPolicy)) {
-              _context3.next = 3;
+              _context4.next = 3;
               break;
             }
-            return _context3.abrupt("return", Toast(locales.getText('pisell2.appointment.deposit.agree.policy')));
+            return _context4.abrupt("return", Toast(locales.getText('pisell2.appointment.deposit.agree.policy')));
           case 3:
             setLoading(true);
 
             // 零售模版
             if (!isRetailTemplate) {
-              _context3.next = 7;
+              _context4.next = 7;
               break;
             }
-            handleForm(true);
-            return _context3.abrupt("return");
+            handleForm(true, extraData);
+            return _context4.abrupt("return");
           case 7:
             // 预约下单
-            onCheckout();
+            onCheckout(extraData);
           case 8:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
-    return function handleNext() {
-      return _ref3.apply(this, arguments);
+    return function handleNext(_x4) {
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -186,22 +272,22 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
    * @Date: 2025-05-28 15:48
    */
   var onCheckout = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var deposit, _yield$appointmentBoo, data, _ref5, is_deposit, deposit_amount, total_amount, order_id, _total, freeResult;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(extraData) {
+      var deposit, _yield$appointmentBoo, data, _ref8, is_deposit, deposit_amount, total_amount, order_id, _total, freeResult;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            _context4.prev = 0;
+            _context5.prev = 0;
             deposit = summary.deposit;
-            _context4.next = 4;
-            return appointmentBooking.submitOrder();
+            _context5.next = 4;
+            return appointmentBooking.submitOrder(extraData);
           case 4:
-            _yield$appointmentBoo = _context4.sent;
+            _yield$appointmentBoo = _context5.sent;
             data = _yield$appointmentBoo.data;
-            _ref5 = data || {}, is_deposit = _ref5.is_deposit, deposit_amount = _ref5.deposit_amount, total_amount = _ref5.total_amount, order_id = _ref5.order_id; // 如果有定金，则支付定金金额，否则订单金额
+            _ref8 = data || {}, is_deposit = _ref8.is_deposit, deposit_amount = _ref8.deposit_amount, total_amount = _ref8.total_amount, order_id = _ref8.order_id; // 如果有定金，则支付定金金额，否则订单金额
             _total = is_deposit ? deposit_amount : total_amount;
             if (!(_total > 0)) {
-              _context4.next = 13;
+              _context5.next = 13;
               break;
             }
             // 拉起支付弹窗
@@ -215,20 +301,20 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
             setTimeout(function () {
               setLoading(false);
             }, 200);
-            _context4.next = 21;
+            _context5.next = 21;
             break;
           case 13:
             if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit)) {
-              _context4.next = 16;
+              _context5.next = 16;
               break;
             }
             goPaymentFinish(order_id, _total);
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
           case 16:
-            _context4.next = 18;
+            _context5.next = 18;
             return appointmentBooking.getFreeProduct(order_id);
           case 18:
-            freeResult = _context4.sent;
+            freeResult = _context5.sent;
             console.log(freeResult, 'freeResult');
             if (freeResult !== null && freeResult !== void 0 && freeResult.status) {
               goPaymentFinish(order_id, total_amount);
@@ -236,40 +322,89 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
               Toast(freeResult === null || freeResult === void 0 ? void 0 : freeResult.message);
             }
           case 21:
-            _context4.next = 27;
+            _context5.next = 27;
             break;
           case 23:
-            _context4.prev = 23;
-            _context4.t0 = _context4["catch"](0);
-            Toast((_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || '');
+            _context5.prev = 23;
+            _context5.t0 = _context5["catch"](0);
+            Toast((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.message) || '');
             setTimeout(function () {
               setLoading(false);
             }, 50);
           case 27:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[0, 23]]);
+      }, _callee5, null, [[0, 23]]);
     }));
-    return function onCheckout() {
-      return _ref4.apply(this, arguments);
+    return function onCheckout(_x5) {
+      return _ref7.apply(this, arguments);
+    };
+  }();
+  var handleSubmit = /*#__PURE__*/function () {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _utils$businessUtils, _utils$businessUtils$;
+      var _utils$businessUtils2, _utils$businessUtils3, contacts_info, _contacts_info, _contacts_info2, _contacts_info3, _contacts_info4, _contacts_info5, newPhone, _contacts_info6, _contacts_info7;
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
+          case 0:
+            if (!(utils !== null && utils !== void 0 && (_utils$businessUtils = utils.businessUtils) !== null && _utils$businessUtils !== void 0 && (_utils$businessUtils$ = _utils$businessUtils.isGuestUser) !== null && _utils$businessUtils$ !== void 0 && _utils$businessUtils$.call(_utils$businessUtils))) {
+              _context6.next = 4;
+              break;
+            }
+            // 避免重复订阅
+            if (!hasSubscribedRef.current) {
+              pubsub.subscribe('bind.guest.user', handleNext);
+              hasSubscribedRef.current = true;
+            }
+            utils === null || utils === void 0 || (_utils$businessUtils2 = utils.businessUtils) === null || _utils$businessUtils2 === void 0 || (_utils$businessUtils3 = _utils$businessUtils2.openRegisterModal) === null || _utils$businessUtils3 === void 0 || _utils$businessUtils3.call(_utils$businessUtils2, true);
+            return _context6.abrupt("return");
+          case 4:
+            contacts_info = null;
+            _context6.prev = 5;
+            if (!showContactInfo) {
+              _context6.next = 14;
+              break;
+            }
+            _context6.next = 9;
+            return form.validateFields();
+          case 9:
+            contacts_info = _context6.sent;
+            newPhone = {
+              phone: ((_contacts_info = contacts_info) === null || _contacts_info === void 0 || (_contacts_info = _contacts_info.phone) === null || _contacts_info === void 0 ? void 0 : _contacts_info.phone) || '',
+              country_calling_code: ((_contacts_info2 = contacts_info) === null || _contacts_info2 === void 0 || (_contacts_info2 = _contacts_info2.phone) === null || _contacts_info2 === void 0 ? void 0 : _contacts_info2.countryCallingCode) || '',
+              country_code: ((_contacts_info3 = contacts_info) === null || _contacts_info3 === void 0 || (_contacts_info3 = _contacts_info3.phone) === null || _contacts_info3 === void 0 ? void 0 : _contacts_info3.countryCode) || ''
+            };
+            contacts_info.phone = newPhone;
+            // 处理dispaly_name
+            if ((_contacts_info4 = contacts_info) !== null && _contacts_info4 !== void 0 && _contacts_info4.first_name || (_contacts_info5 = contacts_info) !== null && _contacts_info5 !== void 0 && _contacts_info5.last_name) {
+              contacts_info.display_name = "".concat(((_contacts_info6 = contacts_info) === null || _contacts_info6 === void 0 ? void 0 : _contacts_info6.first_name) || '', " ").concat(((_contacts_info7 = contacts_info) === null || _contacts_info7 === void 0 ? void 0 : _contacts_info7.last_name) || '');
+            } else {
+              contacts_info.display_name = '';
+            }
+            console.log('contacts_info', contacts_info);
+          case 14:
+            _context6.next = 20;
+            break;
+          case 16:
+            _context6.prev = 16;
+            _context6.t0 = _context6["catch"](5);
+            console.log('error', _context6.t0);
+            return _context6.abrupt("return");
+          case 20:
+            handleNext({
+              contacts_info: contacts_info
+            });
+          case 21:
+          case "end":
+            return _context6.stop();
+        }
+      }, _callee6, null, [[5, 16]]);
+    }));
+    return function handleSubmit() {
+      return _ref9.apply(this, arguments);
     };
   }();
-  var handleSubmit = function handleSubmit() {
-    var _utils$businessUtils, _utils$businessUtils$;
-    // 如果用户是guest用户，下单时则拉起注册弹窗
-    if (utils !== null && utils !== void 0 && (_utils$businessUtils = utils.businessUtils) !== null && _utils$businessUtils !== void 0 && (_utils$businessUtils$ = _utils$businessUtils.isGuestUser) !== null && _utils$businessUtils$ !== void 0 && _utils$businessUtils$.call(_utils$businessUtils)) {
-      var _utils$businessUtils2, _utils$businessUtils3;
-      // 避免重复订阅
-      if (!hasSubscribedRef.current) {
-        pubsub.subscribe('bind.guest.user', handleNext);
-        hasSubscribedRef.current = true;
-      }
-      utils === null || utils === void 0 || (_utils$businessUtils2 = utils.businessUtils) === null || _utils$businessUtils2 === void 0 || (_utils$businessUtils3 = _utils$businessUtils2.openRegisterModal) === null || _utils$businessUtils3 === void 0 || _utils$businessUtils3.call(_utils$businessUtils2, true);
-      return;
-    }
-    handleNext();
-  };
   useEffect(function () {
     return function () {
       pubsub.unsubscribe('bind.guest.user', handleNext);
@@ -281,11 +416,73 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
       next: handleSubmit
     };
   });
+  var showContactInfo = useMemo(function () {
+    var visible = false;
+    // 默认不显示联系信息，只有设置为显示了才显示
+    // showContactInfo是第一优先级，如果showContactInfo为1，则显示联系信息
+    // 只有showContactInfo为1，才判定contactInfoSetting中showName、showPhone、showEmail，如果全部为0，则不显示联系信息
+    var _ref10 = bookingSetting || {},
+      showContactInfoValue = _ref10.showContactInfo,
+      contactInfoSetting = _ref10.contactInfoSetting;
+    if (showContactInfoValue === 1 || showContactInfoValue === '1') {
+      var _ref11 = contactInfoSetting || {},
+        showName = _ref11.showName,
+        showPhone = _ref11.showPhone,
+        showEmail = _ref11.showEmail;
+      if ((showName === 0 || showName === '0') && (showPhone === 0 || showPhone === '0') && (showEmail === 0 || showEmail === '0')) {
+        visible = false;
+      } else {
+        visible = true;
+      }
+    } else {
+      visible = false;
+    }
+    return visible;
+  }, [bookingSetting === null || bookingSetting === void 0 ? void 0 : bookingSetting.showContactInfo, bookingSetting === null || bookingSetting === void 0 ? void 0 : bookingSetting.contactInfoSetting]);
+  var renderContactInfo = function renderContactInfo() {
+    var _ref12 = (bookingSetting === null || bookingSetting === void 0 ? void 0 : bookingSetting.contactInfoSetting) || {},
+      emailRequired = _ref12.emailRequired,
+      nameRequired = _ref12.nameRequired,
+      phoneRequired = _ref12.phoneRequired,
+      showEmail = _ref12.showEmail,
+      showName = _ref12.showName,
+      showPhone = _ref12.showPhone;
+    if (!showContactInfo) {
+      return null;
+    }
+    return /*#__PURE__*/React.createElement("div", {
+      className: "appointment-confirm-information-contact-info-wrap"
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "appointment-confirm-information-contact-info-title"
+    }, locales.getText('pisell2.text.contact-info.title')), /*#__PURE__*/React.createElement(ContactInfoModalContent, {
+      dataSource: null,
+      form: form,
+      config: {
+        first_name: {
+          visible: showName === 0 ? false : true,
+          required: nameRequired === 'required' ? true : false // 姓名默认选填
+        },
+        last_name: {
+          visible: showName === 0 ? false : true,
+          required: nameRequired === 'required' ? true : false // 姓名默认选填
+        },
+        phone: {
+          visible: showPhone === 0 ? false : true,
+          required: phoneRequired === 'optional' ? false : true // 手机号默认必填
+        },
+        email: {
+          visible: showEmail === 0 ? false : true,
+          required: emailRequired === 'optional' ? false : true // 邮箱默认选填
+        }
+      }
+    }));
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-confirm-information-wrap"
   }, isMobile() ? /*#__PURE__*/React.createElement(CartItem, {
-    onNext: handleSubmit
-  }) : /*#__PURE__*/React.createElement("div", {
+    onNext: handleSubmit,
+    renderContactInfo: renderContactInfo
+  }) : showContactInfo ? renderContactInfo() : /*#__PURE__*/React.createElement("div", {
     className: "appointment-confirm-information-content"
   }, /*#__PURE__*/React.createElement("div", {
     className: "image"

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

@@ -33,3 +33,18 @@
     }
   }
 }
+.appointment-confirm-information-contact-info-wrap {
+  .appointment-confirm-information-contact-info-title {
+    color: #1b1b1b;
+    font-size: 20px;
+    font-weight: 600;
+  }
+
+  .pisell-contact-info-modal-content {
+    padding: 14px 0;
+  }
+
+  .pisell-lowcode-form-item {
+    margin-bottom: 14px;
+  }
+}

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

@@ -103,4 +103,5 @@ export declare const useAppointmentBookingSetting: () => {
     setOtherData: (key: string, val: any) => any;
     getOtherData: (key: string) => any;
     formName: any;
+    bookingSetting: any;
 };