@pisell/private-materials 6.3.177 → 6.3.178

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

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

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

@@ -1,10 +1,8 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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 _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); }); }; }
@@ -13,7 +11,13 @@ 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); }
-import React, { useMemo } 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, { useEffect, useMemo, useState } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import ShoppingCart from "../../../../shoppingCart";
 import ContinueButton from "../ContinueButton";
@@ -25,6 +29,8 @@ import { formatHolder, formatCurrentUser, openForm, getMultiResources, updateCar
 import VoucherCard from "../../Voucher";
 import Deposit from "../../Deposit";
 import { handleAddHolder } from "../utils";
+import { buildCartHolderParams, getAppointmentCartHolderConfig } from "../../../../../utils/buildCartHolderParams";
+import { getSkuRelationFormId, handleCartHolderFormSuccess } from "../../../../../utils/buildCartHolderParams";
 import "./index.less";
 var CartItem = function CartItem(_ref) {
   var _businessUtils$getApp, _businessUtils$getApp2, _currentStep$step, _currentStep$step2;
@@ -55,12 +61,34 @@ var CartItem = function CartItem(_ref) {
     isLogin = _useAppointmentBookin4.isLogin;
   var utils = contextUtils();
   var businessUtils = utils.businessUtils,
-    translation = utils.translation;
+    translation = utils.translation,
+    pisellos = utils.pisellos;
   var taxTitle = summary.taxTitle,
     totalTaxFee = summary.totalTaxFee,
     isPriceIncludeTax = summary.isPriceIncludeTax,
     total = summary.total,
     deposit = summary.deposit;
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    holderMap = _useState2[0],
+    setHolderMap = _useState2[1];
+  useEffect(function () {
+    var _pisellos$effects;
+    var onHolderChanged = function onHolderChanged(res) {
+      if ((res === null || res === void 0 ? void 0 : res.path) === 'holderMap') {
+        setHolderMap(res === null || res === void 0 ? void 0 : res.value);
+      }
+    };
+    pisellos === null || pisellos === void 0 || (_pisellos$effects = pisellos.effects) === null || _pisellos$effects === void 0 || _pisellos$effects.on('appointmentBooking_holder:changed', onHolderChanged);
+    return function () {
+      var _pisellos$effects2;
+      pisellos === null || pisellos === void 0 || (_pisellos$effects2 = pisellos.effects) === null || _pisellos$effects2 === void 0 || _pisellos$effects2.off('appointmentBooking_holder:changed', onHolderChanged);
+    };
+  }, []);
+  useEffect(function () {
+    var _holderMap = (appointmentBooking === null || appointmentBooking === void 0 ? void 0 : appointmentBooking.getHolderFormMap()) || {};
+    setHolderMap(_holderMap);
+  }, []);
 
   /**
    * @title: 当前客户
@@ -149,35 +177,58 @@ var CartItem = function CartItem(_ref) {
 
     // 添加holder
     if (type === 'add_holder') {
+      var _e$_productInit;
       // 关联的表单id
       var relationShipFormId = bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.relationship_form_id;
+      var formId = e === null || e === void 0 || (_e$_productInit = e._productInit) === null || _e$_productInit === void 0 || (_e$_productInit = _e$_productInit.holder_config) === null || _e$_productInit === void 0 ? void 0 : _e$_productInit.resource_id;
+      var skuRelationFormId = getSkuRelationFormId(holderMap, formId);
       return openForm({
-        form_id: relationShipFormId || (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id),
+        form_id: skuRelationFormId || formId || relationShipFormId || (bookingSubject === null || bookingSubject === void 0 ? void 0 : bookingSubject.form_id),
         title: locales.getText('pisell2.event.create.form'),
         utils: utils,
         callback: function () {
           var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
-            var result;
+            var result, _handleCartHolderForm, formRecordId, mainField;
             return _regeneratorRuntime().wrap(function _callee$(_context) {
               while (1) switch (_context.prev = _context.next) {
                 case 0:
                   if (!((res === null || res === void 0 ? void 0 : res.status) === 'success')) {
-                    _context.next = 12;
+                    _context.next = 16;
                     break;
                   }
-                  result = undefined; // 未关联表，则将接口返回的数据作为holder数据
+                  result = undefined;
+                  if (!formId) {
+                    _context.next = 6;
+                    break;
+                  }
+                  _handleCartHolderForm = handleCartHolderFormSuccess({
+                    res: res,
+                    formId: formId,
+                    skuRelationFormId: skuRelationFormId,
+                    utils: utils,
+                    module: appointmentBooking
+                  }), formRecordId = _handleCartHolderForm.formRecordId, mainField = _handleCartHolderForm.mainField;
+                  appointmentBooking.updateCart({
+                    _id: e === null || e === void 0 ? void 0 : e._id,
+                    account: {
+                      id: formRecordId,
+                      username: mainField
+                    }
+                  });
+                  return _context.abrupt("return");
+                case 6:
                   if (relationShipFormId) {
-                    _context.next = 8;
+                    _context.next = 12;
                     break;
                   }
-                  _context.next = 5;
+                  _context.next = 9;
                   return addAccount(res === null || res === void 0 ? void 0 : res.values, 'holder');
-                case 5:
+                case 9:
                   result = _context.sent;
-                  _context.next = 11;
+                  _context.next = 15;
                   break;
-                case 8:
-                  _context.next = 10;
+                case 12:
+                  _context.next = 14;
                   return handleAddHolder({
                     res: res,
                     bookingSubject: bookingSubject,
@@ -186,9 +237,9 @@ var CartItem = function CartItem(_ref) {
                     getHolders: getHolders,
                     appointmentBooking: appointmentBooking
                   });
-                case 10:
+                case 14:
                   result = _context.sent;
-                case 11:
+                case 15:
                   // 更新购物车的holder数据
                   if (result) {
                     appointmentBooking.updateCart({
@@ -196,7 +247,7 @@ var CartItem = function CartItem(_ref) {
                       account: result
                     });
                   }
-                case 12:
+                case 16:
                 case "end":
                   return _context.stop();
               }
@@ -212,11 +263,25 @@ var CartItem = function CartItem(_ref) {
   };
   var products = useMemo(function () {
     if (!(carts !== null && carts !== void 0 && carts.length)) return [];
-    carts.forEach(function (item) {
-      item.isShowChangeHolder = !appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id);
+    var enrichedCarts = carts.map(function (item) {
+      // item.isShowChangeHolder = !appointmentBooking.isTargetCartIdNormalProduct(
+      //   item?._id
+      // );
+      // 是否是普通商品，本期普通商品不支持holder
+      var isNormalProduct = appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id);
+      var holderConfig = getAppointmentCartHolderConfig(item);
+      var formData = holderMap === null || holderMap === void 0 ? void 0 : holderMap[holderConfig === null || holderConfig === void 0 ? void 0 : holderConfig.resource_id];
+      var holderParams = buildCartHolderParams({
+        item: item,
+        holderConfig: holderConfig,
+        formData: formData,
+        translation: translation,
+        enabled: !isFormSubject ? false : !isNormalProduct
+      });
+      return _objectSpread(_objectSpread({}, item), holderParams);
     });
     if ((currentSelectedResources === null || currentSelectedResources === void 0 ? void 0 : currentSelectedResources.length) > 0) {
-      var newCarts = carts.map(function (item) {
+      var newCarts = enrichedCarts.map(function (item) {
         var currentResourceData = currentSelectedResources.find(function (resource) {
           return (resource === null || resource === void 0 ? void 0 : resource._id) === (item === null || item === void 0 ? void 0 : item._id);
         });
@@ -225,15 +290,15 @@ var CartItem = function CartItem(_ref) {
         var multiResources = getMultiResources(item, currentResourceData === null || currentResourceData === void 0 ? void 0 : currentResourceData.currentSelectedResource, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key);
         return _objectSpread(_objectSpread({}, item), {}, {
           isMultipleResource: true,
-          multiResources: multiResources,
-          isErrorHolder: isErrorHolder || false
+          multiResources: multiResources
+          // isErrorHolder: isErrorHolder || false,
         });
       });
       return newCarts;
     } else {
-      return carts;
+      return enrichedCarts;
     }
-  }, [carts, currentSelectedResources, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, isErrorHolder]);
+  }, [carts, currentSelectedResources, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, isErrorHolder, holderMap, isFormSubject]);
 
   /**
    * @description: 结算列表数据
@@ -287,7 +352,9 @@ var CartItem = function CartItem(_ref) {
       isShowDelete: (currentStep === null || currentStep === void 0 || (_currentStep$step2 = currentStep.step) === null || _currentStep$step2 === void 0 ? void 0 : _currentStep$step2.key) === 'select-service',
       isShowPackageNote: false,
       isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
+      // isShowChangeHolder: isLastStep ? false : !isRetailTemplate && isLogin,
       isShowHolder: isFormSubject,
+      // isShowHolder: !isRetailTemplate,
       isShowAddHolderButton: true
     },
     collapseParams: {

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

@@ -44,7 +44,8 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
     setTimes = _ref.setTimes;
   var _useAppointmentBookin = useAppointmentBookingSetting(),
     isRetailTemplate = _useAppointmentBookin.isRetailTemplate,
-    bookingSetting = _useAppointmentBookin.bookingSetting;
+    bookingSetting = _useAppointmentBookin.bookingSetting,
+    isFormSubject = _useAppointmentBookin.isFormSubject;
   console.log(bookingSetting, 'bookingSetting');
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -282,21 +283,24 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
    */
   var onCheckout = /*#__PURE__*/function () {
     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;
+      var _extraData, 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:
             _context5.prev = 0;
+            _extraData = _objectSpread(_objectSpread({}, extraData), {}, {
+              is_add_holder_info: isFormSubject
+            });
             deposit = summary.deposit;
-            _context5.next = 4;
-            return appointmentBooking.submitOrder(extraData);
-          case 4:
+            _context5.next = 5;
+            return appointmentBooking.submitOrder(_extraData);
+          case 5:
             _yield$appointmentBoo = _context5.sent;
             data = _yield$appointmentBoo.data;
             _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)) {
-              _context5.next = 13;
+              _context5.next = 14;
               break;
             }
             // 拉起支付弹窗
@@ -310,19 +314,19 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
             setTimeout(function () {
               setLoading(false);
             }, 200);
-            _context5.next = 21;
+            _context5.next = 22;
             break;
-          case 13:
+          case 14:
             if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit)) {
-              _context5.next = 16;
+              _context5.next = 17;
               break;
             }
             goPaymentFinish(order_id, _total);
             return _context5.abrupt("return");
-          case 16:
-            _context5.next = 18;
+          case 17:
+            _context5.next = 19;
             return appointmentBooking.getFreeProduct(order_id);
-          case 18:
+          case 19:
             freeResult = _context5.sent;
             console.log(freeResult, 'freeResult');
             if (freeResult !== null && freeResult !== void 0 && freeResult.status) {
@@ -330,28 +334,28 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
             } else {
               Toast(freeResult === null || freeResult === void 0 ? void 0 : freeResult.message);
             }
-          case 21:
-            _context5.next = 30;
+          case 22:
+            _context5.next = 31;
             break;
-          case 23:
-            _context5.prev = 23;
+          case 24:
+            _context5.prev = 24;
             _context5.t0 = _context5["catch"](0);
             if (!checkProductStock(productStockCheckModalRef, _context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.data, carts)) {
-              _context5.next = 28;
+              _context5.next = 29;
               break;
             }
             setLoading(false);
             return _context5.abrupt("return");
-          case 28:
+          case 29:
             Toast((_context5.t0 === null || _context5.t0 === void 0 ? void 0 : _context5.t0.message) || '');
             setTimeout(function () {
               setLoading(false);
             }, 50);
-          case 30:
+          case 31:
           case "end":
             return _context5.stop();
         }
-      }, _callee5, null, [[0, 23]]);
+      }, _callee5, null, [[0, 24]]);
     }));
     return function onCheckout(_x5) {
       return _ref7.apply(this, arguments);

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

@@ -7,16 +7,16 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import React, { useMemo, useRef } from 'react';
+import React, { useMemo } from 'react';
 import { locales } from '@pisell/utils';
 import ProgressBar from "../../../eventBooking/components/progressBar";
 import { useAppointmentBookingContext } from "../../context";
-import { useShopDiscount, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingProduct, contextUtils, useInterceptBrowserBack } from "../../hooks";
+import { useShopDiscount, useAppointmentBookingStep, useAppointmentBookingSetting, useAppointmentBookingProduct, contextUtils } from "../../hooks";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { getResourceTitle } from "../../utils";
 import "./index.less";
 var Header = function Header() {
-  var _currentStep$step3, _currentStep$index;
+  var _currentStep$step3;
   var _ref = useAppointmentBookingContext(),
     currentStep = _ref.currentStep,
     appointmentBooking = _ref.appointmentBooking,
@@ -36,7 +36,6 @@ var Header = function Header() {
   var _useAppointmentBookin3 = useAppointmentBookingProduct(),
     checkProductType = _useAppointmentBookin3.checkProductType;
   var utils = contextUtils();
-  var progressBarRef = useRef(null);
 
   /**
    * @title: 获取资源名称
@@ -186,25 +185,7 @@ 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('/');
   };
-
-  /**
-   * 移动端浏览器/系统返回键：逐步触发 handleBack，第一步时打开关闭确认弹窗。
-   */
-  var _useInterceptBrowserB = useInterceptBrowserBack({
-      stepIndex: (_currentStep$index = currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) !== null && _currentStep$index !== void 0 ? _currentStep$index : 0,
-      canGoBack: function canGoBack() {
-        var _currentStep$index2;
-        return ((_currentStep$index2 = currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) !== null && _currentStep$index2 !== void 0 ? _currentStep$index2 : 0) > 0;
-      },
-      onBack: handleBack,
-      onExit: function onExit() {
-        var _progressBarRef$curre;
-        return (_progressBarRef$curre = progressBarRef.current) === null || _progressBarRef$curre === void 0 ? void 0 : _progressBarRef$curre.triggerClose();
-      }
-    }),
-    restoreBackTrap = _useInterceptBrowserB.restoreBackTrap;
   return /*#__PURE__*/React.createElement(ProgressBar, {
-    ref: progressBarRef,
     title: currentStep ? "".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,
@@ -213,8 +194,7 @@ var Header = function Header() {
     },
     onClose: function onClose() {
       return handleClose();
-    },
-    onConfirmCancel: restoreBackTrap
+    }
   });
 };
 export default Header;

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

@@ -30,6 +30,7 @@ import "../../../booking/components/voucher/index.less";
 import { showDiscountScanFailMessage } from "../../../booking/utils";
 import "./index.less";
 import { useDebounceFn } from 'ahooks';
+import { getCustomer } from "../../utils";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -292,7 +293,16 @@ var VoucherCard = function VoucherCard(props) {
       onClick: function onClick() {
         if (!action) return;
         openLoginModal({
+          data: {
+            type: 'plugin'
+          },
           callback: function callback(status) {
+            if (status === 'success') {
+              var customer = getCustomer(utils);
+              appointmentBooking === null || appointmentBooking === void 0 || appointmentBooking.refreshAllHolderFormRecords({
+                customer_id: customer === null || customer === void 0 ? void 0 : customer.id
+              });
+            }
             // const user = utils.store?.getState()?.global?.userInfo;
             // const currentUser = formatCustomer(user);
             // const meAccount = accountLists?.find((d: any) => !d?.isGuest);

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

@@ -46,6 +46,7 @@ export declare const useAppointmentBookingLogin: () => {
     isLogin: boolean;
     openLoginModal: (params: {
         callback: any;
+        data?: any;
     }) => void;
 };
 /**
@@ -105,20 +106,3 @@ export declare const useAppointmentBookingSetting: () => {
     formName: any;
     bookingSetting: any;
 };
-export interface UseInterceptBrowserBackOptions {
-    /** 是否启用拦截，默认 true */
-    enabled?: boolean;
-    /** 当前步骤 index（0-based），用于同步 history 栈深度 */
-    stepIndex: number;
-    /** 是否还能在流程内后退（如 currentStep.index > 0） */
-    canGoBack: () => boolean;
-    /** 流程内后退，对应 Header.handleBack */
-    onBack: () => void | Promise<void>;
-    /** 已在第一步时的退出逻辑，对应 Header.handleClose */
-    onExit?: () => void;
-}
-export interface UseInterceptBrowserBackResult {
-    /** 系统返回触发退出确认但被取消时，补回 history trap */
-    restoreBackTrap: () => void;
-}
-export declare const useInterceptBrowserBack: ({ enabled, stepIndex, canGoBack, onBack, onExit, }: UseInterceptBrowserBackOptions) => UseInterceptBrowserBackResult;