@pisell/private-materials 6.3.11 → 6.3.13

package/es/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -7,7 +7,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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); }); }; }
-import React, { forwardRef, useImperativeHandle, useEffect } from 'react';
+import React, { forwardRef, useImperativeHandle, useEffect, useRef } from 'react';
 import { locales, isMobile } from '@pisell/utils';
 import useEngineContext from "../../../../hooks/useEngineContext";
 import { useAppointmentBookingContext } from "../../context";
@@ -18,9 +18,12 @@ import { getFormParams } from "./utils";
 import "./index.less";
 var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
   var _context$appHelper;
+  // 用于跟踪是否已经订阅了事件，避免重复订阅
+  var hasSubscribedRef = useRef(false);
   var context = useEngineContext();
   var config = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.constants) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.config) || {};
   var utils = contextUtils();
+  var pubsub = context.appHelper.utils.pubsub;
   var _ref = useAppointmentBookingContext(),
     appointmentBooking = _ref.appointmentBooking,
     summary = _ref.summary,
@@ -252,15 +255,36 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
       return _ref4.apply(this, arguments);
     };
   }();
+  var handleSubmit = function handleSubmit() {
+    var _utils$businessUtils, _utils$businessUtils$;
+    // 如果用户是guest用户，下单时则拉起注册弹窗
+    if (utils !== null && utils !== void 0 && (_utils$businessUtils = utils.businessUtils) !== null && _utils$businessUtils !== void 0 && (_utils$businessUtils$ = _utils$businessUtils.isGuestUser) !== null && _utils$businessUtils$ !== void 0 && _utils$businessUtils$.call(_utils$businessUtils)) {
+      var _utils$businessUtils2, _utils$businessUtils3;
+      // 避免重复订阅
+      if (!hasSubscribedRef.current) {
+        pubsub.subscribe('bind.guest.user', handleNext);
+        hasSubscribedRef.current = true;
+      }
+      utils === null || utils === void 0 || (_utils$businessUtils2 = utils.businessUtils) === null || _utils$businessUtils2 === void 0 || (_utils$businessUtils3 = _utils$businessUtils2.openRegisterModal) === null || _utils$businessUtils3 === void 0 || _utils$businessUtils3.call(_utils$businessUtils2, true);
+      return;
+    }
+    handleNext();
+  };
+  useEffect(function () {
+    return function () {
+      pubsub.unsubscribe('bind.guest.user', handleNext);
+      hasSubscribedRef.current = false;
+    };
+  }, []);
   useImperativeHandle(ref, function () {
     return {
-      next: handleNext
+      next: handleSubmit
     };
   });
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-confirm-information-wrap"
   }, isMobile() ? /*#__PURE__*/React.createElement(CartItem, {
-    onNext: handleNext
+    onNext: handleSubmit
   }) : /*#__PURE__*/React.createElement("div", {
     className: "appointment-confirm-information-content"
   }, /*#__PURE__*/React.createElement("div", {

package/es/components/appointmentBooking/components/Content/index.js

@@ -124,7 +124,7 @@ var Layout = function Layout() {
     }();
     pubsub.subscribe('pisell1.login.success', handleLoginSuccess);
     return function () {
-      pubsub.unsubscribe('pisell1.login.success');
+      pubsub.unsubscribe('pisell1.login.success', handleLoginSuccess);
     };
   }, []);
   useEffect(function () {

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

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

package/es/components/appointmentBooking/index.d.ts

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

package/es/components/appointmentBooking/index.js

@@ -24,6 +24,16 @@ var AppointmentBooking = function AppointmentBooking() {
       if (!data.length) {
         var currentUser = formatCurrentUser(utils);
         appointmentBooking.addAccounts([currentUser]);
+      } else if (data.length >= 1) {
+        var meAccount = data === null || data === void 0 ? void 0 : data.find(function (d) {
+          return !(d !== null && d !== void 0 && d.isGuest);
+        });
+        // 如果 length >= 1 找到非 guest 账号，检测这个账号是否跟 localStorage 里已登录的账号 id 一致
+        // 如果不一致的话，则setLoginAccount ls 里的账号
+        var _currentUser = formatCurrentUser(utils);
+        if (_currentUser && meAccount.id !== _currentUser.id) {
+          appointmentBooking.setLoginAccount(meAccount.id, _currentUser);
+        }
       }
     });
   }, []);

package/es/components/booking/components/footer/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/es/components/booking/components/footer/utils.js

@@ -443,7 +443,7 @@ var formatBookings = function formatBookings(data, values) {
   if (isEvent) {
     list = list.filter(function (d) {
       var _d$_extend;
-      return (_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.holder_id;
+      return ((_d$_extend = d._extend) === null || _d$_extend === void 0 ? void 0 : _d$_extend.holder_id) && !isNormalProductByDurationSchedule(d);
     });
   }
   if (!isDay && !isEvent) {

package/es/components/booking/components/reloadResourceModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

package/es/components/booking/hooks/useQuotation.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const calculateTotalPrice: (data: any) => number;
 declare const useQuotation: (state: any, dispatch: any) => {
     dom: JSX.Element;

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

package/es/components/booking/info/service/Lists.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange, onAction, isParallelResource }: any) => JSX.Element;
 export default Lists;

package/es/components/booking/info/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

package/es/components/booking/info2/service/addTimeModal/index.d.ts

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

package/es/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const AddNote: ({ value, onChange, wait, title, placeholder }: any) => JSX.Element;
 export default AddNote;

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

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -11,7 +11,7 @@ import './device.less';
 declare const _default: ({ api, onChange, onClose, className, device_number, isMobile, net, client, formatAmount, }: {
     api: PayProps['api'];
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@ 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, { useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useState, useRef } from 'react';
 import { locales } from '@pisell/utils';
 import { Button, PisellToast } from '@pisell/materials';
 import { useCart, useHolder, useStep, useCheckout, useSales, useCustomer, useSummary } from "../../../../../Sales";
@@ -26,7 +26,9 @@ import useEngineContext from "../../../../../../hooks/useEngineContext";
 import "./index.less";
 import { Toast } from "../../../../../appointmentBooking/utils";
 var ContinueButton = function ContinueButton() {
-  var _context$appHelper, _cartData$cartItems;
+  var _context$appHelper, _context$appHelper2, _context$appHelper3, _cartData$cartItems;
+  // 用于跟踪是否已经订阅了事件，避免重复订阅
+  var hasSubscribedRef = useRef(false);
   var _useSales = useSales(),
     data = _useSales.data;
   var _useHolder = useHolder(),
@@ -71,7 +73,10 @@ var ContinueButton = function ContinueButton() {
     setData = _useSales2.setData,
     removeSessionStorage = _useSales2.removeSessionStorage;
   var context = useEngineContext();
-  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+  var config = (context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.constants) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.config) || {};
+  var utils = (context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils) || {};
+  var pubsub = context.appHelper.utils.pubsub;
+  var _ref = ((_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 ? void 0 : _context$appHelper3.utils) || {},
     store = _ref.store,
     action = _ref.action,
     getStore = _ref.getStore;
@@ -95,7 +100,7 @@ var ContinueButton = function ContinueButton() {
               data: params,
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
-                  var _context$appHelper2;
+                  var _context$appHelper4;
                   var value, result, _result$err;
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
@@ -108,7 +113,7 @@ var ContinueButton = function ContinueButton() {
                       case 2:
                         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,
+                          platform: context === null || context === void 0 || (_context$appHelper4 = context.appHelper) === null || _context$appHelper4 === void 0 || (_context$appHelper4 = _context$appHelper4.constants) === null || _context$appHelper4 === void 0 ? void 0 : _context$appHelper4.platform,
                           excludeDisabled: false,
                           extra: {
                             relation_forms: e
@@ -395,7 +400,7 @@ var ContinueButton = function ContinueButton() {
    */
   var handleContinue = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-      var _context$appHelper3, _deposit$protocols, value, checkRes, emptyHolders;
+      var _context$appHelper5, _deposit$protocols, value, checkRes, emptyHolders;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -405,7 +410,7 @@ var ContinueButton = function ContinueButton() {
             }
             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
+              platform: context === null || context === void 0 || (_context$appHelper5 = context.appHelper) === null || _context$appHelper5 === void 0 || (_context$appHelper5 = _context$appHelper5.constants) === null || _context$appHelper5 === void 0 ? void 0 : _context$appHelper5.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;
@@ -481,6 +486,27 @@ var ContinueButton = function ContinueButton() {
       return _ref7.apply(this, arguments);
     };
   }();
+  var handleSubmit = function handleSubmit() {
+    var _utils$businessUtils, _utils$businessUtils$;
+    // 如果用户是guest用户，下单时则拉起注册弹窗
+    if (utils !== null && utils !== void 0 && (_utils$businessUtils = utils.businessUtils) !== null && _utils$businessUtils !== void 0 && (_utils$businessUtils$ = _utils$businessUtils.isGuestUser) !== null && _utils$businessUtils$ !== void 0 && _utils$businessUtils$.call(_utils$businessUtils)) {
+      var _utils$businessUtils2, _utils$businessUtils3;
+      // 避免重复订阅
+      if (!hasSubscribedRef.current) {
+        pubsub.subscribe('bind.guest.user', handleContinue);
+        hasSubscribedRef.current = true;
+      }
+      utils === null || utils === void 0 || (_utils$businessUtils2 = utils.businessUtils) === null || _utils$businessUtils2 === void 0 || (_utils$businessUtils3 = _utils$businessUtils2.openRegisterModal) === null || _utils$businessUtils3 === void 0 || _utils$businessUtils3.call(_utils$businessUtils2, true);
+      return;
+    }
+    handleContinue();
+  };
+  useEffect(function () {
+    return function () {
+      pubsub.unsubscribe('bind.guest.user', handleContinue);
+      hasSubscribedRef.current = false;
+    };
+  }, []);
 
   /**
    * @title: 确认按钮文案
@@ -515,7 +541,7 @@ var ContinueButton = function ContinueButton() {
     size: "large",
     type: "primary",
     onClick: function onClick() {
-      return handleContinue();
+      return isLastStep ? handleSubmit() : handleContinue();
     },
     loading: confirmLoading
   }, continueText), /*#__PURE__*/React.createElement(OrderProductModal, {

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

@@ -61,6 +61,26 @@ var ProgressBar = function ProgressBar(_ref) {
   var handleOk = function handleOk() {
     var _interaction$utils, _interaction$utils$is;
     if (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 && _interaction$utils$is.call(_interaction$utils)) {
+      var url = window.location.href;
+
+      // 如果 url中包含 isByTabbar 删除url中的cacheId 并刷新页面
+      if (url.includes('isByTabbar')) {
+        removeSessionStorage === null || removeSessionStorage === void 0 || removeSessionStorage();
+        var urlParams = new URLSearchParams(window.location.search);
+        urlParams.delete('cacheId');
+        setOpen(false);
+        interaction.utils.postMessageToApp({
+          module: 'global',
+          key: 'openNative',
+          data: {
+            link: {
+              page: "home"
+            }
+          }
+        });
+        window.location.href = window.location.pathname + '?' + urlParams.toString();
+        return;
+      }
       interaction.utils.postMessageToApp({
         module: 'global',
         key: 'paymentResultAction',

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

@@ -15,7 +15,7 @@ import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
 import { Context } from "../../model";
 import { getPayGroupParamsFromStorage } from "../../payGroup";
 import useEngineContext from "../../../../../hooks/useEngineContext";
-import { formatFranchiseeRoute } from "../../utils";
+import { clientPayment, formatFranchiseeRoute } from "../../utils";
 /**
  * @title: 谷歌支付
  * @description:
@@ -26,7 +26,7 @@ import { formatFranchiseeRoute } from "../../utils";
  * @Date: 2024-08-16 11:01
  */
 var GooglePay = function GooglePay(props, ref) {
-  var _context$appHelper;
+  var _context$appHelper, _context$appHelper2;
   var _useContext = useContext(Context),
     state = _useContext.state;
   var _useState = useState(false),
@@ -36,6 +36,8 @@ var GooglePay = function GooglePay(props, ref) {
   var context = useEngineContext();
   var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.constants) || {},
     config = _ref.config;
+  var _context$appHelper$ut = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils,
+    interaction = _context$appHelper$ut.interaction;
 
   /**
    * @title: 初始化
@@ -47,23 +49,34 @@ var GooglePay = function GooglePay(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
-      var _utils$getStore;
+      var _utils$getStore, _interaction$utils, _interaction$utils$is, _interaction$utils2, _interaction$utils2$i;
       var payGroup, utils, dvaStore, values, _dvaStore$core, _dvaStore$core2, _state$payGroup, locale, shopId, currentURL, linkElement, shop_domain, _href;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref2.payGroup;
-            setOpen(true);
             utils = context.appHelper.utils || {};
             dvaStore = utils === null || utils === void 0 || (_utils$getStore = utils.getStore) === null || _utils$getStore === void 0 || (_utils$getStore = _utils$getStore.call(utils)) === null || _utils$getStore === void 0 ? void 0 : _utils$getStore.getState(); // 获取交易组
             values = getPayGroupParamsFromStorage(payGroup.order_id);
+            if (!(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 && _interaction$utils$is.call(_interaction$utils) && (interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || (_interaction$utils2$i = _interaction$utils2.isAndroid_ios) === null || _interaction$utils2$i === void 0 ? void 0 : _interaction$utils2$i.call(_interaction$utils2)) === 'android')) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return", clientPayment({
+              order_id: payGroup.order_id,
+              type: 'google_pay',
+              values: values,
+              interaction: interaction
+            }));
+          case 6:
+            setOpen(true);
             if (values) {
-              _context.next = 8;
+              _context.next = 10;
               break;
             }
             setOpen(false);
             return _context.abrupt("return");
-          case 8:
+          case 10:
             try {
               locale = ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en';
               shopId = (_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.core) === null || _dvaStore$core2 === void 0 || (_dvaStore$core2 = _dvaStore$core2.shop) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.id;
@@ -78,7 +91,7 @@ var GooglePay = function GooglePay(props, ref) {
             } catch (err) {
               setOpen(false);
             }
-          case 9:
+          case 11:
           case "end":
             return _context.stop();
         }

package/es/components/pay/toC/PaymentMethods/WalletPass/List/index.d.ts

@@ -10,6 +10,7 @@ export interface WalletPassListProps {
     walletSetting: {
         name: string;
     };
+    onChangeDebounce?: boolean;
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;

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

@@ -20,7 +20,10 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
     onChange = props.onChange,
     propsData = props.data,
     value = props.value,
-    walletSetting = props.walletSetting;
+    walletSetting = props.walletSetting,
+    onLoadingChange = props.onLoadingChange,
+    propsLoading = props.loading,
+    onChangeDebounce = props.onChangeDebounce;
   var _useState = useState(propsData || []),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -34,6 +37,9 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
       setData(propsData);
     }
   }, [propsData]);
+  useEffect(function () {
+    setLoading(!!propsLoading);
+  }, [propsLoading]);
   var getList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, formatList) {
       var list;
@@ -84,6 +90,9 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
       init: init
     };
   });
+  useEffect(function () {
+    onLoadingChange === null || onLoadingChange === void 0 || onLoadingChange(loading);
+  }, [loading]);
 
   /**
    * 拆分出可用的和不可用的列表
@@ -131,7 +140,8 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
     value: value,
     onChange: handleChange,
     showEmpty: data.length === 0,
-    empty: empty
+    empty: empty,
+    onChangeDebounce: onChangeDebounce
   }), !!disabledList.length && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-walletPass-list-disabled"
   }, locales.getText('tocPay.text.walletPassDisabled')), /*#__PURE__*/React.createElement(PisellCardList, {

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

@@ -42,41 +42,45 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     setCurrentWalletPass = _useState2[1];
   var _useState3 = useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
-
-  /** 搜索 modal */
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    searchOpen = _useState6[0],
-    setSearchOpen = _useState6[1];
+    open = _useState6[0],
+    setOpen = _useState6[1];
 
-  /** 搜索后添加的walletPass */
-  var _useState7 = useState([]),
+  /** 搜索 modal */
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    addList = _useState8[0],
-    setAddList = _useState8[1];
+    searchOpen = _useState8[0],
+    setSearchOpen = _useState8[1];
 
-  /** 当前order信息 */
-  var _useState9 = useState(null),
+  /** 搜索后添加的walletPass */
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    order = _useState10[0],
-    setOrder = _useState10[1];
+    addList = _useState10[0],
+    setAddList = _useState10[1];
 
-  /** 当前搜索modal内list数据 */
-  var _useState11 = useState([]),
+  /** 当前order信息 */
+  var _useState11 = useState(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    searchData = _useState12[0],
-    setSearchData = _useState12[1];
+    order = _useState12[0],
+    setOrder = _useState12[1];
+
+  /** 当前搜索modal内list数据 */
+  var _useState13 = useState([]),
+    _useState14 = _slicedToArray(_useState13, 2),
+    searchData = _useState14[0],
+    setSearchData = _useState14[1];
 
   /** 当前搜索modal内选中数据 */
-  var _useState13 = useState({
+  var _useState15 = useState({
       ids: [],
       details: []
     }),
-    _useState14 = _slicedToArray(_useState13, 2),
-    searchSelectData = _useState14[0],
-    setSearchSelectData = _useState14[1];
+    _useState16 = _slicedToArray(_useState15, 2),
+    searchSelectData = _useState16[0],
+    setSearchSelectData = _useState16[1];
 
   /** 是否默认选中 搜索时默认选中 列表select变更更新列表时不默认选中 */
   var isAutoSelect = useRef(false);
@@ -361,13 +365,16 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     data: otherCustomerWalletPassList,
     title: locales.getText('tocPay.text.couponCodesAdded'),
     onChange: handleOtherChange,
-    value: selectValue
+    value: selectValue,
+    loading: loading,
+    onChangeDebounce: true
   }), /*#__PURE__*/React.createElement(List, {
     walletSetting: walletSetting,
     title: walletSetting.name,
     onChange: handleCurrentChange,
     ref: listRef,
-    value: selectValue
+    value: selectValue,
+    onLoadingChange: setLoading
   }))), /*#__PURE__*/React.createElement(PisellModal, {
     title: /*#__PURE__*/React.createElement("div", null, locales.getText('tocPay.text.searchResult')),
     mobileModalHeight: '90%',

package/es/components/pay/toC/utils.d.ts

@@ -51,7 +51,7 @@ export declare const formatFranchiseeRoute: (url: string, history?: any) => stri
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
 export declare const clientPayment: (params: {
     order_id: number;
-    type: "aliPay" | "wxPay";
+    type: "aliPay" | "wxPay" | 'google_pay';
     values: any;
     interaction?: any;
 }) => void;

package/es/components/productSelect/components/TabProduct/index.d.ts

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

package/es/components/productSelect/components/productGroup/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type BoolConfigVal = 0 | 1;
 export interface ProductCardConfig {

package/es/components/shoppingCart/components/Cart/Product.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductProps } from '../../type';
 declare const Product: (props: ProductProps) => JSX.Element;
 export default Product;

package/es/components/ticketBooking/components/ticketBooking/index.d.ts

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

package/es/components/ticketBooking/components/timeBar/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { Dayjs } from 'dayjs';
 import './index.less';
 interface ITimeBarProps {