@pisell/private-materials 6.4.63 → 6.4.65

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

@@ -26,7 +26,7 @@ import { getProductExtend } from "../../../booking/info2/service/addService/util
 import { holderId, isDaysBooking, isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
 import { isBooking4Shop } from "../../../booking/info/utils";
 import { useService } from "../../../booking/info/service/serviceManager";
-import ProductSelect from "../../../../plus/productSelect";
+import ProductDisplayAdapter, { resolveProductDisplayConfig } from "../ProductDisplayAdapter";
 import "./index.less";
 import { addService, addServiceScroll, createSimpleCacheItem, genServiceKey, getIsShowNumber, isSameProduct } from "../../utils";
 import NotAvailable from "../notAvailable";
@@ -34,6 +34,7 @@ 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";
 var productListLayout = {
   grid: true,
   config: '12:12'
@@ -52,11 +53,13 @@ var AddSerivce = function AddSerivce(props) {
     state = props.state,
     dispatch = props.dispatch,
     _props$renderMode = props.renderMode,
-    renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode;
+    renderMode = _props$renderMode === void 0 ? 'current' : _props$renderMode,
+    productDisplayConfig = props.productDisplayConfig;
   var context = useEngineContext();
   var notAvailableRef = useRef(null);
   var isLoadedServiceRef = useRef(false);
   request.setRequest(context.appHelper.utils.request);
+  var isActive = useIsActive();
   var Toast = useToast();
   var _useService = useService({
       renderMode: renderMode,
@@ -71,12 +74,25 @@ var AddSerivce = function AddSerivce(props) {
     _useState2 = _slicedToArray(_useState, 2),
     currentProduct = _useState2[0],
     setCurrentProduct = _useState2[1];
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    firstLoading = _useState4[0],
+    setFirstLoading = _useState4[1];
   var stateRef = useRef(state);
   stateRef.current = state;
-  var _useProducts = useProducts(),
+  var _useProducts = useProducts(notAvailableRef),
     getProducts = _useProducts.getProducts,
     products = _useProducts.products,
     loading = _useProducts.loading;
+  useEffect(function () {
+    var timer = setTimeout(function () {
+      setFirstLoading(false);
+    }, 300);
+    return function () {
+      clearTimeout(timer);
+    };
+  }, []);
+
   // 组件卸载时清理所有定时器
   useEffect(function () {
     return function () {
@@ -140,8 +156,10 @@ var AddSerivce = function AddSerivce(props) {
     });
   });
   useMemo(function () {
-    setHandleSetService(scanAddService);
-  }, []);
+    if (isActive) {
+      setHandleSetService(scanAddService);
+    }
+  }, [isActive]);
 
   /*
   const removeNotAvailableService = (list: any) => {
@@ -386,7 +404,7 @@ var AddSerivce = function AddSerivce(props) {
               if (cacheItem.autoClose) {
                 cacheItem.autoClose = false;
                 cacheItem._serviceKey = genServiceKey(cacheItem);
-                _addService2 = addService(_toConsumableArray(state.service.value), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity;
+                _addService2 = addService(_toConsumableArray(stateRef.current.service.value), cacheItem, state), _list = _addService2.list, quantity = _addService2.quantity;
                 if (!notShowToast) {
                   handleAddToast(cacheItem.title, quantity || 1);
                 }
@@ -464,7 +482,7 @@ var AddSerivce = function AddSerivce(props) {
 
     // 如果不需要打开弹窗, 直接添加数据
     if (cacheValues) {
-      var _state$service$value, _detail$_extend, _Toast$success2;
+      var _stateRef$current$ser, _detail$_extend, _Toast$success2;
       var productId = item.id.toString();
 
       // 如果已经有pending的同商品，增加点击次数
@@ -476,7 +494,7 @@ var AddSerivce = function AddSerivce(props) {
         clickCountRef.current[productId] = 1;
       }
       var cacheItem = createSimpleCacheItem(item, cacheValues, state);
-      var detail = (_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.find(function (val) {
+      var detail = (_stateRef$current$ser = stateRef.current.service.value) === null || _stateRef$current$ser === void 0 ? void 0 : _stateRef$current$ser.find(function (val) {
         return isSameProduct(val, cacheItem);
       });
       var originalQuantity = (detail === null || detail === void 0 || (_detail$_extend = detail._extend) === null || _detail$_extend === void 0 ? void 0 : _detail$_extend.quantity) || 0;
@@ -543,20 +561,37 @@ var AddSerivce = function AddSerivce(props) {
       });
     }
   }, [renderMode, currentDate, customerId, menuList, currentDatetime]);
+
+  // 产品展示配置，支持字符串预设或完整配置对象
+  var finalDisplayConfig = useMemo(function () {
+    // 解析配置（支持字符串或对象）
+    var resolvedConfig = resolveProductDisplayConfig(productDisplayConfig);
+
+    // 如果是 ProductSelect 模式，合并默认的 layout 和 setting
+    if (resolvedConfig.displayMode === 'product-select') {
+      var _resolvedConfig$produ, _resolvedConfig$produ2;
+      return _objectSpread(_objectSpread({}, resolvedConfig), {}, {
+        productSelectConfig: _objectSpread(_objectSpread({}, resolvedConfig.productSelectConfig), {}, {
+          layout: ((_resolvedConfig$produ = resolvedConfig.productSelectConfig) === null || _resolvedConfig$produ === void 0 ? void 0 : _resolvedConfig$produ.layout) || productListLayout,
+          productListSetting: ((_resolvedConfig$produ2 = resolvedConfig.productSelectConfig) === null || _resolvedConfig$produ2 === void 0 ? void 0 : _resolvedConfig$produ2.productListSetting) || productListSetting
+        })
+      });
+    }
+    return resolvedConfig;
+  }, [productDisplayConfig]);
   return useMemo(function () {
     if (renderMode === 'current') {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductSelect, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProductDisplayAdapter, {
+        config: finalDisplayConfig,
         dataSource: renderList,
-        layout: productListLayout,
-        onChange: handleSelectProduct,
-        value: currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.id,
-        loading: !renderList.length && loading,
-        productListSetting: productListSetting
+        loading: !renderList.length && loading || firstLoading,
+        currentProductId: currentProduct === null || currentProduct === void 0 ? void 0 : currentProduct.id,
+        onSelectProduct: handleSelectProduct
       }), /*#__PURE__*/React.createElement(NotAvailable, {
         ref: notAvailableRef
       }));
     }
     return null;
-  }, [state.service.addModal, locales, renderList, state.amountSymbol, state.renderType, state === null || state === void 0 ? void 0 : state.activeCartId, holderId(state), loading, currentProduct, isBooking4]);
+  }, [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]);
 };
 export default AddSerivce;

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

@@ -1,6 +1,8 @@
+import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;
+    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
 }
 declare const AddServiceVariant: (props: AddServiceVariantProps) => JSX.Element;
 export default AddServiceVariant;

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

@@ -8,7 +8,8 @@ import React, { useRef } from 'react';
 import AddService from "./addService";
 var AddServiceVariant = function AddServiceVariant(props) {
   var globalState = props.globalState,
-    setGlobalState = props.setGlobalState;
+    setGlobalState = props.setGlobalState,
+    productDisplayConfig = props.productDisplayConfig;
   var stateRef = useRef(globalState);
   stateRef.current = globalState;
   var dispatch = function dispatch(_ref) {
@@ -22,7 +23,8 @@ var AddServiceVariant = function AddServiceVariant(props) {
   };
   return /*#__PURE__*/React.createElement(AddService, {
     state: globalState,
-    dispatch: dispatch
+    dispatch: dispatch,
+    productDisplayConfig: productDisplayConfig
   });
 };
 export default AddServiceVariant;

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

@@ -1,3 +1,7 @@
 import './index.less';
-declare const index: () => JSX.Element;
+interface MenuBarProps {
+    activeNavKey?: string;
+    onNavChange?: (key: string) => void;
+}
+declare const index: (props: MenuBarProps) => JSX.Element;
 export default index;

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

@@ -1,19 +1,102 @@
-import React from 'react';
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function _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 } from 'react';
 import { useNetworkStatus, NetworkStatus, NetworkStatusColor } from "../../hooks/useNetworkStatus";
 import "./index.less";
 import { Menu } from 'antd';
-import { SettingOutlined } from '@ant-design/icons';
+import { ReloadOutlined, SettingOutlined } from '@ant-design/icons';
 import { locales } from '@pisell/utils';
-import { ConfigProvider } from '@pisell/materials';
-var index = function index() {
+import { ConfigProvider, Iconfont } from '@pisell/materials';
+import { getBookingConfig } from "../../serve";
+var index = function index(props) {
+  var _props$activeNavKey = props.activeNavKey,
+    activeNavKey = _props$activeNavKey === void 0 ? 'ticket' : _props$activeNavKey,
+    onNavChange = props.onNavChange;
   var status = useNetworkStatus();
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    showFoodMenu = _useState2[0],
+    setShowFoodMenu = _useState2[1];
+
+  // 检查是否显示 food 菜单
+  useEffect(function () {
+    var checkFoodConfig = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var data;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              _context.next = 3;
+              return getBookingConfig({
+                item_type: 'appointment_booking',
+                sub_type: 'food',
+                source_type: 'pos'
+              });
+            case 3:
+              data = _context.sent;
+              if (data) {
+                setShowFoodMenu(true);
+              }
+              _context.next = 10;
+              break;
+            case 7:
+              _context.prev = 7;
+              _context.t0 = _context["catch"](0);
+              console.error('获取 food 配置失败:', _context.t0);
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, null, [[0, 7]]);
+      }));
+      return function checkFoodConfig() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+    checkFoodConfig();
+  }, []);
+
+  // 导航项配置
+  var navItems = [{
+    key: 'ticket',
+    icon: /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-ticket",
+      style: {
+        fontSize: 32
+      }
+    }),
+    label: ''
+  }].concat(_toConsumableArray(showFoodMenu ? [{
+    key: 'food',
+    label: '',
+    icon: /*#__PURE__*/React.createElement(Iconfont, {
+      type: "pisell2-food",
+      style: {
+        fontSize: 32
+      }
+    })
+  }] : []));
   var items = [{
+    key: 'reload',
+    label: locales.getText('pisell2.ticket-booking.reload'),
+    icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
+  }, {
     key: '1',
     icon: /*#__PURE__*/React.createElement(SettingOutlined, null),
     children: [{
-      key: 'reload',
-      label: locales.getText('pisell2.ticket-booking.reload')
-    }, {
       key: 'version',
       label: '6.4.38'
     }
@@ -34,8 +117,8 @@ var index = function index() {
         return 'Offline';
     }
   };
-  var handleClick = function handleClick(_ref) {
-    var key = _ref.key;
+  var handleClick = function handleClick(_ref2) {
+    var key = _ref2.key;
     if (key === 'reload') {
       window.location.reload();
     }
@@ -43,6 +126,11 @@ var index = function index() {
       window.location.href = '/login';
     }
   };
+
+  // 处理导航项点击
+  var handleNavClick = function handleNavClick(key) {
+    onNavChange === null || onNavChange === void 0 || onNavChange(key);
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: "pisell-ticket-booking-menu-bar"
   }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
@@ -58,21 +146,15 @@ var index = function index() {
     fill: "#8157D5"
   }))), /*#__PURE__*/React.createElement("div", {
     className: "nav-wrapper"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "nav-item active"
-  }, /*#__PURE__*/React.createElement("svg", {
-    xmlns: "http://www.w3.org/2000/svg",
-    width: "32",
-    height: "25",
-    viewBox: "0 0 34 27",
-    fill: "none"
-  }, /*#__PURE__*/React.createElement("path", {
-    d: "M13.8 7.05078V5.48828M13.8 14.082V12.5195M13.8 21.1133V19.5508M6.12 0.800781H27.88C29.6722 0.800781 30.5683 0.800781 31.2528 1.14139C31.8549 1.44099 32.3444 1.91905 32.6512 2.50706C33 3.17554 33 4.05062 33 5.80078V7.83203C29.9072 7.83203 27.4 10.2805 27.4 13.3008C27.4 16.3211 29.9072 18.7695 33 18.7695V20.8008C33 22.5509 33 23.426 32.6512 24.0945C32.3444 24.6825 31.8549 25.1606 31.2528 25.4602C30.5683 25.8008 29.6722 25.8008 27.88 25.8008H6.12C4.32783 25.8008 3.43175 25.8008 2.74723 25.4602C2.14511 25.1606 1.65557 24.6825 1.34878 24.0945C1 23.426 1 22.5509 1 20.8008V18.7695C4.09279 18.7695 6.6 16.3211 6.6 13.3008C6.6 10.2805 4.09279 7.83203 1 7.83203V5.80078C1 4.05062 1 3.17554 1.34878 2.50706C1.65557 1.91905 2.14511 1.44099 2.74723 1.14139C3.43175 0.800781 4.32783 0.800781 6.12 0.800781Z",
-    stroke: "white",
-    "stroke-width": "1.5",
-    "stroke-linecap": "round",
-    "stroke-linejoin": "round"
-  }))))), /*#__PURE__*/React.createElement("div", {
+  }, navItems.map(function (navItem) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: navItem.key,
+      className: "nav-item ".concat(activeNavKey === navItem.key ? 'active' : ''),
+      onClick: function onClick() {
+        return handleNavClick(navItem.key);
+      }
+    }, navItem.icon && navItem.icon, navItem.label && navItem.label);
+  }))), /*#__PURE__*/React.createElement("div", {
     className: "menu-wrapper"
   }, /*#__PURE__*/React.createElement(ConfigProvider, {
     theme: {

package/es/components/ticketBooking/components/menuBar/index.less

@@ -28,6 +28,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
+    gap: 12px;
 
     .nav-item {
       cursor: pointer;
@@ -38,10 +39,35 @@
       justify-content: center;
       align-items: center;
       position: relative;
-      background: var(--Gray-950, #0c111d);
+      background: transparent;
+      color: rgba(255, 255, 255, 0.75);
+      transition: all 0.3s ease;
+
+      svg {
+        transition: all 0.3s ease;
+        
+        path {
+          stroke: rgba(255, 255, 255, 0.75);
+          transition: all 0.3s ease;
+        }
+      }
+
+      &:hover {
+        background: rgba(129, 87, 213, 0.1);
+        color: rgba(255, 255, 255, 0.95);
+
+        svg path {
+          stroke: rgba(255, 255, 255, 0.95);
+        }
+      }
 
       &.active {
         background: #8157d5;
+        color: #ffffff;
+
+        svg path {
+          stroke: #ffffff;
+        }
 
         &::before {
           display: block;
@@ -94,5 +120,10 @@
     bottom: 44px;
     left: 6px;
     z-index: 99999;
+    .pisell-lowcode-menu {
+      li {
+        padding-top: 6px;
+      }
+    }
   }
 }

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

@@ -1,4 +1,9 @@
 import './index.less';
+import { ProductDisplayConfig, ProductDisplayPresetKey } from '../ProductDisplayAdapter/types';
 export declare const _formatBookingDetail: (data: any, modalState: any) => any;
-declare const TicketBooking: () => JSX.Element;
+declare const TicketBooking: (props: {
+    productDisplayConfig?: ProductDisplayPresetKey | ProductDisplayConfig;
+    isShowTimeBar?: boolean;
+    isShowFloatButtons?: boolean;
+}) => JSX.Element;
 export default TicketBooking;

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

@@ -32,7 +32,7 @@ import dayjs from 'dayjs';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useStore } from "../../miniRedux";
 import BookingInfo from "../../../../components/booking/info";
-import { formatDateToStr, getNextTimeSlice, getDisabledEdit, restoreProductOtherData, getIsParallelResourcesBooking, formatHolder } from "../../utils";
+import { formatDateToStr, getNextTimeSlice, getDisabledEdit, restoreProductOtherData, getIsParallelResourcesBooking, formatHolder, getBoardConfigCache, setBoardConfigCache } from "../../utils";
 import AddServiceVariant from "../addServiceVariant";
 import TimeBar from "../timeBar";
 import { formatProducts } from "../../../booking/info/service2/utils";
@@ -49,6 +49,9 @@ import { useCustomer } from "../../hooks/pisellos";
 import { useMemoizedFn } from 'ahooks';
 import useScanManager from "../../hooks/pisellos/useScanManager";
 import { useDebounceFn } from 'ahooks';
+import { useOsKey } from "../../context";
+import { useIsActive } from "../../context/IsActiveContext";
+import { useShopDiscountModule } from "../../hooks/pisellos/useShopDiscountModule";
 export var _formatBookingDetail = function _formatBookingDetail(data, modalState) {
   var _bookings$list, _bookings$list2;
   var customer_id = data.customer_id,
@@ -218,8 +221,13 @@ var formatProductValues = function formatProductValues(data) {
     });
   });
 };
-var TicketBooking = function TicketBooking() {
+var TicketBooking = function TicketBooking(props) {
   var _engineContext$appHel2, _state$modalState2, _state$modalState4;
+  var productDisplayConfig = props.productDisplayConfig,
+    _props$isShowTimeBar = props.isShowTimeBar,
+    isShowTimeBar = _props$isShowTimeBar === void 0 ? true : _props$isShowTimeBar,
+    _props$isShowFloatBut = props.isShowFloatButtons,
+    isShowFloatButtons = _props$isShowFloatBut === void 0 ? true : _props$isShowFloatBut;
   var _useStore = useStore(),
     _useStore2 = _slicedToArray(_useStore, 2),
     state = _useStore2[0],
@@ -244,6 +252,7 @@ var TicketBooking = function TicketBooking() {
   var _listTimerRef = useRef();
   var _timerRef = useRef();
   var _callbackFnRef = useRef();
+  var _isFirstLoadBoardConfigRef = useRef(true); // 跟踪 boardConfig 是否首次加载
   var _useState = useState(0),
     _useState2 = _slicedToArray(_useState, 2),
     activeBookingId = _useState2[0],
@@ -254,6 +263,9 @@ var TicketBooking = function TicketBooking() {
     setShowTerminalUpgradeModal = _useState4[1];
   var pisellFloatingPanelRef = useRef(null);
   var closeRef = useRef(null);
+  var shopDiscount = useShopDiscountModule();
+  var isActive = useIsActive();
+  var osKey = useOsKey();
   var bookingTicket = useBookingTicket();
   var _useScanGlobal = useScanGlobal(),
     openScan = _useScanGlobal.openScan,
@@ -302,16 +314,16 @@ var TicketBooking = function TicketBooking() {
       }
     }
   });
-  useMemo(function () {
-    openScan(function (data) {
-      handleScan(data);
-    });
-  }, []);
   useEffect(function () {
+    if (isActive) {
+      openScan(function (data) {
+        handleScan(data);
+      });
+    }
     return function () {
       closeScan();
     };
-  }, []);
+  }, [isActive]);
   var _useDebounceFn = useDebounceFn(function (type, orderId) {
       // 支付成功后清空状态
       try {
@@ -720,27 +732,57 @@ var TicketBooking = function TicketBooking() {
    */
   var _getBoardConfig = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _data$config;
-      var bookingConfigParams, data;
+      var bookingConfigParams, isHasCache, cachedBoardConfig, _cachedBoardConfig$co, data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            bookingConfigParams = state.bookingConfigParams; // 获取board设置
-            _context2.next = 3;
+            bookingConfigParams = state.bookingConfigParams;
+            isHasCache = false; // 1. 如果是首次加载，尝试从缓存中获取数据
+            if (_isFirstLoadBoardConfigRef.current && osKey) {
+              cachedBoardConfig = getBoardConfigCache(osKey);
+              if (cachedBoardConfig) {
+                isHasCache = true;
+                // 先展示缓存数据
+                setState({
+                  bookingConfig: cachedBoardConfig
+                });
+                console.log('[BoardConfigCache] 使用缓存数据展示');
+
+                // 如果缓存数据中有 quick_time 配置，也加载快捷时间产品
+                if (cachedBoardConfig !== null && cachedBoardConfig !== void 0 && (_cachedBoardConfig$co = cachedBoardConfig.config) !== null && _cachedBoardConfig$co !== void 0 && (_cachedBoardConfig$co = _cachedBoardConfig$co.information_tab) !== null && _cachedBoardConfig$co !== void 0 && (_cachedBoardConfig$co = _cachedBoardConfig$co.appointment_card) !== null && _cachedBoardConfig$co !== void 0 && _cachedBoardConfig$co.quick_time) {
+                  _getAddTimeProducts();
+                }
+              }
+              _isFirstLoadBoardConfigRef.current = false;
+            }
+
+            // 2. 无论是否有缓存，都调用接口获取最新数据
+            _context2.prev = 3;
+            _context2.next = 6;
             return getBookingConfig(_objectSpread({}, bookingConfigParams));
-          case 3:
+          case 6:
             data = _context2.sent;
-            if (data !== null && data !== void 0 && (_data$config = data.config) !== null && _data$config !== void 0 && (_data$config = _data$config.information_tab) !== null && _data$config !== void 0 && (_data$config = _data$config.appointment_card) !== null && _data$config !== void 0 && _data$config.quick_time) {
-              _getAddTimeProducts();
+            if (!isHasCache) {
+              setState({
+                bookingConfig: data
+              });
             }
-            setState({
-              bookingConfig: data
-            });
-          case 6:
+            // 4. 将新数据缓存到 storage
+            if (osKey && data) {
+              setBoardConfigCache(osKey, data);
+              console.log('[BoardConfigCache] 已更新缓存');
+            }
+            _context2.next = 14;
+            break;
+          case 11:
+            _context2.prev = 11;
+            _context2.t0 = _context2["catch"](3);
+            console.error('[BoardConfigCache] 获取配置失败:', _context2.t0);
+          case 14:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[3, 11]]);
     }));
     return function _getBoardConfig() {
       return _ref2.apply(this, arguments);
@@ -1265,10 +1307,11 @@ var TicketBooking = function TicketBooking() {
       productExtensionType: state.productExtensionType,
       isBookingTicket2: true
     }),
-    setGlobalState: _setModalState
-  }), /*#__PURE__*/React.createElement(FloatButtons, {
+    setGlobalState: _setModalState,
+    productDisplayConfig: productDisplayConfig
+  }), isShowFloatButtons && /*#__PURE__*/React.createElement(FloatButtons, {
     items: floatButtons
-  })), /*#__PURE__*/React.createElement(TimeBar, {
+  })), isShowTimeBar && /*#__PURE__*/React.createElement(TimeBar, {
     onCreateClick: handleCreateClick,
     setGlobalState: setState,
     globalState: state,

package/es/components/ticketBooking/components/timeBar/index.less

@@ -4,6 +4,7 @@
   align-items: center;
   gap: 16px;
   padding: 8px;
+  background-color: #fff;
 
   button {
     flex-shrink: 0;

package/es/components/ticketBooking/context/IsActiveContext.d.ts

@@ -0,0 +1,26 @@
+import React from 'react';
+/**
+ * IsActive Context
+ * 用于在 TicketBooking 组件树中提供 isActive 状态
+ * isActive 用于标识当前组件是否处于激活状态
+ */
+interface IsActiveContextType {
+    /** 是否激活 */
+    isActive: boolean;
+}
+declare const IsActiveContext: React.Context<IsActiveContextType>;
+interface IsActiveProviderProps {
+    isActive: boolean;
+    children: React.ReactNode;
+}
+/**
+ * IsActive Provider
+ * 提供 isActive 给子组件使用
+ */
+export declare const IsActiveProvider: React.FC<IsActiveProviderProps>;
+/**
+ * useIsActive Hook
+ * 在子组件中使用此 hook 获取 isActive 状态
+ */
+export declare const useIsActive: () => boolean;
+export default IsActiveContext;