@pisell/private-materials 3.4.72 → 3.4.74

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,9 +14,9 @@ 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, { useRef, useState } from 'react';
 import Titlebar from "./component/header/titlebar";
 import { ModeEnum } from "./const";
 import { getPayAmonunt } from "./helper";
@@ -21,6 +24,8 @@ 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 { sendWarningLog } from '@pisell/utils';
 
 /**
  * @title: 设备选择页
@@ -43,11 +48,16 @@ export default (function (_ref) {
     formatAmount = _ref$formatAmount === void 0 ? function (number, precision, symbol) {
       return "".concat(symbol).concat(number);
     } : _ref$formatAmount;
+  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],
@@ -61,6 +71,7 @@ export default (function (_ref) {
     list = _useState6[0],
     setList = _useState6[1];
   var dispatch = useDispatch();
+  var timerRef = useRef();
 
   /**
    * @title: 设备选择事件
@@ -77,11 +88,55 @@ 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];
     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: 初始化加载设备列表页 若只有一条数据 则直接进入下一步
@@ -90,10 +145,13 @@ export default (function (_ref) {
    */
   useMount(function () {
     setLoading(true);
+    // Terminal环境，进入设备列表页面初始化默认关闭原生弹窗的loading，5s后如果还是没有调用成功再放开
+    closeFirstWithDelayShow();
     api.getDeviceList({
       type: eftpos,
       status: 'paired'
     }).then(function (res) {
+      clearTimer();
       setLoading(false);
       if (res && Array.isArray(res.list) && res.list.length > 0) {
         if (device_number) {
@@ -115,44 +173,156 @@ export default (function (_ref) {
         setDataStaus(true);
         setList(setDeviceList(res.list));
         if (res.list.length === 1) {
+          // 只存在一个设备时，直接选中进行支付
           setDevice(res.list[0]);
+        } else {
+          // 存在多个设备时，等待用户选择，Terminal环境需要显示关闭按钮
+          triggerCloseButton(true);
         }
         return;
       }
+      // 列表为空，显示关闭按钮
+      triggerCloseButton(true);
       setDataStaus(false);
     }, function () {
+      clearTimer();
+      // 加载失败，显示关闭按钮
+      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:
+            dispatch(updateDevice({
+              device: device
+            }));
+            if (typeof api.selectDevice === 'function') {
+              api.selectDevice(device);
+            }
+            if (!(typeof onChange === 'function')) {
+              _context2.next = 13;
+              break;
+            }
+            if (!(mode === ModeEnum.Pay)) {
+              _context2.next = 12;
+              break;
+            }
+            // Terminal环境，进入支付页面之前需要先隐藏关闭按钮
+            triggerCloseButton(false);
+            // 由于js和原生通信存在延时，需要检查当前页面是否处于活跃状态，如果不在活跃状态，则不进行支付
+            _context2.next = 7;
+            return checkIsActiveWithDelay(100);
+          case 7:
+            isActive = _context2.sent;
+            if (isActive) {
+              _context2.next = 11;
+              break;
+            }
+            sendWarningLog({
+              title: '支付-当前页面非活跃状态，无法进行支付',
+              content: [{
+                key: 'activeStatus',
+                value: JSON.stringify({
+                  order_id: order_id,
+                  isActive: isActive
+                })
+              }]
+            });
+            return _context2.abrupt("return");
+          case 11:
+            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 12:
+            onChange('page', mode === ModeEnum.FullPay ? 'amount' : 'pay');
+          case 13:
+          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), {}, {
@@ -178,9 +348,11 @@ export default (function (_ref) {
     } : {}
   }, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
+    size: "large",
     style: {
       flex: 1,
-      overflow: 'auto'
+      overflow: 'auto',
+      minHeight: '200px'
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
@@ -188,10 +360,10 @@ 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 id = _ref6.id,
+      name = _ref6.name,
+      pay = _ref6.pay;
     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' : ''),

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PayProps } from './const';
 import './index.less';
 /**

package/es/components/eftposPay/store/index.d.ts

@@ -295,7 +295,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
+        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
         eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
         action?: "amount" | "pay" | "deviceList" | undefined;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ api, onChange, formatAmount, }: {
     api: any;
     onChange: any;

package/es/components/eventBooking/components/Provider/Cart/Deposit/index.d.ts

@@ -1,3 +1,6 @@
 /// <reference types="react" />
-declare const Deposit: () => JSX.Element;
+interface DepositProps {
+    showTitle?: boolean;
+}
+declare const Deposit: (props: DepositProps) => JSX.Element;
 export default Deposit;

package/es/components/eventBooking/components/Provider/Cart/Deposit/index.js

@@ -1,13 +1,16 @@
 import React from 'react';
 import { useSummary } from "../../../../../Sales";
 import { DepositContent } from "../../../../../appointmentBooking/components/Deposit";
-var Deposit = function Deposit() {
+var Deposit = function Deposit(props) {
+  var _props$showTitle = props.showTitle,
+    showTitle = _props$showTitle === void 0 ? true : _props$showTitle;
   var _useSummary = useSummary(),
     deposit = _useSummary.deposit,
     isAgreeDepositPolicy = _useSummary.isAgreeDepositPolicy,
     setIsAgreeDepositPolicy = _useSummary.setIsAgreeDepositPolicy,
     getDepositProtocol = _useSummary.getDepositProtocol;
   return /*#__PURE__*/React.createElement(DepositContent, {
+    showTitle: showTitle,
     isAgreeDepositPolicy: !!isAgreeDepositPolicy,
     setIsAgreeDepositPolicy: setIsAgreeDepositPolicy,
     deposit: deposit,

package/es/components/eventBooking/components/Provider/Cart/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const CartItem: () => JSX.Element;
 export default CartItem;

package/es/components/eventBooking/components/Provider/Cart/Item/index.js

@@ -1,15 +1,22 @@
-import React from 'react';
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _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; }
+import React, { useMemo } from 'react';
 import { isMobile, locales } from '@pisell/utils';
 import ShoppingCart from "../../../../../shoppingCart";
 import { useCart, useHolder, useSummary, useStep } from "../../../../../Sales";
 import SelectHolderModal from "../../SelectHolderModal";
 import ContinueButton from "../ContinueButton";
-import Total from "./Total";
+import { SubTotal } from "../../../../../index";
+import useEngineContext from "../../../../../../hooks/useEngineContext";
 import Deposit from "../Deposit";
 import Voucher from "../../../Voucher";
 import "./index.less";
 var CartItem = function CartItem() {
-  var _cartData$cartItems;
+  var _context$appHelper, _cartData$cartItems2;
   var _useHolder = useHolder(),
     open = _useHolder.open,
     holderData = _useHolder.holderData,
@@ -20,14 +27,24 @@ var CartItem = function CartItem() {
     cartData = _useCart.cartData,
     addNoteToCartItem = _useCart.addNoteToCartItem;
   var _useSummary = useSummary(),
-    deposit = _useSummary.deposit;
+    taxTitle = _useSummary.taxTitle,
+    taxRate = _useSummary.taxRate,
+    totalTaxFee = _useSummary.totalTaxFee,
+    isPriceIncludeTax = _useSummary.isPriceIncludeTax,
+    total = _useSummary.total,
+    deposit = _useSummary.deposit,
+    subtotal = _useSummary.subtotal,
+    surcharge = _useSummary.surcharge;
   var _useStep = useStep(),
     isLastStep = _useStep.isLastStep;
+  var context = useEngineContext();
+  var _ref = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    translation = _ref.translation;
   var handleClickCard = function handleClickCard(e, type, key) {
     if (type === 'note') {
       return addNoteToCartItem(e);
     }
-    console.log(e, type, key, 'wh9988767');
+
     // 删除
     if (type === 'delete') {
       return deleteCartItem(e);
@@ -36,6 +53,54 @@ var CartItem = function CartItem() {
       return deleteCartItemByHolder(key);
     }
   };
+
+  /**
+   * @description: 是否显示定金
+   * @param {*} useMemo
+   * @return {*}
+   */
+  var showDeposit = useMemo(function () {
+    var _cartData$cartItems;
+    return (cartData === null || cartData === void 0 || (_cartData$cartItems = cartData.cartItems) === null || _cartData$cartItems === void 0 ? void 0 : _cartData$cartItems.length) > 0 && (deposit === null || deposit === void 0 ? void 0 : deposit.hasDeposit);
+  }, [cartData === null || cartData === void 0 || (_cartData$cartItems2 = cartData.cartItems) === null || _cartData$cartItems2 === void 0 ? void 0 : _cartData$cartItems2.length, deposit === null || deposit === void 0 ? void 0 : deposit.hasDeposit]);
+
+  /**
+   * @description: 结算列表数据
+   * @param {*} useMemo
+   * @return {*}
+   */
+  var subTotalList = useMemo(function () {
+    var surchargeList = ((surcharge === null || surcharge === void 0 ? void 0 : surcharge.surchargeList) || []).map(function (d, index) {
+      return {
+        key: "custom_surcharge_".concat(index),
+        label: translation(d === null || d === void 0 ? void 0 : d.name),
+        value: d.amount
+      };
+    });
+    return [{
+      key: 'deposit',
+      value: deposit === null || deposit === void 0 ? void 0 : deposit.total,
+      label: locales.getText('pisell2.appointment.deposit'),
+      hidden: !showDeposit
+    }, {
+      key: 'sub_total',
+      value: subtotal
+    }].concat(_toConsumableArray(surchargeList), [{
+      key: 'tax',
+      value: totalTaxFee,
+      hidden: Number(totalTaxFee) <= 0,
+      tax: {
+        rate: taxRate,
+        is_price_include_tax: isPriceIncludeTax,
+        title: taxTitle
+      }
+    }, {
+      key: 'custom_total',
+      value: total,
+      label: locales.getText('pisell2.event.total'),
+      bold: !showDeposit
+    }]);
+  }, [total, subtotal, surcharge === null || surcharge === void 0 ? void 0 : surcharge.surchargeList, deposit === null || deposit === void 0 ? void 0 : deposit.total, taxRate, isPriceIncludeTax, totalTaxFee, taxTitle, showDeposit]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "cart-item-wrap ".concat(isMobile() ? 'cart-mobile-item-wrap' : '')
   }, /*#__PURE__*/React.createElement("div", {
@@ -59,7 +124,15 @@ var CartItem = function CartItem() {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "event-footer"
-  }, /*#__PURE__*/React.createElement(Voucher, null), /*#__PURE__*/React.createElement(Total, null), (cartData === null || cartData === void 0 || (_cartData$cartItems = cartData.cartItems) === null || _cartData$cartItems === void 0 ? void 0 : _cartData$cartItems.length) > 0 && deposit !== null && deposit !== void 0 && deposit.hasDeposit ? /*#__PURE__*/React.createElement(Deposit, null) : null, /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
+  }, /*#__PURE__*/React.createElement(Voucher, null), /*#__PURE__*/React.createElement(SubTotal, {
+    list: subTotalList,
+    style: {
+      padding: 0
+    },
+    children: showDeposit ? /*#__PURE__*/React.createElement(Deposit, {
+      showTitle: false
+    }) : null
+  }), /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
     open: open
   }));
 };

package/es/components/eventBooking/components/Provider/Cart/Item/index.less

@@ -1,8 +1,12 @@
 .cart-item-wrap {
   height: 100%;
+  display: flex;
+  flex-direction: column;
   .content {
     background: #fff;
     padding: 20px;
+    height: auto;
+    overflow: auto;
     .pisell-lowcode__shopping-cart-content {
       .ant-card-body {
         padding: 0;
@@ -71,15 +75,12 @@
 
   .content {
     flex: 1;
-    overflow-y: auto;
-    padding: 0 0 140px;
+    padding: 20px 20px 4px;
+    max-height: 100%;
   }
   .event-footer {
     z-index: 10;
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    right: 0;
+    flex: none;
     border-top: 1px solid #eaecf0;
     padding: 14px 24px 24px;
     margin-top: 0;

package/es/components/eventBooking/components/Provider/Cart/index.js

@@ -15,16 +15,11 @@ var Cart = function Cart(_ref) {
       return _onCancel();
     },
     bodyStyle: {
-      padding: '20px'
+      padding: 0
     },
     destroyOnClose: true,
     className: "event-cart-modal",
     footer: null
-  }, /*#__PURE__*/React.createElement("div", {
-    style: {
-      flex: 1,
-      overflowY: 'auto'
-    }
-  }, /*#__PURE__*/React.createElement(CartItem, null)));
+  }, /*#__PURE__*/React.createElement(CartItem, null));
 };
 export default Cart;

package/es/components/eventBooking/components/Provider/Content/index.less

@@ -14,7 +14,7 @@
     width: 360px;
     position: sticky;
     top: 93px;
-    height: fit-content;
+    height: calc(var(--vh, 1vh) * 100 - 110px);
   }
 }
 

package/es/components/eventBooking/components/Voucher/index.js

@@ -102,7 +102,7 @@ var VoucherCard = function VoucherCard() {
   var batchUpdateCart = function batchUpdateCart(productList) {
     if (!(productList !== null && productList !== void 0 && productList.length)) return;
     productList.forEach(function (product) {
-      updateCartItem(product);
+      updateCartItem(product, 'deposit');
     });
   };
 

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare type CallToBookProps = {
     show: boolean;
     type: string;

package/es/components/index.d.ts

@@ -10,7 +10,6 @@ import RuleSetting from './ruleSetting';
 import TaxSelect from './taxSelect';
 import ToCPay from './pay/toC';
 import WalletList from './walletList';
-import Wallet from './wallet';
 import WorkspaceListDetail from './workSpaceListDetail/';
 import WorkspaceList from './workSpaceList';
 import PisellSelectCustomerModal from './pisellSelectCustomerModal';
@@ -21,4 +20,4 @@ import PinModal from './pinModal';
 import PinVerifyModal from './pinVerifyModal';
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './authentication/admin';
 import Registry from './systemSettings/registry';
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry, };

package/es/components/index.js

@@ -10,7 +10,6 @@ import RuleSetting from "./ruleSetting";
 import TaxSelect from "./taxSelect";
 import ToCPay from "./pay/toC";
 import WalletList from "./walletList";
-import Wallet from "./wallet";
 import WorkspaceListDetail from "./workSpaceListDetail/";
 import WorkspaceList from "./workSpaceList";
 import PisellSelectCustomerModal from "./pisellSelectCustomerModal";
@@ -21,4 +20,4 @@ import PinModal from "./pinModal";
 import PinVerifyModal from "./pinVerifyModal";
 import { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./authentication/admin";
 import Registry from "./systemSettings/registry";
-export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, Wallet, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry };
+export { Login, BookingInfo, Booking, BookingNotes, BookingAddons, BookingForms, Schedules, ProductExtension, RuleSetting, TaxSelect, ToCPay, PisellSelectCustomerModal, WalletList, WorkspaceList, WorkspaceListDetail, SubTotal, EditBookingModal, StepController, PinModal, PinVerifyModal, OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth, Registry };

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;