@pisell/private-materials 6.6.2 → 6.7.2

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

@@ -0,0 +1,143 @@
+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 _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 from 'react';
+import { Button, PisellToast } from '@pisell/materials';
+import { locales } from '@pisell/utils';
+import { useMemoizedFn } from 'ahooks';
+import { getPaymentResult } from "../../../serve";
+import usePrefix from "../../../../../../hooks/usePrefix";
+import "./index.less";
+/**
+ * 支付返回后展示的内容组件
+ * 当用户从外部支付页面返回时展示此组件
+ */
+var PaymentReturnContent = function PaymentReturnContent(_ref) {
+  var orderId = _ref.orderId,
+    unique_payment_number = _ref.unique_payment_number,
+    state = _ref.state,
+    handleReturn = _ref.handleReturn,
+    pay_number = _ref.pay_number;
+  var prefix = usePrefix();
+  var getPaymentIsPaid = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _yield$getPaymentResu, data;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (!(!unique_payment_number && !pay_number)) {
+            _context.next = 2;
+            break;
+          }
+          return _context.abrupt("return", true);
+        case 2:
+          _context.next = 4;
+          return getPaymentResult({
+            order_id: orderId,
+            pay_number: pay_number,
+            unique_payment_number: pay_number ? undefined : unique_payment_number
+          });
+        case 4:
+          _yield$getPaymentResu = _context.sent;
+          data = _yield$getPaymentResu.data;
+          return _context.abrupt("return", (data === null || data === void 0 ? void 0 : data.payment_status) === 'paid');
+        case 7:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
+
+  /**
+   * 查看订单
+   * @returns 
+   */
+  var handleViewOrder = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _state$payCallback;
+      var isPaid;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return getPaymentIsPaid();
+          case 2:
+            isPaid = _context2.sent;
+            if (isPaid) {
+              _context2.next = 6;
+              break;
+            }
+            PisellToast({
+              content: locales.getText('tocPay.text.paymentFailed')
+            });
+            return _context2.abrupt("return");
+          case 6:
+            // 如果已支付，则跳转至订单详情
+            (_state$payCallback = state.payCallback) === null || _state$payCallback === void 0 || _state$payCallback.call(state, {
+              key: 'success'
+            });
+          case 7:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleViewOrder() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+
+  /**
+   * 返回并选择其他支付方式
+   * @returns 
+   */
+  var handleGoBack = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var isPaid, _state$payCallback2;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return getPaymentIsPaid();
+          case 2:
+            isPaid = _context3.sent;
+            if (isPaid) {
+              _context3.next = 8;
+              break;
+            }
+            handleReturn === null || handleReturn === void 0 || handleReturn();
+            return _context3.abrupt("return");
+          case 8:
+            // 如果已支付，则跳转至订单详情
+            (_state$payCallback2 = state.payCallback) === null || _state$payCallback2 === void 0 || _state$payCallback2.call(state, {
+              key: 'success'
+            });
+          case 9:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function handleGoBack() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/React.createElement("div", {
+    className: "payment-return-content"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "payment-return-content-img"
+  }, /*#__PURE__*/React.createElement("img", {
+    src: "".concat(prefix, "/payment-content.png"),
+    alt: "success"
+  })), /*#__PURE__*/React.createElement("div", {
+    className: "payment-return-content-buttons"
+  }, /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    className: "payment-return-content-order-button",
+    onClick: handleViewOrder
+  }, locales.getText('tocPay.text.paymentCompletedAndViewOrder')), /*#__PURE__*/React.createElement(Button, {
+    block: true,
+    onClick: handleGoBack
+  }, locales.getText('tocPay.text.returnAndSelectOtherPaymentMethod'))));
+};
+export default PaymentReturnContent;

package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less

@@ -0,0 +1,34 @@
+.payment-return-content {
+  padding: 100px 46px 0;
+
+  .payment-return-content-img {
+    width: 100%;
+    margin-bottom: 60px;
+    min-height: 270px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+  
+  .payment-return-content-buttons {
+    display: flex;
+    flex-direction: column;
+    gap: 24px;
+    button {
+      border-radius: 40px;
+      span {
+        width: 100%;
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
+    }
+    .payment-return-content-order-button {
+      background: #7F56DA;
+      color: var(--Primary-700, #6941C6);
+      border: 1px solid var(--Primary-200, #E9D7FE);
+      background: var(--Primary-50, #F9F5FF);
+    }
+  }
+}
+

package/es/components/pay/toC/PaymentMethods/hooks/index.d.ts

@@ -0,0 +1,19 @@
+export interface UsePaymentRedirectOptions {
+    orderId?: string;
+    paymentType: string;
+    onAfterReturn?: () => void;
+}
+export interface UsePaymentRedirectReturn {
+    isReturned: boolean;
+    handleRedirect: (url: string) => Promise<void>;
+    resetState: () => void;
+}
+/**
+ * 支付跳转 Hook
+ * 用于处理跳转到外部支付页面的逻辑，包括：
+ * 1. 保存跳转标记到 history state
+ * 2. 跳转到外部支付页面
+ * 3. 监听页面返回事件
+ * 4. 返回后更新状态
+ */
+export declare const usePaymentRedirect: (options: UsePaymentRedirectOptions) => UsePaymentRedirectReturn;

package/es/components/{ticketBooking/components/addServiceVariant/MultiDayTimeSelectModal.js → pay/toC/PaymentMethods/hooks/index.js}

@@ -1,5 +1,10 @@
 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 _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 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(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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -8,112 +13,114 @@ 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, useEffect, useRef } from 'react';
-import dayjs from 'dayjs';
-import { PisellModal } from '@pisell/materials';
-import { locales } from '@pisell/utils';
-import MultiDayTimeSelect from "../../../../pro/multiDayTimeSelect";
-import "./MultiDayTimeSelectModal.less";
-var MultiDayTimeSelectModal = function MultiDayTimeSelectModal(_ref) {
-  var open = _ref.open,
-    productName = _ref.productName,
-    _ref$locale = _ref.locale,
-    locale = _ref$locale === void 0 ? 'en' : _ref$locale,
-    defaultStartDate = _ref.defaultStartDate,
-    _ref$loading = _ref.loading,
-    loading = _ref$loading === void 0 ? false : _ref$loading,
-    _ref$maxDays = _ref.maxDays,
-    maxDays = _ref$maxDays === void 0 ? 30 : _ref$maxDays,
-    _ref$separateStartEnd = _ref.separateStartEnd,
-    separateStartEnd = _ref$separateStartEnd === void 0 ? false : _ref$separateStartEnd,
-    onConfirm = _ref.onConfirm,
-    onCancel = _ref.onCancel;
-  var _useState = useState(null),
+import { useMemoizedFn } from 'ahooks';
+import { useState, useEffect } from 'react';
+/**
+ * 支付跳转 Hook
+ * 用于处理跳转到外部支付页面的逻辑，包括：
+ * 1. 保存跳转标记到 history state
+ * 2. 跳转到外部支付页面
+ * 3. 监听页面返回事件
+ * 4. 返回后更新状态
+ */
+export var usePaymentRedirect = function usePaymentRedirect(options) {
+  var orderId = options.orderId,
+    paymentType = options.paymentType,
+    onAfterReturn = options.onAfterReturn;
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    value = _useState2[0],
-    setValue = _useState2[1];
-  var formRef = useRef(null);
+    isReturned = _useState2[0],
+    setIsReturned = _useState2[1];
 
-  // 初始化值
-  useEffect(function () {
-    if (open) {
-      var _startDate = defaultStartDate || dayjs();
-      var _endDate = _startDate.add(1, 'day');
-      var initialValue = {
-        startDate: _startDate,
-        endDate: _endDate,
-        duration: 1
-      };
-      setValue(initialValue);
-    }
-  }, [open, defaultStartDate]);
-
-  // 处理值变化
-  var handleChange = function handleChange(newValue) {
-    setValue(newValue);
-  };
-
-  // 确认按钮
-  var handleConfirm = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _formRef$current;
+  /**
+   * 执行跳转
+   */
+  var handleRedirect = useMemoizedFn( /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url) {
+      var currentState;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
-            _context.next = 3;
-            return (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.validate();
-          case 3:
-            if (value) {
-              onConfirm(value.startDate, value.endDate, value.duration);
-            }
-            _context.next = 8;
+            // 使用 History State 保存跳转标记
+            currentState = window.history.state || {};
+            window.history.replaceState(_objectSpread(_objectSpread({}, currentState), {}, {
+              paymentRedirected: true,
+              paymentType: paymentType,
+              orderId: orderId,
+              timestamp: Date.now()
+            }), '', window.location.href);
+
+            // 跳转到外部支付页面
+            window.location.href = url;
+            _context.next = 9;
             break;
           case 6:
             _context.prev = 6;
             _context.t0 = _context["catch"](0);
-          case 8:
+            throw _context.t0;
+          case 9:
           case "end":
             return _context.stop();
         }
       }, _callee, null, [[0, 6]]);
     }));
-    return function handleConfirm() {
-      return _ref2.apply(this, arguments);
+    return function (_x) {
+      return _ref.apply(this, arguments);
+    };
+  }());
+
+  /**
+   * 重置状态
+   */
+  var resetState = useMemoizedFn(function () {
+    setIsReturned(false);
+  });
+
+  /**
+   * 监听页面显示事件（包括浏览器返回按钮）
+   */
+  useEffect(function () {
+    var handlePageShow = function handlePageShow(event) {
+      if (!orderId) return;
+
+      // 检查 History State 中是否有跳转标记
+      var historyState = window.history.state;
+      if (historyState !== null && historyState !== void 0 && historyState.paymentRedirected && (historyState === null || historyState === void 0 ? void 0 : historyState.paymentType) === paymentType && (historyState === null || historyState === void 0 ? void 0 : historyState.orderId) === orderId) {
+        console.log("\u68C0\u6D4B\u5230\u4ECE ".concat(paymentType, " \u8FD4\u56DE, event.persisted:"), event.persisted);
+
+        // 从支付页面返回，设置返回状态
+        setIsReturned(true);
+
+        // 执行返回后的回调
+        if (onAfterReturn) {
+          onAfterReturn();
+        }
+
+        // 清除标记，避免重复触发
+        var newState = _objectSpread({}, historyState);
+        delete newState.paymentRedirected;
+        delete newState.paymentType;
+        delete newState.timestamp;
+        delete newState.orderId;
+        window.history.replaceState(newState, '', window.location.href);
+      }
     };
-  }();
 
-  // 取消按钮
-  var handleCancel = function handleCancel() {
-    if (loading) return; // loading 时不允许取消
-    onCancel();
+    // 首次加载时也检查一次
+    handlePageShow({
+      persisted: false
+    });
+
+    // 监听 pageshow 事件（浏览器返回时触发）
+    window.addEventListener('pageshow', handlePageShow);
+    return function () {
+      window.removeEventListener('pageshow', handlePageShow);
+    };
+  }, [orderId, paymentType]);
+  return {
+    isReturned: isReturned,
+    handleRedirect: handleRedirect,
+    resetState: resetState
   };
-  return /*#__PURE__*/React.createElement(PisellModal, {
-    open: open,
-    title: productName || locales.getText('pisell2.text.product_name'),
-    onCancel: handleCancel,
-    onOk: handleConfirm,
-    okText: locales.getText('pisell2.text.confirm'),
-    cancelText: locales.getText('pisell2.text.cancel'),
-    width: 600,
-    destroyOnClose: true,
-    confirmLoading: loading,
-    closable: !loading,
-    maskClosable: !loading,
-    headerDivider: false,
-    footerDivider: false,
-    cancelButtonProps: {
-      disabled: loading
-    }
-  }, /*#__PURE__*/React.createElement(MultiDayTimeSelect, {
-    ref: formRef,
-    maxDays: maxDays,
-    defaultStartDate: defaultStartDate,
-    separateStartEnd: separateStartEnd,
-    value: value || undefined,
-    onChange: handleChange,
-    locale: locale,
-    disabled: loading
-  }));
-};
-export default MultiDayTimeSelectModal;
+};

package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

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

@@ -17,7 +17,7 @@ import React, { useState, useMemo, useContext, useRef, useImperativeHandle, forw
 import { Decimal } from 'decimal.js';
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 import { PisellModal, PisellText, PisellContainer, PisellLoading, PisellToast } from '@pisell/materials';
-import { detectIncognito, locales, copyToClipboard } from '@pisell/utils';
+import { detectIncognito, locales, copyToClipboard, getUniqueId } from '@pisell/utils';
 import PayCountdown from "./PayCountdown";
 import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
@@ -121,7 +121,8 @@ var ToCPay = function ToCPay(props, ref) {
         status: 'init',
         // 将支付回调储存在store, 方便其他模块调用
         payCallback: props.callback,
-        history: (_context$appHelper$ut5 = context.appHelper.utils) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.history
+        history: (_context$appHelper$ut5 = context.appHelper.utils) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.history,
+        front_order_uuid: getUniqueId('front_order_uuid_')
         // 支付组
         // payGroup: {
         //   order_id: initProps?.order?.order_id,
@@ -260,7 +261,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass;
+      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, withCustomerIdList;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -283,10 +284,13 @@ var ToCPay = function ToCPay(props, ref) {
             _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass; // 记录获取到的数据
             paymentLogger.addLog({
               key: '支付数据获取',
-              value: ""
+              value: ''
             });
-
-            // 设置交易组
+            withCustomerIdList = (wallet_pass_recommend_list || []).map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                customer_id: customer_id || item.customer_id
+              });
+            }); // 设置交易组
             dispatch({
               type: 'setPayGroup',
               payload: {
@@ -299,7 +303,7 @@ var ToCPay = function ToCPay(props, ref) {
                 // 支付方式没有walletPass时walletPass设置null
                 walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.walletPass), walletPass), {}, {
                   amount: wallet_pass_amount,
-                  cards: wallet_pass_recommend_list
+                  cards: withCustomerIdList
                 }) : null,
                 total_amount: order === null || order === void 0 ? void 0 : order.amount,
                 wait_amount: remain_amount
@@ -307,9 +311,9 @@ var ToCPay = function ToCPay(props, ref) {
             });
 
             // 初始化支付列表
-            _context3.next = 10;
+            _context3.next = 11;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list);
-          case 10:
+          case 11:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
@@ -318,12 +322,12 @@ var ToCPay = function ToCPay(props, ref) {
             // 记录获取支付列表成功
             paymentLogger.addLog({
               key: '获取支付列表成功',
-              value: ""
+              value: ''
             });
-            _context3.next = 20;
+            _context3.next = 21;
             break;
-          case 14:
-            _context3.prev = 14;
+          case 15:
+            _context3.prev = 15;
             _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
 
@@ -346,11 +350,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 20:
+          case 21:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 14]]);
+      }, _callee3, null, [[1, 15]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);
@@ -377,7 +381,7 @@ var ToCPay = function ToCPay(props, ref) {
             currentPayGroup = payGroup || state.payGroup; // 记录开始处理支付
             paymentLogger.addLog({
               key: '开始支付处理',
-              value: ""
+              value: ''
             });
             _context4.prev = 3;
             // 打开loading
@@ -393,7 +397,7 @@ var ToCPay = function ToCPay(props, ref) {
             // 记录支付方法调用成功
             paymentLogger.addLog({
               key: '支付方法调用成功',
-              value: ""
+              value: ''
             });
             paymentLogger.sendLogs('支付方法调用成功');
 
@@ -449,7 +453,7 @@ var ToCPay = function ToCPay(props, ref) {
             orderId = newOrderId || ((_state$payGroup4 = state.payGroup) === null || _state$payGroup4 === void 0 ? void 0 : _state$payGroup4.order_id); // 记录开始创建交易组
             paymentLogger.addLog({
               key: '开始创建交易组',
-              value: ""
+              value: ''
             });
             setSubmitLoading(true);
             _context5.prev = 3;
@@ -474,7 +478,7 @@ var ToCPay = function ToCPay(props, ref) {
             // 记录创建交易组成功
             paymentLogger.addLog({
               key: '创建交易组成功',
-              value: ""
+              value: ''
             });
             return _context5.abrupt("return", _objectSpread(_objectSpread({}, state.payGroup), {}, {
               order_id: orderId,
@@ -624,7 +628,7 @@ var ToCPay = function ToCPay(props, ref) {
             }
             paymentLogger.addLog({
               key: '无痕模式检测',
-              value: ""
+              value: ''
             });
             setShowDetectIncognitoConfirm(true);
             return _context7.abrupt("return");
@@ -635,7 +639,7 @@ var ToCPay = function ToCPay(props, ref) {
             }
             paymentLogger.addLog({
               key: '需要创建交易组',
-              value: ""
+              value: ''
             });
             _context7.next = 14;
             return paymentInit(newOrderId);
@@ -652,7 +656,7 @@ var ToCPay = function ToCPay(props, ref) {
             // 记录提交成功（这里是调用成功，实际支付结果在payCallback中处理）
             paymentLogger.addLog({
               key: '支付提交调用成功',
-              value: ""
+              value: ''
             });
             _context7.next = 25;
             break;

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

@@ -94,6 +94,9 @@ declare const _default: {
         'tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment': (walletName: string) => string;
         'tocPay.text.bestValueCombination': string;
         'tocPay.text.viewDetail': string;
+        'tocPay.text.returnAndSelectOtherPaymentMethod': string;
+        'tocPay.text.paymentCompletedAndViewOrder': string;
+        'tocPay.text.paymentFailed': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -189,6 +192,9 @@ declare const _default: {
         'tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment': (walletName: string) => string;
         'tocPay.text.bestValueCombination': string;
         'tocPay.text.viewDetail': string;
+        'tocPay.text.returnAndSelectOtherPaymentMethod': string;
+        'tocPay.text.paymentCompletedAndViewOrder': string;
+        'tocPay.text.paymentFailed': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -284,6 +290,9 @@ declare const _default: {
         'tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment': (walletName: string) => string;
         'tocPay.text.bestValueCombination': string;
         'tocPay.text.viewDetail': string;
+        'tocPay.text.returnAndSelectOtherPaymentMethod': string;
+        'tocPay.text.paymentCompletedAndViewOrder': string;
+        'tocPay.text.paymentFailed': string;
     };
 };
 export default _default;