@pisell/private-materials 6.3.139 → 6.3.141

package/es/components/scanOrder/components/Content/index.js

@@ -9,7 +9,7 @@ function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol
 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 _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); }
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import { message, Modal } from 'antd';
 import { Button, PisellModal } from '@pisell/materials';
@@ -78,7 +78,9 @@ function ReadyState() {
     scanOrderModule = _useScanOrderContext.scanOrderModule,
     isCacheHydrated = _useScanOrderContext.isCacheHydrated,
     markGate = _useScanOrderContext.markGate,
-    isGatePassed = _useScanOrderContext.isGatePassed;
+    isGatePassed = _useScanOrderContext.isGatePassed,
+    resumeStep = _useScanOrderContext.resumeStep,
+    consumeResumeStep = _useScanOrderContext.consumeResumeStep;
   var _useScanOrderLogin = useScanOrderLogin(),
     isLogin = _useScanOrderLogin.isLogin,
     openLoginModal = _useScanOrderLogin.openLoginModal;
@@ -111,20 +113,122 @@ function ReadyState() {
     _useState8 = _slicedToArray(_useState7, 2),
     pendingFormPayload = _useState8[0],
     setPendingFormPayload = _useState8[1];
+
+  /**
+   * 商品列表状态：挂在 ReadyState 而不是 Menu 本地，保证从 check 返回 product 时命中缓存、不重发请求
+   * （stepRegistry 切换会让 Menu unmount，本地 useState 会丢；ReadyState 在整段会话内不 unmount）
+   * - productListLoadedRef：同步判定是否已有有效结果，避免 setState 异步窗口内重复请求
+   * - productListPromiseRef：in-flight promise 去重，让并发调用合并成同一次请求
+   */
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    productList = _useState10[0],
+    setProductList = _useState10[1];
+  var productListLoadedRef = useRef(false);
+  var productListPromiseRef = useRef(null);
+  var ensureProductListLoaded = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var request;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          if (!productListLoadedRef.current) {
+            _context2.next = 2;
+            break;
+          }
+          return _context2.abrupt("return");
+        case 2:
+          if (!productListPromiseRef.current) {
+            _context2.next = 6;
+            break;
+          }
+          _context2.next = 5;
+          return productListPromiseRef.current.catch(function () {});
+        case 5:
+          return _context2.abrupt("return");
+        case 6:
+          request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+            var res;
+            return _regeneratorRuntime().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  _context.prev = 0;
+                  _context.next = 3;
+                  return runModuleAction('getProductList');
+                case 3:
+                  res = _context.sent;
+                  if (!Array.isArray(res)) {
+                    _context.next = 8;
+                    break;
+                  }
+                  productListLoadedRef.current = true;
+                  setProductList(res);
+                  return _context.abrupt("return");
+                case 8:
+                  // 非数组错误载荷：沿用原 Menu 内的 Modal.confirm + 跳首页逻辑
+                  Modal.confirm({
+                    title: res === null || res === void 0 ? void 0 : res.message,
+                    okText: String(locales.getText('pisell2.event.confirm') || 'OK'),
+                    cancelButtonProps: {
+                      style: {
+                        display: 'none'
+                      }
+                    },
+                    maskClosable: false,
+                    onOk: function onOk() {
+                      location.replace('/');
+                    }
+                  });
+                  _context.next = 14;
+                  break;
+                case 11:
+                  _context.prev = 11;
+                  _context.t0 = _context["catch"](0);
+                  console.warn('[scanOrder] getProductList failed', _context.t0);
+                case 14:
+                  _context.prev = 14;
+                  productListPromiseRef.current = null;
+                  return _context.finish(14);
+                case 17:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee, null, [[0, 11, 14, 17]]);
+          }))();
+          productListPromiseRef.current = request;
+          _context2.next = 10;
+          return request;
+        case 10:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  })), [runModuleAction]);
+
   /** checkResourceAvailable 返回 requestEntryPax === 1 时，在协议/表单之后弹人数并写入 scanOrder otherParams */
   var requestEntryPaxRef = useRef(0);
   var requestPaxMinRef = useRef(1);
   var requestPaxMaxRef = useRef(1);
   var tableFormRecordRef = useRef(null);
+  /** 本次会话是否曾实际弹出过入口人数弹窗（商品页返回首页前可二次弹窗） */
+  var entryPaxModalWasPresentedRef = useRef(false);
 
-  /** 根据当前语言从多语言 name 对象中取值，兜底 original -> en -> 空串 */
+  /** 根据当前语言从多语言 name 对象中取值，兜底当前语言 -> original -> 空串 */
   var getLocalizedName = function getLocalizedName(nameMap) {
     if (!nameMap) return '';
     var currentLocale = locales.getLocale();
-    return nameMap[currentLocale] || nameMap.original || nameMap.en || '';
+    var localized = nameMap[currentLocale];
+    if (typeof localized === 'string' && localized) return localized;
+    var original = nameMap.original;
+    if (typeof original === 'string' && original) return original;
+    return '';
   };
 
-  /** 解析可能是纯字符串或多语言对象的文案，兜底 current locale -> original -> en -> 空串 */
+  /**
+   * 解析可能是纯字符串或多语言对象的文案
+   * - 字符串：原样返回
+   * - 多语言对象（如 { en, 'zh-CN', original, ... }）：取当前语言，兜底 original
+   * - 其它：空串
+   */
   var resolveLocalizedText = function resolveLocalizedText(value) {
     if (value == null) return '';
     if (typeof value === 'string') return value;
@@ -132,11 +236,11 @@ function ReadyState() {
     return getLocalizedName(value);
   };
   var normalizeFormPayload = function normalizeFormPayload(formPayload, partyroomBookingPayload) {
-    var _ref, _ref2, _sourcePayload$id;
+    var _ref3, _ref4, _sourcePayload$id;
     var sourcePayload = formPayload !== null && formPayload !== void 0 ? formPayload : partyroomBookingPayload;
     if (!sourcePayload) return null;
     var isPrimitivePayload = typeof sourcePayload === 'number' || typeof sourcePayload === 'string';
-    var rawId = isPrimitivePayload ? sourcePayload : (_ref = (_ref2 = (_sourcePayload$id = sourcePayload === null || sourcePayload === void 0 ? void 0 : sourcePayload.id) !== null && _sourcePayload$id !== void 0 ? _sourcePayload$id : sourcePayload === null || sourcePayload === void 0 ? void 0 : sourcePayload.form_id) !== null && _ref2 !== void 0 ? _ref2 : sourcePayload === null || sourcePayload === void 0 ? void 0 : sourcePayload.resource_form_id) !== null && _ref !== void 0 ? _ref : sourcePayload === null || sourcePayload === void 0 ? void 0 : sourcePayload.partyroom_booking;
+    var rawId = isPrimitivePayload ? sourcePayload : (_ref3 = (_ref4 = (_sourcePayload$id = sourcePayload === null || sourcePayload === void 0 ? void 0 : sourcePayload.id) !== null && _sourcePayload$id !== void 0 ? _sourcePayload$id : sourcePayload === null || sourcePayload === void 0 ? void 0 : sourcePayload.form_id) !== null && _ref4 !== void 0 ? _ref4 : sourcePayload === null || sourcePayload === void 0 ? void 0 : sourcePayload.resource_form_id) !== null && _ref3 !== void 0 ? _ref3 : sourcePayload === null || sourcePayload === void 0 ? void 0 : sourcePayload.partyroom_booking;
     var formId = Number(rawId);
     if (Number.isNaN(formId) || formId <= 0) return null;
     var sourceDetail = _typeof(sourcePayload) === 'object' && sourcePayload !== null ? sourcePayload : {};
@@ -148,20 +252,54 @@ function ReadyState() {
     };
   };
   var app = utils === null || utils === void 0 || (_utils$getApp = utils.getApp) === null || _utils$getApp === void 0 ? void 0 : _utils$getApp.call(utils);
+
+  /** 回站点首页（与商品步返回兜底一致） */
+  var navigateToHome = function navigateToHome() {
+    var _app$history, _app$history2;
+    if (app !== null && app !== void 0 && (_app$history = app.history) !== null && _app$history !== void 0 && _app$history.replace) {
+      app.history.replace('/');
+    } else if (app !== null && app !== void 0 && (_app$history2 = app.history) !== null && _app$history2 !== void 0 && _app$history2.push) {
+      app.history.push('/');
+    } else {
+      location.replace('/');
+    }
+  };
+
+  /** 弹出入口人数弹窗，返回有效人数或取消/关闭时为 null */
+  var requestEntryPaxModal = function requestEntryPaxModal() {
+    return new Promise(function (resolve) {
+      var _tableFormRecordRef$c;
+      if (typeof (utils === null || utils === void 0 ? void 0 : utils.action) !== 'function') {
+        resolve(null);
+        return;
+      }
+      utils.action({
+        type: 'pisell1.handlePaxModal',
+        data: {
+          tableName: getLocalizedName((_tableFormRecordRef$c = tableFormRecordRef.current) === null || _tableFormRecordRef$c === void 0 ? void 0 : _tableFormRecordRef$c.name),
+          requestPaxMin: requestPaxMinRef.current,
+          requestPaxMax: requestPaxMaxRef.current
+        },
+        callback: function callback(result) {
+          resolve(extractEntryPaxNumber(result));
+        }
+      });
+    });
+  };
+
   // 跳转到订单详情页
   var handleOrderDetail = function handleOrderDetail(order_id) {
-    var _app$history, _app$history2;
+    var _app$history3, _app$history4;
     var link = "/order/details?id=".concat(order_id);
-    if (app !== null && app !== void 0 && (_app$history = app.history) !== null && _app$history !== void 0 && _app$history.replace) {
+    if (app !== null && app !== void 0 && (_app$history3 = app.history) !== null && _app$history3 !== void 0 && _app$history3.replace) {
       app.history.replace(link);
-    } else if (app !== null && app !== void 0 && (_app$history2 = app.history) !== null && _app$history2 !== void 0 && _app$history2.push) {
+    } else if (app !== null && app !== void 0 && (_app$history4 = app.history) !== null && _app$history4 !== void 0 && _app$history4.push) {
       app.history.push(link);
     } else {
       location.replace(link);
     }
   };
   var handleBack = function handleBack() {
-    var _app$history3, _app$history4;
     if (currentStep !== 'product') {
       prevStep();
       return;
@@ -170,123 +308,153 @@ function ReadyState() {
       handleOrderDetail(entryContext.order_id);
       return;
     }
-    if (app !== null && app !== void 0 && (_app$history3 = app.history) !== null && _app$history3 !== void 0 && _app$history3.replace) {
-      app.history.replace('/');
-    } else if (app !== null && app !== void 0 && (_app$history4 = app.history) !== null && _app$history4 !== void 0 && _app$history4.push) {
-      app.history.push('/');
-    } else {
-      location.replace('/');
+    if (entryPaxModalWasPresentedRef.current) {
+      void _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var pax;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              _context3.next = 2;
+              return requestEntryPaxModal();
+            case 2:
+              pax = _context3.sent;
+              if (!(pax == null)) {
+                _context3.next = 6;
+                break;
+              }
+              navigateToHome();
+              return _context3.abrupt("return");
+            case 6:
+              _context3.prev = 6;
+              _context3.next = 9;
+              return runModuleAction('setEntryPaxNumber', pax);
+            case 9:
+              _context3.next = 11;
+              return refreshViewModel();
+            case 11:
+              _context3.next = 16;
+              break;
+            case 13:
+              _context3.prev = 13;
+              _context3.t0 = _context3["catch"](6);
+              console.warn('[scanOrder] setEntryPaxNumber on back pax confirm failed', _context3.t0);
+            case 16:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, null, [[6, 13]]);
+      }))();
+      return;
     }
+    navigateToHome();
   };
   var enterProductStep = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var target;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context.prev = 0;
-            _context.next = 3;
+            _context4.prev = 0;
+            _context4.next = 3;
             return runModuleAction('applyItemRulePrefill');
           case 3:
-            _context.next = 5;
+            _context4.next = 5;
             return refreshViewModel();
           case 5:
-            _context.next = 10;
+            _context4.next = 10;
             break;
           case 7:
-            _context.prev = 7;
-            _context.t0 = _context["catch"](0);
-            console.warn('[scanOrder] applyItemRulePrefill failed', _context.t0);
+            _context4.prev = 7;
+            _context4.t0 = _context4["catch"](0);
+            console.warn('[scanOrder] applyItemRulePrefill failed', _context4.t0);
           case 10:
-            _context.prev = 10;
-            // 步骤缓存命中时，currentStep 可能已恢复到 'check'；不把它拉回 'product'
-            if (currentStep !== 'check') goToStep('product');
-            return _context.finish(10);
-          case 13:
+            _context4.prev = 10;
+            // bootstrap 结束后统一由 resumeStep 决定最终去向：
+            //   - resumeStep === 'check' → 恢复到结算页（此时 dineInConfig 已加载）
+            //   - 其它（null / 'product'） → 正常进入商品页
+            target = resumeStep === 'check' ? 'check' : 'product';
+            if (resumeStep) consumeResumeStep();
+            goToStep(target);
+            return _context4.finish(10);
+          case 15:
           case "end":
-            return _context.stop();
+            return _context4.stop();
         }
-      }, _callee, null, [[0, 7, 10, 13]]);
+      }, _callee4, null, [[0, 7, 10, 15]]);
     }));
     return function enterProductStep() {
-      return _ref3.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
   /** 需要时先走人数弹窗与 setOtherParams(entryPaxNumber)，再进入商品步 */
   var runEntryPaxGateThenEnterProduct = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var pax;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            if (!(requestEntryPaxRef.current !== 1)) {
-              _context2.next = 4;
+            if (!(entryMode === 'additional_order')) {
+              _context5.next = 4;
               break;
             }
-            _context2.next = 3;
+            _context5.next = 3;
             return enterProductStep();
           case 3:
-            return _context2.abrupt("return");
+            return _context5.abrupt("return");
           case 4:
-            if (!isGatePassed('paxEntered')) {
-              _context2.next = 8;
+            if (!(requestEntryPaxRef.current !== 1)) {
+              _context5.next = 8;
               break;
             }
-            _context2.next = 7;
+            _context5.next = 7;
             return enterProductStep();
           case 7:
-            return _context2.abrupt("return");
+            return _context5.abrupt("return");
           case 8:
-            _context2.next = 10;
-            return new Promise(function (resolve) {
-              var _tableFormRecordRef$c;
-              if (typeof (utils === null || utils === void 0 ? void 0 : utils.action) !== 'function') {
-                resolve(null);
-                return;
-              }
-              utils.action({
-                type: 'pisell1.handlePaxModal',
-                data: {
-                  tableName: getLocalizedName((_tableFormRecordRef$c = tableFormRecordRef.current) === null || _tableFormRecordRef$c === void 0 ? void 0 : _tableFormRecordRef$c.name),
-                  requestPaxMin: requestPaxMinRef.current,
-                  requestPaxMax: requestPaxMaxRef.current
-                },
-                callback: function callback(result) {
-                  resolve(extractEntryPaxNumber(result));
-                }
-              });
-            });
-          case 10:
-            pax = _context2.sent;
+            if (!isGatePassed('paxEntered')) {
+              _context5.next = 12;
+              break;
+            }
+            _context5.next = 11;
+            return enterProductStep();
+          case 11:
+            return _context5.abrupt("return");
+          case 12:
+            entryPaxModalWasPresentedRef.current = true;
+            _context5.next = 15;
+            return requestEntryPaxModal();
+          case 15:
+            pax = _context5.sent;
             if (!(pax == null)) {
-              _context2.next = 14;
+              _context5.next = 19;
               break;
             }
-            location.replace('/');
-            return _context2.abrupt("return");
-          case 14:
-            _context2.prev = 14;
-            _context2.next = 17;
+            navigateToHome();
+            return _context5.abrupt("return");
+          case 19:
+            _context5.prev = 19;
+            _context5.next = 22;
             return runModuleAction('setEntryPaxNumber', pax);
-          case 17:
+          case 22:
             markGate('paxEntered');
-            _context2.next = 23;
+            _context5.next = 28;
             break;
-          case 20:
-            _context2.prev = 20;
-            _context2.t0 = _context2["catch"](14);
-            console.warn('[scanOrder] setOtherParams failed', _context2.t0);
-          case 23:
-            _context2.next = 25;
-            return enterProductStep();
           case 25:
+            _context5.prev = 25;
+            _context5.t0 = _context5["catch"](19);
+            console.warn('[scanOrder] setOtherParams failed', _context5.t0);
+          case 28:
+            _context5.next = 30;
+            return enterProductStep();
+          case 30:
           case "end":
-            return _context2.stop();
+            return _context5.stop();
         }
-      }, _callee2, null, [[14, 20]]);
+      }, _callee5, null, [[19, 25]]);
     }));
     return function runEntryPaxGateThenEnterProduct() {
-      return _ref4.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var closePolicyAndBack = function closePolicyAndBack() {
@@ -348,16 +516,16 @@ function ReadyState() {
   };
   useEffect(function () {
     var checkResourceAvailable = /*#__PURE__*/function () {
-      var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var hasOrderId, _yield$runModuleActio, mode, order_id, errorTips, policy, form, partyroom_booking, requestEntryPax, requestPaxMin, requestPaxMax, table_form_record, normalizedFormPayload, isAdditionalOrder, normalizedPolicyPayload, tips, content;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        var hasOrderId, _yield$runModuleActio, mode, order_id, errorTips, policy, form, partyroom_booking, requestEntryPax, requestPaxMin, requestPaxMax, table_form_record, normalizedFormPayload, isAdditionalOrder, normalizedPolicyPayload, tips, _scanOrderModule$setU, content;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
             case 0:
               hasOrderId = !!(entryContext !== null && entryContext !== void 0 && entryContext.order_id);
-              _context3.next = 3;
+              _context6.next = 3;
               return runModuleAction('checkResourceAvailable', entryContext === null || entryContext === void 0 ? void 0 : entryContext.resource_id, hasOrderId);
             case 3:
-              _yield$runModuleActio = _context3.sent;
+              _yield$runModuleActio = _context6.sent;
               mode = _yield$runModuleActio.mode;
               order_id = _yield$runModuleActio.order_id;
               errorTips = _yield$runModuleActio.errorTips;
@@ -378,14 +546,14 @@ function ReadyState() {
               setEntryMode(isAdditionalOrder ? 'additional_order' : 'default');
               // 资源空闲：按需依次弹 协议 -> 表单 -> 人数，最后进入商品选择
               if (!(mode === 'idle')) {
-                _context3.next = 35;
+                _context6.next = 35;
                 break;
               }
               normalizedPolicyPayload = _typeof(policy) === 'object' && policy !== null ? policy : {
                 id: policy
               }; // 步骤缓存：同一 resourceId 会话内已确认过协议则跳过
               if (!(normalizedPolicyPayload !== null && normalizedPolicyPayload !== void 0 && normalizedPolicyPayload.id && !isGatePassed('policyAccepted'))) {
-                _context3.next = 28;
+                _context6.next = 28;
                 break;
               }
               setPendingFormPayload(normalizedFormPayload);
@@ -393,79 +561,96 @@ function ReadyState() {
                 open: true,
                 content: normalizedPolicyPayload
               });
-              return _context3.abrupt("return");
+              return _context6.abrupt("return");
             case 28:
               if (!(normalizedFormPayload && !isGatePassed('formSubmitted'))) {
-                _context3.next = 31;
+                _context6.next = 31;
                 break;
               }
               openFormModal(normalizedFormPayload);
-              return _context3.abrupt("return");
+              return _context6.abrupt("return");
             case 31:
-              _context3.next = 33;
+              _context6.next = 33;
               return runEntryPaxGateThenEnterProduct();
             case 33:
-              _context3.next = 54;
+              _context6.next = 48;
               break;
             case 35:
               if (!isAdditionalOrder) {
-                _context3.next = 44;
-                break;
-              }
-              if (!hasOrderId) {
-                _context3.next = 41;
+                _context6.next = 40;
                 break;
               }
-              _context3.next = 39;
+              _context6.next = 38;
               return enterProductStep();
-            case 39:
-              _context3.next = 42;
-              break;
-            case 41:
-              handleOrderDetail(order_id);
-            case 42:
-              _context3.next = 54;
+            case 38:
+              _context6.next = 48;
               break;
-            case 44:
+            case 40:
               if (!(mode === 'submit_disabled')) {
-                _context3.next = 51;
+                _context6.next = 47;
                 break;
               }
               // 禁止下单模式：允许进入商品选择，但下一步按钮需被禁用，点击提示 errorTips
               tips = resolveLocalizedText(errorTips) || String(locales.getText('pisell2.scan.order.submit.disabled.default') || '');
               setSubmitDisabledTips(tips);
-              _context3.next = 49;
+              _context6.next = 45;
               return enterProductStep();
-            case 49:
-              _context3.next = 54;
+            case 45:
+              _context6.next = 48;
               break;
-            case 51:
-              // 其他情况，视为不在营业或者异常,返回异常提示
-              content = resolveLocalizedText(errorTips);
-              if (!content) {
-                if (mode === 'resource_busy') {
-                  content = String(locales.getText('pisell2.scan.order.resource.status.exception') || '');
+            case 47:
+              if (mode === 'resource_busy') {
+                // 如果资源是占用，则跳转到订单详情页
+                // 需要检测当前是否已经登录，如果未登录则先登录再跳转
+                // 若用户直接关闭登录弹窗（非登录成功），由于当前还卡在 initialize 步骤，
+                // 没有合法后续状态，统一兜底回首页避免卡死。
+                if (!isLogin) {
+                  // 登录回流意图：登录成功后 hydrate 阶段消费 pendingStep，避免卡在 init
+                  scanOrderModule === null || scanOrderModule === void 0 || (_scanOrderModule$setU = scanOrderModule.setUIState) === null || _scanOrderModule$setU === void 0 || _scanOrderModule$setU.call(scanOrderModule, 'pendingStep', currentStep);
+                  openLoginModal({
+                    callback: function callback(status) {
+                      var _scanOrderModule$dele2;
+                      if (status === 'success') {
+                        var _scanOrderModule$dele;
+                        scanOrderModule === null || scanOrderModule === void 0 || (_scanOrderModule$dele = scanOrderModule.deleteUIState) === null || _scanOrderModule$dele === void 0 || _scanOrderModule$dele.call(scanOrderModule, 'pendingStep');
+                        handleOrderDetail(order_id);
+                        return;
+                      }
+                      scanOrderModule === null || scanOrderModule === void 0 || (_scanOrderModule$dele2 = scanOrderModule.deleteUIState) === null || _scanOrderModule$dele2 === void 0 || _scanOrderModule$dele2.call(scanOrderModule, 'pendingStep');
+                      location.replace('/');
+                    }
+                  });
                 } else {
-                  content = String(locales.getText('pisell2.scan.order.store.status.exception') || '');
+                  handleOrderDetail(order_id);
                 }
-              }
-              Modal.info({
-                title: locales.getText('pisell2.scan.order.step.error'),
-                content: String(content || '').trim(),
-                okText: String(locales.getText('pisell2.event.confirm') || 'OK'),
-                maskClosable: false,
-                onOk: function onOk() {
-                  location.replace('/');
+              } else {
+                // 其他情况，视为不在营业或者异常,返回异常提示
+                content = resolveLocalizedText(errorTips);
+                if (!content) {
+                  if (mode === 'resource_block') {
+                    content = String(locales.getText('pisell2.scan.order.resource.status.exception') || '');
+                  } else {
+                    content = String(locales.getText('pisell2.scan.order.store.status.exception') || '');
+                  }
                 }
-              });
-            case 54:
+                Modal.info({
+                  title: locales.getText('pisell2.scan.order.step.error'),
+                  content: resolveLocalizedText(content).trim(),
+                  okText: String(locales.getText('pisell2.event.confirm') || 'OK'),
+                  maskClosable: false,
+                  onOk: function onOk() {
+                    location.replace('/');
+                  }
+                });
+              }
+            case 48:
             case "end":
-              return _context3.stop();
+              return _context6.stop();
           }
-        }, _callee3);
+        }, _callee6);
       }));
       return function checkResourceAvailable() {
-        return _ref5.apply(this, arguments);
+        return _ref8.apply(this, arguments);
       };
     }();
     // 等 ScanOrderProvider 的步骤缓存 hydrate 完成再跑，确保 gate 标记已就位
@@ -494,7 +679,9 @@ function ReadyState() {
     product: /*#__PURE__*/React.createElement(Menu, {
       onCheckout: function onCheckout() {
         return goToStep('check');
-      }
+      },
+      productList: productList,
+      onEnsureProductList: ensureProductListLoaded
     }),
     check: /*#__PURE__*/React.createElement(Check, null),
     error: /*#__PURE__*/React.createElement(ErrorState, {
@@ -564,22 +751,22 @@ function ReadyState() {
 
   // 跳转到订单确认页
   var gotoCheckOrder = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
       var _otherParams$dineInCo;
-      var firstFailure, failedProductIds, failureTips, otherParams, dineInConfig, isPauseOrder, _dineInConfig$availab;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      var firstFailure, failedProductIds, failureTips, otherParams, dineInConfig, isPauseOrder, _dineInConfig$availab, _scanOrderModule$setU2;
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             if (!submitDisabledTips) {
-              _context4.next = 3;
+              _context7.next = 3;
               break;
             }
             message.warning(submitDisabledTips, 2);
-            return _context4.abrupt("return");
+            return _context7.abrupt("return");
           case 3:
             firstFailure = Array.isArray(cartValidation === null || cartValidation === void 0 ? void 0 : cartValidation.failures) ? cartValidation.failures[0] : null;
             if (!((cartValidation === null || cartValidation === void 0 ? void 0 : cartValidation.passed) === false)) {
-              _context4.next = 10;
+              _context7.next = 10;
               break;
             }
             failedProductIds = getFirstFailedProductIds();
@@ -588,17 +775,17 @@ function ReadyState() {
             }
             failureTips = String((firstFailure === null || firstFailure === void 0 ? void 0 : firstFailure.validationMessage) || '').trim();
             message.warning(failureTips, 2);
-            return _context4.abrupt("return");
+            return _context7.abrupt("return");
           case 10:
-            _context4.next = 12;
+            _context7.next = 12;
             return runModuleAction('getOtherParams');
           case 12:
-            otherParams = _context4.sent;
+            otherParams = _context7.sent;
             console.log('otherParams >>>>> ', otherParams);
             dineInConfig = (_otherParams$dineInCo = otherParams === null || otherParams === void 0 ? void 0 : otherParams.dineInConfig) !== null && _otherParams$dineInCo !== void 0 ? _otherParams$dineInCo : {};
             isPauseOrder = dineInConfig === null || dineInConfig === void 0 ? void 0 : dineInConfig['availability.paused']; // 如果暂停接单直接弹提示，点完确定回首页
             if (!isPauseOrder) {
-              _context4.next = 19;
+              _context7.next = 19;
               break;
             }
             Modal.info({
@@ -609,28 +796,33 @@ function ReadyState() {
                 location.replace('/');
               }
             });
-            return _context4.abrupt("return");
+            return _context7.abrupt("return");
           case 19:
-            // 需要先确认当前是否登录，如果没有则需要登录
-            if (!isLogin) {
-              openLoginModal({
-                callback: function callback(status) {
-                  if (status === 'success') {
-                    goToStep('check');
-                  }
-                }
-              });
-            } else {
-              goToStep('check');
+            if (isLogin) {
+              _context7.next = 23;
+              break;
             }
-          case 20:
+            // 登录前落盘跳转意图：弹窗 callback 能触发时由本函数消费，
+            // 整页跳转回流时由 Provider 的 hydrate 消费（参见 venueBooking 同名实现）
+            scanOrderModule === null || scanOrderModule === void 0 || (_scanOrderModule$setU2 = scanOrderModule.setUIState) === null || _scanOrderModule$setU2 === void 0 || _scanOrderModule$setU2.call(scanOrderModule, 'pendingStep', 'check');
+            openLoginModal({
+              callback: function callback(status) {
+                var _scanOrderModule$dele3;
+                scanOrderModule === null || scanOrderModule === void 0 || (_scanOrderModule$dele3 = scanOrderModule.deleteUIState) === null || _scanOrderModule$dele3 === void 0 || _scanOrderModule$dele3.call(scanOrderModule, 'pendingStep');
+                if (status === 'success') goToStep('check');
+              }
+            });
+            return _context7.abrupt("return");
+          case 23:
+            goToStep('check');
+          case 24:
           case "end":
-            return _context4.stop();
+            return _context7.stop();
         }
-      }, _callee4);
+      }, _callee7);
     }));
     return function gotoCheckOrder() {
-      return _ref6.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var isMobileView = isMobile();