@pisell/private-materials 3.4.88 → 3.4.90

package/lib/components/booking/info/service/addService/utils.d.ts

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info2/service/addService/utils.d.ts

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/lib/components/booking/info2/service/editService/index.js

@@ -52,6 +52,8 @@ var import_materials = require("@pisell/materials");
 var import_utils5 = require("../../../info/utils");
 var import_utils6 = require("../../../info/service2/utils");
 var import_utils7 = require("../../../../ticketBooking/utils");
+var import_decimal = require("decimal.js");
+var import_utils8 = require("./utils");
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I;
@@ -165,7 +167,7 @@ var Info = (_, ref) => {
     form.setFieldsValue({ discount });
   };
   const onFinish = (values) => {
-    var _a2, _b2;
+    var _a2, _b2, _c2, _d2, _e2;
     let isSuccess = (_a2 = resourcesRef.current) == null ? void 0 : _a2.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -193,6 +195,23 @@ var Info = (_, ref) => {
     const { startDate, endDate } = (0, import_utils3.getServiceTimes)({ _extend });
     _extend.startDate = startDate;
     _extend.endDate = endDate;
+    if (isChangeTotal.current) {
+      const discountRatio = new import_decimal.Decimal(values.total).div(_item._extend.origin_total);
+      const bundles2 = ((_c2 = _extend == null ? void 0 : _extend.other) == null ? void 0 : _c2.bundle) || [];
+      let childProductsTotal = new import_decimal.Decimal(0);
+      if (bundles2.length > 0) {
+        bundles2.forEach((bundle) => {
+          const discountedPrice = new import_decimal.Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_HALF_UP);
+          bundle.bundle_selling_price = discountedPrice.toNumber();
+          childProductsTotal = childProductsTotal.add(
+            discountedPrice.mul(bundle.quantity)
+          );
+        });
+      }
+      const mainProductTotal = new import_decimal.Decimal(values.total).sub(childProductsTotal);
+      const mainProductQuantity = ((_d2 = _extend.other) == null ? void 0 : _d2.quantity) || _extend.quantity || 1;
+      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
+    }
     if (_extend.bundle_edit !== void 0) {
       _extend.bundle_edit = 1;
     }
@@ -200,6 +219,10 @@ var Info = (_, ref) => {
     _item._time = (/* @__PURE__ */ new Date()).getTime();
     _item._serviceKey = (0, import_utils7.genServiceKey)(_item);
     let _id = _item == null ? void 0 : _item._id;
+    _item = (0, import_utils8.setProductPrice)(_item, {
+      newTotal: values.total,
+      origin_total: (_e2 = _item._extend) == null ? void 0 : _e2.origin_total
+    });
     if (!_list.some((d) => d._id === _id)) {
       const detail = (0, import_utils7.addService)(_list, _item, state);
       _list = detail.list;

package/lib/components/booking/info2/service/editService/utils.d.ts

@@ -11,3 +11,18 @@ export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;
 }) => void;
+/**
+ * 手动折扣后给商品价格和子商品价格重新计算
+ *
+ * 计算逻辑：
+ * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
+ * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
+ *
+ * @param cacheItem - 缓存的商品项
+ * @param newTotal - 折扣后的新总价
+ * @param origin_total - 原始总价
+ */
+export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
+    newTotal: number;
+    origin_total: number;
+}) => any;

package/lib/components/booking/info2/service/editService/utils.js

@@ -20,10 +20,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
-  setAutoAllocationStorage: () => setAutoAllocationStorage
+  setAutoAllocationStorage: () => setAutoAllocationStorage,
+  setProductPrice: () => setProductPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
+var import_utils2 = require("../addService/utils");
+var import_decimal = require("decimal.js");
+var import_utils3 = require("@pisell/utils");
 var getAutoAllocationStorage = (id) => {
   const value = localStorage.getItem("resource-auto-allocation");
   if (value) {
@@ -41,8 +45,40 @@ var setAutoAllocationStorage = (data) => {
     localStorage.setItem("resource-auto-allocation", JSON.stringify({ ...data }));
   }
 };
+var setProductPrice = (cacheItem, { newTotal, origin_total }) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  if (((_a = cacheItem == null ? void 0 : cacheItem.discount_list) == null ? void 0 : _a.length) && ((cacheItem == null ? void 0 : cacheItem.discount_list) || []).some((item) => ["good_pass", "discount_card", "product_discount_card"].includes(
+    item.type
+  ))) {
+    return cacheItem;
+  }
+  if (cacheItem.discount_amount) {
+    return cacheItem;
+  }
+  const discountRatio = new import_decimal.Decimal(newTotal).div(new import_decimal.Decimal(origin_total));
+  let subTotal = new import_decimal.Decimal(0);
+  if (((_b = cacheItem._extend.other) == null ? void 0 : _b.bundle) && (0, import_utils3.isArr)((_c = cacheItem._extend.other) == null ? void 0 : _c.bundle)) {
+    (_e = (_d = cacheItem._extend.other) == null ? void 0 : _d.bundle) == null ? void 0 : _e.forEach((bundle) => {
+      const newPrice = new import_decimal.Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_DOWN).toNumber();
+      const quantity = bundle.num ?? bundle.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.Decimal(newPrice).mul(quantity));
+      bundle.price = newPrice;
+    });
+  }
+  if (((_f = cacheItem._extend.other) == null ? void 0 : _f.option) && (0, import_utils3.isArr)((_g = cacheItem._extend.other) == null ? void 0 : _g.option)) {
+    (_i = (_h = cacheItem._extend.other) == null ? void 0 : _h.option) == null ? void 0 : _i.forEach((option) => {
+      const newPrice = new import_decimal.Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, import_decimal.Decimal.ROUND_DOWN).toNumber();
+      const quantity = option.num ?? option.quantity ?? 1;
+      subTotal = subTotal.add(new import_decimal.Decimal(newPrice).mul(quantity));
+      option.price = newPrice;
+    });
+  }
+  cacheItem._extend.price = new import_decimal.Decimal(newTotal).sub(subTotal).toNumber();
+  return cacheItem;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getAutoAllocationStorage,
-  setAutoAllocationStorage
+  setAutoAllocationStorage,
+  setProductPrice
 });

package/lib/components/booking/model.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -108,4 +109,11 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: any, Context: any;
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/notes/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/payments/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/lib/components/booking/utils.d.ts

@@ -166,10 +166,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/eftpos/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/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: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/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: "page" | "success" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "success" | "page" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

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

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     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/lib/components/eftposPay/store/index.d.ts

@@ -176,7 +176,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "loading" | "success" | "warn" | "fail" | "question";
+        status: "warn" | "success" | "loading" | "fail" | "question";
     };
 };
 /**
@@ -197,7 +197,7 @@ export declare const updateComponent: (component: string, render?: boolean) => {
     } | {
         readonly type: "step";
         readonly render: boolean;
-        readonly component?: undefined;
+        component?: undefined;
     };
 };
 /**
@@ -297,10 +297,10 @@ export declare const backUpFree: (payload: Partial<State>) => {
         name?: string | undefined;
         symbol?: string | undefined;
         amount?: string | number | undefined;
-        mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
+        mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "pay" | "amount" | "deviceList" | undefined;
+        eftpos?: "stripe" | "payo" | "tyro" | "windcave" | "linkly" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -310,7 +310,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "warn" | "success" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */

package/lib/components/eftposPay/tyro/hooks.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 获取 Tyro 资源
  * @description:

package/lib/components/eventBooking/components/ErrorTip/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateStatus/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/CallToBook/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare type CallToBookProps = {
     show: boolean;
     type: string;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/WeekItem/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/CalenDateWeek/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare type CalenDateWeekProps = {
     currentDate: string;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/DayItem/index.d.ts

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

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Item/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 import { CalendarItemProps } from '../../../../../type';
 declare const Item: (props: CalendarItemProps) => import("react").JSX.Element;

package/lib/components/eventBooking/components/bookingAvailabilityCalendar/components/CalendarDate/Status/index.d.ts

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

package/lib/components/pay/toC/PaymentList/payment/google_pay.svg

@@ -1,9 +1,27 @@
-<svg width="46" height="32" viewBox="0 0 46 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="0.5" y="0.5" width="45" height="31" rx="3.5" fill="white"/>
-<rect x="0.5" y="0.5" width="45" height="31" rx="3.5" stroke="#F2F4F7"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4108 20.7039V16.7911H23.4303C24.2579 16.7911 24.9563 16.5138 25.5257 15.9669L25.6624 15.8282C26.7025 14.696 26.6342 12.9321 25.5257 11.8846C24.9715 11.33 24.2123 11.0296 23.4303 11.045H20.1885V20.7039H21.4108ZM21.4109 15.6048V12.2311H23.4611C23.9016 12.2311 24.3192 12.4006 24.6305 12.7087C25.2911 13.3557 25.3063 14.434 24.6685 15.1041C24.3572 15.4353 23.9167 15.6202 23.4611 15.6048H21.4109ZM31.3639 14.6112C30.84 14.1259 30.1263 13.8795 29.2229 13.8795C28.0613 13.8795 27.1882 14.3108 26.6112 15.1658L27.6893 15.8513C28.0841 15.2659 28.6231 14.9732 29.3064 14.9732C29.7391 14.9732 30.1567 15.135 30.4832 15.4277C30.802 15.7049 30.9842 16.1055 30.9842 16.5291V16.8141C30.5135 16.5522 29.9214 16.4136 29.1925 16.4136C28.3422 16.4136 27.6589 16.6138 27.1502 17.0221C26.6416 17.4303 26.3834 17.9695 26.3834 18.655C26.3682 19.2789 26.634 19.872 27.1047 20.2725C27.583 20.7039 28.1904 20.9195 28.904 20.9195C29.7467 20.9195 30.4148 20.5421 30.9235 19.7873H30.9767V20.7039H32.1458V16.6292C32.1458 15.7743 31.8877 15.0964 31.3639 14.6112ZM28.046 19.4869C27.7954 19.3021 27.6436 19.0017 27.6436 18.6782C27.6436 18.3161 27.8106 18.0157 28.1371 17.777C28.4712 17.5382 28.8889 17.4149 29.3824 17.4149C30.0658 17.4072 30.5974 17.5613 30.977 17.8694C30.977 18.3932 30.772 18.8476 30.3696 19.2327C30.0051 19.6025 29.5115 19.8104 28.9952 19.8104C28.6535 19.8181 28.3194 19.7026 28.046 19.4869ZM34.7734 23.6077L38.858 14.0952H37.5294L35.6389 18.8399H35.6162L33.6802 14.0952H32.3516L35.0316 20.2803L33.5132 23.6077H34.7734Z" fill="#3C4043"/>
-<path d="M17.1905 15.9439C17.1905 15.5665 17.1601 15.1891 17.0994 14.8193H11.9443V16.9529H14.8977C14.7762 17.6384 14.3814 18.2546 13.8044 18.6398V20.0262H15.5658C16.5983 19.0634 17.1905 17.6385 17.1905 15.9439Z" fill="#4285F4"/>
-<path d="M11.9452 21.3662C13.4181 21.3662 14.6632 20.8732 15.5666 20.0259L13.8053 18.6395C13.3118 18.9784 12.6816 19.1709 11.9452 19.1709C10.5179 19.1709 9.31074 18.1927 8.87799 16.8833H7.06348V18.316C7.98971 20.1877 9.88015 21.3662 11.9452 21.3662Z" fill="#34A853"/>
-<path d="M8.87795 16.8834C8.65015 16.1978 8.65015 15.4507 8.87795 14.7575V13.3325H7.06315C6.28103 14.8961 6.28103 16.7447 7.06315 18.3083L8.87795 16.8834Z" fill="#FBBC04"/>
-<path d="M11.9452 12.47C12.7272 12.4546 13.4788 12.755 14.0406 13.3018L15.6046 11.7151C14.61 10.7754 13.3042 10.2593 11.9452 10.2747C9.88015 10.2747 7.98971 11.4609 7.06348 13.3326L8.87799 14.7653C9.31074 13.4482 10.5179 12.47 11.9452 12.47Z" fill="#EA4335"/>
+<svg width="46" height="32" viewBox="170 168 754 328" fill="none" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg">
+<path fill="#FFFFFF" d="M722.7,170h-352c-110,0-200,90-200,200l0,0c0,110,90,200,200,200h352c110,0,200-90,200-200l0,0
+	C922.7,260,832.7,170,722.7,170z"/>
+<path fill="#3C4043" d="M722.7,186.2c24.7,0,48.7,4.9,71.3,14.5c21.9,9.3,41.5,22.6,58.5,39.5
+	c16.9,16.9,30.2,36.6,39.5,58.5c9.6,22.6,14.5,46.6,14.5,71.3s-4.9,48.7-14.5,71.3c-9.3,21.9-22.6,41.5-39.5,58.5
+	c-16.9,16.9-36.6,30.2-58.5,39.5c-22.6,9.6-46.6,14.5-71.3,14.5h-352c-24.7,0-48.7-4.9-71.3-14.5c-21.9-9.3-41.5-22.6-58.5-39.5
+	c-16.9-16.9-30.2-36.6-39.5-58.5c-9.6-22.6-14.5-46.6-14.5-71.3s4.9-48.7,14.5-71.3c9.3-21.9,22.6-41.5,39.5-58.5
+	c16.9-16.9,36.6-30.2,58.5-39.5c22.6-9.6,46.6-14.5,71.3-14.5L722.7,186.2 M722.7,170h-352c-110,0-200,90-200,200l0,0
+	c0,110,90,200,200,200h352c110,0,200-90,200-200l0,0C922.7,260,832.7,170,722.7,170L722.7,170z"/>
+<path fill="#3C4043" d="M529.3,384.2v60.5h-19.2V295.3H561c12.9,0,23.9,4.3,32.9,12.9
+	c9.2,8.6,13.8,19.1,13.8,31.5c0,12.7-4.6,23.2-13.8,31.7c-8.9,8.5-19.9,12.7-32.9,12.7h-31.7V384.2z M529.3,313.7v52.1h32.1
+	c7.6,0,14-2.6,19-7.7c5.1-5.1,7.7-11.3,7.7-18.3c0-6.9-2.6-13-7.7-18.1c-5-5.3-11.3-7.9-19-7.9h-32.1V313.7z"/>
+<path fill="#3C4043" d="M657.9,339.1c14.2,0,25.4,3.8,33.6,11.4c8.2,7.6,12.3,18,12.3,31.2v63h-18.3v-14.2h-0.8
+	c-7.9,11.7-18.5,17.5-31.7,17.5c-11.3,0-20.7-3.3-28.3-10s-11.4-15-11.4-25c0-10.6,4-19,12-25.2c8-6.3,18.7-9.4,32-9.4
+	c11.4,0,20.8,2.1,28.1,6.3v-4.4c0-6.7-2.6-12.3-7.9-17c-5.3-4.7-11.5-7-18.6-7c-10.7,0-19.2,4.5-25.4,13.6l-16.9-10.6
+	C625.9,345.8,639.7,339.1,657.9,339.1z M633.1,413.3c0,5,2.1,9.2,6.4,12.5c4.2,3.3,9.2,5,14.9,5c8.1,0,15.3-3,21.6-9
+	s9.5-13,9.5-21.1c-6-4.7-14.3-7.1-25-7.1c-7.8,0-14.3,1.9-19.5,5.6C635.7,403.1,633.1,407.8,633.1,413.3z"/>
+<path fill="#3C4043" d="M808.2,342.4l-64,147.2h-19.8l23.8-51.5L706,342.4h20.9l30.4,73.4h0.4l29.6-73.4H808.2z"/>
+<path fill="#4285F4" d="M452.93,372c0-6.26-0.56-12.25-1.6-18.01h-80.48v33L417.2,387
+	c-1.88,10.98-7.93,20.34-17.2,26.58v21.41h27.59C443.7,420.08,452.93,398.04,452.93,372z"/>
+<path fill="#34A853" d="M400.01,413.58c-7.68,5.18-17.57,8.21-29.14,8.21c-22.35,0-41.31-15.06-48.1-35.36
+	h-28.46v22.08c14.1,27.98,43.08,47.18,76.56,47.18c23.14,0,42.58-7.61,56.73-20.71L400.01,413.58z"/>
+<path fill="#FABB05" d="M320.09,370.05c0-5.7,0.95-11.21,2.68-16.39v-22.08h-28.46
+	c-5.83,11.57-9.11,24.63-9.11,38.47s3.29,26.9,9.11,38.47l28.46-22.08C321.04,381.26,320.09,375.75,320.09,370.05z"/>
+<path fill="#E94235" d="M370.87,318.3c12.63,0,23.94,4.35,32.87,12.85l24.45-24.43
+	c-14.85-13.83-34.21-22.32-57.32-22.32c-33.47,0-62.46,19.2-76.56,47.18l28.46,22.08C329.56,333.36,348.52,318.3,370.87,318.3z"/>
 </svg>

package/lib/components/pay/toC/PaymentList/payment/google_pay2.svg

@@ -0,0 +1,9 @@
+<svg width="46" height="32" viewBox="0 0 46 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.5" y="0.5" width="45" height="31" rx="3.5" fill="white"/>
+<rect x="0.5" y="0.5" width="45" height="31" rx="3.5" stroke="#F2F4F7"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M21.4108 20.7039V16.7911H23.4303C24.2579 16.7911 24.9563 16.5138 25.5257 15.9669L25.6624 15.8282C26.7025 14.696 26.6342 12.9321 25.5257 11.8846C24.9715 11.33 24.2123 11.0296 23.4303 11.045H20.1885V20.7039H21.4108ZM21.4109 15.6048V12.2311H23.4611C23.9016 12.2311 24.3192 12.4006 24.6305 12.7087C25.2911 13.3557 25.3063 14.434 24.6685 15.1041C24.3572 15.4353 23.9167 15.6202 23.4611 15.6048H21.4109ZM31.3639 14.6112C30.84 14.1259 30.1263 13.8795 29.2229 13.8795C28.0613 13.8795 27.1882 14.3108 26.6112 15.1658L27.6893 15.8513C28.0841 15.2659 28.6231 14.9732 29.3064 14.9732C29.7391 14.9732 30.1567 15.135 30.4832 15.4277C30.802 15.7049 30.9842 16.1055 30.9842 16.5291V16.8141C30.5135 16.5522 29.9214 16.4136 29.1925 16.4136C28.3422 16.4136 27.6589 16.6138 27.1502 17.0221C26.6416 17.4303 26.3834 17.9695 26.3834 18.655C26.3682 19.2789 26.634 19.872 27.1047 20.2725C27.583 20.7039 28.1904 20.9195 28.904 20.9195C29.7467 20.9195 30.4148 20.5421 30.9235 19.7873H30.9767V20.7039H32.1458V16.6292C32.1458 15.7743 31.8877 15.0964 31.3639 14.6112ZM28.046 19.4869C27.7954 19.3021 27.6436 19.0017 27.6436 18.6782C27.6436 18.3161 27.8106 18.0157 28.1371 17.777C28.4712 17.5382 28.8889 17.4149 29.3824 17.4149C30.0658 17.4072 30.5974 17.5613 30.977 17.8694C30.977 18.3932 30.772 18.8476 30.3696 19.2327C30.0051 19.6025 29.5115 19.8104 28.9952 19.8104C28.6535 19.8181 28.3194 19.7026 28.046 19.4869ZM34.7734 23.6077L38.858 14.0952H37.5294L35.6389 18.8399H35.6162L33.6802 14.0952H32.3516L35.0316 20.2803L33.5132 23.6077H34.7734Z" fill="#3C4043"/>
+<path d="M17.1905 15.9439C17.1905 15.5665 17.1601 15.1891 17.0994 14.8193H11.9443V16.9529H14.8977C14.7762 17.6384 14.3814 18.2546 13.8044 18.6398V20.0262H15.5658C16.5983 19.0634 17.1905 17.6385 17.1905 15.9439Z" fill="#4285F4"/>
+<path d="M11.9452 21.3662C13.4181 21.3662 14.6632 20.8732 15.5666 20.0259L13.8053 18.6395C13.3118 18.9784 12.6816 19.1709 11.9452 19.1709C10.5179 19.1709 9.31074 18.1927 8.87799 16.8833H7.06348V18.316C7.98971 20.1877 9.88015 21.3662 11.9452 21.3662Z" fill="#34A853"/>
+<path d="M8.87795 16.8834C8.65015 16.1978 8.65015 15.4507 8.87795 14.7575V13.3325H7.06315C6.28103 14.8961 6.28103 16.7447 7.06315 18.3083L8.87795 16.8834Z" fill="#FBBC04"/>
+<path d="M11.9452 12.47C12.7272 12.4546 13.4788 12.755 14.0406 13.3018L15.6046 11.7151C14.61 10.7754 13.3042 10.2593 11.9452 10.2747C9.88015 10.2747 7.98971 11.4609 7.06348 13.3326L8.87799 14.7653C9.31074 13.4482 10.5179 12.47 11.9452 12.47Z" fill="#EA4335"/>
+</svg>

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/Add/index.d.ts

@@ -4,9 +4,15 @@ export interface AddMWCreditCardRef {
     init: () => void;
     onReset: () => void;
     onSubmit: () => void;
+    close: () => void;
 }
 export interface AddMWCreditCardProps {
+    /** 创建卡片回调 */
     onCreate?: (values: any) => void;
+    /** 店铺名称，用于授权说明文案 */
+    shopName?: string;
+    /** 按钮 loading */
+    btnLoading?: boolean;
 }
 declare const _default: React.ForwardRefExoticComponent<AddMWCreditCardProps & React.RefAttributes<any>>;
 export default _default;

package/lib/components/pay/toC/PaymentMethods/MWCreditCard/Add/index.js

@@ -71,7 +71,7 @@ var formatName = (card_name) => {
   }
 };
 var AddMWCreditCard = (props, ref) => {
-  const { onCreate } = props;
+  const { onCreate, shopName = "", btnLoading = false } = props;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [form] = import_antd.Form.useForm();
   const { state } = (0, import_react.useContext)(import_model.Context);
@@ -147,12 +147,16 @@ var AddMWCreditCard = (props, ref) => {
   const onSubmit = () => {
     form.submit();
   };
+  const close = () => {
+    setOpen(false);
+  };
   (0, import_react.useImperativeHandle)(
     ref,
     () => ({
       init,
       onReset,
-      onSubmit
+      onSubmit,
+      close
     })
   );
   const okText = (0, import_react.useMemo)(() => {
@@ -167,15 +171,37 @@ var AddMWCreditCard = (props, ref) => {
   return /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
-      title: /* @__PURE__ */ import_react.default.createElement("div", null, import_utils.locales.getText("tocPay.text.addCard")),
+      title: /* @__PURE__ */ import_react.default.createElement("div", { className: "secure-card-payment-title" }, import_utils.locales.getText("tocPay.text.secureCardPayment"), /* @__PURE__ */ import_react.default.createElement(
+        import_materials.Iconfont,
+        {
+          type: "pisell2-shield-tick",
+          className: "secure-card-payment-title-icon"
+        }
+      )),
       open,
       onCancel,
       cancelVisible: false,
       onOk: onSubmit,
       okText,
-      bodyStyle: { padding: 24 }
+      bodyStyle: { padding: 24, display: "flex", flexDirection: "column" },
+      okButtonProps: {
+        loading: btnLoading,
+        style: {
+          display: "flex",
+          justifyContent: "center",
+          alignItems: "center"
+        }
+      }
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "" }, /* @__PURE__ */ import_react.default.createElement(
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "add-mw-credit-card-wrap" }, /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellAlert,
+      {
+        className: "secure-card-tip-alert",
+        icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-shield-tick" }),
+        showIcon: true,
+        message: import_utils.locales.getText("tocPay.text.secureBankInfo")
+      }
+    ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Form,
       {
         layout: "vertical",
@@ -246,24 +272,21 @@ var AddMWCreditCard = (props, ref) => {
             placeholder: import_utils.locales.getText("tocPay.text.incorrectName")
           }
         )
-      )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
+      ))),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "merchant-authorization-text" }, import_utils.locales.getText("tocPay.text.merchantAuthorizationBefore"), /* @__PURE__ */ import_react.default.createElement("span", { className: "merchant-shop-name" }, shopName), import_utils.locales.getText("tocPay.text.merchantAuthorizationAfter")),
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Divider, { className: "secure-card-divider" }),
+      /* @__PURE__ */ import_react.default.createElement(
         import_antd.Form.Item,
         {
           name: "is_save",
           valuePropName: "checked",
-          initialValue: true
+          initialValue: true,
+          className: "save-card-form-item"
         },
         /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, null, /* @__PURE__ */ import_react.default.createElement("span", { className: "save-card-checkbox-text" }, import_utils.locales.getText("tocPay.text.saveCardForNextTime")))
-      )), /* @__PURE__ */ import_react.default.createElement(import_antd.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellAlert,
-        {
-          className: "save-card-alert",
-          icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-shield-tick" }),
-          showIcon: true,
-          message: import_utils.locales.getText("tocPay.text.secureBankInfo")
-        }
-      )))
-    ))
+      ),
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "save-card-encryption-text" }, import_utils.locales.getText("tocPay.text.saveCardEncryption"))
+    ), /* @__PURE__ */ import_react.default.createElement("div", { className: "three-d-secure-section" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "three-d-secure-badge" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-shield-01", className: "three-d-secure-icon" }), /* @__PURE__ */ import_react.default.createElement("span", { className: "three-d-secure-badge-text" }, "3D")), /* @__PURE__ */ import_react.default.createElement("span", { className: "three-d-secure-text" }, import_utils.locales.getText("tocPay.text.threeDSecureProtection"))))
   );
 };
 var Add_default = (0, import_react.forwardRef)(AddMWCreditCard);