@pisell/private-materials 6.8.6 → 6.8.8

package/es/components/index.d.ts

@@ -10,7 +10,6 @@ import RuleSetting from './ruleSetting';
 import TaxSelect from './taxSelect';
 import ToCPay from './pay/toC';
 import WalletList from './walletList';
-import Wallet from './wallet';
 import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
@@ -21,4 +20,4 @@ import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
 import Registry from './systemSettings/registry';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };

package/es/components/index.js

@@ -10,7 +10,6 @@ import RuleSetting from "./ruleSetting";
 import TaxSelect from "./taxSelect";
 import ToCPay from "./pay/toC";
 import WalletList from "./walletList";
-import Wallet from "./wallet";
 import WorkspaceListDetail from "./workSpaceListDetail/";
 import WorkspaceList from "./workSpaceList";
 import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
@@ -21,4 +20,4 @@ import PinModal from "./pinModal";
 import PinVerifyModal from "./pinVerifyModal";
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./authentication/admin";
 import Registry from "./systemSettings/registry";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry };

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     platform: 'pc' | 'h5' | '' | undefined;
     order: any;
@@ -30,11 +29,4 @@ export interface PayGroup {
     _order: any;
     front_order_uuid?: string;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/schedules/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CalendarDataItem, ScheduleItem } from "./type";
 import dayjs from "dayjs";
 export interface FormState {
@@ -69,11 +68,4 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/es/components/shoppingCart/components/Cart/Product.js

@@ -33,6 +33,7 @@ var Product = function Product(props) {
     platform = state.platform,
     isShowChangeResource = state.isShowChangeResource,
     isShowDelete = state.isShowDelete,
+    isShowAmountFooter = state.isShowAmountFooter,
     isShowChangeHolder = state.isShowChangeHolder,
     isShowHolder = state.isShowHolder,
     isShowAddHolderButton = state.isShowAddHolderButton,
@@ -75,15 +76,17 @@ var Product = function Product(props) {
       isShowDelete: isShowDelete,
       isShowHolder: isShowHolder,
       isShowAddHolderButton: isShowAddHolderButton,
-      isShowEditProduct: isShowEditProduct
+      isShowEditProduct: isShowEditProduct,
+      isShowAmountFooter: isShowAmountFooter
     };
-  }, [isShowNote, isShowPackageNote, disabledEdit, isShowChangeResource, isShowDelete, isShowHolder, isShowAddHolderButton, isShowChangeHolder, isShowEditProduct]);
+  }, [isShowNote, isShowPackageNote, disabledEdit, isShowChangeResource, isShowDelete, isShowHolder, isShowAddHolderButton, isShowChangeHolder, isShowEditProduct, isShowAmountFooter]);
   var getProductCardStyleProps = useMemoizedFn(function (type) {
     var conf = productCardStyleConfig["".concat(type, "_product_card_style")];
     if (state.scenario !== 'booking2') return {};
     return {
       isShowImage: conf === null || conf === void 0 ? void 0 : conf.show_product_image,
-      isShowDelete: conf === null || conf === void 0 ? void 0 : conf.show_remove_button,
+      isShowDelete: (conf === null || conf === void 0 ? void 0 : conf.show_remove_button) && isShowDelete,
+      isShowAmountFooter: isShowAmountFooter,
       disabledEdit: true
     };
   });

package/es/components/shoppingCart/components/Empty/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Empty: (props: any) => import("react").JSX.Element;
 export default Empty;

package/es/components/shoppingCart/type.d.ts

@@ -29,6 +29,7 @@ export interface shoppingCartProps {
     isShowImage?: boolean;
     isShowHolder?: boolean;
     isShowDelete?: boolean;
+    isShowAmountFooter?: boolean;
     collapseParams?: CollapseProps;
     productParams?: productProps;
     isHideClearCart?: boolean;

package/es/components/ticketBooking/components/addServiceVariant/MultiDayTimeSelectModal.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+import { Dayjs } from 'dayjs';
+import './MultiDayTimeSelectModal.less';
+interface MultiDayTimeSelectModalProps {
+    open: boolean;
+    productName?: string;
+    locale?: string;
+    defaultStartDate?: Dayjs;
+    loading?: boolean;
+    /** 最大天数，默认30天 */
+    maxDays?: number;
+    /** 开始时间和结束时间是否分离 */
+    separateStartEnd?: boolean;
+    onConfirm: (startDate: Dayjs, endDate: Dayjs, duration: number) => void;
+    onCancel: () => void;
+}
+declare const MultiDayTimeSelectModal: React.FC<MultiDayTimeSelectModalProps>;
+export default MultiDayTimeSelectModal;

package/es/components/{wallet/Detail/serve.js → ticketBooking/components/addServiceVariant/MultiDayTimeSelectModal.js}

@@ -2,63 +2,118 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import { request } from "./../../../utils";
-/**
- * 资产明细列表
- * @param params 接口请求参数
- * @returns 资产明细列表
- */
-export var getAssetList = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-    var _yield$request$getReq, data;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return request.getRequest().get("/h5/pay/asset/lowcode/list", params);
-        case 2:
-          _yield$request$getReq = _context.sent;
-          data = _yield$request$getReq.data;
-          return _context.abrupt("return", data);
-        case 5:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function getAssetList(_x) {
-    return _ref.apply(this, arguments);
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import React, { useState, useEffect, useRef } from 'react';
+import dayjs from 'dayjs';
+import { PisellModal } from '@pisell/materials';
+import { locales } from '@pisell/utils';
+import MultiDayTimeSelect from "../../../../pro/multiDayTimeSelect";
+import "./MultiDayTimeSelectModal.less";
+var MultiDayTimeSelectModal = function MultiDayTimeSelectModal(_ref) {
+  var open = _ref.open,
+    productName = _ref.productName,
+    _ref$locale = _ref.locale,
+    locale = _ref$locale === void 0 ? 'en' : _ref$locale,
+    defaultStartDate = _ref.defaultStartDate,
+    _ref$loading = _ref.loading,
+    loading = _ref$loading === void 0 ? false : _ref$loading,
+    _ref$maxDays = _ref.maxDays,
+    maxDays = _ref$maxDays === void 0 ? 30 : _ref$maxDays,
+    _ref$separateStartEnd = _ref.separateStartEnd,
+    separateStartEnd = _ref$separateStartEnd === void 0 ? false : _ref$separateStartEnd,
+    onConfirm = _ref.onConfirm,
+    onCancel = _ref.onCancel;
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  var formRef = useRef(null);
+
+  // 初始化值
+  useEffect(function () {
+    if (open) {
+      var _startDate = defaultStartDate || dayjs();
+      var _endDate = _startDate.add(1, 'day');
+      var initialValue = {
+        startDate: _startDate,
+        endDate: _endDate,
+        duration: 1
+      };
+      setValue(initialValue);
+    }
+  }, [open, defaultStartDate]);
+
+  // 处理值变化
+  var handleChange = function handleChange(newValue) {
+    setValue(newValue);
   };
-}();
 
-/**
- * 获取资产详情
- * @param params 接口请求参数
- * @returns 资产详情
- */
-export var getDetailApi = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
-    var _yield$request$getReq2, data;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          _context2.next = 2;
-          return request.getRequest().get("/h5/machinecode/lowcode/detail/".concat(params.id), {
-            order_behavior_count: 1,
-            // 订单行为次数
-            order_behavior_count_customer: 1 // 客户订单行为次数
-          });
-        case 2:
-          _yield$request$getReq2 = _context2.sent;
-          data = _yield$request$getReq2.data;
-          return _context2.abrupt("return", data);
-        case 5:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function getDetailApi(_x2) {
-    return _ref2.apply(this, arguments);
+  // 确认按钮
+  var handleConfirm = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _formRef$current;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validate();
+          case 3:
+            if (value) {
+              onConfirm(value.startDate, value.endDate, value.duration);
+            }
+            _context.next = 8;
+            break;
+          case 6:
+            _context.prev = 6;
+            _context.t0 = _context["catch"](0);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 6]]);
+    }));
+    return function handleConfirm() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+
+  // 取消按钮
+  var handleCancel = function handleCancel() {
+    if (loading) return; // loading 时不允许取消
+    onCancel();
   };
-}();
+  return /*#__PURE__*/React.createElement(PisellModal, {
+    open: open,
+    title: productName || locales.getText('pisell2.text.product_name'),
+    onCancel: handleCancel,
+    onOk: handleConfirm,
+    okText: locales.getText('pisell2.text.confirm'),
+    cancelText: locales.getText('pisell2.text.cancel'),
+    width: 600,
+    destroyOnClose: true,
+    confirmLoading: loading,
+    closable: !loading,
+    maskClosable: !loading,
+    headerDivider: false,
+    footerDivider: false,
+    cancelButtonProps: {
+      disabled: loading
+    }
+  }, /*#__PURE__*/React.createElement(MultiDayTimeSelect, {
+    ref: formRef,
+    maxDays: maxDays,
+    defaultStartDate: defaultStartDate,
+    separateStartEnd: separateStartEnd,
+    value: value || undefined,
+    onChange: handleChange,
+    locale: locale,
+    disabled: loading
+  }));
+};
+export default MultiDayTimeSelectModal;

package/es/components/ticketBooking/components/addServiceVariant/addService.js

@@ -23,18 +23,20 @@ import { useMemoizedFn } from 'ahooks';
 import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
 import { isSessionProduct, request, getProductTotalPrice, getIsEject, getIsOnlySession } from "../../../booking/utils";
 import { getProductExtend } from "../../../booking/info2/service/addService/utils";
-import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
+import { holderId, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
 import { useService } from "../../../booking/info/service/serviceManager";
 import ProductDisplayAdapter, { resolveProductDisplayConfig } from "../ProductDisplayAdapter";
 import "./index.less";
-import { addService, addServiceScroll, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
+import { addService, addServiceScroll, genHolderKey, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
 import NotAvailable from "../notAvailable";
 import dayjs from 'dayjs';
 import { useProducts } from "../../hooks/pisellos";
 import { createCacheItem, genValues, isBundle, isOption, setHandleSetService } from "./utils";
 import { useToast } from '@pisell/materials';
 import { useIsActive } from "../../context/IsActiveContext";
+import MultiDayTimeSelectModal from "./MultiDayTimeSelectModal";
+import { SelectHolderModal } from "../../../booking/utils/selectHolderModal";
 var productListLayout = {
   grid: true,
   config: '12:12'
@@ -80,6 +82,18 @@ var AddSerivce = function AddSerivce(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     firstLoading = _useState4[0],
     setFirstLoading = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    multiDayModalOpen = _useState6[0],
+    setMultiDayModalOpen = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    multiDayModalLoading = _useState8[0],
+    setMultiDayModalLoading = _useState8[1];
+  var _useState9 = useState(null),
+    _useState10 = _slicedToArray(_useState9, 2),
+    pendingMultiDayData = _useState10[0],
+    setPendingMultiDayData = _useState10[1];
   var stateRef = useRef(state);
   stateRef.current = state;
   var prerenderCompletedRef = useRef(false);
@@ -180,6 +194,7 @@ var AddSerivce = function AddSerivce(props) {
       var values = genValues(item, code);
       var cacheItem = createCacheItem(item, values, stateRef.current);
       cacheItem._serviceKey = genServiceKey(cacheItem);
+      cacheItem._holderKey = genHolderKey(cacheItem);
       cacheItem.autoClose = false;
       var _addService = addService(_toConsumableArray(newService), cacheItem, stateRef.current),
         _list = _addService.list,
@@ -899,7 +914,7 @@ var AddSerivce = function AddSerivce(props) {
          debouncedExecuteCacheValues(productId, cacheValues, item, callback);
          return;
       }
-      state.action({
+       state.action({
         type: 'pisell1.handleOpenProductModal',
         data: {
           id: item.id,
@@ -926,16 +941,6 @@ var AddSerivce = function AddSerivce(props) {
   */
   var renderList = useMemo(function () {
     var _list = products || [];
-
-    // 跨日预约
-    if (isDaysBooking(state)) {
-      // 公共购物车下过滤掉预约商品
-      if (!holderId(state)) {
-        _list = _list.filter(function (item) {
-          return isNormalProductByDurationSchedule(item);
-        });
-      }
-    }
     return _list;
   }, [products, state === null || state === void 0 ? void 0 : state.activeCartId]);
   var currentDate = useMemo(function () {
@@ -987,6 +992,7 @@ var AddSerivce = function AddSerivce(props) {
   }, [productDisplayConfig]);
   return useMemo(function () {
     if (renderMode === 'current') {
+      var _pendingMultiDayData$;
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductDisplayAdapter, {
         config: finalDisplayConfig,
         dataSource: renderList,
@@ -995,9 +1001,17 @@ var AddSerivce = function AddSerivce(props) {
         onSelectProduct: handleSelectProduct
       }), /*#__PURE__*/React.createElement(NotAvailable, {
         ref: notAvailableRef
-      }));
+      }), /*#__PURE__*/React.createElement(MultiDayTimeSelectModal, {
+        open: multiDayModalOpen,
+        productName: pendingMultiDayData === null || pendingMultiDayData === void 0 || (_pendingMultiDayData$ = pendingMultiDayData.item) === null || _pendingMultiDayData$ === void 0 ? void 0 : _pendingMultiDayData$.title,
+        locale: state === null || state === void 0 ? void 0 : state.locale,
+        defaultStartDate: state.date.value,
+        loading: multiDayModalLoading,
+        onConfirm: handleMultiDayConfirm,
+        onCancel: handleMultiDayCancel
+      }), /*#__PURE__*/React.createElement(SelectHolderModal, null));
     }
     return null;
-  }, [firstLoading, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4, finalDisplayConfig]);
+  }, [firstLoading, state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4, finalDisplayConfig, multiDayModalOpen, pendingMultiDayData, multiDayModalLoading]);
 };
 export default AddSerivce;

package/es/components/ticketBooking/components/addServiceVariant/index.js

@@ -21,6 +21,10 @@ var AddServiceVariant = function AddServiceVariant(props) {
       setGlobalState({
         service: _objectSpread(_objectSpread({}, stateRef.current.service), payload)
       });
+    } else if (type === 'setPet') {
+      setGlobalState({
+        pet: _objectSpread(_objectSpread({}, stateRef.current.pet), payload)
+      });
     }
   };
   return /*#__PURE__*/React.createElement(AddService, {

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -710,17 +710,20 @@ var TicketBooking = function TicketBooking(props) {
       _getProducts(date);
     }
     setTimeout(function () {
-      var _state$modalState$ser;
-      if ((_state$modalState$ser = state.modalState.service) !== null && _state$modalState$ser !== void 0 && (_state$modalState$ser = _state$modalState$ser.value) !== null && _state$modalState$ser !== void 0 && _state$modalState$ser.length) {
-        var _state$bookingFunctio, _state$bookingFunctio2, _state$modalState$ser2;
-        var _list = (_state$bookingFunctio = state.bookingFunctions) === null || _state$bookingFunctio === void 0 || (_state$bookingFunctio2 = _state$bookingFunctio.updateServiceDate) === null || _state$bookingFunctio2 === void 0 ? void 0 : _state$bookingFunctio2.call(_state$bookingFunctio, (_state$modalState$ser2 = state.modalState.service) === null || _state$modalState$ser2 === void 0 ? void 0 : _state$modalState$ser2.value, date, false);
-        _setModalState({
-          service: _objectSpread(_objectSpread({}, state.modalState.service), {}, {
-            value: _list,
-            edit: true
-          })
-        });
-      }
+      // if (state.modalState.service?.value?.length) {
+      //   let _list = state.bookingFunctions?.updateServiceDate?.(
+      //     state.modalState.service?.value,
+      //     date,
+      //     false
+      //   );
+      //   _setModalState({
+      //     service: {
+      //       ...state.modalState.service,
+      //       value: _list,
+      //       edit: true,
+      //     },
+      //   });
+      // }
     }, 100);
   };
   var _setShopOpeningHours = function _setShopOpeningHours() {

package/es/components/ticketBooking/utils/index.d.ts

@@ -15,15 +15,21 @@ export declare const restoreProductOtherData: (data: any) => {
     quantity: number;
 } | undefined;
 export declare const isSameProduct: (a: any, b: any) => boolean;
-export declare const addService: (list: any[], addItem: any, state: any) => {
+export declare const addService: (list: any[], addItem: any, state: any, isMultiDay?: boolean) => {
+    list: any[];
+    count: number;
+    quantity?: undefined;
+} | {
     list: any[];
     quantity: any;
+    count?: undefined;
 };
 export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
 export declare const getCartProductOverlay: (state: any) => any;
 export declare const getIsOverlayProduct: (item: any, state: any) => any;
 export declare const getIsShowNumber: (item: any, state: any) => any;
 export declare const genServiceKey: (item: any) => string;
+export declare const genHolderKey: (item: any) => string;
 export declare const getIsParallelResourcesBooking: (record: any) => boolean;
 declare type ScanData = {
     type: string;
@@ -41,7 +47,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
+    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;
@@ -73,6 +79,8 @@ export declare const rulesHooks: {
         num: any;
         quantity: any;
         vouchersApplicable: any;
+        holder_id: any;
+        isNormalProduct: any;
         startDate: any;
         bundle: any;
         options: any;

package/es/components/ticketBooking/utils/index.js

@@ -20,6 +20,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { isNormalProductByDurationSchedule } from "../../booking/info/service2/utils";
 import { isArr, getUniqueId } from '@pisell/utils';
+import { isMultiDayProduct } from "../../booking/info2/service/addService/utils";
 
 /** dayjs对象格式化为字符串时间 */
 export var formatDateToStr = function formatDateToStr(date) {
@@ -135,11 +136,20 @@ export var isSameProduct = function isSameProduct(a, b) {
     var _a$_extend, _b$_extend;
     return ((_a$_extend = a._extend) === null || _a$_extend === void 0 || (_a$_extend = _a$_extend.other) === null || _a$_extend === void 0 ? void 0 : _a$_extend.rowKey) === ((_b$_extend = b._extend) === null || _b$_extend === void 0 || (_b$_extend = _b$_extend.other) === null || _b$_extend === void 0 ? void 0 : _b$_extend.rowKey);
   }
-  return ((_a$_extend2 = a._extend) === null || _a$_extend2 === void 0 || (_a$_extend2 = _a$_extend2.other) === null || _a$_extend2 === void 0 ? void 0 : _a$_extend2.rowKey) === ((_b$_extend2 = b._extend) === null || _b$_extend2 === void 0 || (_b$_extend2 = _b$_extend2.other) === null || _b$_extend2 === void 0 ? void 0 : _b$_extend2.rowKey) && a._serviceKey === b._serviceKey;
+  return ((_a$_extend2 = a._extend) === null || _a$_extend2 === void 0 || (_a$_extend2 = _a$_extend2.other) === null || _a$_extend2 === void 0 ? void 0 : _a$_extend2.rowKey) === ((_b$_extend2 = b._extend) === null || _b$_extend2 === void 0 || (_b$_extend2 = _b$_extend2.other) === null || _b$_extend2 === void 0 ? void 0 : _b$_extend2.rowKey) && a._serviceKey === b._serviceKey && a._holderKey === b._holderKey;
 };
-export var addService = function addService(list, addItem, state) {
+export var addService = function addService(list, addItem, state, isMultiDay) {
   var value = list;
   var count;
+
+  // 跨日预约 不需要叠加
+  if (isMultiDay && isArr(addItem)) {
+    return {
+      list: [].concat(_toConsumableArray(addItem), _toConsumableArray(value)),
+      count: 1
+    };
+  }
+
   // 预约商品 并且配置商品卡片不叠加 直接添加
   if (!isNormalProductByDurationSchedule(addItem) && !getIsOverlayProduct(addItem, state)) {
     // 不能合并的商品，如果 quantity > 1，需要拆分成多个独立卡片
@@ -261,6 +271,10 @@ export var getIsOverlayProduct = function getIsOverlayProduct(item, state) {
 // 获取购物车商品是否显示数量
 export var getIsShowNumber = function getIsShowNumber(item, state) {
   var isBookingTicket2 = state.isBookingTicket2;
+  // 跨日商品不允许选多个
+  if (isMultiDayProduct(item)) {
+    return false;
+  }
   return isNormalProductByDurationSchedule(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
 };
 
@@ -279,7 +293,21 @@ export var genServiceKey = function genServiceKey(item) {
   });
   return "".concat(product_id, "-").concat(durationKey, "-").concat(resourceKey, "-").concat(start_time, "-").concat(total);
 };
-
+//
+// 生成 holder key
+export var genHolderKey = function genHolderKey(item) {
+  var _item$_extend7;
+  var product_id = item.product_id;
+  var holder_id;
+  if (isArr((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id)) {
+    var _item$_extend8;
+    holder_id = (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.holder_id.join('-');
+  } else {
+    var _item$_extend9;
+    holder_id = (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.holder_id;
+  }
+  return "".concat(product_id, "-").concat(holder_id);
+};
 // 是否是平行资源预约
 export var getIsParallelResourcesBooking = function getIsParallelResourcesBooking(record) {
   return (record === null || record === void 0 ? void 0 : record.relation_id) === 0 && (record === null || record === void 0 ? void 0 : record.relation_type) === "";
@@ -375,7 +403,7 @@ export var getShopDiscountKey = function getShopDiscountKey(osKey) {
 export var rulesHooks = {
   // 获取商品关键信息
   getProduct: function getProduct(product) {
-    var _product$_extend, _product$_extend2, _product$_extend3;
+    var _product$_extend, _product$_extend2, _product$_extend3, _product$_extend4, _product$_extend5;
     var detail = {
       booking_id: product.booking_id,
       id: product.id,
@@ -387,9 +415,11 @@ export var rulesHooks = {
       num: product._extend.quantity,
       quantity: product._extend.quantity || 1,
       vouchersApplicable: product.vouchersApplicable,
-      startDate: (_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.startDate,
-      bundle: ((_product$_extend2 = product._extend) === null || _product$_extend2 === void 0 || (_product$_extend2 = _product$_extend2.other) === null || _product$_extend2 === void 0 ? void 0 : _product$_extend2.bundle) || [],
-      options: ((_product$_extend3 = product._extend) === null || _product$_extend3 === void 0 || (_product$_extend3 = _product$_extend3.other) === null || _product$_extend3 === void 0 ? void 0 : _product$_extend3.option) || []
+      holder_id: (_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.holder_id,
+      isNormalProduct: (_product$_extend2 = product._extend) === null || _product$_extend2 === void 0 ? void 0 : _product$_extend2.isNormalProduct,
+      startDate: (_product$_extend3 = product._extend) === null || _product$_extend3 === void 0 ? void 0 : _product$_extend3.startDate,
+      bundle: ((_product$_extend4 = product._extend) === null || _product$_extend4 === void 0 || (_product$_extend4 = _product$_extend4.other) === null || _product$_extend4 === void 0 ? void 0 : _product$_extend4.bundle) || [],
+      options: ((_product$_extend5 = product._extend) === null || _product$_extend5 === void 0 || (_product$_extend5 = _product$_extend5.other) === null || _product$_extend5 === void 0 ? void 0 : _product$_extend5.option) || []
     };
     return detail;
   },