@pisell/private-materials 3.0.155 → 3.0.157-gray

package/es/components/booking/info/pet/index.js

@@ -527,6 +527,6 @@ var Pet = function Pet(props) {
         }()
       }, addButtonProps)
     })));
-  }, [valueLoading, hideTitle, state.pet.value, state.pet.formData, state.action, state.modalOpen, state.pet.value, (_state$client11 = state.client) === null || _state$client11 === void 0 ? void 0 : _state$client11.value, loading, state.disabledEdit, state.isTerminal, state.disableEventBookingEdit, params.search, loadMore, addButtonProps]);
+  }, [valueLoading, hideTitle, state.pet.value, state.pet.formData, state.action, state.modalOpen, state.pet.value, (_state$client11 = state.client) === null || _state$client11 === void 0 ? void 0 : _state$client11.value, loading, state.disabledEdit, state.isTerminal, state.disableEventBookingEdit, params.search, loadMore, addButtonProps, state.isBookingCreatePage]);
 };
 export default Pet;

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

@@ -1,6 +1,12 @@
 import React from 'react';
+import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
-declare const Info: ({ onEdit }: {
+interface AddServiceProps {
     onEdit: any;
-}) => React.JSX.Element;
+    dispatch?: any;
+    state?: any;
+    drawerProps?: PisellDrawerProps;
+    renderMode?: 'current' | 'drawer';
+}
+declare const Info: (props: AddServiceProps) => React.JSX.Element;
 export default Info;

package/es/components/booking/info/service/addService/index.js

@@ -1,4 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -33,9 +34,11 @@ import { formatProductListByCategory, getProductTotalPrice, request } from "../.
 import { locales, getUniqueId } from '@pisell/utils';
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
-var Info = function Info(_ref) {
-  var _state$service3, _state$service5, _state$service7, _state$service7$cache;
-  var onEdit = _ref.onEdit;
+var Info = function Info(props) {
+  var _state$service3, _state$service6, _state$service8, _state$service8$cache;
+  var onEdit = props.onEdit,
+    drawerProps = props.drawerProps,
+    renderMode = props.renderMode;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     search = _useState2[0],
@@ -49,6 +52,8 @@ var Info = function Info(_ref) {
     setLoading = _useState4[1];
   var searchRef = useRef();
   var context = useEngineContext();
+  state = state || (props === null || props === void 0 ? void 0 : props.state);
+  dispatch = dispatch || (props === null || props === void 0 ? void 0 : props.dispatch);
   request.setRequest(context.appHelper.utils.request);
 
   /**
@@ -60,7 +65,7 @@ var Info = function Info(_ref) {
    * @Date: 2024-05-14 13:55
    */
   var setDefaultService = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(list) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(list) {
       var _list, product, detail, isBundleOrCombination, _item;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -140,11 +145,11 @@ var Info = function Info(_ref) {
       }, _callee);
     }));
     return function setDefaultService(_x2) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   var getServices = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
       var _state$eventOtherPara;
       var data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -152,7 +157,7 @@ var Info = function Info(_ref) {
           case 0:
             setLoading(true);
             _context2.next = 3;
-            return state.apis.getServices({
+            return state.apis.getServices(_objectSpread({
               skip: 1,
               num: 500,
               extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket'],
@@ -162,11 +167,14 @@ var Info = function Info(_ref) {
               with_schedule: 1,
               with_count: ['bundleGroup', 'optionGroup'],
               order_by_string: 'sort:desc',
-              status: 'published',
+              status: 'published'
+            }, state.isBookingCreatePage ? {
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date
+            } : {
               _config: {
                 useCache: true
               }
-            });
+            }));
           case 3:
             data = _context2.sent;
             setLoading(false);
@@ -187,8 +195,8 @@ var Info = function Info(_ref) {
         }
       }, _callee2);
     }));
-    return function getServices() {
-      return _ref3.apply(this, arguments);
+    return function getServices(_x3) {
+      return _ref2.apply(this, arguments);
     };
   }();
   var handleSelectService = function handleSelectService() {
@@ -257,6 +265,11 @@ var Info = function Info(_ref) {
           cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
           cacheItem.new = 0;
         }
+        // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
+        if (renderMode === 'current') {
+          // cacheItem._extend.resource = 0;
+          cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
+        }
         cacheItem._extend = getProductExtend({
           cacheItem: cacheItem,
           state: state
@@ -292,22 +305,23 @@ var Info = function Info(_ref) {
   }, [search, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.services]);
   console.log('state.service.renderList', renderList);
   var isService = useMemo(function () {
-    return state.service.value.length > 0;
+    var _state$service4, _state$service4$value;
+    return ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$value = _state$service4.value) === null || _state$service4$value === void 0 ? void 0 : _state$service4$value.length) > 0;
   }, [state.service.value]);
   useEffect(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service4, _state$service4$value;
+    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service5, _state$service5$value;
     // Salonip 不要这个
     if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) || state.closeAutoOpenService) {
       return;
     }
 
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$value = _state$service4.value) === null || _state$service4$value === void 0 ? void 0 : _state$service4$value.length) === 0) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : (_state$service5$value = _state$service5.value) === null || _state$service5$value === void 0 ? void 0 : _state$service5$value.length) === 0) {
       setTimeout(function () {
         handleSelectService();
       }, 10);
     }
-  }, [state.modalOpen, state.bookingId, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
+  }, [state.modalOpen, state.bookingId, (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -317,12 +331,30 @@ var Info = function Info(_ref) {
       setSearch('');
     }
   }, [state.service.addModal]);
+  var currentDate = useMemo(function () {
+    return state.date.value.format('YYYY-MM-DD');
+  }, [state.date.value]);
+  console.log(currentDate, 'currentDate');
+  useEffect(function () {
+    if (renderMode === 'current') {
+      getServices({
+        schedule_date: currentDate
+      });
+    }
+  }, [renderMode, currentDate]);
   useEffect(function () {
     if (state.renderType === 'eventBooking' && state.modalOpen) {
       getServices();
     }
   }, [state.renderType, state.modalOpen]);
   var addButton = useMemo(function () {
+    if (state.isBookingCreatePage) {
+      return /*#__PURE__*/React.createElement("div", {
+        style: {
+          height: 20
+        }
+      });
+    }
     if (state.renderType === 'eventBooking') {
       return isService ? /*#__PURE__*/React.createElement("div", {
         style: {
@@ -347,14 +379,52 @@ var Info = function Info(_ref) {
       }
     });
   }, [state.renderType, showAddButton, isService, state.service.value, loading]);
+  var isRenderCurrent = useMemo(function () {
+    return renderMode === 'current';
+  }, [renderMode]);
   return useMemo(function () {
-    var _state$service6, _state$service6$cache;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : _state$service6$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+    var _state$service7, _state$service7$cache;
+    var header = /*#__PURE__*/React.createElement("div", {
+      className: 'pisell-lowcode__booking-service-header'
+    }, /*#__PURE__*/React.createElement(Input, {
+      ref: searchRef,
+      prefix: /*#__PURE__*/React.createElement(SearchLg, null),
+      style: {
+        marginTop: 16,
+        height: 44
+      },
+      placeholder: locales.getText('pisell2.text.search'),
+      allowClear: true,
+      value: search,
+      onChange: function onChange(e) {
+        setSearch(e.target.value);
+      }
+    }));
+    var content = /*#__PURE__*/React.createElement("div", {
+      className: 'pisell-lowcode__booking-service-body'
+    }, /*#__PURE__*/React.createElement(TabProduct, {
+      list: renderList,
+      amountSymbol: state.amountSymbol,
+      onChange: handleSelectProduct,
+      scrollDom: isRenderCurrent ? '.pisell-lowcode__booking-vertical-add-service-wrap' : '.booking-server-wrap .pisell-lowcode-drawer-body '
+    }));
+    if (renderMode === 'current') {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "pisell-lowcode__booking-vertical-add-service-wrap",
+        style: {
+          width: '100%',
+          height: '100%',
+          overflow: 'auto'
+        }
+      }, header, content);
+    }
+    return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : _state$service7$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
       loading: true,
       active: true,
       round: true
-    }), addButton, /*#__PURE__*/React.createElement(Drawer, {
-      open: state.service.addModal,
+    }), addButton, /*#__PURE__*/React.createElement(Drawer, _extends({
+      titleNoWrap: true,
+      open: state.service.addModal && !state.isBookingCreatePage,
       title: locales.getText('pisell2.text.select-service'),
       rootClassName: "booking-server-wrap",
       onClose: function onClose() {
@@ -366,30 +436,8 @@ var Info = function Info(_ref) {
           }
         });
       },
-      header: /*#__PURE__*/React.createElement("div", {
-        className: "pisell-lowcode__booking-service-header"
-      }, /*#__PURE__*/React.createElement(Input, {
-        ref: searchRef,
-        prefix: /*#__PURE__*/React.createElement(SearchLg, null),
-        style: {
-          marginTop: 16,
-          height: 44
-        },
-        placeholder: locales.getText('pisell2.text.search'),
-        allowClear: true,
-        value: search,
-        onChange: function onChange(e) {
-          setSearch(e.target.value);
-        }
-      }))
-    }, /*#__PURE__*/React.createElement("div", {
-      className: "pisell-lowcode__booking-service-body"
-    }, /*#__PURE__*/React.createElement(TabProduct, {
-      list: renderList,
-      amountSymbol: state.amountSymbol,
-      onChange: handleSelectProduct,
-      scrollDom: ".booking-server-wrap .pisell-lowcode-drawer-body"
-    }))));
-  }, [(_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : _state$service7$cache.autoClose, addButton, state.service.addModal, locales, search, renderList, state.amountSymbol]);
+      header: header
+    }, drawerProps || {}), content));
+  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : (_state$service8$cache = _state$service8.cacheItem) === null || _state$service8$cache === void 0 ? void 0 : _state$service8$cache.autoClose, addButton, state.service.addModal, locales, search, renderList, state.amountSymbol]);
 };
 export default Info;

package/es/components/booking/info/service/addService/index.less

@@ -3,7 +3,33 @@
   // border-bottom: 1px solid var(--gray-300, #D0D5DD);
 }
 
-
 .pisell-lowcode__booking-service-body {
   background: var(--gray-50, #F9FAFB);
+}
+
+.pisell-lowcode__booking-vertical-add-service-wrap {
+  &::-webkit-scrollbar {
+    display: none !important;
+  }
+  .pisell-lowcode__booking-service-header {
+    background-color: #fff;
+    top: 0;
+    position: sticky;
+    z-index: 2;
+    padding: 16px !important;
+    margin: 0;
+    .pisell-lowcode-input-affix-wrapper {
+      margin: 0 !important;
+    }
+  }
+  .booking-category-list {
+    padding: 0 16px !important;
+  }
+  .pisell-lowcode__booking-service-body {
+    .booking-tab-product {
+      .booking-tabs-wrap {
+        top: 76px !important;
+      }
+    }
+  }
 }

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

@@ -584,6 +584,7 @@ var AddTimeModal = function AddTimeModal() {
   return useMemo(function () {
     var _currentTimeItem$stat, _currentProduct$add_t;
     return /*#__PURE__*/React.createElement(Drawer, {
+      titleNoWrap: true,
       open: state.service.addTimeModal,
       title: locales.getText('page.booking.text.add-time'),
       rootClassName: "booking-server-wrap",

package/es/components/booking/info/service/addTimeModal/index.less

@@ -20,7 +20,7 @@
     margin: 10px 0;
     flex: 0 0 100%;
     position: sticky;
-    top: 95px;
+    top: 58px !important;
     z-index: 1;
   }
 

package/es/components/booking/info/service/editService/index.js

@@ -36,7 +36,7 @@ import { getNoResource } from "../../../mock";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _window$BaseMaterials, _state$service$cacheI15, _state$service7, _state$service7$cache, _state$service7$cache2, _state$service$cacheI16, _state$service$cacheI17, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$bookingConfig12;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service$cacheI4, _state$service$cacheI5, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service3, _state$service3$cache, _state$service5, _state$service5$cache, _state$service5$cache2, _state$service5$cache3, _state$date, _state$date$value, _state$date$value$for, _window$BaseMaterials, _state$service$cacheI15, _state$service7, _state$service7$cache, _state$service7$cache2, _state$service$cacheI16, _state$service$cacheI17, _state$bookingConfig9, _state$bookingConfig10, _state$bookingConfig11, _state$bookingConfig12;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -155,7 +155,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 13:38
    */
   var getResources = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cacheItem) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(cacheItem, open) {
       var _list, _cacheItem, autoClose;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -189,7 +189,7 @@ var Info = function Info(_, ref) {
                 }, 200);
               } else {
                 setTimeout(function () {
-                  if (selectOpen === undefined) {
+                  if (selectOpen === undefined || open) {
                     setSelectOpen(true);
                   }
                 }, 500);
@@ -206,7 +206,7 @@ var Info = function Info(_, ref) {
         }
       }, _callee, null, [[1, 11]]);
     }));
-    return function getResources(_x2) {
+    return function getResources(_x2, _x3) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -401,13 +401,13 @@ var Info = function Info(_, ref) {
       }
     });
   });
-  var setEditData = useMemoizedFn(function (_cacheItem) {
+  var setEditData = useMemoizedFn(function (_cacheItem, open) {
     var cacheItem = _cacheItem || state.service.cacheItem;
     var values = cacheItem._extend;
     form.setFieldsValue(values);
     if (state.renderType !== 'eventBooking') {
       // 获取资源列表
-      getResources(_cacheItem);
+      getResources(cacheItem, open);
     }
   });
 
@@ -456,13 +456,11 @@ var Info = function Info(_, ref) {
     }
   }, [useStartTime, useDuration, state.renderType, state.service.resourcesOrigin, (_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 ? void 0 : _state$service$cacheI7.autoClose]);
   useEffect(function () {
-    // if (!state.service.editModal) {
-    //   setTimeout(() => {
-    //     setSelectOpen(undefined);
-    //     form.resetFields();
-    //   }, 200);
-    // }
-  }, [state.service.editModal]);
+    // 预约创建页面并且打开了编辑弹窗
+    if (state.isBookingCreatePage && state.service.editModal) {
+      setEditData(null, true);
+    }
+  }, [state.service.editModal, state.isBookingCreatePage]);
 
   /**
    * @title: 资源 时间 发生变化时, 重新计算错误信息
@@ -563,7 +561,7 @@ var Info = function Info(_, ref) {
     setTimeout(function () {
       getResourcesData();
     }, 20);
-  }, [state.date.value]);
+  }, [(_state$date = state.date) === null || _state$date === void 0 ? void 0 : (_state$date$value = _state$date.value) === null || _state$date$value === void 0 ? void 0 : (_state$date$value$for = _state$date$value.format) === null || _state$date$value$for === void 0 ? void 0 : _state$date$value$for.call(_state$date$value, 'YYYY-MM-DD')]);
 
   /**
    * @title: 编辑商品
@@ -665,6 +663,7 @@ var Info = function Info(_, ref) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer
     //通过zIndex的方式控制  添加商品 和 编辑服务弹窗的上下层级
     , {
+      titleNoWrap: true,
       zIndex: state.service.changeService ? 999 : 1000,
       forceRender: true,
       open: state.service.editModal && !((_state$service$cacheI10 = state.service.cacheItem) !== null && _state$service$cacheI10 !== void 0 && _state$service$cacheI10.autoClose),
@@ -702,7 +701,7 @@ var Info = function Info(_, ref) {
       className: "current-service-info-name"
     }, ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : (_state$service6$cache2 = _state$service6$cache._extend) === null || _state$service6$cache2 === void 0 ? void 0 : _state$service6$cache2.product_name) || '-'), /*#__PURE__*/React.createElement(Button, {
       onClick: handleEdit
-    }, locales.getText('pisell2.text.edit')), /*#__PURE__*/React.createElement(Button, {
+    }, locales.getText('pisell2.text.edit')), !state.isBookingCreatePage && /*#__PURE__*/React.createElement(Button, {
       onClick: handleChange
     }, locales.getText('pisell2.text.change'))), /*#__PURE__*/React.createElement(CollapsibleList, {
       style: {

package/es/components/booking/info/service/serviceList/index.js

@@ -18,6 +18,7 @@ import { getNoResource } from "../../../mock";
 import { getErrorList } from "../../../utils";
 import ServiceItem from "../serviceItem";
 var ServiceList = function ServiceList(_ref) {
+  var _state$service, _state$service$value;
   var onEdit = _ref.onEdit;
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -90,7 +91,7 @@ var ServiceList = function ServiceList(_ref) {
   };
   return /*#__PURE__*/React.createElement("div", {
     className: ""
-  }, state.service.value.map(function (d) {
+  }, (_state$service = state.service) === null || _state$service === void 0 ? void 0 : (_state$service$value = _state$service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.map(function (d) {
     var _d$_extend;
     var resourceItem = getResourceItem((_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.resource);
     var errorMessage = getErrorMessage(d, resourceItem);

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

@@ -88,6 +88,6 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572];
+  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007];
   return booking4Shops.includes(shopId);
 };

package/es/components/booking/info2/index.js

@@ -27,6 +27,7 @@ import { updateServiceDate } from "../info/date";
 import useEngineContext from "../../../hooks/useEngineContext";
 import Notes from "../info/notes";
 import "../info/index.less";
+import { Skeleton } from "antd";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -211,6 +212,14 @@ var Info = Provider(function (props) {
     height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4$u = _context$appHelper4.utils) !== null && _context$appHelper4$u !== void 0 && _context$appHelper4$u.isMobile ? '100%' : '100vh'
   }), _defineProperty(_React$createElement, "bodyClassName", "booking-info-warp"), _React$createElement), /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, notes, slot ? slot : null)) : null);
+  }, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+    loading: globalState.loading,
+    round: true,
+    active: true,
+    avatar: false,
+    style: {
+      paddingTop: 20
+    }
+  }, modules.service ? /*#__PURE__*/React.createElement(React.Fragment, null, modal.state.date.value ? /*#__PURE__*/React.createElement(Service, null) : null) : null, notes, slot ? slot : null))) : null);
 });
 export default Info;

package/es/components/booking/locales.d.ts

@@ -195,6 +195,22 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'pisell2.booking.dashboard.groups-on-site-now': string;
+        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
+        'pisell2.booking.dashboard.people-on-site-now': string;
+        'pisell2.booking.dashboard.people-on-site-now-tip': string;
+        'pisell2.booking.dashboard.total-visitors-today': string;
+        'pisell2.booking.dashboard.total-visitors-today-tip': string;
+        'pisell2.booking.dashboard.ongoing-visitors': string;
+        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
+        'pisell2.booking.dashboard.upcoming-visitors': string;
+        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
+        'pisell2.booking.dashboard.overdue-visitors': string;
+        'pisell2.booking.dashboard.overdue-visitors-tip': string;
+        'pisell2.booking.dashboard.completed-visitors': string;
+        'pisell2.booking.dashboard.completed-visitors-tip': string;
+        'pisell2.booking.dashboard.departed-visitors': string;
+        'pisell2.booking.dashboard.departed-visitors-tip': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -392,6 +408,22 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'pisell2.booking.dashboard.groups-on-site-now': string;
+        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
+        'pisell2.booking.dashboard.people-on-site-now': string;
+        'pisell2.booking.dashboard.people-on-site-now-tip': string;
+        'pisell2.booking.dashboard.total-visitors-today': string;
+        'pisell2.booking.dashboard.total-visitors-today-tip': string;
+        'pisell2.booking.dashboard.ongoing-visitors': string;
+        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
+        'pisell2.booking.dashboard.upcoming-visitors': string;
+        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
+        'pisell2.booking.dashboard.overdue-visitors': string;
+        'pisell2.booking.dashboard.overdue-visitors-tip': string;
+        'pisell2.booking.dashboard.completed-visitors': string;
+        'pisell2.booking.dashboard.completed-visitors-tip': string;
+        'pisell2.booking.dashboard.departed-visitors': string;
+        'pisell2.booking.dashboard.departed-visitors-tip': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -589,6 +621,22 @@ declare const _default: {
         'page.booking.text.please-choose-an-option-1': string;
         'page.booking.text.please-choose-an-option-2': string;
         'page.booking.text.resource.min-length-error': (x: number, y: string) => string;
+        'pisell2.booking.dashboard.groups-on-site-now': string;
+        'pisell2.booking.dashboard.groups-on-site-now-tip': string;
+        'pisell2.booking.dashboard.people-on-site-now': string;
+        'pisell2.booking.dashboard.people-on-site-now-tip': string;
+        'pisell2.booking.dashboard.total-visitors-today': string;
+        'pisell2.booking.dashboard.total-visitors-today-tip': string;
+        'pisell2.booking.dashboard.ongoing-visitors': string;
+        'pisell2.booking.dashboard.ongoing-visitors-tip': string;
+        'pisell2.booking.dashboard.upcoming-visitors': string;
+        'pisell2.booking.dashboard.upcoming-visitors-tip': string;
+        'pisell2.booking.dashboard.overdue-visitors': string;
+        'pisell2.booking.dashboard.overdue-visitors-tip': string;
+        'pisell2.booking.dashboard.completed-visitors': string;
+        'pisell2.booking.dashboard.completed-visitors-tip': string;
+        'pisell2.booking.dashboard.departed-visitors': string;
+        'pisell2.booking.dashboard.departed-visitors-tip': string;
     };
 };
 export default _default;