@pisell/private-materials 3.3.107 → 3.4.2

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

@@ -16,7 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState } from 'react';
 import { locales } from '@pisell/utils';
 import { Button, PisellToast } from '@pisell/materials';
-import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer, useSummary } from "../../../../../Sales";
+import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer } from "../../../../../Sales";
 import { formatValues, getFormParams } from "../../../../../Sales/Checkout/utils";
 import OrderProductModal from "../../OrderProductModal/index";
 import EmptyHolderModal from "../../EmptyHolderModal";
@@ -24,7 +24,6 @@ import { getProductPrice } from "../../../../../Sales/Event/serve";
 import { useRequest } from 'ahooks';
 import useEngineContext from "../../../../../../hooks/useEngineContext";
 import "./index.less";
-import { Toast } from "../../../../../appointmentBooking/utils";
 var ContinueButton = function ContinueButton() {
   var _context$appHelper, _cartData$cartItems;
   var _useSales = useSales(),
@@ -44,14 +43,10 @@ var ContinueButton = function ContinueButton() {
     onCheckout = _useCheckout.onCheckout,
     createBooking = _useCheckout.createBooking,
     onCheckBeforeBooking = _useCheckout.onCheckBeforeBooking,
-    checkBeforeBooking = _useCheckout.checkBeforeBooking,
-    freePay = _useCheckout.freePay;
+    checkBeforeBooking = _useCheckout.checkBeforeBooking;
   var _useCustomer = useCustomer(),
     openLoginModal = _useCustomer.openLoginModal,
     isLogin = _useCustomer.isLogin;
-  var _useSummary = useSummary(),
-    deposit = _useSummary.deposit,
-    isAgreeDepositPolicy = _useSummary.isAgreeDepositPolicy;
 
   // 下单之前是否检测失败
   var _useState = useState(false),
@@ -95,6 +90,7 @@ var ContinueButton = function ContinueButton() {
               data: params,
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
+                  var _context$appHelper2;
                   var value, result, _result$err;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
@@ -105,8 +101,13 @@ var ContinueButton = function ContinueButton() {
                         }
                         return _context.abrupt("return");
                       case 2:
-                        value = formatValues(data, false, {
-                          relation_forms: e
+                        value = formatValues({
+                          state: data,
+                          platform: context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.constants) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.platform,
+                          excludeDisabled: false,
+                          extra: {
+                            relation_forms: e
+                          }
                         }); // 如果检测成功，则直接下单
                         _context.next = 5;
                         return onCheckout(value);
@@ -389,48 +390,44 @@ var ContinueButton = function ContinueButton() {
    */
   var handleContinue = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      var _deposit$protocols, value, checkRes, emptyHolders;
+      var _context$appHelper3, value, checkRes, emptyHolders;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!isLastStep) {
-              _context6.next = 17;
-              break;
-            }
-            value = formatValues(data); // 如果未同意定金政策，则提示
-            if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit && (deposit === null || deposit === void 0 || (_deposit$protocols = deposit.protocols) === null || _deposit$protocols === void 0 ? void 0 : _deposit$protocols.length) > 0 && !isAgreeDepositPolicy)) {
-              _context6.next = 5;
+              _context6.next = 14;
               break;
             }
-            Toast(locales.getText('pisell2.appointment.deposit.agree.policy'));
-            return _context6.abrupt("return");
-          case 5:
-            _context6.next = 7;
+            value = formatValues({
+              state: data,
+              platform: context === null || context === void 0 || (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.constants) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.platform
+            }); // 检测商品是否可以下单
+            _context6.next = 4;
             return onCheckBeforeBooking(value);
-          case 7:
+          case 4:
             checkRes = _context6.sent;
             if (!((checkRes === null || checkRes === void 0 ? void 0 : checkRes.result) === false)) {
-              _context6.next = 12;
+              _context6.next = 9;
               break;
             }
             setCheckedNumber(checkRes === null || checkRes === void 0 ? void 0 : checkRes.num);
             setOpenCheckout(true);
             return _context6.abrupt("return");
-          case 12:
+          case 9:
             // 验证holder是否为空
             emptyHolders = getWithoutCartItemsHolderNames();
             if (!((emptyHolders === null || emptyHolders === void 0 ? void 0 : emptyHolders.length) > 0)) {
-              _context6.next = 15;
+              _context6.next = 12;
               break;
             }
             return _context6.abrupt("return", setOpenEmptyHolder(true));
-          case 15:
+          case 12:
             // 关闭购物车弹窗
             onCloseCart();
             return _context6.abrupt("return", handleCheckout());
-          case 17:
+          case 14:
             if (isLogin()) {
-              _context6.next = 20;
+              _context6.next = 17;
               break;
             }
             onCloseCart();
@@ -460,9 +457,9 @@ var ContinueButton = function ContinueButton() {
                 return callback;
               }()
             }));
-          case 20:
+          case 17:
             handleHolder();
-          case 21:
+          case 18:
           case "end":
             return _context6.stop();
         }
@@ -499,8 +496,8 @@ var ContinueButton = function ContinueButton() {
    */
   var confirmLoading = useMemo(function () {
     if (!isLastStep) return false;
-    return (createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading) || (checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading) || (freePay === null || freePay === void 0 ? void 0 : freePay.loading);
-  }, [isLastStep, createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading, checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading, freePay === null || freePay === void 0 ? void 0 : freePay.loading]);
+    return (createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading) || (checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading);
+  }, [isLastStep, createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading, checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     disabled: !(cartData !== null && cartData !== void 0 && (_cartData$cartItems = cartData.cartItems) !== null && _cartData$cartItems !== void 0 && _cartData$cartItems.length),
     size: "large",

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

@@ -5,25 +5,21 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import React from 'react';
 import { locales } from '@pisell/utils';
 import { PisellText } from '@pisell/materials';
-import { useCart, useSummary } from "../../../../../Sales";
+import { useSummary } from "../../../../../Sales";
 import useEngineContext from "../../../../../../hooks/useEngineContext";
 import "./index.less";
 import classNames from 'classnames';
 var Total = function Total(_ref) {
-  var _context$appHelper, _context$appHelper$ge, _cartData$cartItems, _cartData$cartItems2, _context$appHelper2, _context$appHelper2$g;
+  var _context$appHelper, _context$appHelper$ge, _context$appHelper2, _context$appHelper2$g;
   var className = _ref.className,
     isFooter = _ref.isFooter;
-  var _useCart = useCart(),
-    cartData = _useCart.cartData;
   var _useSummary = useSummary(),
     taxTitle = _useSummary.taxTitle,
     totalTaxFee = _useSummary.totalTaxFee,
     isPriceIncludeTax = _useSummary.isPriceIncludeTax,
-    total = _useSummary.total,
-    deposit = _useSummary.deposit;
+    total = _useSummary.total;
   var context = useEngineContext();
-  console.log(taxTitle, isPriceIncludeTax, totalTaxFee, total, context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getSymbolic) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper), deposit, 'wh97978');
-  var showDeposit = (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);
+  console.log(taxTitle, isPriceIncludeTax, totalTaxFee, total, context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getSymbolic) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper), 'wh97978');
   return /*#__PURE__*/React.createElement("div", {
     className: "event-total-wrap ".concat(className)
   }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("div", {
@@ -35,8 +31,8 @@ var Total = function Total(_ref) {
     className: classNames('event-total', _defineProperty({}, ['total-gst-wrap'], !isPriceIncludeTax && Number(totalTaxFee) > 0))
   }, /*#__PURE__*/React.createElement("div", {
     className: "left"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, isFooter && showDeposit ? locales.getText('pisell2.appointment.deposit') : locales.getText('pisell2.event.total'), isFooter ? ': ' : ''), isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
-    value: (cartData === null || cartData === void 0 || (_cartData$cartItems2 = cartData.cartItems) === null || _cartData$cartItems2 === void 0 ? void 0 : _cartData$cartItems2.length) > 0 && deposit !== null && deposit !== void 0 && deposit.hasDeposit ? deposit === null || deposit === void 0 ? void 0 : deposit.total : total,
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.event.total'), isFooter ? ': ' : ''), isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
+    value: total,
     showCurrencySymbol: true,
     className: "event-amount"
   }) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("span", {

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

@@ -5,10 +5,8 @@ import { useCart, useHolder, useSummary, useStep } from "../../../../../Sales";
 import SelectHolderModal from "../../SelectHolderModal";
 import ContinueButton from "../ContinueButton";
 import Total from "./Total";
-import Deposit from "../Deposit";
 import "./index.less";
 var CartItem = function CartItem() {
-  var _cartData$cartItems;
   var _useHolder = useHolder(),
     open = _useHolder.open,
     holderData = _useHolder.holderData,
@@ -19,7 +17,7 @@ var CartItem = function CartItem() {
     cartData = _useCart.cartData,
     addNoteToCartItem = _useCart.addNoteToCartItem;
   var _useSummary = useSummary(),
-    deposit = _useSummary.deposit;
+    subtotal = _useSummary.subtotal;
   var _useStep = useStep(),
     isLastStep = _useStep.isLastStep;
   var handleClickCard = function handleClickCard(e, type, key) {
@@ -58,7 +56,7 @@ var CartItem = function CartItem() {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "event-footer"
-  }, /*#__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(Total, null), /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
     open: open
   }));
 };

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

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

package/es/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => JSX.Element;

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

@@ -304,9 +304,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     utils === null || utils === void 0 || utils.action({
       type: 'pisell1.productDetail',
       data: {
-        detail: _objectSpread(_objectSpread({}, (bookingOption === null || bookingOption === void 0 ? void 0 : bookingOption._originData) || {}), {}, {
-          open_deposit: 1
-        }),
+        detail: _objectSpread({}, (bookingOption === null || bookingOption === void 0 ? void 0 : bookingOption._originData) || {}),
         isOS: false
       },
       callback: function callback(data) {

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

@@ -71,14 +71,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
     'zh-CN': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -152,14 +144,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
     'zh-HK': {
         'pisell2.event.calendar.limit.unavailable': string;
@@ -233,14 +217,6 @@ declare const _default: {
         'pisell2.event.capacity.limit.reached.tip': string;
         'pisell2.event.schedule.item.expand': string;
         'pisell2.event.schedule.item.collapse': string;
-        'pisell2.appointment.deposit': string;
-        'pisell2.appointment.deposit.agreed': string;
-        'pisell2.appointment.deposit.agree.policy': string;
-        'pisell2.appointment.deposit.and': string;
-        'pisell2.appointment.deposit.amount.tip1': string;
-        'pisell2.appointment.deposit.amount.tip2': string;
-        'pisell2.appointment.deposit.close': string;
-        'pisell2.appointment.booking.empty.data': string;
     };
 };
 export default _default;

package/es/components/eventBooking/locales.js

@@ -82,15 +82,7 @@ export default {
     'pisell2.event.capacity.limit.reached.title': 'Capacity limit reached',
     'pisell2.event.capacity.limit.reached.tip': 'One or more events in your cart are no longer available due to full capacity. Please remove unavailable events from your cart to complete checkout.',
     'pisell2.event.schedule.item.expand': 'See more',
-    'pisell2.event.schedule.item.collapse': 'See less',
-    'pisell2.appointment.deposit': 'Deposit',
-    'pisell2.appointment.deposit.agreed': 'I have read and agree to the ',
-    'pisell2.appointment.deposit.agree.policy': 'You need to agree the policy to proceed',
-    'pisell2.appointment.deposit.and': ' & ',
-    'pisell2.appointment.deposit.amount.tip1': ' needs to be paid as deposit.',
-    'pisell2.appointment.deposit.amount.tip2': ' ',
-    'pisell2.appointment.deposit.close': 'Close',
-    'pisell2.appointment.booking.empty.data': 'No data'
+    'pisell2.event.schedule.item.collapse': 'See less'
   },
   'zh-CN': {
     'pisell2.event.calendar.limit.unavailable': '不可预约',
@@ -175,15 +167,7 @@ export default {
     'pisell2.event.capacity.limit.reached.title': '活动名额已满',
     'pisell2.event.capacity.limit.reached.tip': '购物车中有一个或多个活动已达预约上限，请将已满额的活动从购物车中移除后再完成结算。',
     'pisell2.event.schedule.item.expand': '查看更多',
-    'pisell2.event.schedule.item.collapse': '收起',
-    'pisell2.appointment.deposit': '定金',
-    'pisell2.appointment.deposit.agreed': '我已阅读并同意 ',
-    'pisell2.appointment.deposit.agree.policy': '您需要同意协议才能继续',
-    'pisell2.appointment.deposit.and': ' 和 ',
-    'pisell2.appointment.deposit.amount.tip1': '请支付 ',
-    'pisell2.appointment.deposit.amount.tip2': ' 定金。',
-    'pisell2.appointment.deposit.close': '关闭',
-    'pisell2.appointment.booking.empty.data': '暂无数据'
+    'pisell2.event.schedule.item.collapse': '收起'
   },
   'zh-HK': {
     'pisell2.event.calendar.limit.unavailable': '不可預約',
@@ -268,14 +252,6 @@ export default {
     'pisell2.event.capacity.limit.reached.title': '活動名額已滿',
     'pisell2.event.capacity.limit.reached.tip': '購物車中有一個或多個活動已達預約上限，請將已滿額的活動從購物車中移除後再完成結算。',
     'pisell2.event.schedule.item.expand': '查看更多',
-    'pisell2.event.schedule.item.collapse': '收起',
-    'pisell2.appointment.deposit': '定金',
-    'pisell2.appointment.deposit.agreed': '我已閱讀並同意 ',
-    'pisell2.appointment.deposit.agree.policy': '您需要同意協議才能繼續',
-    'pisell2.appointment.deposit.and': ' 和 ',
-    'pisell2.appointment.deposit.amount.tip1': '請支付 ',
-    'pisell2.appointment.deposit.amount.tip2': ' 定金。',
-    'pisell2.appointment.deposit.close': '关闭',
-    'pisell2.appointment.booking.empty.data': '暫無數據'
+    'pisell2.event.schedule.item.collapse': '收起'
   }
 };

package/es/components/listComponent/index.js

@@ -1,9 +1,9 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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 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; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+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 _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); }

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

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/SDK.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

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

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts

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

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

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

package/es/components/pay/toC/PaymentMethods/index.js

@@ -27,7 +27,7 @@ import GlobePayQrcode from "./GlobePayQrcode";
 import { walletPassPay } from "./WalletPass/serve";
 import { formatWalletPassParams } from "../utils";
 import useEngineContext from "../../../../hooks/useEngineContext";
-import { isJson } from "@pisell/utils";
+import { isJson, sendWarningLog } from "@pisell/utils";
 var isOfflinePayment = function isOfflinePayment(type) {
   if (isCustomPayment(type)) {
     return true;
@@ -35,7 +35,7 @@ var isOfflinePayment = function isOfflinePayment(type) {
   return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_bank_transfer'].includes(type);
 };
 var PaymentMethods = function PaymentMethods(props, ref) {
-  var _context$appHelper, _interaction$utils, _interaction$utils$is;
+  var _context$appHelper;
   var MWCreditCardRef = useRef(null);
   var SuperPayAliPayH5Ref = useRef(null);
   var StripePayRef = useRef(null);
@@ -62,15 +62,33 @@ var PaymentMethods = function PaymentMethods(props, ref) {
           case 0:
             type = _ref.type, payGroup = _ref.payGroup;
             waitAmount = (payGroup === null || payGroup === void 0 ? void 0 : payGroup.wait_amount) || 0;
-            cards = payGroup === null || payGroup === void 0 || (_payGroup$walletPass = payGroup.walletPass) === null || _payGroup$walletPass === void 0 || (_payGroup$walletPass = _payGroup$walletPass.cards) === null || _payGroup$walletPass === void 0 ? void 0 : _payGroup$walletPass.length; // 仅选择钱包 并且当前选择的支付方式是 线下支付|自定义支付|银行转账, 前置支付钱包
+            cards = payGroup === null || payGroup === void 0 || (_payGroup$walletPass = payGroup.walletPass) === null || _payGroup$walletPass === void 0 || (_payGroup$walletPass = _payGroup$walletPass.cards) === null || _payGroup$walletPass === void 0 ? void 0 : _payGroup$walletPass.length;
+            sendWarningLog({
+              title: '支付初始化',
+              content: [{
+                key: 'type',
+                value: type
+              }, {
+                key: 'payGroup',
+                value: JSON.stringify(payGroup)
+              }, {
+                key: 'waitAmount',
+                value: waitAmount
+              }, {
+                key: 'cards',
+                value: cards
+              }]
+            });
+
+            // 仅选择钱包 并且当前选择的支付方式是 线下支付|自定义支付|银行转账, 前置支付钱包
             if (!(cards && (waitAmount <= 0 || isOfflinePayment(type)))) {
-              _context.next = 13;
+              _context.next = 15;
               break;
             }
-            _context.prev = 4;
-            _context.next = 7;
+            _context.prev = 5;
+            _context.next = 8;
             return walletPassPay(formatWalletPassParams(payGroup));
-          case 7:
+          case 8:
             // 支付成功后 清空卡片
             syncPayGroupToStorage(_objectSpread(_objectSpread({}, payGroup), {}, {
               walletPass: _objectSpread(_objectSpread({}, payGroup.walletPass), {}, {
@@ -78,11 +96,26 @@ var PaymentMethods = function PaymentMethods(props, ref) {
                 paid: true
               })
             }));
-            _context.next = 13;
+            _context.next = 15;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](4);
+          case 11:
+            _context.prev = 11;
+            _context.t0 = _context["catch"](5);
+            sendWarningLog({
+              title: '钱包支付失败 catch',
+              content: [{
+                key: '错误信息',
+                value: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || '未知错误'
+              }, {
+                key: '错误堆栈',
+                value: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.stack) || '无堆栈信息'
+              }, {
+                key: '错误类型',
+                value: (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.name) || '未知错误类型'
+              }]
+            });
+
+            // 钱包支付失败时 跳转失败页面 不继续后续流程
             return _context.abrupt("return", props.payCallback({
               key: 'fail',
               data: {
@@ -91,38 +124,53 @@ var PaymentMethods = function PaymentMethods(props, ref) {
                 fn: 'init'
               }
             }));
-          case 13:
+          case 15:
             if (!(waitAmount <= 0)) {
-              _context.next = 17;
+              _context.next = 18;
               break;
             }
-            // 清空交易组
-            removePayGroupFromStorage(payGroup.order_id);
-            props.payCallback({
-              key: 'success'
-            });
+            try {
+              // 清空交易组
+              removePayGroupFromStorage(payGroup.order_id);
+              props.payCallback({
+                key: 'success'
+              });
+            } catch (err) {
+              sendWarningLog({
+                title: '跳转成功页面 catch',
+                content: [{
+                  key: '错误信息',
+                  value: (err === null || err === void 0 ? void 0 : err.message) || '未知错误'
+                }, {
+                  key: '错误堆栈',
+                  value: (err === null || err === void 0 ? void 0 : err.stack) || '无堆栈信息'
+                }, {
+                  key: '错误类型',
+                  value: (err === null || err === void 0 ? void 0 : err.name) || '未知错误类型'
+                }]
+              });
+            }
             return _context.abrupt("return");
-          case 17:
-            _context.next = 19;
+          case 18:
+            _context.next = 20;
             return onPayByType({
               type: type,
               payGroup: payGroup
             });
-          case 19:
+          case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 10]]);
+      }, _callee, null, [[5, 11]]);
     }));
     return function init(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
-  console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils), interaction, context);
   useEffect(function () {
-    var _interaction$utils2, _interaction$utils2$i, _interaction$utils3, _interaction$utils3$i;
-    console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAppEnv) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2));
-    if (interaction !== null && interaction !== void 0 && (_interaction$utils3 = interaction.utils) !== null && _interaction$utils3 !== void 0 && (_interaction$utils3$i = _interaction$utils3.isAppEnv) !== null && _interaction$utils3$i !== void 0 && _interaction$utils3$i.call(_interaction$utils3)) {
+    var _interaction$utils, _interaction$utils$is, _interaction$utils2, _interaction$utils2$i;
+    console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils));
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils2 = interaction.utils) !== null && _interaction$utils2 !== void 0 && (_interaction$utils2$i = _interaction$utils2.isAppEnv) !== null && _interaction$utils2$i !== void 0 && _interaction$utils2$i.call(_interaction$utils2)) {
       interaction.utils.mountFunction('global', 'paymentResult', function (strResult) {
         console.log('paymentResult', strResult);
         if (!isJson(strResult)) return;