@pisell/private-materials 6.5.26 → 6.6.1

package/es/components/checkout/PaymentModal.js

@@ -17,7 +17,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useRef, useState, useEffect, useCallback, useMemo, useImperativeHandle, forwardRef } from 'react';
 import Decimal from 'decimal.js';
-import { locales } from '@pisell/utils';
+import { locales, webPrint } from '@pisell/utils';
 import { getLocale } from "../../utils/locales";
 import { useMemoizedFn } from 'ahooks';
 import { createPortal } from 'react-dom';
@@ -46,7 +46,6 @@ import { cloneDeep } from 'lodash';
 import { getShopWalletPassId, reorderPaymentMethodList } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
 import { Button } from 'antd';
-import usePrinter from "../../hooks/printer";
 import { DiscountKeyboard } from "../../pro/priceKeyboard";
 import { useActiveExecute } from "../ticketBooking/hooks/pisellos";
 
@@ -150,8 +149,6 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     walletPassData = _useState18[0],
     setWalletPassData = _useState18[1];
-  var _usePrinter = usePrinter(),
-    nativePrint = _usePrinter.nativePrint;
   var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
     syncingLock = _useState20[0],
@@ -806,12 +803,11 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 data: {
                   order_id: responseData.order_id,
                   machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                  small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data,
-                  machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
+                  small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment = responseData.payment_info) === null || _responseData$payment === void 0 ? void 0 : _responseData$payment.small_ticket_data
                 }
               };
               console.log('print_order_onOrderSynced_params>>>>', params);
-              nativePrint(params, function (res) {
+              webPrint(params, function (res) {
                 console.log('print_order_onOrderSynced_res>>>>', res);
               });
             } catch (error) {
@@ -1093,7 +1089,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
                 }
               };
               try {
-                nativePrint(params, function (res) {
+                webPrint(params, function (res) {
                   console.log('handleButtonClick_print-receipt_res>>>>', res);
                   if (!(res !== null && res !== void 0 && res.result)) {
                     Toast === null || Toast === void 0 || Toast.error((res === null || res === void 0 ? void 0 : res.msg) || '');
@@ -1414,15 +1410,17 @@ var PaymentModal = function PaymentModal(_ref18) {
     _useState34 = _slicedToArray(_useState33, 2),
     showRetryModal = _useState34[0],
     setShowRetryModal = _useState34[1];
-  var _useState35 = useState(editOrderId || 0),
+  var _useState35 = useState(false),
     _useState36 = _slicedToArray(_useState35, 2),
-    currentEditOrderId = _useState36[0],
-    _setCurrentEditOrderId = _useState36[1];
+    showCreateErrorModal = _useState36[0],
+    setShowCreateErrorModal = _useState36[1];
+  var _useState37 = useState(editOrderId || 0),
+    _useState38 = _slicedToArray(_useState37, 2),
+    currentEditOrderId = _useState38[0],
+    _setCurrentEditOrderId = _useState38[1];
   var _useActiveExecute2 = useActiveExecute(),
     executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
-  var _usePrinter2 = usePrinter(),
-    nativePrint = _usePrinter2.nativePrint;
 
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
@@ -1554,18 +1552,18 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState37 = useState(false),
-    _useState38 = _slicedToArray(_useState37, 2),
-    noteModalOpen = _useState38[0],
-    setNoteModalOpen = _useState38[1];
-  var _useState39 = useState(''),
+  var _useState39 = useState(false),
     _useState40 = _slicedToArray(_useState39, 2),
-    orderNote = _useState40[0],
-    setOrderNote = _useState40[1];
-  var _useState41 = useState('payment-content'),
+    noteModalOpen = _useState40[0],
+    setNoteModalOpen = _useState40[1];
+  var _useState41 = useState(''),
     _useState42 = _slicedToArray(_useState41, 2),
-    noteModalSource = _useState42[0],
-    setNoteModalSource = _useState42[1];
+    orderNote = _useState42[0],
+    setOrderNote = _useState42[1];
+  var _useState43 = useState('payment-content'),
+    _useState44 = _slicedToArray(_useState43, 2),
+    noteModalSource = _useState44[0],
+    setNoteModalSource = _useState44[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
@@ -2149,8 +2147,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                             data: {
                               order_id: responseData.order_id,
                               machine_code_print_info: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info,
-                              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data,
-                              machine_code_print_info_v2: responseData === null || responseData === void 0 ? void 0 : responseData.machine_code_print_info_v2
+                              small_ticket_data: responseData === null || responseData === void 0 || (_responseData$payment3 = responseData.payment_info) === null || _responseData$payment3 === void 0 ? void 0 : _responseData$payment3.small_ticket_data
                             }
                           };
                           console.log('print_order_onOrderSynced_params>>>>', params);
@@ -2161,7 +2158,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                               params: params
                             }
                           });
-                          nativePrint(params, function (res) {
+                          webPrint(params, function (res) {
                             console.log('print_order_onOrderSynced_res>>>>', res);
                             logger === null || logger === void 0 || logger.addLog({
                               type: 'info',
@@ -2295,7 +2292,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
             case 42:
-              _context23.next = 48;
+              _context23.next = 49;
               break;
             case 44:
               _context23.prev = 44;
@@ -2308,7 +2305,9 @@ var PaymentModal = function PaymentModal(_ref18) {
                   error: _context23.t0
                 }
               });
-            case 48:
+              // 如果订单创建失败，弹出提示让重新加载 app
+              setShowCreateErrorModal(true);
+            case 49:
             case "end":
               return _context23.stop();
           }
@@ -2440,7 +2439,7 @@ var PaymentModal = function PaymentModal(_ref18) {
                   }
                 };
                 try {
-                  nativePrint(params, function (res) {
+                  webPrint(params, function (res) {
                     console.log('handleButtonClick_print-receipt_res>>>>', res);
                     if (!(res !== null && res !== void 0 && res.result)) {
                       Toast === null || Toast === void 0 || Toast.error((res === null || res === void 0 ? void 0 : res.msg) || '');
@@ -2814,7 +2813,39 @@ var PaymentModal = function PaymentModal(_ref18) {
       width: '100%',
       marginTop: '80px'
     }
-  }, locales.getText('retry') || '重试'))));
+  }, locales.getText('retry') || '重试'))), /*#__PURE__*/React.createElement(PisellContainer, {
+    renderType: "modal",
+    props: {
+      open: showCreateErrorModal,
+      title: locales.getText('pisell2.checkout.tips'),
+      footer: null,
+      keyboard: false,
+      onCancel: function onCancel() {
+        setShowCreateErrorModal(false);
+      } // 禁用关闭
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      textAlign: 'center',
+      padding: '20px'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: '16px',
+      fontSize: '16px'
+    }
+  }, locales.getText('pisell2.checkout.order-create-failed')), /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    size: "large",
+    onClick: function onClick() {
+      setShowCreateErrorModal(false);
+      window.location.reload();
+    },
+    style: {
+      width: '100%',
+      marginTop: '80px'
+    }
+  }, locales.getText('confirm') || '确认'))));
 };
 
 // 导出类型供外部使用

package/es/components/checkout/components/CashPaymentModule/index.js

@@ -14,8 +14,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { locales, formatAmount } from '@pisell/utils';
 import checkoutLocales from "../../locales";
 import useToast from "../../../../hooks/useToast";
-import { useDebounceFn } from 'ahooks';
 import { CashKeyboard } from "../../../../pro/priceKeyboard";
+import { useDebounceFn } from 'ahooks';
 import "./index.less";
 export function CashPaymentModule(_ref) {
   var amountSymbol = _ref.amountSymbol,
@@ -65,12 +65,6 @@ export function CashPaymentModule(_ref) {
 
   // 检查是否应该禁用输入框：原本disabled为true 或者 订单金额为0
   var isInputDisabled = disabled || Number(customAmount || 0) === 0;
-  var handleAmountClick = function handleAmountClick(clickedAmount) {
-    if (isAmountButtonsDisabled) return;
-    var amountStr = clickedAmount.toString();
-    setAmount(amountStr);
-    setRoundingAmount(0);
-  };
   var handleCashPayInternal = function handleCashPayInternal() {
     if (isAmountButtonsDisabled) return;
     if (onPaymentComplete) {

package/es/components/checkout/components/ScrollableList/index.js

@@ -241,7 +241,6 @@ var ScrollableList = function ScrollableList(_ref) {
     style: getGridStyle()
   }, children)), isScrollable && /*#__PURE__*/React.createElement("button", {
     style: _objectSpread(_objectSpread({}, bottomGradientStyle), {}, {
-      width: '100%',
       border: 'none',
       background: 'linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #A78BE1 100%)'
     }, gradientStyle),

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

@@ -154,6 +154,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -322,6 +323,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -490,6 +492,7 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;

package/es/components/checkout/locales.js

@@ -200,6 +200,7 @@ export default {
     'pisell2.amount-summary.amount-cannot-be-zero': 'The amount cannot be 0',
     // Order sync errors
     'pisell2.checkout.order-sync-failed': 'Order sync failed, please check your network',
+    'pisell2.checkout.order-create-failed': 'Order create failed, please refresh app',
     'pisell2.checkout.sync-retry-hint': 'Network error, please click the retry button to resync the order',
     'pisell2.checkout.tips': 'Tips',
     'retry': 'Retry',
@@ -418,6 +419,7 @@ export default {
     'pisell2.amount-summary.amount-cannot-be-zero': '金额不能为0',
     // Order sync errors
     'pisell2.checkout.order-sync-failed': '订单同步失败，请检查网络',
+    'pisell2.checkout.order-create-failed': '订单创建失败，请重启APP',
     'pisell2.checkout.sync-retry-hint': '网络异常，请点击重试按钮重新同步订单',
     'pisell2.checkout.tips': '提示',
     'retry': '重试',
@@ -636,6 +638,7 @@ export default {
     'pisell2.amount-summary.amount-cannot-be-zero': '金額不能為0',
     // Order sync errors
     'pisell2.checkout.order-sync-failed': '訂單同步失敗，請檢查網絡',
+    'pisell2.checkout.order-create-failed': '订单创建失败，请重启APP',
     'pisell2.checkout.sync-retry-hint': '網絡異常，請點擊重試按鈕重新同步訂單',
     'pisell2.checkout.tips': '提示',
     'retry': '重試',

package/es/components/eftposPay/linkly/index.js

@@ -1,4 +1,7 @@
 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 _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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -6,7 +9,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useEffect, useRef } from 'react';
 import { Button } from 'antd';
-import { locales } from '@pisell/utils';
+import { locales, sendWarningLog } from '@pisell/utils';
 import { useContextData, useDispatch, updateCustom, updateState, updateNextStep } from "../store";
 import { useFail, useStoreRef } from "../hooks";
 import useEngineContext from "../../../hooks/useEngineContext";
@@ -101,6 +104,7 @@ var Linkly = function Linkly(_ref) {
     failRef.current = fail;
   }, [fail]);
   useEffect(function () {
+    var _utils$isTerminal, _utils$interaction;
     if (statusRef.current === StatusEnum.Success || statusRef.current === StatusEnum.Fail) {
       return;
     }
@@ -114,7 +118,65 @@ var Linkly = function Linkly(_ref) {
       resultQuery();
       return;
     }
-    payOrRefund(resultQuery, handleLinklySuccess);
+
+    // 如果是terminal环境，判定当前页面是否处于活跃状态
+    if (utils !== null && utils !== void 0 && (_utils$isTerminal = utils.isTerminal) !== null && _utils$isTerminal !== void 0 && _utils$isTerminal.call(utils) && utils !== null && utils !== void 0 && (_utils$interaction = utils.interaction) !== null && _utils$interaction !== void 0 && (_utils$interaction = _utils$interaction.utils) !== null && _utils$interaction !== void 0 && _utils$interaction.asyncDataManager) {
+      var _payOrRefund = /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var _utils$interaction2, _utils$interaction2$a, activeStatus;
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                _context.prev = 0;
+                _context.next = 3;
+                return utils === null || utils === void 0 || (_utils$interaction2 = utils.interaction) === null || _utils$interaction2 === void 0 || (_utils$interaction2 = _utils$interaction2.utils) === null || _utils$interaction2 === void 0 || (_utils$interaction2$a = _utils$interaction2.asyncDataManager) === null || _utils$interaction2$a === void 0 ? void 0 : _utils$interaction2$a.call(_utils$interaction2, {
+                  module: 'get',
+                  key: 'pay_webview_active'
+                });
+              case 3:
+                activeStatus = _context.sent;
+                // 强判定不为 unActive 则进行支付，为了兼容老版本
+                if (activeStatus !== 'unActive') {
+                  payOrRefund(resultQuery, handleLinklySuccess);
+                } else {
+                  sendWarningLog({
+                    title: 'Linkly-支付-当前页面非活跃状态，无法进行支付',
+                    content: [{
+                      key: 'response',
+                      value: JSON.stringify({
+                        activeStatus: activeStatus
+                      })
+                    }]
+                  });
+                }
+                _context.next = 11;
+                break;
+              case 7:
+                _context.prev = 7;
+                _context.t0 = _context["catch"](0);
+                sendWarningLog({
+                  title: 'Linkly-支付-获取当前页面活跃状态失败',
+                  content: [{
+                    key: 'error',
+                    value: JSON.stringify(_context.t0)
+                  }]
+                });
+                // 如果获取活跃状态失败，则进行支付，防止流程卡死
+                payOrRefund(resultQuery, handleLinklySuccess);
+              case 11:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee, null, [[0, 7]]);
+        }));
+        return function _payOrRefund() {
+          return _ref2.apply(this, arguments);
+        };
+      }();
+      _payOrRefund();
+    } else {
+      payOrRefund(resultQuery, handleLinklySuccess);
+    }
   }, []);
   useEffect(function () {
     return function () {

package/es/components/eftposPay/tyro/index.js

@@ -180,6 +180,12 @@ export default (function (_ref) {
       response: {},
       metadata: {
         receipt: []
+      },
+      _config: {
+        retry: {
+          count: 10,
+          delay: 500
+        }
       }
     }).then(function (res) {
       requestIdRef.current = res.data.id;
@@ -254,6 +260,12 @@ export default (function (_ref) {
       response: {},
       metadata: {
         receipt: []
+      },
+      _config: {
+        retry: {
+          count: 10,
+          delay: 500
+        }
       }
     }).then(function (res) {
       requestIdRef.current = res.data.id;

package/es/components/list/List.js

@@ -179,6 +179,9 @@ var List = function List(props) {
   var processedData = useMemo(function () {
     // 如果正在加载且没有数据，使用模拟数据
     var sourceData = loading ? MOCK_LIST_DATA : data || [];
+    console.log("processedData recalculating: tabStyle=".concat(tabStyle, ", activeTab=").concat(activeTab, ", tabItems=").concat(tabItems.length, ", dataLength=").concat(sourceData.length));
+    console.log("sourceData sample: ".concat(JSON.stringify(sourceData.slice(0, 2), null, 2)));
+    console.log("tabGroup: ".concat(tabGroup));
 
     // 如果tab样式是anchor，需要按分组显示数据
     if (tabStyle === 'anchor' && tabItems.length > 0) {

package/es/components/pay/toB/components/MX51/index.js

@@ -1,6 +1,6 @@
 import { forwardRef, useImperativeHandle } from 'react';
+import { webPayment } from '@pisell/utils';
 import useLogger from "../../../../../hooks/useLogger";
-import useEngineContext from "../../../../../hooks/useEngineContext";
 var getUuid = function getUuid() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0;
@@ -9,10 +9,7 @@ var getUuid = function getUuid() {
   });
 };
 var MX51 = function MX51(props, ref) {
-  var _context$appHelper;
   var logger = useLogger();
-  var context = useEngineContext();
-  var action = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.action;
   var onOpen = function onOpen(_ref) {
     var data = _ref.data,
       payCallback = _ref.payCallback;
@@ -36,47 +33,20 @@ var MX51 = function MX51(props, ref) {
         params: newData
       }
     });
-
-    // 通过action调用mx51支付
-    action({
-      type: 'webpos.handleMX51Pay',
-      data: newData,
-      callback: function callback(res) {
-        var isSame = false;
-        if (res !== null && res !== void 0 && res.uniquePaymentNumber) {
-          // jsbridge调用场景结果
-          var _res = res;
-          // 判断是否是同一个支付
-          isSame = (_res === null || _res === void 0 ? void 0 : _res.uniquePaymentNumber) === uniquePaymentNumber;
-          if (isSame) {
-            payCallback === null || payCallback === void 0 || payCallback(_res);
-          }
-        } else {
-          var _res2$data, _res2$data2;
-          // 原生调用场景结果
-          var _res2 = res;
-          // 转换为MX51PayResult类型，上层调用需要
-          var newRes = {
-            result: (_res2 === null || _res2 === void 0 ? void 0 : _res2.code) == '200' ? true : false,
-            msg: _res2 === null || _res2 === void 0 ? void 0 : _res2.msg,
-            amount: _res2 === null || _res2 === void 0 || (_res2$data = _res2.data) === null || _res2$data === void 0 ? void 0 : _res2$data.amount,
-            surcharge: _res2 === null || _res2 === void 0 || (_res2$data2 = _res2.data) === null || _res2$data2 === void 0 ? void 0 : _res2$data2.surcharge,
-            uniquePaymentNumber: _res2 === null || _res2 === void 0 ? void 0 : _res2.uuid
-          };
-          // 判断是否是同一个支付
-          isSame = (_res2 === null || _res2 === void 0 ? void 0 : _res2.uuid) === uniquePaymentNumber;
-          if (isSame) {
-            payCallback === null || payCallback === void 0 || payCallback(newRes);
-          }
+    // 通过jsbridge调用mx51支付
+    webPayment(newData, function (res) {
+      // 判断是否是同一个支付
+      var isSame = (res === null || res === void 0 ? void 0 : res.uniquePaymentNumber) === uniquePaymentNumber;
+      logger === null || logger === void 0 || logger.addLog({
+        type: 'info',
+        title: 'ToB_MX51_onOpen_callback',
+        metadata: {
+          msg: isSame ? 'uniquePaymentNumber一致' : 'uniquePaymentNumber不一致',
+          res: res
         }
-        logger === null || logger === void 0 || logger.addLog({
-          type: 'info',
-          title: 'ToB_MX51_onOpen_callback',
-          metadata: {
-            msg: isSame ? '交易流水号一致' : '交易流水号不一致',
-            res: res
-          }
-        });
+      });
+      if (isSame) {
+        payCallback === null || payCallback === void 0 || payCallback(res);
       }
     });
   };

package/es/components/pay/toB/types/index.d.ts

@@ -58,15 +58,3 @@ export interface MX51PayResult {
     surcharge: number;
     uniquePaymentNumber: string;
 }
-/**
- * @title 原生MX51支付结果
- */
-export interface NativeMX51PayResult {
-    code: string;
-    msg?: string;
-    data: {
-        amount: number;
-        surcharge: number;
-    };
-    uuid: string;
-}

package/es/components/pay/toB/types/index.js

@@ -11,8 +11,4 @@ export * from "./storeTypes";
 /**
  * @title: MX51支付结果
  */
-
-/**
- * @title 原生MX51支付结果
- */
 export {};

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

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

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

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

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

@@ -1,18 +1,6 @@
 .sku-list-container {
   height: 100%;
   background-color: #4e4e4e;
-  .empty-content {
-    .empty-icon-wrapper {
-      .empty-default-icon {
-        color: rgba(255, 255, 255, 0.8) !important;
-      }
-    }
-    .empty-inner {
-      .empty-text {
-        color: rgba(255, 255, 255, 0.8) !important;
-      }
-    }
-  }
   .sku-list {
     background-color: #4e4e4e;
     overflow: auto;

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

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