@pisell/private-materials 6.3.136 → 6.3.138

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

@@ -1,13 +1,14 @@
 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 _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 _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; }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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 { isMobile, locales } from '@pisell/utils';
 import { Modal } from 'antd';
@@ -24,6 +25,38 @@ import Check from "../Check";
 import PolicyModal from "../../../appointmentBooking/deposit/components/PolicyModal";
 import useComponents from "../../../../hooks/useComponents";
 import "./index.less";
+/** 从 pisell1.handlePaxModal 的 callback 入参中解析人数（兼容数字、字符串或对象字段） */
+function extractEntryPaxNumber(payload) {
+  if (payload == null) return null;
+  if (typeof payload === 'number' && Number.isFinite(payload) && payload >= 1) {
+    return Math.floor(payload);
+  }
+  if (typeof payload === 'string') {
+    var n = Number(payload);
+    if (Number.isFinite(n) && n >= 1) return Math.floor(n);
+  }
+  if (_typeof(payload) === 'object') {
+    var o = payload;
+    var _iterator = _createForOfIteratorHelper(['entryPaxNumber', 'pax', 'num', 'count', 'value']),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var k = _step.value;
+        var v = o[k];
+        if (typeof v === 'number' && Number.isFinite(v) && v >= 1) return Math.floor(v);
+        if (typeof v === 'string') {
+          var _n = Number(v);
+          if (Number.isFinite(_n) && _n >= 1) return Math.floor(_n);
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+  return null;
+}
 function ReadyState() {
   var _formModal$content, _formModal$content2, _formModal$content3, _formModal$content4;
   var _useScanOrderContext = useScanOrderContext(),
@@ -69,6 +102,22 @@ function ReadyState() {
     _useState8 = _slicedToArray(_useState7, 2),
     pendingFormPayload = _useState8[0],
     setPendingFormPayload = _useState8[1];
+  var _useState9 = useState('default'),
+    _useState10 = _slicedToArray(_useState9, 2),
+    entryMode = _useState10[0],
+    setEntryMode = _useState10[1];
+  /** checkResourceAvailable 返回 requestEntryPax === 1 时，在协议/表单之后弹人数并写入 scanOrder otherParams */
+  var requestEntryPaxRef = useRef(0);
+  var requestPaxMinRef = useRef(1);
+  var requestPaxMaxRef = useRef(1);
+  var tableFormRecordRef = useRef(null);
+
+  /** 根据当前语言从多语言 name 对象中取值，兜底 original -> en -> 空串 */
+  var getLocalizedName = function getLocalizedName(nameMap) {
+    if (!nameMap) return '';
+    var currentLocale = locales.getLocale();
+    return nameMap[currentLocale] || nameMap.original || nameMap.en || '';
+  };
   var normalizeFormPayload = function normalizeFormPayload(formPayload, partyroomBookingPayload) {
     var _ref, _ref2, _sourcePayload$id;
     var sourcePayload = formPayload !== null && formPayload !== void 0 ? formPayload : partyroomBookingPayload;
@@ -91,6 +140,17 @@ function ReadyState() {
     var link = "/order/details?id=".concat(order_id);
     location.replace(link);
   };
+  var handleBack = function handleBack() {
+    if (currentStep !== 'product') {
+      prevStep();
+      return;
+    }
+    if (entryMode === 'additional_order' && entryContext !== null && entryContext !== void 0 && entryContext.order_id) {
+      handleOrderDetail(entryContext.order_id);
+      return;
+    }
+    location.replace('/');
+  };
   var enterProductStep = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -123,6 +183,74 @@ function ReadyState() {
       return _ref3.apply(this, arguments);
     };
   }();
+
+  /** 需要时先走人数弹窗与 setOtherParams(entryPaxNumber)，再进入商品步 */
+  var runEntryPaxGateThenEnterProduct = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var pax;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(requestEntryPaxRef.current !== 1)) {
+              _context2.next = 4;
+              break;
+            }
+            _context2.next = 3;
+            return enterProductStep();
+          case 3:
+            return _context2.abrupt("return");
+          case 4:
+            _context2.next = 6;
+            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 6:
+            pax = _context2.sent;
+            if (!(pax == null)) {
+              _context2.next = 10;
+              break;
+            }
+            location.replace('/');
+            return _context2.abrupt("return");
+          case 10:
+            _context2.prev = 10;
+            _context2.next = 13;
+            return runModuleAction('setEntryPaxNumber', pax);
+          case 13:
+            _context2.next = 18;
+            break;
+          case 15:
+            _context2.prev = 15;
+            _context2.t0 = _context2["catch"](10);
+            console.warn('[scanOrder] setOtherParams failed', _context2.t0);
+          case 18:
+            _context2.next = 20;
+            return enterProductStep();
+          case 20:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[10, 15]]);
+    }));
+    return function runEntryPaxGateThenEnterProduct() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   var closePolicyAndBack = function closePolicyAndBack() {
     setPolicyModal({
       open: false,
@@ -155,7 +283,7 @@ function ReadyState() {
       content: null
     });
     setPendingFormPayload(null);
-    void enterProductStep();
+    void runEntryPaxGateThenEnterProduct();
   };
   var handleFormConfirm = function handleFormConfirm() {
     var _formModalRef$current, _formModalRef$current2;
@@ -172,7 +300,7 @@ function ReadyState() {
       openFormModal(pendingFormPayload);
       return;
     }
-    void enterProductStep();
+    void runEntryPaxGateThenEnterProduct();
   };
   var depositProtocolRequest = function depositProtocolRequest(id) {
     var _utils$request, _utils$request$get;
@@ -180,36 +308,43 @@ function ReadyState() {
   };
   useEffect(function () {
     var checkResourceAvailable = /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var hasOrderId, _yield$runModuleActio, mode, order_id, errorTips, policy, form, partyroom_booking, normalizedFormPayload, normalizedPolicyPayload, content;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      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, content;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               hasOrderId = !!(entryContext !== null && entryContext !== void 0 && entryContext.order_id);
-              _context2.next = 3;
+              _context3.next = 3;
               return runModuleAction('checkResourceAvailable', entryContext === null || entryContext === void 0 ? void 0 : entryContext.resource_id, hasOrderId);
             case 3:
-              _yield$runModuleActio = _context2.sent;
+              _yield$runModuleActio = _context3.sent;
               mode = _yield$runModuleActio.mode;
               order_id = _yield$runModuleActio.order_id;
               errorTips = _yield$runModuleActio.errorTips;
               policy = _yield$runModuleActio.policy;
               form = _yield$runModuleActio.form;
               partyroom_booking = _yield$runModuleActio.partyroom_booking;
-              normalizedFormPayload = normalizeFormPayload(form, partyroom_booking); // 资源空闲或者是加单模式，进入商品选择
-              if (!(mode === 'idle' || mode === 'additional_order' || mode === 'additional_order_with_code')) {
-                _context2.next = 25;
+              requestEntryPax = _yield$runModuleActio.requestEntryPax;
+              requestPaxMin = _yield$runModuleActio.requestPaxMin;
+              requestPaxMax = _yield$runModuleActio.requestPaxMax;
+              table_form_record = _yield$runModuleActio.table_form_record;
+              requestEntryPaxRef.current = Number(requestEntryPax) === 1 ? 1 : 0;
+              requestPaxMinRef.current = Number(requestPaxMin) || 1;
+              requestPaxMaxRef.current = Number(requestPaxMax) || 1;
+              tableFormRecordRef.current = table_form_record || {};
+              normalizedFormPayload = normalizeFormPayload(form, partyroom_booking);
+              isAdditionalOrder = mode === 'additional_order' || mode === 'additional_order_with_code';
+              setEntryMode(isAdditionalOrder ? 'additional_order' : 'default');
+              // 资源空闲：按需依次弹 协议 -> 表单 -> 人数，最后进入商品选择
+              if (!(mode === 'idle')) {
+                _context3.next = 34;
                 break;
               }
               normalizedPolicyPayload = _typeof(policy) === 'object' && policy !== null ? policy : {
                 id: policy
-              }; // 加餐不需要显示协议和表单
-              if (!(mode === 'idle')) {
-                _context2.next = 21;
-                break;
-              }
+              };
               if (!(normalizedPolicyPayload !== null && normalizedPolicyPayload !== void 0 && normalizedPolicyPayload.id)) {
-                _context2.next = 18;
+                _context3.next = 27;
                 break;
               }
               setPendingFormPayload(normalizedFormPayload);
@@ -217,21 +352,31 @@ function ReadyState() {
                 open: true,
                 content: normalizedPolicyPayload
               });
-              return _context2.abrupt("return");
-            case 18:
+              return _context3.abrupt("return");
+            case 27:
               if (!normalizedFormPayload) {
-                _context2.next = 21;
+                _context3.next = 30;
                 break;
               }
               openFormModal(normalizedFormPayload);
-              return _context2.abrupt("return");
-            case 21:
-              _context2.next = 23;
+              return _context3.abrupt("return");
+            case 30:
+              _context3.next = 32;
+              return runEntryPaxGateThenEnterProduct();
+            case 32:
+              _context3.next = 40;
+              break;
+            case 34:
+              if (!isAdditionalOrder) {
+                _context3.next = 39;
+                break;
+              }
+              _context3.next = 37;
               return enterProductStep();
-            case 23:
-              _context2.next = 26;
+            case 37:
+              _context3.next = 40;
               break;
-            case 25:
+            case 39:
               if (mode === 'resource_busy') {
                 // 如果资源是占用，则跳转到订单详情页
                 // 需要检测当前是否已经登录，如果未登录则先登录再跳转
@@ -266,14 +411,14 @@ function ReadyState() {
                   }
                 });
               }
-            case 26:
+            case 40:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2);
+        }, _callee3);
       }));
       return function checkResourceAvailable() {
-        return _ref4.apply(this, arguments);
+        return _ref5.apply(this, arguments);
       };
     }();
     checkResourceAvailable();
@@ -307,63 +452,100 @@ function ReadyState() {
       message: locales.getText('pisell2.scan.order.store.status.exception')
     })
   };
-  var getFirstFailedProductId = function getFirstFailedProductId() {
+  var getFirstFailedProductIds = function getFirstFailedProductIds() {
     var firstFailure = Array.isArray(cartValidation === null || cartValidation === void 0 ? void 0 : cartValidation.failures) ? cartValidation.failures[0] : null;
-    var firstFailedTarget = Array.isArray(firstFailure === null || firstFailure === void 0 ? void 0 : firstFailure.targets) ? firstFailure.targets[0] : null;
-    var firstFailedProductId = Number(firstFailedTarget === null || firstFailedTarget === void 0 ? void 0 : firstFailedTarget.product_id);
-    if (!Number.isFinite(firstFailedProductId) || firstFailedProductId <= 0) {
-      return null;
+    var targets = Array.isArray(firstFailure === null || firstFailure === void 0 ? void 0 : firstFailure.targets) ? firstFailure.targets : [];
+    var ids = [];
+    var seen = new Set();
+    var _iterator2 = _createForOfIteratorHelper(targets),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var target = _step2.value;
+        var id = Number(target === null || target === void 0 ? void 0 : target.product_id);
+        if (Number.isFinite(id) && id > 0 && !seen.has(id)) {
+          seen.add(id);
+          ids.push(id);
+        }
+      }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
     }
-    return firstFailedProductId;
+    return ids;
   };
-  var scrollAndHighlightProductById = function scrollAndHighlightProductById(productId) {
-    var failedProductElement = document.querySelector("[data-product-id=\"".concat(String(productId), "\"]"));
-    if (!failedProductElement) return false;
-    failedProductElement.classList.remove('highlight-product-item');
-    failedProductElement.scrollIntoView({
-      behavior: 'smooth',
-      block: 'center'
-    });
-    failedProductElement.classList.add('highlight-product-item');
-    setTimeout(function () {
-      failedProductElement.classList.remove('highlight-product-item');
-    }, 3000);
-    return true;
+  var scrollAndHighlightProductsByIds = function scrollAndHighlightProductsByIds(productIds) {
+    if (!(productIds !== null && productIds !== void 0 && productIds.length)) return false;
+    var scrolled = false;
+    var highlighted = false;
+    var _iterator3 = _createForOfIteratorHelper(productIds),
+      _step3;
+    try {
+      var _loop = function _loop() {
+        var productId = _step3.value;
+        var failedProductElement = document.querySelector("[data-product-id=\"".concat(String(productId), "\"]"));
+        if (!failedProductElement) return 1; // continue
+        failedProductElement.classList.remove('highlight-product-item');
+        if (!scrolled) {
+          failedProductElement.scrollIntoView({
+            behavior: 'smooth',
+            block: 'center'
+          });
+          scrolled = true;
+        }
+        // 触发重绘，确保动画从头播放
+        void failedProductElement.offsetWidth;
+        failedProductElement.classList.add('highlight-product-item');
+        setTimeout(function () {
+          failedProductElement.classList.remove('highlight-product-item');
+        }, 3000);
+        highlighted = true;
+      };
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        if (_loop()) continue;
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
+    return highlighted;
   };
 
   // 跳转到订单确认页
   var gotoCheckOrder = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _otherParams$dineInCo;
-      var firstFailure, firstFailedProductId, failureTips, otherParams, dineInConfig, isPauseOrder, _dineInConfig$availab;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      var firstFailure, failedProductIds, failureTips, otherParams, dineInConfig, isPauseOrder, _dineInConfig$availab;
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             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)) {
-              _context3.next = 7;
+              _context4.next = 7;
               break;
             }
-            firstFailedProductId = getFirstFailedProductId();
-            if (firstFailedProductId) {
-              scrollAndHighlightProductById(firstFailedProductId);
+            failedProductIds = getFirstFailedProductIds();
+            if (failedProductIds.length) {
+              scrollAndHighlightProductsByIds(failedProductIds);
             }
             failureTips = String((firstFailure === null || firstFailure === void 0 ? void 0 : firstFailure.validationMessage) || '').trim();
             PisellToast({
               content: failureTips,
               duration: 2
             });
-            return _context3.abrupt("return");
+            return _context4.abrupt("return");
           case 7:
-            _context3.next = 9;
+            _context4.next = 9;
             return runModuleAction('getOtherParams');
           case 9:
-            otherParams = _context3.sent;
+            otherParams = _context4.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) {
-              _context3.next = 16;
+              _context4.next = 16;
               break;
             }
             Modal.info({
@@ -374,7 +556,7 @@ function ReadyState() {
                 location.replace('/');
               }
             });
-            return _context3.abrupt("return");
+            return _context4.abrupt("return");
           case 16:
             // 需要先确认当前是否登录，如果没有则需要登录
             if (!isLogin) {
@@ -390,12 +572,12 @@ function ReadyState() {
             }
           case 17:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function gotoCheckOrder() {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var isMobileView = isMobile();
@@ -409,7 +591,7 @@ function ReadyState() {
   }, [currentStep, isMobileView]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Header, {
     currentStep: currentStep,
-    onBack: prevStep
+    onBack: handleBack
   }), /*#__PURE__*/React.createElement("div", {
     className: "pisell-scan-order-content-wrap ".concat(isMobileView ? 'pisell-scan-order-content-mobile-wrap' : ''),
     "data-cart-validation-passed": String(cartValidation === null || cartValidation === void 0 ? void 0 : cartValidation.passed)

package/es/components/scanOrder/context.js

@@ -251,38 +251,26 @@ export function ScanOrderProvider(_ref) {
               return scanOrderModule.getPageConfig(entryContext);
             case 18:
               _context5.next = 20;
-              return safeRunModuleAction(scanOrderModule, 'setItemRuleRuntimeConfig', {
-                pax: {
-                  total: 2,
-                  adult: 2,
-                  child: 0
-                },
-                serviceType: 'dine-in',
-                submissionIndex: 0,
-                historicalItems: []
-              });
-            case 20:
-              _context5.next = 22;
               return refreshViewModel();
-            case 22:
+            case 20:
               if (!unmounted) {
                 setErrorMessage('');
                 setIsLoading(false);
               }
-              _context5.next = 28;
+              _context5.next = 26;
               break;
-            case 25:
-              _context5.prev = 25;
+            case 23:
+              _context5.prev = 23;
               _context5.t1 = _context5["catch"](0);
               if (!unmounted) {
                 setErrorMessage((_context5.t1 === null || _context5.t1 === void 0 ? void 0 : _context5.t1.message) || 'scanOrder load failed');
                 setIsLoading(false);
               }
-            case 28:
+            case 26:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, null, [[0, 25]]);
+        }, _callee5, null, [[0, 23]]);
       }));
       return function bootstrap() {
         return _ref6.apply(this, arguments);

package/es/components/scanOrder/utils/toShoppingCartProducts.d.ts

@@ -2,8 +2,9 @@ interface ScanOrderOrderProduct {
     product_id: number | null;
     product_variant_id: number;
     num?: number;
-    payment_price?: string | number;
+    /** 券后单品单价（订单域成交单价）。 */
     selling_price?: string | number;
+    /** 券前单品单价（店铺售价）。 */
     original_price?: string | number;
     product_option_item?: any[];
     product_bundle?: any[];

package/es/components/scanOrder/utils/toShoppingCartProducts.js

@@ -14,23 +14,29 @@ function getDisplayName(product) {
   var origin = (product === null || product === void 0 ? void 0 : product._origin) || {};
   var callbackData = (origin === null || origin === void 0 ? void 0 : origin.callbackData) || {};
   var callbackOrigin = (callbackData === null || callbackData === void 0 ? void 0 : callbackData.origin) || {};
-  return (callbackData === null || callbackData === void 0 ? void 0 : callbackData.name) || (callbackData === null || callbackData === void 0 ? void 0 : callbackData.title) || (callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.name) || (callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.title) || (origin === null || origin === void 0 ? void 0 : origin.name) || (origin === null || origin === void 0 ? void 0 : origin.title) || (origin === null || origin === void 0 || (_origin$resources = origin.resources) === null || _origin$resources === void 0 || (_origin$resources = _origin$resources[0]) === null || _origin$resources === void 0 ? void 0 : _origin$resources.main_field) || (product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.resource_name) || "Product #".concat((_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : 'unknown');
+  var sourceItem = (origin === null || origin === void 0 ? void 0 : origin.sourceItem) || {};
+  return (callbackData === null || callbackData === void 0 ? void 0 : callbackData.name) || (callbackData === null || callbackData === void 0 ? void 0 : callbackData.title) || (callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.name) || (callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.title) || (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.name) || (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.title) || (origin === null || origin === void 0 ? void 0 : origin.name) || (origin === null || origin === void 0 ? void 0 : origin.title) || (origin === null || origin === void 0 || (_origin$resources = origin.resources) === null || _origin$resources === void 0 || (_origin$resources = _origin$resources[0]) === null || _origin$resources === void 0 ? void 0 : _origin$resources.main_field) || (product === null || product === void 0 || (_product$metadata = product.metadata) === null || _product$metadata === void 0 ? void 0 : _product$metadata.resource_name) || "Product #".concat((_product$product_id = product.product_id) !== null && _product$product_id !== void 0 ? _product$product_id : 'unknown');
 }
 function getDisplayImage(product) {
   var origin = (product === null || product === void 0 ? void 0 : product._origin) || {};
   var callbackData = (origin === null || origin === void 0 ? void 0 : origin.callbackData) || {};
   var callbackOrigin = (callbackData === null || callbackData === void 0 ? void 0 : callbackData.origin) || {};
-  return (callbackData === null || callbackData === void 0 ? void 0 : callbackData.image) || (callbackData === null || callbackData === void 0 ? void 0 : callbackData.cover) || (callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.image) || (callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.cover) || (origin === null || origin === void 0 ? void 0 : origin.image) || (origin === null || origin === void 0 ? void 0 : origin.cover) || '';
+  var sourceItem = (origin === null || origin === void 0 ? void 0 : origin.sourceItem) || {};
+  return (callbackData === null || callbackData === void 0 ? void 0 : callbackData.image) || (callbackData === null || callbackData === void 0 ? void 0 : callbackData.cover) || (callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.image) || (callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.cover) || (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.image) || (sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.cover) || (origin === null || origin === void 0 ? void 0 : origin.image) || (origin === null || origin === void 0 ? void 0 : origin.cover) || '';
 }
 function getUnitPrice(product) {
-  var origin = (product === null || product === void 0 ? void 0 : product._origin) || {};
-  var callbackData = (origin === null || origin === void 0 ? void 0 : origin.callbackData) || {};
+  var _product$_origin, _product$_origin2;
+  var callbackData = (product === null || product === void 0 || (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.callbackData) || {};
   var callbackOrigin = (callbackData === null || callbackData === void 0 ? void 0 : callbackData.origin) || {};
-  return toNumber(product.payment_price, NaN) || toNumber(product.selling_price, NaN) || toNumber(product.original_price, NaN) || toNumber(callbackData === null || callbackData === void 0 ? void 0 : callbackData.price, NaN) || toNumber(callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.price, NaN) || toNumber(origin === null || origin === void 0 ? void 0 : origin.price, NaN) || toNumber(origin === null || origin === void 0 ? void 0 : origin.selling_price, NaN) || toNumber(origin === null || origin === void 0 ? void 0 : origin.base_price, 0);
+  var sourceItem = (product === null || product === void 0 || (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.sourceItem) || {};
+  // 注：本地临时订单链路不再用 payment_price 作为展示单价。
+  // payment_price 语义为「券后单价」，仅用于订单提交，不参与购物车展示；
+  // 券带来的节省由 origin_total 与 total 的对照以及 SubTotal 汇总体现。
+  return toNumber(product.selling_price, NaN) || toNumber(product.original_price, NaN) || toNumber(callbackData === null || callbackData === void 0 ? void 0 : callbackData.price, NaN) || toNumber(callbackOrigin === null || callbackOrigin === void 0 ? void 0 : callbackOrigin.price, NaN) || toNumber(sourceItem === null || sourceItem === void 0 ? void 0 : sourceItem.price, 0);
 }
 function normalizeOptions(product) {
-  var _product$_origin;
-  var callbackData = (product === null || product === void 0 || (_product$_origin = product._origin) === null || _product$_origin === void 0 ? void 0 : _product$_origin.callbackData) || {};
+  var _product$_origin3;
+  var callbackData = (product === null || product === void 0 || (_product$_origin3 = product._origin) === null || _product$_origin3 === void 0 ? void 0 : _product$_origin3.callbackData) || {};
   var sourceOptions = Array.isArray(callbackData === null || callbackData === void 0 ? void 0 : callbackData.option) ? callbackData.option : (product === null || product === void 0 ? void 0 : product.product_option_item) || [];
   return sourceOptions.map(function (optionItem) {
     var _optionItem$product_o;
@@ -47,8 +53,8 @@ function normalizeOptions(product) {
   });
 }
 function normalizeBundles(product) {
-  var _product$_origin2;
-  var callbackData = (product === null || product === void 0 || (_product$_origin2 = product._origin) === null || _product$_origin2 === void 0 ? void 0 : _product$_origin2.callbackData) || {};
+  var _product$_origin4;
+  var callbackData = (product === null || product === void 0 || (_product$_origin4 = product._origin) === null || _product$_origin4 === void 0 ? void 0 : _product$_origin4.callbackData) || {};
   var sourceBundles = Array.isArray(callbackData === null || callbackData === void 0 ? void 0 : callbackData.bundle) ? callbackData.bundle : (product === null || product === void 0 ? void 0 : product.product_bundle) || [];
   return sourceBundles.map(function (bundleItem, bundleIndex) {
     var _ref, _bundleItem$price, _bundleItem$id;

package/es/components/scanOrder/utils/transformProductDetail.d.ts

@@ -43,9 +43,10 @@ export interface ScanOrderOrderProductInput {
         price: number;
     }>;
     product_bundle: ProductDetailBundleItem[];
+    /** 券后单品单价；初次加购由入口置为 selling_price，之后由 SDK Rules 引擎维护。 */
     selling_price: string;
+    /** 券前单品单价（店铺售价）。 */
     original_price: string;
-    payment_price: string;
     tax_fee: string;
     is_charge_tax: number;
     metadata: Record<string, any>;