@pisell/private-materials 6.5.27 → 6.6.2

package/es/components/booking/info/service/Lists.js

@@ -8,7 +8,7 @@ import React, { useContext, useMemo } from 'react';
 import ShoppingCart from "../../../shoppingCart";
 import { CartContext } from "../../../shoppingCart/Provider";
 import { Context } from "../model";
-import { formatProducts, isEventBooking, isNormalProductByDurationSchedule, updateServices } from "../service2/utils";
+import { formatProducts, isEventBooking, updateServices } from "../service2/utils";
 import useHolderConfig from "../hooks/useHolderConfig";
 import { useMemoizedFn } from 'ahooks';
 import { getProductExtend } from "../../info2/service/addService/utils";
@@ -18,7 +18,11 @@ var Lists = function Lists(_ref) {
   var onEdit = _ref.onEdit,
     onChange = _ref.onChange,
     onAction = _ref.onAction,
-    isParallelResource = _ref.isParallelResource;
+    isParallelResource = _ref.isParallelResource,
+    _ref$isShowDelete = _ref.isShowDelete,
+    isShowDelete = _ref$isShowDelete === void 0 ? true : _ref$isShowDelete,
+    _ref$isShowAmountFoot = _ref.isShowAmountFooter,
+    isShowAmountFooter = _ref$isShowAmountFoot === void 0 ? true : _ref$isShowAmountFoot;
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
@@ -53,7 +57,7 @@ var Lists = function Lists(_ref) {
       var cacheItem = _objectSpread(_objectSpread({}, product), {}, {
         new: 0
       });
-      if (isParallelResource && !isNormalProductByDurationSchedule(products)) {
+      if (isParallelResource) {
         cacheItem = getProductExtend({
           cacheItem: cacheItem,
           state: state
@@ -89,6 +93,8 @@ var Lists = function Lists(_ref) {
     return {
       hideAddBtn: state.isTerminalDayBookingPage || state.isBookingCreatePage,
       isShowNote: state.isBookingTicket2 ? true : isEventBooking(state),
+      isShowDelete: isShowDelete,
+      isShowAmountFooter: isShowAmountFooter,
       isShowPackageNote: false,
       accounts: [],
       isEdit: !!(state !== null && state !== void 0 && state.bookingId),
@@ -104,7 +110,7 @@ var Lists = function Lists(_ref) {
   var products = useMemo(function () {
     var _state$service;
     console.time('products');
-    var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, false, true, isParallelResource);
+    var p = formatProducts((state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || [], state, true, true, isParallelResource);
     console.timeEnd('products');
     return p;
   }, [state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value, state]);

package/es/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info/service/addTimeModal/serve.js

@@ -1,10 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function 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 { request } from "../../../utils";
@@ -15,12 +10,7 @@ export var getAddTimeProducts = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return request.getRequest().post("/shop/product/query", params, _objectSpread(_objectSpread({}, config), {}, {
-            cache: {
-              mode: "remote_local",
-              type: "indexDB"
-            }
-          }));
+          return request.getRequest().post("/shop/product/query", params, config);
         case 2:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;

package/es/components/booking/info/service/serve.d.ts

@@ -18,3 +18,17 @@ export declare const getProductPrice: (params: {
     customer_id: number;
     schedule_date: string;
 }) => Promise<any>;
+declare type MultiDayProductPriceParams = {
+    customer_id: number;
+    data: {
+        product_id: number;
+        schedule_date: string;
+    }[];
+};
+/**
+ * 获取普通商品和跨日预约的价格
+ * @param params
+ * @returns
+ */
+export declare const getNormalAndMultiDayProductPrice: (params: MultiDayProductPriceParams) => Promise<any>;
+export {};

package/es/components/booking/info/service/serve.js

@@ -8,12 +8,7 @@ export var getProductDetail = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", request.getRequest().get("/shop/product/query/".concat(id), params, {
-            cache: {
-              mode: "remote_local",
-              type: "indexDB"
-            }
-          }));
+          return _context.abrupt("return", request.getRequest().get("/shop/product/query/".concat(id), params));
         case 1:
         case "end":
           return _context.stop();
@@ -27,7 +22,7 @@ export var getProductDetail = /*#__PURE__*/function () {
 
 /**
  * @title: 跨日预约获取预约商品报价单
- * @description: 
+ * @description:
  * @param {string} id
  * @param {any} params
  * @return {*}
@@ -40,11 +35,7 @@ export var postMultiDay = /*#__PURE__*/function () {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           return _context2.abrupt("return", request.getRequest().post("/shop/product/multi-day/detail/".concat(id), params, {
-            useCache: true,
-            cache: {
-              mode: "remote_local",
-              type: "indexDB"
-            }
+            useCache: true
           }));
         case 1:
         case "end":
@@ -66,12 +57,7 @@ export var getProductPrice = /*#__PURE__*/function () {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", request.getRequest().post("/shop/product/query/price", params, {
-            cache: {
-              mode: "remote_local",
-              type: "indexDB"
-            }
-          }));
+          return _context3.abrupt("return", request.getRequest().post("/shop/product/query/price", params));
         case 1:
         case "end":
           return _context3.stop();
@@ -81,4 +67,25 @@ export var getProductPrice = /*#__PURE__*/function () {
   return function getProductPrice(_x5) {
     return _ref3.apply(this, arguments);
   };
+}();
+/**
+ * 获取普通商品和跨日预约的价格
+ * @param params
+ * @returns
+ */
+export var getNormalAndMultiDayProductPrice = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          return _context4.abrupt("return", request.getRequest().post("/shop/product/query/shelf/price", params));
+        case 1:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return function getNormalAndMultiDayProductPrice(_x6) {
+    return _ref4.apply(this, arguments);
+  };
 }();

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

@@ -7,6 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import { getUniqueId } from "@pisell/utils";
 import { getProductTotalPrice } from "../../../utils";
 import { distributeDiscountOrIncrease } from "../../service/serviceManager/distributeDiscount";
+import { genServiceKey } from "../../../../ticketBooking/utils";
 
 // 创建group
 
@@ -107,6 +108,7 @@ export var createBookingItemsByGroup = function createBookingItemsByGroup(item,
     cacheItem._extend.total = totalPrice;
     cacheItem._extend.origin_total = totalPrice;
     cacheItem._extend.items = undefined;
+    cacheItem._serviceKey = genServiceKey(cacheItem);
     bookings.push(cacheItem);
   }
   if (isBatchEdit) {

package/es/components/booking/info/service2/utils.d.ts

@@ -67,39 +67,7 @@ export declare const genRowKey: (key: string) => string;
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => {
-    _origin: any;
-    id: any;
-    _id: any;
-    name: any;
-    title: any;
-    price: any;
-    total: number;
-    origin_total: number;
-    num: any;
-    image: any;
-    isShowNote: boolean;
-    note: any;
-    like_status: any;
-    bundle: any;
-    options: any;
-    errorMessage: string;
-    product_option_string: any;
-    discount_reason: any;
-    resource_id: any;
-    relation_form_name: any;
-    holder_title: any;
-    start_date: any;
-    end_date: any;
-    holder_id: any;
-    isNormalProduct: boolean;
-    isCustomItem: any;
-    vouchersApplicable: any;
-    locale: any;
-    symbol: any;
-    relation_products: any;
-    items: any[];
-}[];
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean, isGeneral?: boolean, isParallelResource?: boolean) => any[];
 /**
  * @title: 禁用日期
  * @description:

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

@@ -28,7 +28,7 @@ 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 { getProductExtend, isMultiDayProduct } 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');
@@ -557,7 +557,7 @@ export var genRowKey = function genRowKey(key) {
   return "rowKey-".concat(key);
 };
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
-  var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
+  var _state$bookingConfig4, _state$bookingConfig5, _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
   var pet = state.pet,
     service = state.service;
   var _ref8 = pet || {},
@@ -567,17 +567,12 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
   var parallelResourceOtherParams = {};
   var multiResources;
   if (isParallelResource) {
-    var hasDataItem = item;
-
-    // 预约商品 没有_data时 使用getProductExtend生成数据
-    if (!isNormalProductByDurationSchedule(hasDataItem) && !hasDataItem._data) {
-      hasDataItem = getProductExtend({
-        cacheItem: _objectSpread(_objectSpread({}, item), {}, {
-          new: 0
-        }),
-        state: state
-      });
-    }
+    var hasDataItem = getProductExtend({
+      cacheItem: _objectSpread(_objectSpread({}, item), {}, {
+        new: 0
+      }),
+      state: state
+    });
     var _ref9 = hasDataItem._data || {},
       resourceMaps = _ref9.resourceMaps,
       resources = _ref9.resources;
@@ -621,10 +616,11 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     }];
   }
   var isNormalProduct = isNormalProductByDurationSchedule(item);
+  var isMultiDay = isMultiDayProduct(item);
   return _objectSpread({
     format: ['HH:mm', 'HH:mm'],
     show_time: true,
-    duration_type: 'minutes',
+    duration_type: isMultiDay ? 'days' : 'minutes',
     // 当前可选择holder列表
     holders: formatHolders(holders),
     isShowChangeHolder: !isNormalProduct,
@@ -632,6 +628,8 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     actionText: locales.getText('page.booking.text.add-time'),
     actionIcon: 'pisell2-clock-plus',
     isMultipleResource: true,
+    isFormSubject: (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.type) === 'form',
+    holderType: (state === null || state === void 0 || (_state$bookingConfig5 = state.bookingConfig) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.holder) === null || _state$bookingConfig5 === void 0 || (_state$bookingConfig5 = _state$bookingConfig5.form) === null || _state$bookingConfig5 === void 0 ? void 0 : _state$bookingConfig5.form_type) || 'minors',
     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,
@@ -660,8 +658,6 @@ export var formatProducts = function formatProducts(lists, state) {
   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$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _resourceItem, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
@@ -670,21 +666,14 @@ export var formatProducts = function formatProducts(lists, state) {
     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 isNormalProductByDurationScheduleVal = isNormalProductByDurationSchedule(item);
     var resourceItem = {};
     var errorMessage = '';
-    // 普通商品没有
-    if ((_isDayBookingProduct || isGeneral) && !isNormalProductByDurationScheduleVal) {
+    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));
     }
-
-    // 普通商品没有
-    var generalParams = {};
-    if (isGeneral && !isNormalProductByDurationScheduleVal) {
-      generalParams = getGeneralParams(item, state, !!isParallelResource);
-    }
+    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,
@@ -723,31 +712,78 @@ export var formatProducts = function formatProducts(lists, state) {
       _origin: item
     });
   };
-  console.log(normalList, 'normalList');
   if (isRenderGroup) {
-    // 将商品分为组商品和非组商品
-    lists.forEach(function (item) {
+    // 记录每个商品在原始列表中的索引
+    var normalItemsWithIndex = [];
+    var groupItemsWithIndex = [];
+    // 记录每个组第一次出现的索引
+    var groupFirstIndexMap = {};
+
+    // 将商品分为组商品和非组商品，并记录索引
+    lists.forEach(function (item, index) {
       var _item$_extend29;
       if (!(item !== null && item !== void 0 && (_item$_extend29 = item._extend) !== null && _item$_extend29 !== void 0 && _item$_extend29.groupId)) {
-        normalList.push(formItem(item));
+        normalItemsWithIndex.push({
+          item: item,
+          index: index
+        });
       } else {
-        groupList.push(item);
+        var _item$_extend30;
+        var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
+        groupItemsWithIndex.push({
+          item: item,
+          index: index
+        });
+        // 记录组第一次出现的索引
+        if (groupFirstIndexMap[groupId] === undefined) {
+          groupFirstIndexMap[groupId] = index;
+        }
       }
     });
 
     // 根据item._extend.groupId 进行分组
-    var groups = groupList.reduce(function (prev, item) {
-      var _item$_extend30;
-      var groupId = item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.groupId;
+    var groups = groupItemsWithIndex.reduce(function (prev, _ref11) {
+      var _item$_extend31;
+      var item = _ref11.item;
+      var groupId = item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.groupId;
       if (!prev[groupId]) {
         prev[groupId] = [];
       }
       prev[groupId].push(item);
       return prev;
     }, {});
-    return Object.values(groups).map(function (d) {
-      return formItem(concatBookings(d));
-    }).concat(normalList);
+
+    // 将分组商品转换为合并后的商品，并记录组第一次出现的索引
+    var mergedGroupItems = Object.entries(groups).map(function (_ref12) {
+      var _ref13 = _slicedToArray(_ref12, 2),
+        groupId = _ref13[0],
+        items = _ref13[1];
+      return {
+        item: formItem(concatBookings(items)),
+        index: groupFirstIndexMap[groupId]
+      };
+    });
+
+    // 将非组商品格式化
+    var formattedNormalItems = normalItemsWithIndex.map(function (_ref14) {
+      var item = _ref14.item,
+        index = _ref14.index;
+      return {
+        item: formItem(item),
+        index: index
+      };
+    });
+
+    // 合并分组商品和非组商品，按照原始索引排序
+    var allItems = [].concat(_toConsumableArray(mergedGroupItems), _toConsumableArray(formattedNormalItems)).sort(function (a, b) {
+      return a.index - b.index;
+    });
+
+    // 返回格式化后的商品列表
+    return allItems.map(function (_ref15) {
+      var item = _ref15.item;
+      return item;
+    });
   } else {
     return lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
       return formItem(item);
@@ -827,9 +863,9 @@ export var formatDayDate = function formatDayDate(_extend) {
  * @Author: WangHan
  * @Date: 2024-12-04 12:07
  */
-export var formatDayTime = function formatDayTime(_ref11) {
-  var startDate = _ref11.startDate,
-    endDate = _ref11.endDate;
+export var formatDayTime = function formatDayTime(_ref16) {
+  var startDate = _ref16.startDate,
+    endDate = _ref16.endDate;
   // 营业日时间
   var shopOpeningTime = localStorage.getItem('shopOpeningHours') || '00:00';
 
@@ -880,8 +916,8 @@ export var initDate = function initDate() {
  * @Date: 2024-12-12 15:47
  */
 export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(state) {
-  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 _state$bookingConfig6, _state$service3, _state$pet2;
+  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 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]) || [];
 
@@ -906,8 +942,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$_extend31;
-        return ((_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend32;
+        return ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });
@@ -952,8 +988,8 @@ export var getDayProducts = function getDayProducts(holderId, lists, isTerminal)
  * @Date: 2024-12-30 22:19
  */
 export var getPets = function getPets(state) {
-  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 _state$bookingConfig7, _state$pet3;
+  var form_id = (state === null || state === void 0 || (_state$bookingConfig7 = state.bookingConfig) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.config) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.basic) === null || _state$bookingConfig7 === void 0 || (_state$bookingConfig7 = _state$bookingConfig7.appointment_subject) === null || _state$bookingConfig7 === void 0 ? void 0 : _state$bookingConfig7.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;
 };
@@ -985,8 +1021,8 @@ export var getAppointmentService = function getAppointmentService(state) {
  * @Date: 2024-12-16 16:12
  */
 export var isOpenDeletePet = function isOpenDeletePet(state, newVal) {
-  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 _state$bookingConfig8, _state$pet4;
+  var form_id = (state === null || state === void 0 || (_state$bookingConfig8 = state.bookingConfig) === null || _state$bookingConfig8 === void 0 || (_state$bookingConfig8 = _state$bookingConfig8.config) === null || _state$bookingConfig8 === void 0 || (_state$bookingConfig8 = _state$bookingConfig8.basic) === null || _state$bookingConfig8 === void 0 || (_state$bookingConfig8 = _state$bookingConfig8.appointment_subject) === null || _state$bookingConfig8 === void 0 ? void 0 : _state$bookingConfig8.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]) || [];
 
@@ -1086,10 +1122,10 @@ function updateSinglePrice(currentValue, single) {
  * @Author: WangHan
  * @Date: 2024-12-31 15:17
  */
-function updateBundlePrice(currentValue, _ref12) {
-  var _ref13 = _slicedToArray(_ref12, 2),
-    bundle = _ref13[0],
-    single = _ref13[1];
+function updateBundlePrice(currentValue, _ref17) {
+  var _ref18 = _slicedToArray(_ref17, 2),
+    bundle = _ref18[0],
+    single = _ref18[1];
   var _bundle = [];
   var _loop2 = function _loop2() {
     var item = currentValue[index];
@@ -1225,7 +1261,7 @@ export function updateNormalBundlePrice(currentValue, newBundleData) {
  * @Date: 2024-12-31 15:15
  */
 var normalServicePrice = /*#__PURE__*/function () {
-  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(ids, state) {
+  var _ref19 = _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) {
@@ -1300,7 +1336,7 @@ var normalServicePrice = /*#__PURE__*/function () {
     }, _callee);
   }));
   return function normalServicePrice(_x, _x2) {
-    return _ref14.apply(this, arguments);
+    return _ref19.apply(this, arguments);
   };
 }();
 
@@ -1314,13 +1350,13 @@ var normalServicePrice = /*#__PURE__*/function () {
  * @Date: 2024-12-25 16:41
  */
 export var updateAppointmentServicePrice = /*#__PURE__*/function () {
-  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, _ref15) {
+  var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(state, _ref20) {
     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 = _ref15.start_date, end_date = _ref15.end_date, product_id = _ref15.product_id;
+          start_date = _ref20.start_date, end_date = _ref20.end_date, product_id = _ref20.product_id;
           defaultReturn = {
             multiDayPrices: [],
             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
@@ -1383,7 +1419,7 @@ export var updateAppointmentServicePrice = /*#__PURE__*/function () {
     }, _callee2, null, [[2, 21]]);
   }));
   return function updateAppointmentServicePrice(_x3, _x4) {
-    return _ref16.apply(this, arguments);
+    return _ref21.apply(this, arguments);
   };
 }();
 

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

@@ -7,6 +7,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import dayjs from "dayjs";
 import { getDays, getIsEdit, isSessionProduct } from "../utils";
 import { isUsableProduct } from "../info2/service/addTimeModal/utils";
+import { isMultiDayProduct } from "../info2/service/addService/utils";
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
   var _productDetail$bundle;
@@ -161,6 +162,10 @@ export var isOpenAddTime = function isOpenAddTime(state) {
 
 // 是否展示加时按钮
 export var isShowAddTime = function isShowAddTime(state, currentService) {
+  // 跨日预约不显示加时按钮
+  if (isMultiDayProduct(currentService)) {
+    return false;
+  }
   if (!isOpenAddTime(state)) {
     return false;
   }