@pisell/private-materials 6.5.27 → 6.7.1

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

@@ -41,8 +41,10 @@ var import_payGroup = require("../../payGroup");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_utils2 = require("../../utils");
+var import_hooks = require("../hooks");
+var import_PaymentReturnContent = __toESM(require("../components/PaymentReturnContent"));
 var GooglePay = (props, ref) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const [open, setOpen] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
@@ -52,12 +54,17 @@ var GooglePay = (props, ref) => {
     orderId: ((_c = state.payGroup) == null ? void 0 : _c.order_id) || "unknown",
     step: "2"
   });
+  const { isReturned, handleRedirect, resetState } = (0, import_hooks.usePaymentRedirect)({
+    orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
+    paymentType: "googlePay"
+  });
   const init = async ({ payGroup }) => {
-    var _a2, _b2, _c2, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a2, _b2, _c2, _d2, _e2, _f, _g, _h, _i, _j, _k;
     paymentLogger.addLog({
       key: "GooglePay初始化开始",
       value: ""
     });
+    setOpen(true);
     const utils = context.appHelper.utils || {};
     const dvaStore = (_b2 = (_a2 = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a2.call(utils)) == null ? void 0 : _b2.getState();
     const values = (0, import_payGroup.getPayGroupParamsFromStorage)(payGroup.order_id);
@@ -79,15 +86,19 @@ var GooglePay = (props, ref) => {
       key: "GooglePay获取支付参数成功",
       value: ""
     });
-    if (((_d = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d.call(_c2)) && ((_f = (_e = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e.isAndroid_ios) == null ? void 0 : _f.call(_e)) === "android") {
+    if (((_d2 = (_c2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _c2.isAppEnv) == null ? void 0 : _d2.call(_c2)) && ((_f = (_e2 = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _e2.isAndroid_ios) == null ? void 0 : _f.call(_e2)) === "android") {
       paymentLogger.addLog({
         key: "GooglePay使用Android客户端支付",
         value: ""
       });
       paymentLogger.sendLogs("GooglePay客户端支付");
-      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "google_pay", values, interaction });
+      return (0, import_utils2.clientPayment)({
+        order_id: payGroup.order_id,
+        type: "google_pay",
+        values,
+        interaction
+      });
     }
-    setOpen(true);
     try {
       const locale = ((_g = dvaStore.core) == null ? void 0 : _g.translateLocale) || "en";
       const shopId = (_j = (_i = (_h = dvaStore.core) == null ? void 0 : _h.core) == null ? void 0 : _i.shop) == null ? void 0 : _j.id;
@@ -96,7 +107,7 @@ var GooglePay = (props, ref) => {
       linkElement.href = currentURL;
       const shop_domain = linkElement.hostname;
       const _href = `${config.pay}${(0, import_utils2.formatFranchiseeRoute)(
-        `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}`,
+        `/google-pay?order_id=${(_k = state.payGroup) == null ? void 0 : _k.order_id}&shop_id=${shopId}&locale=${locale}&shop_domain=${shop_domain}&total_amount=${values.amount}&payment_group_id=${values.payment_group_id}&front_order_uuid=${state.front_order_uuid}&is_replace_router=1`,
         state.history
       )}`;
       paymentLogger.addLog({
@@ -104,7 +115,7 @@ var GooglePay = (props, ref) => {
         value: ""
       });
       paymentLogger.sendLogs("GooglePay跳转成功");
-      window.location.href = _href;
+      await handleRedirect(_href);
     } catch (err) {
       paymentLogger.addLog({
         key: "GooglePay处理错误",
@@ -126,6 +137,10 @@ var GooglePay = (props, ref) => {
       init
     })
   );
+  const handleReturn = () => {
+    setOpen(false);
+    resetState();
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -136,11 +151,20 @@ var GooglePay = (props, ref) => {
       closable: false,
       bodyStyle: { padding: 0 }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, !isReturned && /* @__PURE__ */ import_react.default.createElement(
       import_ThreedsLoading.default,
       {
         title: import_utils.locales.getText("tocPay.text.connectingGooglePay")
       }
+    ), isReturned && // 跳转后返回时展示新组件内容
+    /* @__PURE__ */ import_react.default.createElement(
+      import_PaymentReturnContent.default,
+      {
+        handleReturn,
+        state,
+        orderId: (_e = state.payGroup) == null ? void 0 : _e.order_id,
+        unique_payment_number: state.front_order_uuid
+      }
     ))
   );
 };

package/lib/components/pay/toC/PaymentMethods/SuperPayAliPayH5/index.js

@@ -43,18 +43,25 @@ var import_index = require("./index.less");
 var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_usePaymentLogger = __toESM(require("../../../../../hooks/usePaymentLogger"));
 var import_utils2 = require("../../utils");
+var import_hooks = require("../hooks");
+var import_PaymentReturnContent = __toESM(require("../components/PaymentReturnContent"));
 var SuperPayAliPayH5 = (props, ref) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const { state } = (0, import_react.useContext)(import_model.Context);
   const { onChange } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [showSuccessBackButton, setShowSuccessBackButton] = (0, import_react.useState)(false);
+  const [statePayNumber, setStatePayNumber] = (0, import_react.useState)("");
   const context = (0, import_useEngineContext.default)();
   const { interaction } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const paymentLogger = (0, import_usePaymentLogger.default)({
     orderId: ((_b = state.payGroup) == null ? void 0 : _b.order_id) || "unknown",
     step: "2"
   });
+  const { isReturned, handleRedirect, resetState } = (0, import_hooks.usePaymentRedirect)({
+    orderId: (_c = state.payGroup) == null ? void 0 : _c.order_id,
+    paymentType: "aliPay"
+  });
   const init = async ({ payGroup }) => {
     var _a2, _b2;
     paymentLogger.addLog({
@@ -68,7 +75,12 @@ var SuperPayAliPayH5 = (props, ref) => {
         value: "检测到App环境，调用客户端支付"
       });
       paymentLogger.sendLogs("SuperPayAliPayH5App环境支付");
-      return (0, import_utils2.clientPayment)({ order_id: payGroup.order_id, type: "aliPay", values, interaction });
+      return (0, import_utils2.clientPayment)({
+        order_id: payGroup.order_id,
+        type: "aliPay",
+        values,
+        interaction
+      });
     }
     setOpen(true);
     if (!values) {
@@ -97,13 +109,14 @@ var SuperPayAliPayH5 = (props, ref) => {
           value: ""
         });
         (0, import_payGroup.setPayNumber)(payGroup == null ? void 0 : payGroup.order_id, data == null ? void 0 : data.pay_number);
+        setStatePayNumber(data == null ? void 0 : data.pay_number);
         setShowSuccessBackButton(true);
         paymentLogger.addLog({
           key: "SuperPayAliPayH5准备跳转支付宝",
           value: ""
         });
         paymentLogger.sendLogs("SuperPayAliPayH5跳转成功");
-        window.location.href = data == null ? void 0 : data.pay_url;
+        await handleRedirect(data == null ? void 0 : data.pay_url);
       } else {
         paymentLogger.addLog({
           key: "SuperPayAliPayH5支付链接为空",
@@ -144,6 +157,10 @@ var SuperPayAliPayH5 = (props, ref) => {
       key: "success"
     });
   };
+  const handleReturn = () => {
+    setOpen(false);
+    resetState();
+  };
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
@@ -154,13 +171,22 @@ var SuperPayAliPayH5 = (props, ref) => {
       closable: false,
       bodyStyle: { padding: 0 }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, !isReturned && /* @__PURE__ */ import_react.default.createElement(
       import_ThreedsLoading.default,
       {
         title: import_utils.locales.getText("tocPay.text.redirectingToAlipay"),
         onSuccessBack: handleSuccessBack,
         showSuccessBackButton
       }
+    ), isReturned && /* @__PURE__ */ import_react.default.createElement(
+      import_PaymentReturnContent.default,
+      {
+        pay_number: statePayNumber,
+        handleReturn,
+        state,
+        orderId: (_d = state.payGroup) == null ? void 0 : _d.order_id,
+        unique_payment_number: state.front_order_uuid
+      }
     ))
   );
 };

package/lib/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import './index.less';
+export interface PaymentReturnContentProps {
+    orderId?: string;
+    unique_payment_number?: string;
+    state?: any;
+    handleReturn?: () => void;
+    pay_number?: string;
+}
+/**
+ * 支付返回后展示的内容组件
+ * 当用户从外部支付页面返回时展示此组件
+ */
+declare const PaymentReturnContent: React.FC<PaymentReturnContentProps>;
+export default PaymentReturnContent;

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

@@ -0,0 +1,88 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.tsx
+var PaymentReturnContent_exports = {};
+__export(PaymentReturnContent_exports, {
+  default: () => PaymentReturnContent_default
+});
+module.exports = __toCommonJS(PaymentReturnContent_exports);
+var import_react = __toESM(require("react"));
+var import_materials = require("@pisell/materials");
+var import_utils = require("@pisell/utils");
+var import_ahooks = require("ahooks");
+var import_serve = require("../../../serve");
+var import_usePrefix = __toESM(require("../../../../../../hooks/usePrefix"));
+var import_index = require("./index.less");
+var PaymentReturnContent = ({
+  orderId,
+  unique_payment_number,
+  state,
+  handleReturn,
+  pay_number
+}) => {
+  const prefix = (0, import_usePrefix.default)();
+  const getPaymentIsPaid = (0, import_ahooks.useMemoizedFn)(async () => {
+    if (!unique_payment_number && !pay_number) {
+      return true;
+    }
+    const { data } = await (0, import_serve.getPaymentResult)({
+      order_id: orderId,
+      pay_number,
+      unique_payment_number: pay_number ? void 0 : unique_payment_number
+    });
+    return (data == null ? void 0 : data.payment_status) === "paid";
+  });
+  const handleViewOrder = async () => {
+    var _a;
+    const isPaid = await getPaymentIsPaid();
+    if (!isPaid) {
+      (0, import_materials.PisellToast)({
+        content: import_utils.locales.getText("tocPay.text.paymentFailed")
+      });
+      return;
+    }
+    (_a = state.payCallback) == null ? void 0 : _a.call(state, {
+      key: "success"
+    });
+  };
+  const handleGoBack = async () => {
+    var _a;
+    const isPaid = await getPaymentIsPaid();
+    if (!isPaid) {
+      handleReturn == null ? void 0 : handleReturn();
+      return;
+    } else {
+      (_a = state.payCallback) == null ? void 0 : _a.call(state, {
+        key: "success"
+      });
+    }
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-img" }, /* @__PURE__ */ import_react.default.createElement("img", { src: `${prefix}/payment-content.png`, alt: "success" })), /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-return-content-buttons" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, className: "payment-return-content-order-button", onClick: handleViewOrder }, import_utils.locales.getText("tocPay.text.paymentCompletedAndViewOrder")), /* @__PURE__ */ import_react.default.createElement(import_materials.Button, { block: true, onClick: handleGoBack }, import_utils.locales.getText("tocPay.text.returnAndSelectOtherPaymentMethod"))));
+};
+var PaymentReturnContent_default = PaymentReturnContent;

package/lib/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/lib/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/lib/components/pay/toC/PaymentMethods/hooks/index.js

@@ -0,0 +1,90 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/pay/toC/PaymentMethods/hooks/index.tsx
+var hooks_exports = {};
+__export(hooks_exports, {
+  usePaymentRedirect: () => usePaymentRedirect
+});
+module.exports = __toCommonJS(hooks_exports);
+var import_ahooks = require("ahooks");
+var import_react = require("react");
+var usePaymentRedirect = (options) => {
+  const { orderId, paymentType, onAfterReturn } = options;
+  const [isReturned, setIsReturned] = (0, import_react.useState)(false);
+  const handleRedirect = (0, import_ahooks.useMemoizedFn)(
+    async (url) => {
+      try {
+        const currentState = window.history.state || {};
+        window.history.replaceState(
+          {
+            ...currentState,
+            paymentRedirected: true,
+            paymentType,
+            orderId,
+            timestamp: Date.now()
+          },
+          "",
+          window.location.href
+        );
+        window.location.href = url;
+      } catch (error) {
+        throw error;
+      }
+    }
+  );
+  const resetState = (0, import_ahooks.useMemoizedFn)(() => {
+    setIsReturned(false);
+  });
+  (0, import_react.useEffect)(() => {
+    const handlePageShow = (event) => {
+      if (!orderId) return;
+      const historyState = window.history.state;
+      if ((historyState == null ? void 0 : historyState.paymentRedirected) && (historyState == null ? void 0 : historyState.paymentType) === paymentType && (historyState == null ? void 0 : historyState.orderId) === orderId) {
+        console.log(
+          `检测到从 ${paymentType} 返回, event.persisted:`,
+          event.persisted
+        );
+        setIsReturned(true);
+        if (onAfterReturn) {
+          onAfterReturn();
+        }
+        const newState = { ...historyState };
+        delete newState.paymentRedirected;
+        delete newState.paymentType;
+        delete newState.timestamp;
+        delete newState.orderId;
+        window.history.replaceState(newState, "", window.location.href);
+      }
+    };
+    handlePageShow({ persisted: false });
+    window.addEventListener("pageshow", handlePageShow);
+    return () => {
+      window.removeEventListener("pageshow", handlePageShow);
+    };
+  }, [orderId, paymentType]);
+  return {
+    isReturned,
+    handleRedirect,
+    resetState
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  usePaymentRedirect
+});

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

@@ -83,7 +83,8 @@ var ToCPay = (props, ref) => {
         status: "init",
         // 将支付回调储存在store, 方便其他模块调用
         payCallback: props.callback,
-        history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history
+        history: (_a2 = context.appHelper.utils) == null ? void 0 : _a2.history,
+        front_order_uuid: (0, import_utils.getUniqueId)("front_order_uuid_")
         // 支付组
         // payGroup: {
         //   order_id: initProps?.order?.order_id,
@@ -175,6 +176,14 @@ var ToCPay = (props, ref) => {
         key: "支付数据获取",
         value: ""
       });
+      const withCustomerIdList = (wallet_pass_recommend_list || []).map(
+        (item) => {
+          return {
+            ...item,
+            customer_id: customer_id || item.customer_id
+          };
+        }
+      );
       dispatch({
         type: "setPayGroup",
         payload: {
@@ -189,7 +198,7 @@ var ToCPay = (props, ref) => {
             ...(_a2 = state.payGroup) == null ? void 0 : _a2.walletPass,
             ...walletPass,
             amount: wallet_pass_amount,
-            cards: wallet_pass_recommend_list
+            cards: withCustomerIdList
           } : null,
           total_amount: order == null ? void 0 : order.amount,
           wait_amount: remain_amount

package/lib/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;

package/lib/components/pay/toC/locales.js

@@ -117,7 +117,10 @@ var locales_default = {
     "tocPay.text.multipleSelectionAvailable": "Multiple selection available",
     "tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment": (walletName) => `You can select multiple ${walletName} to combine for payment`,
     "tocPay.text.bestValueCombination": "Best value combination",
-    "tocPay.text.viewDetail": "View detail"
+    "tocPay.text.viewDetail": "View detail",
+    "tocPay.text.returnAndSelectOtherPaymentMethod": "Go Back / Choose Another Payment",
+    "tocPay.text.paymentCompletedAndViewOrder": "Payment Completed / View Order",
+    "tocPay.text.paymentFailed": "Not paid yet, please check if the payment is successful"
   },
   "zh-CN": {
     "tocPay.text.checkout": "结账",
@@ -212,7 +215,10 @@ var locales_default = {
     "tocPay.text.multipleSelectionAvailable": "可多选",
     "tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment": (walletName) => `您可以选择多个${walletName}进行组合付款`,
     "tocPay.text.bestValueCombination": "最佳组合",
-    "tocPay.text.viewDetail": "查看详情"
+    "tocPay.text.viewDetail": "查看详情",
+    "tocPay.text.returnAndSelectOtherPaymentMethod": "返回 / 选择其他支付方式",
+    "tocPay.text.paymentCompletedAndViewOrder": "支付完成 / 查看订单",
+    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功"
   },
   "zh-HK": {
     "tocPay.text.checkout": "結帳",
@@ -307,6 +313,9 @@ var locales_default = {
     "tocPay.text.multipleSelectionAvailable": "可多選",
     "tocPay.text.youCanSelectMultipleWalletPassesToCombineForPayment": (walletName) => `您可以選擇多個${walletName}進行組合付款`,
     "tocPay.text.bestValueCombination": "最佳組合",
-    "tocPay.text.viewDetail": "查看詳情"
+    "tocPay.text.viewDetail": "查看詳情",
+    "tocPay.text.returnAndSelectOtherPaymentMethod": "返回 / 選擇其他支付方式",
+    "tocPay.text.paymentCompletedAndViewOrder": "支付完成 / 查看訂單",
+    "tocPay.text.paymentFailed": "未支付完成，请检查是否支付成功"
   }
 };

package/lib/components/pay/toC/model.d.ts

@@ -28,6 +28,7 @@ export interface PayGroup {
     payment_priority?: string[];
     pay_number?: string;
     _order: any;
+    front_order_uuid?: string;
 }
 export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
     state: FormState;

package/lib/components/pay/toC/serve.d.ts

@@ -55,3 +55,8 @@ export declare const getWalletNameAndPopupStatus: (values: {
         popup_status?: 1 | 0;
     };
 }>;
+/**
+ * @title: 获取支付结果
+ * @description: 获取支付结果
+ */
+export declare const getPaymentResult: (values: any) => Promise<any>;

package/lib/components/pay/toC/serve.js

@@ -21,6 +21,7 @@ var serve_exports = {};
 __export(serve_exports, {
   getPaymentInit: () => getPaymentInit,
   getPaymentList: () => getPaymentList,
+  getPaymentResult: () => getPaymentResult,
   getPaymentsAndWalletPass: () => getPaymentsAndWalletPass,
   getWalletNameAndPopupStatus: () => getWalletNameAndPopupStatus
 });
@@ -75,10 +76,12 @@ var getWalletNameAndPopupStatus = async (values) => {
   const { data } = await import_utils.request.getRequest().get("/h5/wallet/setting", values);
   return data;
 };
+var getPaymentResult = (values) => import_utils.request.getRequest().get(`/h5/pay/order/payment/result`, values);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getPaymentInit,
   getPaymentList,
+  getPaymentResult,
   getPaymentsAndWalletPass,
   getWalletNameAndPopupStatus
 });

package/lib/components/ticketBooking/components/ticketBooking/index.less

@@ -36,7 +36,8 @@
       .booking-info-create-new,
       .pisell-lowcode__booking-field-title,
       .pisell-lowcode__shopping-cart-empty,
-      .pisell-lowcode__booking-service-clear-btn {
+      .pisell-lowcode__booking-service-clear-btn,
+      .pisell-lowcode__booking-contact-info-title {
         color: #ffffff;
       }
     }

package/lib/components/ticketBooking/utils/index.d.ts

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;