@pisell/private-materials 6.0.25 → 6.1.1

package/es/components/booking/info/service2/utils.js

@@ -1,12 +1,12 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _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 _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 _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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 _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 _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); }
@@ -20,12 +20,17 @@ 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); }
 import { getNoResource } from "../../mock";
 import { getErrorList, getProductTotalPrice } from "../../utils";
-import { locales } from "@pisell/utils";
+import { isArr, locales } from '@pisell/utils';
 import dayjs from 'dayjs';
 import { appointmentTypes, openingTime } from "./status";
 import { postMultiDay } from "../service/serve";
 import localeTexts from "../../locales";
 import { concatBookings, isGroupBooking, getProductByGroupId } from "./Group/utils";
+import { isShowAddTime } from "../utils";
+import { formatResources } from "../service/addService/utils";
+import { getProductExtend } from "../../info2/service/addService/utils";
+import { getErrorList as getErrorListInfo2 } from "../../info2/utilsByBooking";
+import { getRelationDetailsTotal } from "../../components/footer/amount";
 locales.init(localeTexts, localStorage.getItem('umi_locale') || 'en');
 export var formatActiveKey = function formatActiveKey(lists, platform, isEdit) {
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
@@ -48,7 +53,7 @@ export var formatActiveKey = function formatActiveKey(lists, platform, isEdit) {
 
 /**
  * @title: 获取资源名称
- * @description: 
+ * @description:
  * @param {any} id
  * @param {any} state
  * @return {*}
@@ -73,7 +78,7 @@ var errorTypes = {
 
 /**
  * @title: 错误提示
- * @description: 
+ * @description:
  * @param {any} service
  * @param {any} resourceItem
  * @return {*}
@@ -98,7 +103,7 @@ export var getErrorMessage = function getErrorMessage(service, resourceItem, isD
 
 /**
  * @title: 格式化主体列表
- * @description: 
+ * @description:
  * @param {any} lists
  * @param {boolean} isOpenGroup
  * @return {*}
@@ -167,7 +172,7 @@ export var isBookingProduct = function isBookingProduct(extension_type, bol) {
 
 /**
  * @title: 是否是预约商品
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2024-12-06 11:24
@@ -175,21 +180,147 @@ export var isBookingProduct = function isBookingProduct(extension_type, bol) {
 export var isDayBookingProduct = function isDayBookingProduct(item, state) {
   return isBookingProduct(item === null || item === void 0 ? void 0 : item.extension_type) && state.renderType === 'dayBooking';
 };
+var currentResource = function currentResource(state, useResource, cacheItem) {
+  var resourcesOrigin = state.service.resourcesOrigin;
+  var resources = formatResources({
+    cacheItem: cacheItem,
+    resourcesOrigin: resourcesOrigin,
+    isDay: false
+  });
+  var item = resources.find(function (d) {
+    return d.form_record_id == useResource;
+  }) || {};
+  return item;
+};
+
+// 更新holder
+export var handleChangeHolder = function handleChangeHolder(products, currentItem, other) {
+  return products.map(function (item) {
+    if (item._id === currentItem._id) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+          holder_id: isArr(other) ? other.map(function (item) {
+            return item.id;
+          }) : item._extend.quantity > 1 ? [other.id] : other.id
+        })
+      });
+    }
+    return item;
+  });
+};
+
+// 添加holder
+var handleAddHolder = function handleAddHolder() {};
+var handleLike = function handleLike(products, currentItem, other) {
+  return products.map(function (item) {
+    if (currentItem.isParallelResource) {
+      if (item._id === currentItem.serviceId) {
+        var _item$_extend, _item$_extend2;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+            resource: _objectSpread(_objectSpread({}, (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.resource), {}, _defineProperty({}, currentItem.resourceId, (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.resource[currentItem.resourceId].map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                like_status: other.like_status
+              });
+            })))
+          })
+        });
+      }
+      return item;
+    } else {
+      if (item._id === currentItem._id) {
+        return _objectSpread(_objectSpread({}, item), {}, {
+          _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+            like_status: other.like_status
+          })
+        });
+      }
+      return item;
+    }
+  });
+};
+
+// 更新资源
+var handleChangeResource = function handleChangeResource(products, currentItem, other, state) {
+  return products.map(function (item) {
+    var _ref = other || {},
+      props = _ref.props,
+      value = _ref.value;
+    var _ref2 = props || {},
+      isParallelResource = _ref2.isParallelResource,
+      resourceId = _ref2.resourceId;
+    if (isParallelResource) {
+      if (item._id === currentItem._id) {
+        var hasDataItem = getProductExtend({
+          cacheItem: _objectSpread(_objectSpread({}, item), {}, {
+            new: 0
+          }),
+          state: state
+        });
+        var maps = hasDataItem._extend.resource[resourceId] ? hasDataItem._extend.resource[resourceId].reduce(function (pre, cur) {
+          pre[cur.relation_id] = cur;
+          return pre;
+        }, {}) : {};
+        item._extend.resource[resourceId] = value.map(function (d) {
+          var _hasDataItem$_data$re, _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _currentForm$renderLi5;
+          var currentForm = ((_hasDataItem$_data$re = hasDataItem._data.resourceMaps) === null || _hasDataItem$_data$re === void 0 ? void 0 : _hasDataItem$_data$re[resourceId]) || {};
+          return (
+            // maps[d] 为真时, 说明是之前已选择, 否则为新增的值,补充数据
+            maps[d] || {
+              relation_type: ((_currentForm$renderLi = currentForm.renderListMaps[d]) === null || _currentForm$renderLi === void 0 || (_currentForm$renderLi = _currentForm$renderLi.usable) === null || _currentForm$renderLi === void 0 ? void 0 : _currentForm$renderLi.relation_type) || 'form',
+              form_id: resourceId,
+              relation_id: d,
+              like_status: 'common',
+              // 新添加的数据补充错误信息
+              errors: getErrorListInfo2((_currentForm$renderLi2 = currentForm.renderListMaps) === null || _currentForm$renderLi2 === void 0 ? void 0 : _currentForm$renderLi2[d], hasDataItem),
+              children: (_currentForm$renderLi3 = currentForm.renderListMaps) === null || _currentForm$renderLi3 === void 0 || (_currentForm$renderLi3 = _currentForm$renderLi3[d]) === null || _currentForm$renderLi3 === void 0 ? void 0 : _currentForm$renderLi3.children,
+              metadata: _objectSpread(_objectSpread({}, (_currentForm$renderLi4 = currentForm.renderListMaps) === null || _currentForm$renderLi4 === void 0 || (_currentForm$renderLi4 = _currentForm$renderLi4[d]) === null || _currentForm$renderLi4 === void 0 ? void 0 : _currentForm$renderLi4.metadata), {}, {
+                form_name: currentForm.title,
+                resource_name: (_currentForm$renderLi5 = currentForm.renderListMaps[d]) === null || _currentForm$renderLi5 === void 0 ? void 0 : _currentForm$renderLi5.main_field
+              })
+            }
+          );
+        });
+      }
+      return item;
+    } else {
+      if (item._id === currentItem._id) {
+        var _resourceItem$_extend;
+        var resourceItem = currentResource(state, other.id, item);
+        var _ref3 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {},
+          relation_type = _ref3.relation_type,
+          item_id = _ref3.item_id,
+          schedule_id = _ref3.schedule_id;
+        return _objectSpread(_objectSpread({}, item), {}, {
+          _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+            resource: item_id || (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) || 0,
+            relation_type: relation_type || 'form',
+            relation_id: item_id || (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) || 0,
+            schedule_id: schedule_id || 0
+          })
+        });
+      }
+      return item;
+    }
+  });
+};
 
 /**
  * @title: 更新商品数据
- * @description: 
+ * @description:
  * @param {any} state
+ * @param currentItem
  * @param {string} type
- * @param {any} _id // 商品id
  * @param {any} other
+ * @param actions
  * @return {*}
  * @Author: WangHan
  * @Date: 2025-01-03 15:00
  */
-export var updateServices = function updateServices(state, currentItem, type, other) {
-  var _state$service;
-  var products = (state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [];
+export var updateServices = function updateServices(state, currentItem, type, other, actions) {
+  var _state$service, _state$service2;
+  if (!(state !== null && state !== void 0 && (_state$service = state.service) !== null && _state$service !== void 0 && _state$service.value)) return [];
+  var products = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || [];
   // currentItem 可能是单个  也可能是数组
   var isGroup = isGroupBooking(currentItem._id);
   // 删除
@@ -212,11 +343,29 @@ export var updateServices = function updateServices(state, currentItem, type, ot
   if (type === 'delete_holders') {
     var _products2;
     products = (_products2 = products) === null || _products2 === void 0 ? void 0 : _products2.filter(function (item) {
-      var _item$_extend;
-      return (item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.holder_id) !== other;
+      var _item$_extend3;
+      return (item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.holder_id) !== other;
     });
   }
 
+  // 更新holder
+  if (type === 'change_holder') {
+    products = handleChangeHolder(products, currentItem, other);
+    return products;
+  }
+  if (type === 'add_holder') {
+    var _actions$handleAddHol;
+    actions === null || actions === void 0 || (_actions$handleAddHol = actions.handleAddHolder) === null || _actions$handleAddHol === void 0 || _actions$handleAddHol.call(actions, products, currentItem);
+    return products;
+  }
+  if (type === 'like') {
+    products = handleLike(products, currentItem, other);
+  }
+  if (type === 'change_resource') {
+    products = handleChangeResource(products, currentItem, other, state);
+    return products;
+  }
+
   // 更新商品的holder_id
   if (type === 'update_holders') {
     var _products3;
@@ -268,7 +417,7 @@ export var updateServices = function updateServices(state, currentItem, type, ot
 
 /**
  * @title: 格式化套餐
- * @description: 
+ * @description:
  * @param {any} bundle
  * @return {*}
  * @Author: WangHan
@@ -293,7 +442,7 @@ var formatBundle = function formatBundle(bundle) {
 
 /**
  * @title: 格式化单规格
- * @description: 
+ * @description:
  * @param {any} options
  * @return {*}
  * @Author: WangHan
@@ -323,10 +472,163 @@ export var formItems = function formItems(items) {
     });
   });
 };
+var formatHolders = function formatHolders(items) {
+  return items.map(function (d) {
+    return {
+      id: d === null || d === void 0 ? void 0 : d.form_record_id,
+      label: d === null || d === void 0 ? void 0 : d.main_field
+    };
+  });
+};
+var getErrorMessageInfo2 = function getErrorMessageInfo2(errorList) {
+  var errorMessage = '';
+  if (errorList !== null && errorList !== void 0 && errorList.length) {
+    if (errorList.length === 1) {
+      errorMessage = errorList[0].label + ' ' + errorTypes[errorList[0].type];
+    } else {
+      errorMessage = "".concat(errorList.length, " ").concat(locales.getText('pisell2.text.warnings'));
+    }
+  }
+  return errorMessage;
+};
+var getAllErrorList = function getAllErrorList(item) {
+  var _ref4 = item._data || {},
+    resourceMaps = _ref4.resourceMaps;
+  var _ref5 = item._extend || {},
+    resource = _ref5.resource;
+  var errorList = [];
+  Object.entries(resource).forEach(function (_ref6) {
+    var _ref7 = _slicedToArray(_ref6, 2),
+      key = _ref7[0],
+      value = _ref7[1];
+    value.forEach(function (val) {
+      var _resourceMaps$key;
+      var list = getErrorListInfo2((_resourceMaps$key = resourceMaps[key]) === null || _resourceMaps$key === void 0 ? void 0 : _resourceMaps$key.renderListMaps[val.relation_id], item);
+      errorList.push.apply(errorList, _toConsumableArray(list));
+      console.log(list, 'list');
+    });
+  });
+  return errorList;
+};
+var mapListItems = function mapListItems(items) {
+  return items.map(function (item) {
+    return {
+      id: item.id || item.form_record_id,
+      label: item.labelText,
+      isError: !item.usable
+    };
+  });
+};
+
+// 获取主体表单是否必填
+export var getIsSubjectRequire = function getIsSubjectRequire(state) {
+  var _state$bookingConfig2, _state$bookingConfig3;
+  return (state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.appointment_subject) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.type) === 'form' && (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.subject_require) === 'require';
+};
+
+// 非预约商品 通过时长和日程判断是否是普通商品
+export var isNormalProductByDurationSchedule = function isNormalProductByDurationSchedule(item) {
+  var _item$schedules, _item$scheduleIds;
+  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !((_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
+};
+
+// 是否全部是普通商品
+export var isAllNormalProduct = function isAllNormalProduct(items) {
+  return items.every(function (item) {
+    return isNormalProductByDurationSchedule(item);
+  });
+};
+export var isAllNormalProductByState = function isAllNormalProductByState(state) {
+  return isAllNormalProduct(state.service.value);
+};
+var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
+  var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
+  var pet = state.pet,
+    service = state.service;
+  var _ref8 = pet || {},
+    _ref8$holders = _ref8.holders,
+    holders = _ref8$holders === void 0 ? [] : _ref8$holders,
+    formData = _ref8.formData;
+  var parallelResourceOtherParams = {};
+  var multiResources;
+  if (isParallelResource) {
+    var hasDataItem = getProductExtend({
+      cacheItem: _objectSpread(_objectSpread({}, item), {}, {
+        new: 0
+      }),
+      state: state
+    });
+    var _ref9 = hasDataItem._data || {},
+      resourceMaps = _ref9.resourceMaps,
+      resources = _ref9.resources;
+    parallelResourceOtherParams.errorMessage = getErrorMessageInfo2(getAllErrorList(hasDataItem));
+    multiResources = resources.map(function (resource) {
+      var _detail$select_type, _value$;
+      var key = resource.form_id;
+      var detail = resourceMaps === null || resourceMaps === void 0 ? void 0 : resourceMaps[key];
+      var isMultiple = (detail === null || detail === void 0 || (_detail$select_type = detail.select_type) === null || _detail$select_type === void 0 ? void 0 : _detail$select_type.type) === 'multiple';
+      var value = item._extend.resource[key];
+      return {
+        is_hide_like: isMultiple,
+        isParallelResource: true,
+        maxLength: isMultiple && detail.select_type.max,
+        resourceMode: isMultiple ? 'multiple' : undefined,
+        serviceId: item._id,
+        resourceId: key,
+        _id: key,
+        id: (value || []).map(function (val) {
+          return val.relation_id;
+        }),
+        status: (value === null || value === void 0 || (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.like_status) || 'common',
+        lists: detail !== null && detail !== void 0 && detail.renderList ? mapListItems(detail === null || detail === void 0 ? void 0 : detail.renderList) : [],
+        disabled: state.disabledEdit || state.disableEventBookingEdit
+      };
+    });
+  } else {
+    var _item$_extend4;
+    var _ref10 = service || {},
+      resourcesOrigin = _ref10.resourcesOrigin;
+    var resource = formatResources({
+      cacheItem: item,
+      resourcesOrigin: resourcesOrigin,
+      isDay: false
+    });
+    multiResources = [{
+      _id: item._id,
+      id: item._extend.resource,
+      status: ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.like_status) || 'common',
+      lists: mapListItems(resource)
+    }];
+  }
+  var isNormalProduct = isNormalProductByDurationSchedule(item);
+  return _objectSpread({
+    format: ['HH:mm', 'HH:mm'],
+    show_time: true,
+    duration_type: 'minutes',
+    // 当前可选择holder列表
+    holders: formatHolders(holders),
+    isShowChangeHolder: !isNormalProduct,
+    isShowAction: isShowAddTime(state, item),
+    actionText: locales.getText('page.booking.text.add-time'),
+    isMultipleResource: true,
+    multiResources: multiResources,
+    holderMaxCount: item === null || item === void 0 ? void 0 : item._extend.quantity,
+    holderMode: (item === null || item === void 0 ? void 0 : item._extend.quantity) > 1 ? 'multiple' : undefined,
+    isErrorHolder: getIsSubjectRequire(state),
+    addHolderButtonText: (formData === null || formData === void 0 || (_formData$ = formData[0]) === null || _formData$ === void 0 || (_formData$ = _formData$.form) === null || _formData$ === void 0 ? void 0 : _formData$.title) || "",
+    holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,
+    start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate : "",
+    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date) : "",
+    rowKey: "rowKey-".concat(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
+  }, parallelResourceOtherParams);
+};
+var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
+  return (Number(total) || 0) + getRelationDetailsTotal(addTimeProducts || []);
+};
 
 /**
  * @title: 格式化商品数据
- * @description: 
+ * @description:
  * @param {any} lists
  * @return {*}
  * @Author: WangHan
@@ -334,59 +636,64 @@ export var formItems = function formItems(items) {
  */
 export var formatProducts = function formatProducts(lists, state) {
   var isRenderGroup = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var isGeneral = arguments.length > 3 ? arguments[3] : undefined;
+  var isParallelResource = arguments.length > 4 ? arguments[4] : undefined;
   if (!(lists !== null && lists !== void 0 && lists.length)) return [];
   var normalList = [];
   var groupList = [];
   var formItem = function formItem(item) {
-    var _item$_extend2, _item$_extend3, _item$_extend4, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9, _item$_extend10, _item$_extend11, _item$_extend12, _resourceItem, _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16;
+    var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _resourceItem, _item$_extend23, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
-    var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.holder_id);
-    var options = formatOptions(item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 || (_item$_extend3 = _item$_extend3.other) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.option);
-    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 || (_item$_extend4 = _item$_extend4.other) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.bundle);
+    var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id);
+    var options = formatOptions(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.option);
+    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.bundle);
     // 是否是普通商品
     var isNormalProduct = !appointmentTypes.includes(item === null || item === void 0 ? void 0 : item.extension_type) || (state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking';
     var resourceItem = {};
     var errorMessage = '';
-    if (_isDayBookingProduct) {
-      var _item$_extend5;
-      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.resource, state);
+    if (_isDayBookingProduct || isGeneral) {
+      var _item$_extend13;
+      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
-    return {
+    var generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
+    return _objectSpread(_objectSpread({
       id: item === null || item === void 0 ? void 0 : item.id,
       _id: item === null || item === void 0 ? void 0 : item._id,
       name: item === null || item === void 0 ? void 0 : item.title,
-      price: item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.price,
-      total: item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.total,
-      origin_total: item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.origin_total,
+      price: item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price,
+      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.relation_details),
+      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.origin_total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
       num: item === null || item === void 0 ? void 0 : item._extend.quantity,
       image: item === null || item === void 0 ? void 0 : item.cover,
       isShowNote: true,
       note: item === null || item === void 0 ? void 0 : item.note,
-      like_status: item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.like_status,
+      like_status: item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.like_status,
       bundle: bundle,
       options: options,
       errorMessage: errorMessage,
-      product_option_string: item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 || (_item$_extend10 = _item$_extend10.other) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.product_option_string,
-      discount_reason: item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.discount_reason,
-      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.resource,
+      product_option_string: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.product_option_string,
+      discount_reason: item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.discount_reason,
+      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.resource,
       relation_form_name: isNormalProduct ? '' : ((_resourceItem = resourceItem) === null || _resourceItem === void 0 ? void 0 : _resourceItem.labelText) || item.relation_form_name,
       holder_title: clientTitle,
-      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.start_date : '',
-      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.end_date : '',
-      holder_id: (item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.holder_id) || 0,
+      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.start_date : '',
+      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date : '',
+      holder_id: (item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id) || 0,
       isNormalProduct: isNormalProduct,
       locale: state.locale,
       symbol: state.amountSymbol,
-      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.items) || []),
+      relation_products: (item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.items) || [])
+    }, generalParams), {}, {
       _origin: item
-    };
+    });
   };
 
   // 将商品分为组商品和非组商品
   lists.forEach(function (item) {
-    var _item$_extend17;
-    if (!(item !== null && item !== void 0 && (_item$_extend17 = item._extend) !== null && _item$_extend17 !== void 0 && _item$_extend17.groupId)) {
+    var _item$_extend28;
+    if (!(item !== null && item !== void 0 && (_item$_extend28 = item._extend) !== null && _item$_extend28 !== void 0 && _item$_extend28.groupId)) {
       normalList.push(formItem(item));
     } else {
       groupList.push(item);
@@ -395,14 +702,15 @@ export var formatProducts = function formatProducts(lists, state) {
 
   // 根据item._extend.groupId 进行分组
   var groups = groupList.reduce(function (prev, item) {
-    var _item$_extend18;
-    var groupId = item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.groupId;
+    var _item$_extend29;
+    var groupId = item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId;
     if (!prev[groupId]) {
       prev[groupId] = [];
     }
     prev[groupId].push(item);
     return prev;
   }, {});
+  console.log(normalList, 'normalList');
   if (isRenderGroup) {
     return Object.values(groups).map(function (d) {
       return formItem(concatBookings(d));
@@ -416,7 +724,7 @@ export var formatProducts = function formatProducts(lists, state) {
 
 /**
  * @title: 禁用日期
- * @description: 
+ * @description:
  * @param {any} current
  * @param {string} position
  * @param {any} startDate
@@ -439,7 +747,7 @@ export var disabledDate = function disabledDate(current, position, currentDate)
 
 /**
  * @title: 是否是跨日预约
- * @description: 
+ * @description:
  * @param {any} state
  * @return {*}
  * @Author: WangHan
@@ -459,7 +767,7 @@ export var isAppointmentProduct = function isAppointmentProduct(item) {
 };
 /**
  * @title: 是否是terminal上的跨日预约
- * @description: 
+ * @description:
  * @param {any} state
  * @return {*}
  * @Author: WangHan
@@ -480,15 +788,15 @@ export var formatDayDate = function formatDayDate(_extend) {
 
 /**
  * @title: 根据营业日时间格式化时间
- * @description: 
+ * @description:
  * @param {any} state
  * @return {*}
  * @Author: WangHan
  * @Date: 2024-12-04 12:07
  */
-export var formatDayTime = function formatDayTime(_ref) {
-  var startDate = _ref.startDate,
-    endDate = _ref.endDate;
+export var formatDayTime = function formatDayTime(_ref11) {
+  var startDate = _ref11.startDate,
+    endDate = _ref11.endDate;
   // 营业日时间
   var shopOpeningTime = localStorage.getItem('shopOpeningHours') || '00:00';
 
@@ -519,7 +827,7 @@ export var formatDateTime = function formatDateTime(start_date, end_date) {
 
 /**
  * @title: 初始化日期
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2024-12-06 17:24
@@ -533,15 +841,15 @@ export var initDate = function initDate() {
 
 /**
  * @title: 是否有预约商品
- * @description: 
+ * @description:
  * @return {*}
  * @Author: WangHan
  * @Date: 2024-12-12 15:47
  */
 export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(state) {
-  var _state$bookingConfig2, _state$service2, _state$pet2;
-  var form_id = (state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.appointment_subject) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.form_id) || 0;
-  var services = ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || [];
+  var _state$bookingConfig4, _state$service3, _state$pet2;
+  var form_id = (state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.appointment_subject) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.form_id) || 0;
+  var services = ((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.value) || [];
   var pets = ((_state$pet2 = state.pet) === null || _state$pet2 === void 0 || (_state$pet2 = _state$pet2.value) === null || _state$pet2 === void 0 ? void 0 : _state$pet2[form_id]) || [];
 
   // 没选择表单，则直接提示
@@ -565,8 +873,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend19;
-        return ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend30;
+        return ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });
@@ -578,7 +886,7 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
 
 /**
  * @title: 过滤出如果是预约商品，则只获取跨日的预约商品
- * @description: 
+ * @description:
  * @param {any} lists
  * @return {*}
  * @Author: WangHan
@@ -604,30 +912,30 @@ export var getDayProducts = function getDayProducts(holderId, lists, isTerminal)
 
 /**
  * @title: 格式化表单数据
- * @description: 
+ * @description:
  * @param {any} state
  * @return {*}
  * @Author: WangHan
  * @Date: 2024-12-30 22:19
  */
 export var getPets = function getPets(state) {
-  var _state$bookingConfig3, _state$pet3;
-  var form_id = (state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.basic) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.appointment_subject) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.form_id) || 0;
+  var _state$bookingConfig5, _state$pet3;
+  var form_id = (state === null || state === void 0 || (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.config) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.basic) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.appointment_subject) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.form_id) || 0;
   var pets = (state === null || state === void 0 || (_state$pet3 = state.pet) === null || _state$pet3 === void 0 || (_state$pet3 = _state$pet3.value) === null || _state$pet3 === void 0 ? void 0 : _state$pet3[form_id]) || [];
   return pets;
 };
 
 /**
  * @title: 得出预约商品
- * @description: 
+ * @description:
  * @param {any} state
  * @return {*}
  * @Author: WangHan
  * @Date: 2024-12-30 22:26
  */
 export var getAppointmentService = function getAppointmentService(state) {
-  var _state$service3;
-  var services = ((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.value) || [];
+  var _state$service4;
+  var services = ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value) || [];
   var lists = services.filter(function (item) {
     return appointmentTypes.includes(item.extension_type);
   });
@@ -636,7 +944,7 @@ export var getAppointmentService = function getAppointmentService(state) {
 
 /**
  * @title: 判断是否打开删除宠物弹窗
- * @description: 
+ * @description:
  * @param {any} state
  * @param {any} newVal
  * @return {*}
@@ -644,8 +952,8 @@ export var getAppointmentService = function getAppointmentService(state) {
  * @Date: 2024-12-16 16:12
  */
 export var isOpenDeletePet = function isOpenDeletePet(state, newVal) {
-  var _state$bookingConfig4, _state$pet4;
-  var form_id = (state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.basic) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.appointment_subject) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.form_id) || 0;
+  var _state$bookingConfig6, _state$pet4;
+  var form_id = (state === null || state === void 0 || (_state$bookingConfig6 = state.bookingConfig) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.config) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.basic) === null || _state$bookingConfig6 === void 0 || (_state$bookingConfig6 = _state$bookingConfig6.appointment_subject) === null || _state$bookingConfig6 === void 0 ? void 0 : _state$bookingConfig6.form_id) || 0;
   var oldPets = (state === null || state === void 0 || (_state$pet4 = state.pet) === null || _state$pet4 === void 0 || (_state$pet4 = _state$pet4.value) === null || _state$pet4 === void 0 ? void 0 : _state$pet4[form_id]) || [];
   var newPets = (newVal === null || newVal === void 0 ? void 0 : newVal[form_id]) || [];
 
@@ -658,9 +966,9 @@ export var isOpenDeletePet = function isOpenDeletePet(state, newVal) {
 
   // 被删除的表单中是否有预约商品
   var servicePets = deletePets.map(function (item) {
-    var _state$service4;
+    var _state$service5;
     return _objectSpread(_objectSpread({}, item), {}, {
-      services: (_state$service4 = state.service) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.value) === null || _state$service4 === void 0 ? void 0 : _state$service4.filter(function (d) {
+      services: (_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.value) === null || _state$service5 === void 0 ? void 0 : _state$service5.filter(function (d) {
         var _d$_extend;
         return ((_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.holder_id) == item.form_record_id;
       })
@@ -682,7 +990,7 @@ export var isOpenDeletePet = function isOpenDeletePet(state, newVal) {
 
 /**
  * @title: 当前选中的表单id
- * @description: 
+ * @description:
  * @param {any} state
  * @return {*}
  * @Author: WangHan
@@ -695,7 +1003,7 @@ export var holderId = function holderId(state) {
 
 /**
  * @title: 计算总价
- * @description: 
+ * @description:
  * @param {any} data
  * @return {*}
  * @Author: WangHan
@@ -710,7 +1018,7 @@ function calculateTotalPrice(data) {
 
 /**
  * @title: 更新单规格价格
- * @description: 
+ * @description:
  * @param {any} currentValue
  * @param {any} single
  * @return {*}
@@ -738,17 +1046,17 @@ function updateSinglePrice(currentValue, single) {
 
 /**
  * @title: 更新套餐价格
- * @description: 
+ * @description:
  * @param {any} currentValue
  * @param {any} param2
  * @return {*}
  * @Author: WangHan
  * @Date: 2024-12-31 15:17
  */
-function updateBundlePrice(currentValue, _ref2) {
-  var _ref3 = _slicedToArray(_ref2, 2),
-    bundle = _ref3[0],
-    single = _ref3[1];
+function updateBundlePrice(currentValue, _ref12) {
+  var _ref13 = _slicedToArray(_ref12, 2),
+    bundle = _ref13[0],
+    single = _ref13[1];
   var _bundle = [];
   var _loop2 = function _loop2() {
     var item = currentValue[index];
@@ -785,7 +1093,7 @@ function updateBundlePrice(currentValue, _ref2) {
 
 /**
  * @title: 平铺套餐数据
- * @description: 
+ * @description:
  * @param {any} newPackageData
  * @return {*}
  * @Author: WangHan
@@ -860,7 +1168,7 @@ function flatData(newPackageData) {
 
 /**
  * @title: 更新套餐的价格
- * @description: 
+ * @description:
  * @param {any} currentValue
  * @param {any} newBundleData
  * @return {*}
@@ -876,7 +1184,7 @@ export function updateNormalBundlePrice(currentValue, newBundleData) {
 
 /**
  * @title: 更新普通商品价格
- * @description: 
+ * @description:
  * @param {any} ids
  * @param {any} state
  * @return {*}
@@ -884,13 +1192,13 @@ export function updateNormalBundlePrice(currentValue, newBundleData) {
  * @Date: 2024-12-31 15:15
  */
 var normalServicePrice = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ids, state) {
-    var _state$service5, _state$client, _data$list;
+  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ids, state) {
+    var _state$service6, _state$client, _data$list;
     var services, customerId, data, _lists;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          services = ((_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value) || [];
+          services = ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value) || [];
           customerId = (state === null || state === void 0 || (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || 0;
           _context.next = 4;
           return state.apis.getServices({
@@ -959,13 +1267,13 @@ var normalServicePrice = /*#__PURE__*/function () {
     }, _callee);
   }));
   return function normalServicePrice(_x, _x2) {
-    return _ref4.apply(this, arguments);
+    return _ref14.apply(this, arguments);
   };
 }();
 
 /**
  * @title: 更新预约商品报价单
- * @description: 
+ * @description:
  * @param {any} state
  * @param {any} cacheItem
  * @return {*}
@@ -973,16 +1281,16 @@ var normalServicePrice = /*#__PURE__*/function () {
  * @Date: 2024-12-25 16:41
  */
 export var updateAppointmentServicePrice = /*#__PURE__*/function () {
-  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, _ref5) {
-    var _state$service6;
+  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, _ref15) {
+    var _state$service7;
     var start_date, end_date, product_id, defaultReturn, _state$client2, _state$service$cacheI, _res$data, _res$data2, format, customer_id, _product_id, multi_day_price, startDate, endDate, params, res, _prices;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          start_date = _ref5.start_date, end_date = _ref5.end_date, product_id = _ref5.product_id;
+          start_date = _ref15.start_date, end_date = _ref15.end_date, product_id = _ref15.product_id;
           defaultReturn = {
             multiDayPrices: [],
-            price: Number(state === null || state === void 0 || (_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 || (_state$service6 = _state$service6._extend) === null || _state$service6 === void 0 ? void 0 : _state$service6.price) || 0
+            price: Number(state === null || state === void 0 || (_state$service7 = state.service) === null || _state$service7 === void 0 || (_state$service7 = _state$service7.cacheItem) === null || _state$service7 === void 0 || (_state$service7 = _state$service7._extend) === null || _state$service7 === void 0 ? void 0 : _state$service7.price) || 0
           };
           _context2.prev = 2;
           format = 'YYYY-MM-DD';
@@ -1042,21 +1350,21 @@ export var updateAppointmentServicePrice = /*#__PURE__*/function () {
     }, _callee2, null, [[2, 21]]);
   }));
   return function updateAppointmentServicePrice(_x3, _x4) {
-    return _ref6.apply(this, arguments);
+    return _ref16.apply(this, arguments);
   };
 }();
 
 /**
  * @title: 更新普通商品报价单价格
- * @description: 
+ * @description:
  * @param {any} state
  * @return {*}
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
 export var updateServicePrice = function updateServicePrice(state) {
-  var _state$service7, _newNormalIds;
-  var services = ((_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : _state$service7.value) || [];
+  var _state$service8, _newNormalIds;
+  var services = ((_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : _state$service8.value) || [];
 
   // 普通商品
   var normalServices = services === null || services === void 0 ? void 0 : services.filter(function (item) {