@pisell/private-materials 6.1.7 → 6.1.8

package/es/components/eftposPay/pay.js

@@ -10,7 +10,7 @@ import { getPayParams } from "./helper";
 import Manual from "./component/manual";
 import Signature from "./component/signature";
 import { StatusEnum, PayRouteEnum, ClientEnum } from "./const";
-import { Payo, Windcave, Tyro } from "./manufacturer";
+import { Payo, Windcave, Tyro, Linkly } from "./manufacturer";
 import { useContextData, useDispatch, updateStatus, backUpProduction, updateComponent, backUpFree, updateState } from "./store";
 import "./index.less";
 
@@ -150,7 +150,7 @@ var Pay = function Pay(_ref) {
       }
     };
   }, []);
-  // console.log("pay2222 = ",'pay 222' , data.render,data.type)
+  console.log('data =>>>>>> ', data);
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.render ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__eft-pay-box ".concat(className),
     style: data.type === 'step' ? {} : {
@@ -178,6 +178,10 @@ var Pay = function Pay(_ref) {
     onChange: onChange,
     key: data.key,
     formatAmount: formatAmount
+  }) : null, data.eftpos === 'linkly' ? /*#__PURE__*/React.createElement(Linkly, {
+    key: data.key,
+    api: api,
+    onChange: onChange
   }) : null) : null, data.type === PayRouteEnum.Unset && Comm ? /*#__PURE__*/React.createElement(Comm, {
     onChange: onChange,
     api: api,

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

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

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 } from "../../../../../Sales";
+import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer, useSummary } from "../../../../../Sales";
 import { formatValues, getFormParams } from "../../../../../Sales/Checkout/utils";
 import OrderProductModal from "../../OrderProductModal/index";
 import EmptyHolderModal from "../../EmptyHolderModal";
@@ -24,6 +24,7 @@ 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(),
@@ -43,10 +44,14 @@ var ContinueButton = function ContinueButton() {
     onCheckout = _useCheckout.onCheckout,
     createBooking = _useCheckout.createBooking,
     onCheckBeforeBooking = _useCheckout.onCheckBeforeBooking,
-    checkBeforeBooking = _useCheckout.checkBeforeBooking;
+    checkBeforeBooking = _useCheckout.checkBeforeBooking,
+    freePay = _useCheckout.freePay;
   var _useCustomer = useCustomer(),
     openLoginModal = _useCustomer.openLoginModal,
     isLogin = _useCustomer.isLogin;
+  var _useSummary = useSummary(),
+    deposit = _useSummary.deposit,
+    isAgreeDepositPolicy = _useSummary.isAgreeDepositPolicy;
 
   // 下单之前是否检测失败
   var _useState = useState(false),
@@ -90,6 +95,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) {
@@ -100,8 +106,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);
@@ -384,41 +395,51 @@ var ContinueButton = function ContinueButton() {
    */
   var handleContinue = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      var value, checkRes, emptyHolders;
+      var _context$appHelper3, _deposit$protocols, value, checkRes, emptyHolders;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!isLastStep) {
-              _context6.next = 14;
+              _context6.next = 17;
+              break;
+            }
+            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
+            }); // 如果未同意定金政策，则提示
+            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;
               break;
             }
-            value = formatValues(data); // 检测商品是否可以下单
-            _context6.next = 4;
+            Toast(locales.getText('pisell2.appointment.deposit.agree.policy'));
+            return _context6.abrupt("return");
+          case 5:
+            _context6.next = 7;
             return onCheckBeforeBooking(value);
-          case 4:
+          case 7:
             checkRes = _context6.sent;
             if (!((checkRes === null || checkRes === void 0 ? void 0 : checkRes.result) === false)) {
-              _context6.next = 9;
+              _context6.next = 12;
               break;
             }
             setCheckedNumber(checkRes === null || checkRes === void 0 ? void 0 : checkRes.num);
             setOpenCheckout(true);
             return _context6.abrupt("return");
-          case 9:
+          case 12:
             // 验证holder是否为空
             emptyHolders = getWithoutCartItemsHolderNames();
             if (!((emptyHolders === null || emptyHolders === void 0 ? void 0 : emptyHolders.length) > 0)) {
-              _context6.next = 12;
+              _context6.next = 15;
               break;
             }
             return _context6.abrupt("return", setOpenEmptyHolder(true));
-          case 12:
+          case 15:
             // 关闭购物车弹窗
             onCloseCart();
             return _context6.abrupt("return", handleCheckout());
-          case 14:
+          case 17:
             if (isLogin()) {
-              _context6.next = 17;
+              _context6.next = 20;
               break;
             }
             onCloseCart();
@@ -448,9 +469,9 @@ var ContinueButton = function ContinueButton() {
                 return callback;
               }()
             }));
-          case 17:
+          case 20:
             handleHolder();
-          case 18:
+          case 21:
           case "end":
             return _context6.stop();
         }
@@ -487,8 +508,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);
-  }, [isLastStep, createBooking === null || createBooking === void 0 ? void 0 : createBooking.loading, checkBeforeBooking === null || checkBeforeBooking === void 0 ? void 0 : checkBeforeBooking.loading]);
+    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 /*#__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/Deposit/index.d.ts

@@ -0,0 +1,2 @@
+declare const Deposit: () => JSX.Element;
+export default Deposit;

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

@@ -0,0 +1,17 @@
+import React from 'react';
+import { useSummary } from "../../../../../Sales";
+import { DepositContent } from "../../../../../appointmentBooking/components/Deposit";
+var Deposit = function Deposit() {
+  var _useSummary = useSummary(),
+    deposit = _useSummary.deposit,
+    isAgreeDepositPolicy = _useSummary.isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy = _useSummary.setIsAgreeDepositPolicy,
+    getDepositProtocol = _useSummary.getDepositProtocol;
+  return /*#__PURE__*/React.createElement(DepositContent, {
+    isAgreeDepositPolicy: !!isAgreeDepositPolicy,
+    setIsAgreeDepositPolicy: setIsAgreeDepositPolicy,
+    deposit: deposit,
+    depositProtocolRequest: getDepositProtocol
+  });
+};
+export default Deposit;

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

@@ -5,21 +5,25 @@ 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 { useSummary } from "../../../../../Sales";
+import { useCart, 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, _context$appHelper2, _context$appHelper2$g;
+  var _context$appHelper, _context$appHelper$ge, _cartData$cartItems, _cartData$cartItems2, _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;
+    total = _useSummary.total,
+    deposit = _useSummary.deposit;
   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), 'wh97978');
+  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);
   return /*#__PURE__*/React.createElement("div", {
     className: "event-total-wrap ".concat(className)
   }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /*#__PURE__*/React.createElement("div", {
@@ -31,8 +35,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, locales.getText('pisell2.event.total'), isFooter ? ': ' : ''), isFooter ? /*#__PURE__*/React.createElement(PisellText.Amount, {
-    value: total,
+  }, /*#__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,
     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,8 +5,10 @@ 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,
@@ -17,7 +19,7 @@ var CartItem = function CartItem() {
     cartData = _useCart.cartData,
     addNoteToCartItem = _useCart.addNoteToCartItem;
   var _useSummary = useSummary(),
-    subtotal = _useSummary.subtotal;
+    deposit = _useSummary.deposit;
   var _useStep = useStep(),
     isLastStep = _useStep.isLastStep;
   var handleClickCard = function handleClickCard(e, type, key) {
@@ -56,7 +58,7 @@ var CartItem = function CartItem() {
     }
   })), /*#__PURE__*/React.createElement("div", {
     className: "event-footer"
-  }, /*#__PURE__*/React.createElement(Total, null), /*#__PURE__*/React.createElement(ContinueButton, null))), /*#__PURE__*/React.createElement(SelectHolderModal, {
+  }, /*#__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, {
     open: open
   }));
 };

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

@@ -38,7 +38,8 @@ var BookingDetailModal = function BookingDetailModal(props) {
     onCloseEventDetail = _useEventDetail.onCloseEventDetail,
     onSelectEventDetail = _useEventDetail.onSelectEventDetail,
     selectEventDetailProductDetail = _useEventDetail.selectEventDetailProductDetail,
-    checkBeforeSelectEventDetail = _useEventDetail.checkBeforeSelectEventDetail;
+    checkBeforeSelectEventDetail = _useEventDetail.checkBeforeSelectEventDetail,
+    getProductDetailRequest = _useEventDetail.getProductDetailRequest;
   var _useCart = useCart(),
     addToCart = _useCart.addToCart,
     checkBeforeAddToCart = _useCart.checkBeforeAddToCart,
@@ -304,7 +305,9 @@ var BookingDetailModal = function BookingDetailModal(props) {
     utils === null || utils === void 0 || utils.action({
       type: 'pisell1.productDetail',
       data: {
-        detail: _objectSpread({}, (bookingOption === null || bookingOption === void 0 ? void 0 : bookingOption._originData) || {}),
+        detail: _objectSpread(_objectSpread({}, (bookingOption === null || bookingOption === void 0 ? void 0 : bookingOption._originData) || {}), {}, {
+          open_deposit: 1
+        }),
         isOS: false
       },
       callback: function callback(data) {
@@ -398,7 +401,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     onOk: handleOk,
     width: isMobile() ? '100%' : 600,
     okButtonProps: {
-      loading: checkBeforeAddToCartResquest === null || checkBeforeAddToCartResquest === void 0 ? void 0 : checkBeforeAddToCartResquest.loading
+      loading: (getProductDetailRequest === null || getProductDetailRequest === void 0 ? void 0 : getProductDetailRequest.loading) || (checkBeforeAddToCartResquest === null || checkBeforeAddToCartResquest === void 0 ? void 0 : checkBeforeAddToCartResquest.loading)
     }
   }, content()), /*#__PURE__*/React.createElement(OrderProductModal, {
     open: openCheckout,

package/es/components/eventBooking/index.js

@@ -58,6 +58,20 @@ var Content = function Content() {
     }
     getResourceList.run(params);
   }, []);
+  useEffect(function () {
+    var setRealVH = function setRealVH() {
+      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
+      var vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
+    };
+
+    // 页面加载和窗口大小变化时都重新计算
+    setRealVH();
+    window.addEventListener('resize', setRealVH);
+    return function () {
+      window.removeEventListener('resize', setRealVH);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "event-booking-wrap ".concat(isMobile() ? 'event-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(Header, null), /*#__PURE__*/React.createElement(EventContent, null), isMobile() && (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) !== 'select-category' ? /*#__PURE__*/React.createElement(Footer, null) : null);

package/es/components/eventBooking/index.less

@@ -15,7 +15,7 @@
 
 .event-booking-mobile-wrap {
   background: #ffffff;
-  min-height: 100vh;
+  min-height: calc(var(--vh, 1vh) * 100);
   .pisell-section-headers-content {
     width: 100%;
   }

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

@@ -71,6 +71,14 @@ 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;
@@ -144,6 +152,14 @@ 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;
@@ -217,6 +233,14 @@ 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,7 +82,15 @@ 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.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'
   },
   'zh-CN': {
     'pisell2.event.calendar.limit.unavailable': '不可预约',
@@ -167,7 +175,15 @@ 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.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': '暂无数据'
   },
   'zh-HK': {
     'pisell2.event.calendar.limit.unavailable': '不可預約',
@@ -252,6 +268,14 @@ 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.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': '暫無數據'
   }
 };

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/GlobePayAliPayH5/index.js

@@ -8,11 +8,12 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useState, useImperativeHandle, forwardRef } from 'react';
+import React, { useState, useImperativeHandle, forwardRef, useContext } from 'react';
 import { PisellModal } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
 import { getAliPayUrl } from "./serve";
+import { Context } from "../../model";
 import { getPayGroupParamsFromStorage, setPayNumber } from "../../payGroup";
 import "./index.less";
 /**
@@ -23,11 +24,17 @@ import "./index.less";
  * @Date: 2024-08-16 11:18
  */
 var GlobePayAliPayH5 = function GlobePayAliPayH5(props, ref) {
+  var _useContext = useContext(Context),
+    state = _useContext.state;
   var onChange = props.onChange;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    showSuccessBackButton = _useState4[0],
+    setShowSuccessBackButton = _useState4[1];
 
   /**
    * @title: 初始化
@@ -64,7 +71,7 @@ var GlobePayAliPayH5 = function GlobePayAliPayH5(props, ref) {
             if (url) {
               // 设置交易号
               setPayNumber(payGroup === null || payGroup === void 0 ? void 0 : payGroup.order_id, data === null || data === void 0 ? void 0 : data.pay_number);
-
+              setShowSuccessBackButton(true);
               // 跳转
               window.location.href = url;
             } else {
@@ -91,6 +98,12 @@ var GlobePayAliPayH5 = function GlobePayAliPayH5(props, ref) {
       init: init
     };
   });
+  var handleSuccessBack = function handleSuccessBack() {
+    var _state$payCallback;
+    (_state$payCallback = state.payCallback) === null || _state$payCallback === void 0 || _state$payCallback.call(state, {
+      key: 'success'
+    });
+  };
   return /*#__PURE__*/React.createElement(PisellModal, {
     platform: 'h5',
     open: open,
@@ -103,7 +116,9 @@ var GlobePayAliPayH5 = function GlobePayAliPayH5(props, ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: ""
   }, /*#__PURE__*/React.createElement(ThreedsLoading, {
-    title: locales.getText('tocPay.text.redirectingToAlipay')
+    title: locales.getText('tocPay.text.redirectingToAlipay'),
+    onSuccessBack: handleSuccessBack,
+    showSuccessBackButton: showSuccessBackButton
   })));
 };
 export default /*#__PURE__*/forwardRef(GlobePayAliPayH5);

package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.d.ts

@@ -1,3 +1,3 @@
 import './index.less';
-declare const ThreedsLoading: ({ title }: any) => JSX.Element;
+declare const ThreedsLoading: ({ title, showSuccessBackButton, onSuccessBack }: any) => JSX.Element;
 export default ThreedsLoading;

package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.js

@@ -4,7 +4,9 @@ import "./index.less";
 import { locales } from '@pisell/utils';
 var ThreedsLoading = function ThreedsLoading(_ref) {
   var _context$appHelper;
-  var title = _ref.title;
+  var title = _ref.title,
+    showSuccessBackButton = _ref.showSuccessBackButton,
+    onSuccessBack = _ref.onSuccessBack;
   var context = useEngineContext();
   var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.constants) || {},
     config = _ref2.config;
@@ -16,6 +18,9 @@ var ThreedsLoading = function ThreedsLoading(_ref) {
     alt: ""
   }), /*#__PURE__*/React.createElement("div", {
     className: 'threeds-loading-title'
-  }, title || locales.getText('tocPay.text.waitingForBankVerification')));
+  }, title || locales.getText('tocPay.text.waitingForBankVerification')), showSuccessBackButton && /*#__PURE__*/React.createElement("div", {
+    onClick: onSuccessBack,
+    className: "threeds-loading-success-back-button"
+  }, locales.getText('tocPay.text.successBack')));
 };
 export default ThreedsLoading;

package/es/components/pay/toC/PaymentMethods/MWCreditCard/TDSPay/ThreedsLoading/index.less

@@ -21,4 +21,12 @@
     line-height: 20px;
     color: #353535;
   }
+
+  .threeds-loading-success-back-button {
+    margin-top: 20px;
+    color: #4b6b99;
+    font-size: 15px;
+    font-weight: bold;
+    line-height: 20px;
+  }
 }