@pisell/private-materials 6.6.62 → 6.6.63

package/es/components/eftposPay/device.js

@@ -4,6 +4,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -11,16 +14,18 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { locales } from '@pisell/utils';
-import { useMount } from 'ahooks';
+import { useMount, useUnmount } from 'ahooks';
 import { Spin, message } from 'antd';
-import React, { useState } from 'react';
+import React, { useState, useRef } from 'react';
 import Titlebar from "./component/header/titlebar";
-import { ModeEnum } from "./const";
+import { ModeEnum, EftposEnum } from "./const";
 import { getPayAmonunt } from "./helper";
 import ChevronRight from '@pisell/icon/es/ChevronRight';
 import { useDispatch, useContextData, updateDevice, updateState } from "./store";
 import { getAmonunt } from "./manufacturer";
 import "./device.less";
+import useEngineContext from "../../hooks/useEngineContext";
+import payLog from "./utils/payLog";
 
 /**
  * @title: 设备选择页
@@ -45,11 +50,16 @@ export default (function (_ref) {
     } : _ref$formatAmount,
     _ref$containerStyle = _ref.containerStyle,
     containerStyle = _ref$containerStyle === void 0 ? {} : _ref$containerStyle;
+  var context = useEngineContext();
+  var _ref2 = context.appHelper.utils || {},
+    isTerminal = _ref2.isTerminal,
+    interaction = _ref2.interaction;
   var store = useContextData();
   var device = store.device,
     symbol = store.symbol,
     mode = store.mode,
-    eftpos = store.eftpos;
+    eftpos = store.eftpos,
+    order_id = store.order_id;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -63,6 +73,7 @@ export default (function (_ref) {
     list = _useState6[0],
     setList = _useState6[1];
   var dispatch = useDispatch();
+  var timerRef = useRef();
 
   /**
    * @title: 设备选择事件
@@ -71,6 +82,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 13:02
    */
   var onClick = function onClick(event) {
+    var _list$index;
     if (!net) {
       message.open({
         key: 'net-warning',
@@ -79,11 +91,59 @@ export default (function (_ref) {
       });
       return;
     }
-    var _ref2 = [Number(event.currentTarget.dataset.index)],
-      index = _ref2[0];
+    var _ref3 = [Number(event.currentTarget.dataset.index)],
+      index = _ref3[0];
+    payLog.log('手动选择设备', {
+      deviceId: (_list$index = list[index]) === null || _list$index === void 0 ? void 0 : _list$index.id,
+      index: index
+    });
     setDevice(list[index]);
   };
 
+  /**
+   * @title 控制原生关闭按钮的显示与隐藏
+   * @description hide_close_button:隐藏关闭按钮 show_close_button:显示关闭按钮
+   * @param bool 是否显示关闭按钮
+   */
+  var triggerCloseButton = function triggerCloseButton(bool) {
+    var _interaction$utils, _interaction$utils$po;
+    if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
+      return;
+    }
+    interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
+      module: 'pos',
+      key: 'other',
+      data: {
+        key: bool ? 'show_close_button' : 'hide_close_button'
+      }
+    });
+  };
+
+  /**
+   * @title 隐藏原生关闭按钮，delay后再显示
+   * @description Terminal环境，进入设备列表页面初始化默认关闭原生弹窗的loading，5s后如果还是没有调用成功再放开
+   */
+  var closeFirstWithDelayShow = function closeFirstWithDelayShow() {
+    timerRef.current && clearTimeout(timerRef.current);
+    if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
+      return;
+    }
+    triggerCloseButton(false);
+    timerRef.current = setTimeout(function () {
+      triggerCloseButton(true);
+    }, 5000);
+  };
+
+  /**
+   * 清除定时器
+   */
+  var clearTimer = function clearTimer() {
+    if (timerRef.current) {
+      clearTimeout(timerRef.current);
+      timerRef.current = undefined;
+    }
+  };
+
   /**
    * @title: 初始化加载设备列表页
    * @description: 初始化加载设备列表页 若只有一条数据 则直接进入下一步
@@ -91,13 +151,20 @@ export default (function (_ref) {
    * @Date: 2024-08-20 13:02
    */
   useMount(function () {
+    payLog.log('设备选择页展示');
     setLoading(true);
+    closeFirstWithDelayShow();
     api.getDeviceList({
       type: eftpos,
       status: 'paired'
     }).then(function (res) {
+      clearTimer();
       setLoading(false);
       if (res && Array.isArray(res.list) && res.list.length > 0) {
+        payLog.log('设备列表加载成功', {
+          count: res.list.length,
+          hasDeviceNumber: !!device_number
+        });
         if (device_number) {
           var hostDeviceList = res.list.filter(function (item) {
             var _item$setting;
@@ -109,6 +176,9 @@ export default (function (_ref) {
             setDataStaus(true);
             setList(setDeviceList(hostDeviceList));
             if (hostDeviceList.length === 1) {
+              payLog.log('自动选择设备（device_number匹配）', {
+                device: hostDeviceList[0]
+              });
               setDevice(hostDeviceList[0]);
             }
             return;
@@ -117,44 +187,155 @@ export default (function (_ref) {
         setDataStaus(true);
         setList(setDeviceList(res.list));
         if (res.list.length === 1) {
+          payLog.log('自动选择设备（单设备）', {
+            device: res.list[0]
+          });
           setDevice(res.list[0]);
+        } else {
+          // 存在多个设备时，等待用户选择，Terminal环境需要显示关闭按钮
+          triggerCloseButton(true);
         }
         return;
       }
+      payLog.log('设备列表为空');
+      triggerCloseButton(true);
       setDataStaus(false);
     }, function () {
+      clearTimer();
+      payLog.log('设备列表加载失败');
+      triggerCloseButton(true);
       setDataStaus(false);
       setLoading(false);
     });
   });
-  var setDevice = function setDevice(device) {
-    dispatch(updateDevice({
-      device: device
+  useUnmount(function () {
+    timerRef.current && clearTimeout(timerRef.current);
+  });
+
+  /**
+   * 延时方法：先延时指定时间，然后执行异步检查
+   * @param time 延时时间（毫秒），默认 100ms
+   * @returns Promise<boolean> 检查结果
+   */
+  var checkIsActiveWithDelay = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _interaction$utils2;
+      var time,
+        _interaction$utils3,
+        _interaction$utils3$a,
+        activeStatus,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            time = _args.length > 0 && _args[0] !== undefined ? _args[0] : 100;
+            if (isTerminal !== null && isTerminal !== void 0 && isTerminal()) {
+              _context.next = 3;
+              break;
+            }
+            return _context.abrupt("return", true);
+          case 3:
+            _context.next = 5;
+            return new Promise(function (resolve) {
+              return setTimeout(resolve, time);
+            });
+          case 5:
+            if (!(interaction !== null && interaction !== void 0 && (_interaction$utils2 = interaction.utils) !== null && _interaction$utils2 !== void 0 && _interaction$utils2.asyncDataManager)) {
+              _context.next = 16;
+              break;
+            }
+            _context.prev = 6;
+            _context.next = 9;
+            return interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || (_interaction$utils3$a = _interaction$utils3.asyncDataManager) === null || _interaction$utils3$a === void 0 ? void 0 : _interaction$utils3$a.call(_interaction$utils3, {
+              module: 'get',
+              key: 'pay_webview_active'
+            });
+          case 9:
+            activeStatus = _context.sent;
+            return _context.abrupt("return", activeStatus !== 'unActive');
+          case 13:
+            _context.prev = 13;
+            _context.t0 = _context["catch"](6);
+            return _context.abrupt("return", true);
+          case 16:
+            return _context.abrupt("return", true);
+          case 17:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[6, 13]]);
     }));
-    if (typeof api.selectDevice === 'function') {
-      api.selectDevice(device);
-    }
-    if (typeof onChange === 'function') {
-      if (mode === ModeEnum.Pay) {
-        if (device.pay) {
-          dispatch(updateState({
-            pay: device.pay
-          }));
-        } else {
-          var amonunt = getAmonunt(_objectSpread(_objectSpread({}, store), {}, {
-            device: device
-          }));
-          var pay = getPayAmonunt(amonunt, function (total) {
-            return formatAmount(total, 2, symbol);
-          });
-          dispatch(updateState({
-            pay: pay
-          }));
+    return function checkIsActiveWithDelay() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var setDevice = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(device) {
+      var isActive, amonunt, pay;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            payLog.setContext({
+              deviceId: device === null || device === void 0 ? void 0 : device.id
+            });
+            dispatch(updateDevice({
+              device: device
+            }));
+            if (typeof api.selectDevice === 'function') {
+              api.selectDevice(device);
+            }
+            if (!(typeof onChange === 'function')) {
+              _context2.next = 14;
+              break;
+            }
+            if (!(mode === ModeEnum.Pay)) {
+              _context2.next = 13;
+              break;
+            }
+            // Terminal环境，进入支付页面之前需要先隐藏关闭按钮
+            triggerCloseButton(false);
+            // 由于js和原生通信存在延时，需要检查当前页面是否处于活跃状态，如果不在活跃状态，则不进行支付
+            _context2.next = 8;
+            return checkIsActiveWithDelay(100);
+          case 8:
+            isActive = _context2.sent;
+            if (isActive) {
+              _context2.next = 12;
+              break;
+            }
+            payLog.log('页面非活跃状态，阻断支付', {
+              order_id: order_id,
+              isActive: isActive
+            });
+            return _context2.abrupt("return");
+          case 12:
+            if (device.pay) {
+              dispatch(updateState({
+                pay: device.pay
+              }));
+            } else {
+              amonunt = getAmonunt(_objectSpread(_objectSpread({}, store), {}, {
+                device: device
+              }));
+              pay = getPayAmonunt(amonunt, function (total) {
+                return formatAmount(total, 2, symbol);
+              });
+              dispatch(updateState({
+                pay: pay
+              }));
+            }
+          case 13:
+            onChange('page', mode === ModeEnum.FullPay ? 'amount' : 'pay');
+          case 14:
+          case "end":
+            return _context2.stop();
         }
-      }
-      onChange('page', mode === ModeEnum.FullPay ? 'amount' : 'pay');
-    }
-  };
+      }, _callee2);
+    }));
+    return function setDevice(_x) {
+      return _ref5.apply(this, arguments);
+    };
+  }();
   var setDeviceList = function setDeviceList(list) {
     return list.map(function (item) {
       var amonunt = getAmonunt(_objectSpread(_objectSpread({}, store), {}, {
@@ -180,9 +361,11 @@ export default (function (_ref) {
     } : {}), containerStyle || {})
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
+    size: "large",
     style: {
       flex: 1,
-      overflow: 'auto'
+      overflow: 'auto',
+      minHeight: '200px'
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -190,10 +373,12 @@ export default (function (_ref) {
       flexDirection: 'column',
       gap: '10px'
     }
-  }, list.map(function (_ref3, index) {
-    var id = _ref3.id,
-      name = _ref3.name,
-      pay = _ref3.pay;
+  }, list.map(function (_ref6, index) {
+    var _connection$response;
+    var id = _ref6.id,
+      name = _ref6.name,
+      pay = _ref6.pay,
+      connection = _ref6.connection;
     return /*#__PURE__*/React.createElement("div", {
       key: id,
       className: "pisell-lowcode__eft-pay-device ".concat(id === (device === null || device === void 0 ? void 0 : device.id) ? 'active' : ''),
@@ -209,7 +394,9 @@ export default (function (_ref) {
       className: "pisell-lowcode__eft-pay-device-money"
     }, pay.totalUnit), /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__eft-pay-device-sucharge"
-    }, locales.getText('page.eftpos-pay.text.surcharge.edit.inc.surcharge'), ": ", formatAmount("".concat(pay.surcharge), 2, symbol), " (", locales.getText('page.eftpos-pay.text.surcharge.edit.rate'), ":", pay.surRate, "% +", ' ', formatAmount("".concat(pay.surMoney), 2, symbol), ")"))), /*#__PURE__*/React.createElement("div", {
+    }, locales.getText('page.eftpos-pay.text.surcharge.edit.inc.surcharge'), ": ", formatAmount("".concat(pay.surcharge), 2, symbol), " (", locales.getText('page.eftpos-pay.text.surcharge.edit.rate'), ":", pay.surRate, "% +", ' ', formatAmount("".concat(pay.surMoney), 2, symbol), ")"), eftpos === EftposEnum.MX51 ? /*#__PURE__*/React.createElement("div", {
+      className: "pisell-lowcode__eft-pay-device-sucharge"
+    }, "Pairing ID: ", connection === null || connection === void 0 || (_connection$response = connection.response) === null || _connection$response === void 0 ? void 0 : _connection$response.pairing_id) : null)), /*#__PURE__*/React.createElement("div", {
       style: {
         flexShrink: 0
       }

package/es/components/eftposPay/helper.d.ts

@@ -29,6 +29,7 @@ export declare const getPayParams: (data: Partial<Omit<State, key>> & Pick<State
     amount?: undefined;
     total?: undefined;
     receipt?: undefined;
+    uniquePaymentNumber?: undefined;
 } | {
     cardReaderSurcharge: {};
     surMoney: string;
@@ -51,6 +52,7 @@ export declare const getPayParams: (data: Partial<Omit<State, key>> & Pick<State
     } | undefined;
     order_id: string | number;
     receipt: {};
+    uniquePaymentNumber: string | number | undefined;
 } | {
     amount: string | number;
     total: string | number;
@@ -58,6 +60,7 @@ export declare const getPayParams: (data: Partial<Omit<State, key>> & Pick<State
     order_id: string | number;
     device?: undefined;
     receipt?: undefined;
+    uniquePaymentNumber?: undefined;
 };
 export declare const limitDecimals: (value: any) => any;
 /**

package/es/components/eftposPay/helper.js

@@ -109,7 +109,8 @@ export var getPayParams = function getPayParams(data, statue) {
       number: data.number,
       device: data.device,
       order_id: data.order_id,
-      receipt: (_data$device2 = data.device) !== null && _data$device2 !== void 0 && (_data$device2 = _data$device2.setting) !== null && _data$device2 !== void 0 && _data$device2.receipts ? [] : receipt
+      receipt: (_data$device2 = data.device) !== null && _data$device2 !== void 0 && (_data$device2 = _data$device2.setting) !== null && _data$device2 !== void 0 && _data$device2.receipts ? [] : receipt,
+      uniquePaymentNumber: data.number
     };
   }
   return {

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"stripe" | "payo" | "tyro" | "windcave" | "linkly" | "huifu">;
+    readonly eftposRef: React.MutableRefObject<"stripe" | "tyro" | "mx51" | "payo" | "windcave" | "linkly" | "huifu">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/index.js

@@ -26,14 +26,25 @@ import { getInitState } from "./manufacturer";
 import { Provider } from "./store";
 import "./index.less";
 import { getLocale } from "../../utils/locales";
+import payLog, { usePayLog } from "./utils/payLog";
 locales.init(localeTexts, getLocale());
 export default (function (props) {
-  var _context$appHelper, _store$getState, _props$params, _props$params2;
+  var _props$params, _context$appHelper, _props$params3, _store$getState, _props$params4, _props$params5;
   var _useState = useState(props.type === EftposEnum.Tyro ? OrderEumn.Null : props.source === RestoreEumn.Restore ? OrderEumn.Restore : OrderEumn.Normal),
     _useState2 = _slicedToArray(_useState, 2),
     check = _useState2[0],
     setCheckStatus = _useState2[1];
   var context = useEngineContext();
+  usePayLog({
+    paymentType: props.type,
+    mode: props.mode || ModeEnum.Pay,
+    orderId: (_props$params = props.params) === null || _props$params === void 0 ? void 0 : _props$params.order_id,
+    extra: {
+      initialParams: (props === null || props === void 0 ? void 0 : props.params) || null,
+      initialSource: (props === null || props === void 0 ? void 0 : props.source) || '',
+      initialDevice: (props === null || props === void 0 ? void 0 : props.device) || null
+    }
+  });
   var _useState3 = useState(0),
     _useState4 = _slicedToArray(_useState3, 2),
     cardSurcharge = _useState4[0],
@@ -69,20 +80,30 @@ export default (function (props) {
     store = _ref.store;
 
   /**
-   * terminal : terminal 内嵌
-   * android_kiosk     : kiosk 内嵌
+   * 优先从 props.params.platform 中获取渠道信息，其次读取 storage 中的 channel 字段
+   * terminal: terminal 内嵌
+   * android_kiosk / kiosk: kiosk 内嵌
+   * 默认: web
    */
   var channel = useMemo(function () {
-    var _storage$get;
-    var channel = (storage === null || storage === void 0 || (_storage$get = storage.get) === null || _storage$get === void 0 ? void 0 : _storage$get.call(storage, 'channel')) || '';
-    if (channel === 'terminal') {
+    var _props$params2, _storage$get;
+    if ((props === null || props === void 0 || (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.platform) === 'kiosk') {
+      return 'kiosk';
+    }
+    var rawChannel = (storage === null || storage === void 0 || (_storage$get = storage.get) === null || _storage$get === void 0 ? void 0 : _storage$get.call(storage, 'channel')) || '';
+    if (rawChannel === 'terminal') {
       return 'terminal';
     }
-    if (channel === 'android_kiosk') {
+    if (rawChannel === 'android_kiosk') {
       return 'kiosk';
     }
     return '';
-  }, []);
+  }, [props === null || props === void 0 || (_props$params3 = props.params) === null || _props$params3 === void 0 ? void 0 : _props$params3.platform, storage]);
+  useEffect(function () {
+    payLog.setContext({
+      channel: channel || 'web'
+    });
+  }, [channel]);
 
   // 是否是移动端，如果isWebPos为true，则表示非原生移动端场景
   var isMobile = useMemo(function () {
@@ -128,8 +149,8 @@ export default (function (props) {
       symbol: current
     });
     // 手动将 originalParams 添加到 State 根级别
-    return _objectSpread(_objectSpread({}, initState), {}, {
-      originalParams: props.params || undefined
+    return _objectSpread(_objectSpread({}, initState || {}), {}, {
+      originalParams: props.params || {}
     });
   }, [mode, props.params, props.type, symbol]);
   var stateRef = useRef(state);
@@ -137,6 +158,11 @@ export default (function (props) {
     stateRef.current = state;
   }, [state]);
   var onChangeStatus = useCallback(function (status, params, other) {
+    payLog.log('支付状态回调', {
+      status: status,
+      params: params,
+      other: other
+    });
     props.onChangeStatus(status, params, other);
   }, []);
   var action = useMemo(function () {
@@ -172,11 +198,10 @@ export default (function (props) {
   }, [mode, state]);
   useEffect(function () {
     document.body.id = 'body';
-    console.log('初始化 ........112218017777');
   }, []);
 
   // console.log('action = ', action);
-  console.log('props?.params?.device_number = ', props === null || props === void 0 || (_props$params = props.params) === null || _props$params === void 0 ? void 0 : _props$params.device_number);
+  console.log('props?.params?.device_number = ', props === null || props === void 0 || (_props$params4 = props.params) === null || _props$params4 === void 0 ? void 0 : _props$params4.device_number);
 
   /**
    * @title: api 接口 数据
@@ -193,12 +218,14 @@ export default (function (props) {
     if (props.source === RestoreEumn.Restore || props.type === EftposEnum.Tyro) {
       return;
     }
+    payLog.log('交易检查：开始检查交易');
     api.getTransaction({
       order_id: stateRef.current.order_id,
       card_reader_type: stateRef.current.eftpos,
       receive_status: 'unprocessed'
     }).then(function (res) {
       if (!Array.isArray(res.data) || res.data.length === 0) {
+        payLog.log('交易检查：无未处理交易');
         setCheckStatus(OrderEumn.Null);
         return;
       }
@@ -215,6 +242,9 @@ export default (function (props) {
         return item.number;
       });
       if (latest.status === OrderEumn.Failed) {
+        payLog.log('交易检查：最新交易已失败', {
+          number: latest.number
+        });
         setCheckStatus(latest.status);
         onChangeStatus('mark_tx_processed', [].concat(_toConsumableArray(numberList), [latest.number]));
         return;
@@ -236,8 +266,15 @@ export default (function (props) {
       try {
         var data = JSON.parse(decodeURIComponent(atob(decodeURIComponent(pay_param_base64))));
         setHistory(data);
+        payLog.log('交易检查：发现待处理交易', {
+          status: latest.status,
+          number: latest.number
+        });
         setCheckStatus(latest.status);
       } catch (e) {
+        payLog.log('交易检查：解析交易数据失败', {
+          error: e
+        });
         setCheckStatus(OrderEumn.Failed);
         return;
       }
@@ -272,7 +309,7 @@ export default (function (props) {
     source: props.source,
     tyroUrl: props.tyroUrl,
     tyroVersion: props.tyroVersion,
-    device_number: props === null || props === void 0 || (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : _props$params2.device_number,
+    device_number: props === null || props === void 0 || (_props$params5 = props.params) === null || _props$params5 === void 0 ? void 0 : _props$params5.device_number,
     isMobile: isMobile,
     formatAmount: formatAmount,
     styles: props.styles

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

@@ -54,7 +54,7 @@ export default (function (params) {
     status: StatusEnum.Loading,
     steps: getStep(mode),
     render: true,
-    client: client !== 'undefined' ? client : ClientEnum.Merchant,
+    client: client !== 'undefined' && client !== undefined ? client : ClientEnum.Merchant,
     warn: '',
     custom: other || {}
   }, typeof net !== 'undefined' ? {