@pisell/private-materials 6.6.1 → 6.7.1

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/pisellSelectCustomerModal/RightPanel/serve.js

@@ -25,7 +25,14 @@ __export(serve_exports, {
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getCustomerList = async (params) => {
-  let { data } = await import_utils.request.getRequest().get(`/shop/customer/select-list`, params, { abort: true, fullResult: true });
+  let { data } = await import_utils.request.getRequest().get(`/shop/customer/select-list`, params, {
+    abort: true,
+    fullResult: true,
+    cache: {
+      mode: "remote_local",
+      type: "indexDB"
+    }
+  });
   return data;
 };
 var addCustomer = async (params) => {

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -54,7 +54,6 @@ var Product = (props) => {
     platform,
     isShowChangeResource,
     isShowDelete,
-    isShowAmountFooter,
     isShowChangeHolder,
     isShowHolder,
     isShowAddHolderButton,
@@ -83,8 +82,7 @@ var Product = (props) => {
       isShowDelete,
       isShowHolder,
       isShowAddHolderButton,
-      isShowEditProduct,
-      isShowAmountFooter
+      isShowEditProduct
     };
   }, [
     isShowNote,
@@ -95,8 +93,7 @@ var Product = (props) => {
     isShowHolder,
     isShowAddHolderButton,
     isShowChangeHolder,
-    isShowEditProduct,
-    isShowAmountFooter
+    isShowEditProduct
   ]);
   const getProductCardStyleProps = (0, import_ahooks.useMemoizedFn)(
     (type) => {
@@ -104,8 +101,7 @@ var Product = (props) => {
       if (state.scenario !== "booking2") return {};
       return {
         isShowImage: conf == null ? void 0 : conf.show_product_image,
-        isShowDelete: (conf == null ? void 0 : conf.show_remove_button) && isShowDelete,
-        isShowAmountFooter,
+        isShowDelete: conf == null ? void 0 : conf.show_remove_button,
         disabledEdit: true
       };
     }

package/lib/components/shoppingCart/type.d.ts

@@ -29,7 +29,6 @@ export interface shoppingCartProps {
     isShowImage?: boolean;
     isShowHolder?: boolean;
     isShowDelete?: boolean;
-    isShowAmountFooter?: boolean;
     collapseParams?: CollapseProps;
     productParams?: productProps;
     isHideClearCart?: boolean;

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

@@ -1,6 +1,18 @@
 .sku-list-container {
   height: 100%;
   background-color: #4e4e4e;
+  .empty-content {
+    .empty-icon-wrapper {
+      .empty-default-icon {
+        color: rgba(255, 255, 255, 0.8) !important;
+      }
+    }
+    .empty-inner {
+      .empty-text {
+        color: rgba(255, 255, 255, 0.8) !important;
+      }
+    }
+  }
   .sku-list {
     background-color: #4e4e4e;
     overflow: auto;

package/lib/components/ticketBooking/components/addServiceVariant/addService.d.ts

@@ -5,6 +5,8 @@ interface AddServiceProps {
     dispatch?: any;
     state?: any;
     renderMode?: 'current' | 'drawer';
+    onPrerenderComplete?: () => void;
+    onGetProductsReady?: (getProducts: any) => void;
     /**
      * 产品展示配置
      *