@pisell/private-materials 6.4.42 → 6.5.2

package/lib/components/checkout/components/AdditionalModule/index.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(AdditionalModule_exports);
 var import_react = __toESM(require("react"));
 var import_antd = require("antd");
 var import_icons = require("@ant-design/icons");
+var import_icon = require("@pisell/icon");
 var import_utils = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
 var import_index = require("./index.less");
@@ -51,6 +52,11 @@ function AdditionalModule({
 }) {
   import_utils.locales.init(import_locales2.default, (0, import_locales.getLocale)());
   const moreMenuItems = [
+    {
+      key: "manual-discount",
+      label: import_utils.locales.getText("pisell2.text.manual-order-discount"),
+      icon: /* @__PURE__ */ import_react.default.createElement(import_icon.Calculator, null)
+    },
     {
       key: "send-link",
       label: import_utils.locales.getText("pisell2.text.send-link"),
@@ -66,65 +72,31 @@ function AdditionalModule({
         className: `additional-module-button-base purple-theme ${hasOrderNote ? "note-button" : ""}`,
         onClick: () => {
           handleButtonClick("order-note");
-        },
-        icon: /* @__PURE__ */ import_react.default.createElement(
-          import_materials.Icon,
-          {
-            type: "pisell2-clipboard-minus",
-            className: "additional-module-button-icon"
-          }
-        ),
-        size: "large"
+        }
       },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.FileTextOutlined, { className: "additional-module-button-icon" }),
       import_utils.locales.getText("pisell2.text.order-note"),
-      hasOrderNote && /* @__PURE__ */ import_react.default.createElement("span", { className: "note-indicator" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-info-circle2" }))
+      hasOrderNote && /* @__PURE__ */ import_react.default.createElement("span", { className: "note-indicator" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-info-circle2" }))
     ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
       {
         className: "additional-module-button-base purple-theme",
         onClick: () => {
           handleButtonClick("print-receipt");
-        },
-        icon: /* @__PURE__ */ import_react.default.createElement(
-          import_materials.Icon,
-          {
-            type: "pisell2-printer",
-            className: "additional-module-button-icon"
-          }
-        ),
-        size: "large"
+        }
       },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.PrinterOutlined, { className: "additional-module-button-icon" }),
       import_utils.locales.getText("pisell2.text.print-receipt")
     )), /* @__PURE__ */ import_react.default.createElement("div", { className: "additional-module-button-row" }, /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
-      {
-        className: "additional-module-button-base purple-theme",
-        onClick: () => {
-          handleButtonClick("manual-discount");
-        },
-        icon: /* @__PURE__ */ import_react.default.createElement(
-          import_materials.Icon,
-          {
-            type: "pisell2-sale-01",
-            className: "additional-module-button-icon"
-          }
-        ),
-        size: "large"
-      },
-      import_utils.locales.getText(
-        "pisell2.text.additional-module.order-discount"
-      )
-    ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
       {
         className: `additional-module-button-base ${disabled ? "disabled-theme" : "orange-theme"}`,
         onClick: () => {
           handleButtonClick("save-pay-later");
         },
-        disabled,
-        size: "large",
-        icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ClockCircleOutlined, { className: "additional-module-button-icon" })
+        disabled
       },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.ClockCircleOutlined, { className: "additional-module-button-icon" }),
       import_utils.locales.getText("pisell2.text.save-pay-later")
     ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,
@@ -137,13 +109,12 @@ function AdditionalModule({
               if (!disabled) {
                 handleButtonClick("send-link");
               } else {
-                Toast.fail(
-                  import_utils.locales.getText(
-                    "pisell2.text.order-no-payment-cannot-send-link"
-                  )
-                );
+                Toast.fail(import_utils.locales.getText("pisell2.text.order-no-payment-cannot-send-link"));
               }
             }
+            if (key === "manual-discount") {
+              handleButtonClick("manual-discount");
+            }
           }
         },
         trigger: ["click"],
@@ -158,10 +129,9 @@ function AdditionalModule({
       /* @__PURE__ */ import_react.default.createElement(
         import_antd.Button,
         {
-          size: "large",
-          className: "additional-module-button-base more-button",
-          icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-dots-vertical", size: 20 })
-        }
+          className: "additional-module-button-base more-button"
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_icons.MoreOutlined, { className: "additional-module-button-icon" })
       )
     )))
   ) : (
@@ -172,52 +142,21 @@ function AdditionalModule({
         className: `additional-module-button-base purple-theme ${hasOrderNote ? "note-button" : ""}`,
         onClick: () => {
           handleButtonClick("order-note");
-        },
-        size: "large",
-        icon: /* @__PURE__ */ import_react.default.createElement(
-          import_materials.Icon,
-          {
-            type: "pisell2-clipboard-minus",
-            className: "additional-module-button-icon"
-          }
-        )
+        }
       },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.FileTextOutlined, { className: "additional-module-button-icon" }),
       import_utils.locales.getText("pisell2.text.order-note"),
-      hasOrderNote && /* @__PURE__ */ import_react.default.createElement("span", { className: "note-indicator" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-info-circle2" }))
+      hasOrderNote && /* @__PURE__ */ import_react.default.createElement("span", { className: "note-indicator" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-info-circle2" }))
     ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
       {
         className: "additional-module-button-base purple-theme",
         onClick: () => {
           handleButtonClick("print-receipt");
-        },
-        size: "large",
-        icon: /* @__PURE__ */ import_react.default.createElement(
-          import_materials.Icon,
-          {
-            type: "pisell2-printer",
-            className: "additional-module-button-icon"
-          }
-        )
+        }
       },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.PrinterOutlined, { className: "additional-module-button-icon" }),
       import_utils.locales.getText("pisell2.text.print-receipt")
-    ), /* @__PURE__ */ import_react.default.createElement(
-      import_antd.Button,
-      {
-        className: "additional-module-button-base purple-theme",
-        onClick: () => {
-          handleButtonClick("manual-discount");
-        },
-        icon: /* @__PURE__ */ import_react.default.createElement(
-          import_materials.Icon,
-          {
-            type: "pisell2-sale-01",
-            className: "additional-module-button-icon"
-          }
-        ),
-        size: "large"
-      },
-      import_utils.locales.getText("pisell2.text.additional-module.order-discount")
     ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Button,
       {
@@ -225,10 +164,9 @@ function AdditionalModule({
         onClick: () => {
           handleButtonClick("save-pay-later");
         },
-        disabled,
-        size: "large",
-        icon: /* @__PURE__ */ import_react.default.createElement(import_icons.ClockCircleOutlined, { className: "additional-module-button-icon" })
+        disabled
       },
+      /* @__PURE__ */ import_react.default.createElement(import_icons.ClockCircleOutlined, { className: "additional-module-button-icon" }),
       import_utils.locales.getText("pisell2.text.save-pay-later")
     ), /* @__PURE__ */ import_react.default.createElement(
       import_antd.Dropdown,
@@ -241,13 +179,12 @@ function AdditionalModule({
               if (!disabled) {
                 handleButtonClick("send-link");
               } else {
-                Toast.fail(
-                  import_utils.locales.getText(
-                    "pisell2.text.order-no-payment-cannot-send-link"
-                  )
-                );
+                Toast.fail(import_utils.locales.getText("pisell2.text.order-no-payment-cannot-send-link"));
               }
             }
+            if (key === "manual-discount") {
+              handleButtonClick("manual-discount");
+            }
           }
         },
         trigger: ["click"],
@@ -262,10 +199,9 @@ function AdditionalModule({
       /* @__PURE__ */ import_react.default.createElement(
         import_antd.Button,
         {
-          className: "additional-module-button-base more-button",
-          size: "large",
-          icon: /* @__PURE__ */ import_react.default.createElement(import_materials.Icon, { type: "pisell2-dots-vertical", size: 20 })
-        }
+          className: "additional-module-button-base more-button"
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_icons.MoreOutlined, { className: "additional-module-button-icon" })
       )
     ))
   )));

package/lib/components/checkout/components/AdditionalModule/index.less

@@ -3,50 +3,50 @@
 
   // 标题样式
   &-title {
-    font-size: 16px;
+    font-size: 24px;
     font-weight: 600;
     color: #1a1a1a;
-    margin-bottom: 8px;
+    margin-bottom: 16px;
   }
 
   // 按钮容器 - 支持两种布局模式
   &-buttons-container {
     display: flex;
     flex-direction: column;
-    gap: 8px;
+    gap: 12px;
   }
 
   // 按钮行容器
   &-button-row {
     display: flex;
-    gap: 8px;
+    gap: 12px;
   }
 
   // 基础按钮样式
   &-button-base {
     flex: 1;
-    border-width: 1px;
-    border-radius: 8px;
+    height: 56px;
+    border-width: 2px;
+    border-radius: 12px;
     background-color: transparent;
-    font-size: 14px;
-    font-weight: 600;
+    font-size: 18px;
+    font-weight: 500;
     display: flex;
     align-items: center;
     justify-content: center;
-    padding-left: 12px;
-    padding-right: 12px;
+    gap: 12px;
 
     // 紫色主题按钮（Order Note, Print Receipt）
     &.purple-theme {
-      border-color: #5d3f9f;
-      color: #5d3f9f;
+      border-color: #7c4dff;
+      color: #7c4dff;
       flex: 1; // 所有按钮等比例分配空间
     }
 
     // 橙色主题按钮（Save & Pay Later）
     &.orange-theme {
-      border-color: #dc6803;
-      color: #dc6803;
+      border-color: #ff9100;
+      color: #ff9100;
       flex: 1; // 与其他前三个按钮宽度相同
     }
 
@@ -57,7 +57,7 @@
       background-color: #f2f4f7;
       cursor: not-allowed;
       flex: 1; // 与其他前三个按钮宽度相同
-
+      
       .additional-module-button-icon {
         color: #98a2b3;
       }
@@ -66,8 +66,8 @@
     // 更多按钮 - 显示为正方形
     &.more-button {
       flex: none;
-      width: 50px; // 与高度相同，形成正方形
-      min-width: 50px;
+      width: 56px;  // 与高度相同，形成正方形
+      min-width: 56px;
       padding: 0;
       gap: 0;
     }
@@ -101,7 +101,7 @@
       width: 24px;
       height: 24px;
       border-radius: 50%;
-      background-color: #7f56da;
+      background-color: #7F56DA;
       color: #fff;
       font-weight: 700;
       display: flex;
@@ -135,28 +135,29 @@
   }
 }
 
+
 // 更多按钮样式（保持与其他按钮一致）
 .additional-module-button-base.more-button {
-  border-color: #d0d5dd;
+  border-color: #D0D5DD;
   color: #475467;
   position: relative;
-  pointer-events: auto;
-  flex: none;
-  width: 50px; // 与高度相同，形成正方形
-  min-width: 50px;
-  padding: 0;
+  pointer-events: auto !important;
+  flex: none !important;
+  width: 56px !important;  // 与高度相同，形成正方形
+  min-width: 56px !important;
+  padding: 0 !important;
 
   &:hover {
-    border-color: #7c4dff;
-    color: #7c4dff;
-    background-color: rgba(124, 77, 255, 0.04);
+    border-color: #7c4dff !important;
+    color: #7c4dff !important;
+    background-color: rgba(124, 77, 255, 0.04) !important;
   }
 
   &:focus {
-    border-color: #7c4dff;
-    color: #7c4dff;
+    border-color: #7c4dff !important;
+    color: #7c4dff !important;
   }
-
+  
   // 确保按钮内容不会干扰hover检测
   * {
     pointer-events: none;
@@ -171,12 +172,12 @@
 // 确保菜单项可以正常点击
 :global(.ant-dropdown-menu-item) {
   cursor: pointer !important;
-
+  
   &:hover {
     background-color: #f5f5f5 !important;
   }
-
+  
   &:active {
     background-color: #e6f7ff !important;
   }
-}
+}

package/lib/components/checkout/components/AdditionalModule/locales.d.ts

@@ -8,7 +8,6 @@ declare const _default: {
         'pisell2.text.manual-order-discount': string;
         'pisell2.text.order-no-payment-required': string;
         'pisell2.text.order-no-payment-cannot-send-link': string;
-        'pisell2.text.additional-module.order-discount': string;
     };
     'zh-CN': {
         'pisell2.text.others': string;
@@ -19,7 +18,6 @@ declare const _default: {
         'pisell2.text.manual-order-discount': string;
         'pisell2.text.order-no-payment-required': string;
         'pisell2.text.order-no-payment-cannot-send-link': string;
-        'pisell2.text.additional-module.order-discount': string;
     };
     'zh-HK': {
         'pisell2.text.others': string;
@@ -30,7 +28,6 @@ declare const _default: {
         'pisell2.text.manual-order-discount': string;
         'pisell2.text.order-no-payment-required': string;
         'pisell2.text.order-no-payment-cannot-send-link': string;
-        'pisell2.text.additional-module.order-discount': string;
     };
 };
 export default _default;

package/lib/components/checkout/components/AdditionalModule/locales.js

@@ -23,7 +23,7 @@ __export(locales_exports, {
 });
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
-  en: {
+  "en": {
     "pisell2.text.others": "Others",
     "pisell2.text.order-note": "Order Note",
     "pisell2.text.print-receipt": "Print Receipt",
@@ -31,8 +31,7 @@ var locales_default = {
     "pisell2.text.send-link": "Send Link",
     "pisell2.text.manual-order-discount": "Manual Order Discount",
     "pisell2.text.order-no-payment-required": "Order requires no payment, cannot manually adjust price",
-    "pisell2.text.order-no-payment-cannot-send-link": "Order requires no payment, cannot send payment link.",
-    "pisell2.text.additional-module.order-discount": "Order Discount"
+    "pisell2.text.order-no-payment-cannot-send-link": "Order requires no payment, cannot send payment link."
   },
   "zh-CN": {
     "pisell2.text.others": "其他",
@@ -42,8 +41,7 @@ var locales_default = {
     "pisell2.text.send-link": "发送链接",
     "pisell2.text.manual-order-discount": "手动订单折扣",
     "pisell2.text.order-no-payment-required": "订单已无需支付，不可手动改价",
-    "pisell2.text.order-no-payment-cannot-send-link": "订单已无需支付，不可发送支付链接",
-    "pisell2.text.additional-module.order-discount": "订单折扣"
+    "pisell2.text.order-no-payment-cannot-send-link": "订单已无需支付，不可发送支付链接"
   },
   "zh-HK": {
     "pisell2.text.others": "其他",
@@ -53,7 +51,6 @@ var locales_default = {
     "pisell2.text.send-link": "發送鏈接",
     "pisell2.text.manual-order-discount": "手動訂單折扣",
     "pisell2.text.order-no-payment-required": "訂單已無需支付，不可手動改價",
-    "pisell2.text.order-no-payment-cannot-send-link": "訂單已無需支付，不可發送支付鏈接",
-    "pisell2.text.additional-module.order-discount": "订单折扣"
+    "pisell2.text.order-no-payment-cannot-send-link": "訂單已無需支付，不可發送支付鏈接"
   }
 };

package/lib/components/checkout/components/AmountSummary/index.d.ts

@@ -11,7 +11,6 @@ interface AmountSummaryProps {
     onAmountChange?: (amount: string) => void;
     onDepositStatusChange?: (isDeposit: boolean) => void;
     onConfirm?: (action?: WalletBalanceConfirmAction) => void;
-    onBalanceDueAmountClick?: (action: string) => void;
     paymentItems?: any[];
     cartData?: any;
     walletPassData?: {
@@ -22,5 +21,5 @@ interface AmountSummaryProps {
     totalAmount?: number;
 }
 export declare type WalletBalanceConfirmAction = 'cancel' | 'save-without-deduct' | 'apply-deduct-now';
-declare function AmountSummary({ amountSymbol, orderInfo, open_deposit, customAmount, balanceDueAmount, clientInfo, onAmountChange, onDepositStatusChange, onBalanceDueAmountClick, onConfirm, paymentItems, cartData, walletPassData, totalAmount, }: AmountSummaryProps): JSX.Element;
+declare function AmountSummary({ amountSymbol, orderInfo, open_deposit, customAmount, balanceDueAmount, clientInfo, onAmountChange, onDepositStatusChange, onConfirm, paymentItems, cartData, walletPassData, totalAmount, }: AmountSummaryProps): JSX.Element;
 export default AmountSummary;