@pisell/private-materials 6.7.4 → 6.7.5

package/lib/plus/walletPassGallery/components/footerButton/index.js

@@ -160,13 +160,13 @@ var FooterButtons = ({
         )
       );
     }
-    const buttonCount = buttons.length;
-    const className = `pisell-wallet-pass-gallery_footer-buttons pisell-wallet-pass-gallery_footer-buttons-count-${buttonCount}`;
+    const className = `pisell-wallet-pass-gallery_footer-buttons`;
     return buttons.length > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className }, buttons) : null;
   };
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-pass-gallery_footer" }, renderButtons()), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,
     {
+      destroyOnClose: true,
       platform,
       mobileModalHeight: "auto",
       headerDivider: false,

package/lib/plus/walletPassGallery/components/footerButton/index.less

@@ -1,83 +1,38 @@
 .pisell-wallet-pass-gallery_footer {
   position: relative;
-  left: 0;
-  right: 0;
-  bottom: 0;
   background-color: #fff;
   padding: 24px;
   z-index: 100;
   border-top: 1px solid #d0d5de;
-  margin-left: -20px;
-  margin-right: -20px;
+  margin-left: -24px;
+  margin-right: -24px;
   &-buttons {
     display: flex;
     gap: 12px;
     width: 100%;
 
-
-.pisell-wallet-pass-gallery_footer-buttons-item-secondary{
-    overflow: hidden;
-    display: flex;
-    >span{
-      display: block;
-      // width: 100%;
-      flex:1;
+    .pisell-wallet-pass-gallery_footer-buttons-item-secondary {
+      overflow: hidden;
+      display: inline-block;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
       text-wrap: nowrap;
-    }
-}
-
-
-    // 按钮数量样式
-    // 单个按钮占满宽度
-    &-count-1 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: 100%;
-      }
-    }
-    
-    // 两个按钮各占一半
-    &-count-2 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(50% - 6px);
+      > span {
+        display: inline;
       }
     }
-    
-    // 三个按钮各占三分之一
-    &-count-3 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(33.33% - 8px);
-      }
-    }
-    
-    // 四个按钮各占四分之一
-    &-count-4 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(25% - 9px);
-      }
-    }
-    
-    // Ant Design按钮覆盖样式
-    :global(.ant-btn) {
-      height: 48px;
-      border-radius: 6px;
-      font-size: 16px;
-      font-weight: 500;
-      width: 100%;
+
+    .pisell-wallet-pass-gallery_footer-buttons-item {
+      flex-grow: 1;
     }
-    
+
     &-item {
       // 修饰符：主按钮
       &-primary {
-        background-color: var(--theme-color, #7F56D9);
+        background-color: var(--theme-color, #7f56d9);
       }
-      
+
       // 修饰符：次按钮
       &-secondary {
         background-color: #fff;
@@ -90,4 +45,4 @@
 
 .pisell-wallet-pass-gallery_footer:empty {
   display: none;
-}
+}

package/lib/plus/walletPassGallery/components/passDetail/index.d.ts

@@ -3,6 +3,7 @@ interface PassDetailProps {
     dataSource?: any | null;
     platform?: 'pc' | 'h5';
     buttonGroupList?: any[][];
+    showTimeLine?: boolean;
 }
 declare const PassDetail: (props: PassDetailProps) => JSX.Element | null;
 export default PassDetail;

package/lib/plus/walletPassGallery/components/passDetail/index.js

@@ -48,19 +48,26 @@ var import_recharge = __toESM(require("../recharge"));
 var import_footerButton = __toESM(require("../footerButton"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
+var import_utils3 = require("../../../../components/wallet/utils");
+var import_locales = __toESM(require("../../locales"));
+var import_utils4 = require("../../../../utils");
 var { Text } = import_antd.Typography;
 var PassDetail = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
-  if (!props.dataSource) return null;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
   const { symbol = "$" } = (0, import_materials.usePisellConfig)();
-  const { dataSource, platform = "pc" } = props;
+  const { dataSource, platform = "pc", showTimeLine = true } = props;
   const [activeKey, setActiveKey] = (0, import_react.useState)("detail");
   const [rechargeOpen, setRechargeOpen] = (0, import_react.useState)(false);
   const containerRef = (0, import_react.useRef)(null);
   const isIndicatorVisibleRef = (0, import_react.useRef)(false);
   const context = (0, import_useEngineContext.default)();
   const { store } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || { store: {} };
-  const timezone = ((_e = (_d = (_c = (_b = store == null ? void 0 : store.getState) == null ? void 0 : _b.call(store)) == null ? void 0 : _c.global) == null ? void 0 : _d.symbol) == null ? void 0 : _e.shop.timezone) || "Asia/Shanghai";
+  const { apiPrefix } = ((_b = context.appHelper) == null ? void 0 : _b.constants) || { apiPrefix: "/h5" };
+  const timezone = ((_g = (_f = (_e = (_d = (_c = store == null ? void 0 : store.getState) == null ? void 0 : _c.call(store)) == null ? void 0 : _d.global) == null ? void 0 : _e.symbol) == null ? void 0 : _f.shop) == null ? void 0 : _g.timezone) || "Asia/Shanghai";
+  import_utils.locales.init(import_locales.default, ((_i = (_h = context == null ? void 0 : context.engine) == null ? void 0 : _h.props) == null ? void 0 : _i.locale) || "en");
+  if ((_k = (_j = context.appHelper) == null ? void 0 : _j.utils) == null ? void 0 : _k.request) {
+    import_utils4.request.setRequest((_m = (_l = context.appHelper) == null ? void 0 : _l.utils) == null ? void 0 : _m.request);
+  }
   const {
     id = "",
     code = "",
@@ -69,17 +76,22 @@ var PassDetail = (props) => {
     encoded = "",
     balance,
     expire_date = "",
-    product = {}
+    product = {},
+    custom_schedule_snapshot,
+    customer_id
   } = dataSource || {};
   const {
     description = "",
     extension_data = [],
     customer_order_behavior_count = 0
   } = product || {};
-  const _getDetail = (0, import_ahooks.useRequest)(() => (0, import_serve.getDetailApi)({ id }), {
+  const _getDetail = (0, import_ahooks.useRequest)(() => (0, import_serve.getDetailApi)({ id, apiPrefix, order_behavior_count_customer_id: customer_id }), {
     ready: !!id,
-    refreshDeps: [id]
+    refreshDeps: [id, customer_id]
   });
+  const scheduleList = (0, import_react.useMemo)(() => {
+    return (custom_schedule_snapshot == null ? void 0 : custom_schedule_snapshot.data) || [];
+  }, [custom_schedule_snapshot]);
   (0, import_react.useEffect)(() => {
     if (tag === "product_discount_card") {
       setActiveKey("detail");
@@ -111,7 +123,29 @@ var PassDetail = (props) => {
     return () => clearTimeout(timeoutId);
   }, []);
   const descs = (0, import_react.useMemo)(() => {
-    var _a2;
+    var _a2, _b2, _c2;
+    const detail = (0, import_utils3.formatScheduleText)(scheduleList, (_b2 = (_a2 = context == null ? void 0 : context.engine) == null ? void 0 : _a2.props) == null ? void 0 : _b2.locale);
+    let expireText = expire_date ? expire_date : import_utils.locales.getText("wallet-pass-gallery.expireDate");
+    if (scheduleList.length > 0) {
+      let validityTexts = "";
+      let excludedText = "";
+      let includedText = "";
+      detail.forEach((item) => {
+        if (item.validityTexts.length > 0) {
+          validityTexts = `${validityTexts}${item.validityTexts.join("\n")}
+`;
+        }
+        if (item.excluded_date.length > 0) {
+          excludedText = `${excludedText}${item.excluded_date.join("\n")}
+`;
+        }
+        if (item.included_date.length > 0) {
+          includedText = `${includedText}${item.included_date.join("\n")}
+`;
+        }
+      });
+      expireText = /* @__PURE__ */ import_react.default.createElement("span", { className: "wallet-detail-expire-text" }, validityTexts, excludedText && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-expire-text-title" }, import_utils.locales.getText("page.wallet.notValidDate")), excludedText, includedText && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-detail-expire-text-title" }, import_utils.locales.getText("page.wallet.includedDate")), includedText);
+    }
     let data = [
       {
         label: import_utils.locales.getText("wallet-pass-gallery.cardName"),
@@ -124,11 +158,11 @@ var PassDetail = (props) => {
       },
       {
         label: import_utils.locales.getText("wallet-pass-gallery.validDate"),
-        value: expire_date ? expire_date : import_utils.locales.getText("wallet-pass-gallery.expireDate")
+        value: expireText
       }
     ];
     if (tag === "product_discount_card") {
-      const isFixedAmount = ((_a2 = dataSource.metadata) == null ? void 0 : _a2.discount_card_type) === "fixed_amount";
+      const isFixedAmount = ((_c2 = dataSource.metadata) == null ? void 0 : _c2.discount_card_type) === "fixed_amount";
       data.splice(2, 0, {
         label: import_utils.locales.getText("wallet-pass-gallery.discount"),
         value: balance ? isFixedAmount ? `${symbol}${Number(balance)}` : `${Number(balance)}%` : ""
@@ -195,14 +229,19 @@ var PassDetail = (props) => {
   };
   const renderTimeLine = () => {
     if (tag === "product_discount_card") return null;
+    if (!showTimeLine) return null;
     return /* @__PURE__ */ import_react.default.createElement(import_timelineSection.default, { code, tag, timezone });
   };
+  if (!props.dataSource) return null;
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: (0, import_classnames.default)(
         `pisell-wallet-pass-gallery_detail`,
-        `pisell-wallet-pass-gallery_detail-${platform}`
+        `pisell-wallet-pass-gallery_detail-${platform}`,
+        {
+          [`pisell-wallet-pass-gallery_detail-with-footer`]: platform === "h5" && tag === "gift_card"
+        }
       )
     },
     /* @__PURE__ */ import_react.default.createElement(
@@ -237,7 +276,7 @@ var PassDetail = (props) => {
           },
           /* @__PURE__ */ import_react.default.createElement("div", { "data-anchor": "detail" })
         ),
-        /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(Text, { className: "pisell-wallet-pass-gallery_detail-title" }, import_utils.locales.getText("wallet-pass-gallery.details")), platform === "pc" && tag === "gift_card" && ((_f = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _f.hide_recharge) === 0 && /* @__PURE__ */ import_react.default.createElement(
+        /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(Text, { className: "pisell-wallet-pass-gallery_detail-title" }, import_utils.locales.getText("wallet-pass-gallery.details")), platform === "pc" && tag === "gift_card" && ((_n = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _n.hide_recharge) === 0 && /* @__PURE__ */ import_react.default.createElement(
           import_antd.Button,
           {
             type: "primary",
@@ -269,9 +308,9 @@ var PassDetail = (props) => {
   ), platform === "h5" && tag === "gift_card" ? /* @__PURE__ */ import_react.default.createElement(
     import_footerButton.default,
     {
-      appleWalletUrl: (_g = _getDetail.data) == null ? void 0 : _g.apple_wallet_url,
-      googleWalletUrl: (_h = _getDetail.data) == null ? void 0 : _h.google_wallet_url,
-      onRechargeClick: ((_i = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _i.hide_recharge) === 0 ? () => setRechargeOpen(true) : void 0,
+      appleWalletUrl: (_o = _getDetail.data) == null ? void 0 : _o.apple_wallet_url,
+      googleWalletUrl: (_p = _getDetail.data) == null ? void 0 : _p.google_wallet_url,
+      onRechargeClick: ((_q = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _q.hide_recharge) === 0 ? () => setRechargeOpen(true) : void 0,
       platform
     }
   ) : null, /* @__PURE__ */ import_react.default.createElement(

package/lib/plus/walletPassGallery/components/passDetail/index.less

@@ -18,6 +18,10 @@
     padding: 20px 0px;
   }
 
+  &-with-footer {
+    height: calc(100% - 90px);
+  }
+
   .pisell-wallet-pass-gallery_detail-content {
     overflow-y: auto;
     height: 100%;

package/lib/plus/walletPassGallery/components/recharge/index.js

@@ -51,6 +51,7 @@ var Recharge = ({
   const { action, storage } = ((_a = context.appHelper) == null ? void 0 : _a.utils) || {};
   const dvaStore = (_e = (_d = (_c = (_b = context.appHelper) == null ? void 0 : _b.utils) == null ? void 0 : _c.getStore) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.getState();
   const shop = ((_g = (_f = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _f.core) == null ? void 0 : _g.shop) || {};
+  const [loading, setLoading] = (0, import_react.useState)(false);
   (0, import_react.useEffect)(() => {
     if (detailData) {
       setChargeItem(((detailData == null ? void 0 : detailData.gift_option) || [])[0]);
@@ -59,6 +60,7 @@ var Recharge = ({
   const handleRecharge = async () => {
     var _a2;
     try {
+      setLoading(true);
       const params = {
         voucher_id: (detailData == null ? void 0 : detailData.id) || "",
         product_id: (detailData == null ? void 0 : detailData.product_id) || "",
@@ -87,11 +89,14 @@ var Recharge = ({
         import_utils.locales.getText("wallet-pass-gallery.log.rechargeOrderFailed"),
         error
       );
+    } finally {
+      setLoading(false);
     }
   };
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Drawer,
     {
+      destroyOnClose: true,
       title: import_utils.locales.getText("wallet-pass-gallery.rechargeOptions"),
       open,
       zIndex: 999,
@@ -105,7 +110,8 @@ var Recharge = ({
           block: true,
           size: "large",
           onClick: handleRecharge,
-          disabled: !(chargeItem == null ? void 0 : chargeItem.id)
+          disabled: !(chargeItem == null ? void 0 : chargeItem.id),
+          loading
         },
         import_utils.locales.getText("wallet-pass-gallery.recharge")
       )

package/lib/plus/walletPassGallery/index.js

@@ -89,7 +89,8 @@ var WalletPassGallery = (props) => {
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
-        filter_wallet_id: walletId || void 0
+        filter_wallet_id: walletId || void 0,
+        "with": ["customScheduleSnapshot"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -115,7 +116,8 @@ var WalletPassGallery = (props) => {
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
-        filter_wallet_id: walletId || void 0
+        filter_wallet_id: walletId || void 0,
+        "with": ["customScheduleSnapshot"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -440,7 +442,9 @@ var WalletPassGallery = (props) => {
     ), /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellModal,
       {
-        platform: "h5",
+        zIndex: 997,
+        destroyOnClose: true,
+        platform,
         visible: !!_currentItem,
         onCancel: () => setCurrentItemId(""),
         footer: null,

package/lib/plus/walletPassGallery/serve.js

@@ -69,11 +69,12 @@ var getAssetList = async (params) => {
   return data;
 };
 var getDetailApi = async (params) => {
-  const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/lowcode/detail/${params.id}`, {
+  const { data } = await import_utils.request.getRequest().get(`${params.apiPrefix || "/h5"}/machinecode/lowcode/detail/${params.id}`, {
     order_behavior_count: 1,
     // 订单行为次数
-    order_behavior_count_customer: 1
+    order_behavior_count_customer: 1,
     // 客户订单行为次数
+    order_behavior_count_customer_id: params.apiPrefix === "/shop" ? params.order_behavior_count_customer_id : void 0
   });
   return data;
 };

package/lib/pro/Login2.0/index.less

@@ -15,6 +15,14 @@
   
   /* 默认底部内边距 */
   padding-bottom: 24px;
+
+  // 加载状态优化
+  .pisell-lowcode-btn-loading-icon {
+    .anticon {
+      color: #ffffff !important;
+    }
+  }
+
   
   /* 在弹窗模式下不需要额外的底部内边距，因为使用 sticky 定位 */
   .pisell-lowcode-modal-body & {
@@ -450,6 +458,13 @@
   .login-lm-drawer-popover & {
     padding-bottom: 100px;
   }
+    // 加载状态优化
+  .pisell-lowcode-btn-loading-icon {
+    .anticon {
+      color: #ffffff !important;
+    }
+  }
+
 }
 
 // 错误提示样式优化
@@ -509,14 +524,6 @@
 //     }
 //   }
 // }
-
-// 加载状态优化
-.pisell-lowcode-btn-loading-icon {
-  .anticon {
-    color: #ffffff !important;
-  }
-}
-
 // 切换认证方式按钮
 .login2-switch-button {
   margin-top: 0;

package/lib/pro/comprehensiveSearch/components/searchSection/locales.js

@@ -24,15 +24,15 @@ __export(locales_exports, {
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
   en: {
-    "pisell2.comprehensive-search.placeholder": "WalletPass Code / Name / Mobile / Email",
+    "pisell2.comprehensive-search.placeholder": "WalletPass Code / Name / Mobile / Email / Contact info",
     "pisell2.text.search": "Search"
   },
   "zh-CN": {
-    "pisell2.comprehensive-search.placeholder": "钱包码 / 姓名 / 电话 / 电子邮箱",
+    "pisell2.comprehensive-search.placeholder": "钱包码 / 姓名 / 电话 / 电子邮箱 / 联系信息",
     "pisell2.text.search": "搜索"
   },
   "zh-HK": {
-    "pisell2.comprehensive-search.placeholder": "錢包碼 / 姓名 / 電話 / 電子郵箱",
+    "pisell2.comprehensive-search.placeholder": "錢包碼 / 姓名 / 電話 / 電子郵箱 / 聯繫信息",
     "pisell2.text.search": "搜索"
   }
 };

package/lib/pro/comprehensiveSearch/locales.js

@@ -24,7 +24,7 @@ __export(locales_exports, {
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
   en: {
-    "pisell2.text.new-client": "New Client",
+    "pisell2.text.new-client": "New Customer",
     "pisell2.comprehensive-search.empty": "No Data"
   },
   "zh-CN": {

package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.js

@@ -37,14 +37,14 @@ var import_antd = require("antd");
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
 var import_utils = require("@pisell/utils");
-var import_materials = require("@pisell/materials");
 var import_shortcuts = __toESM(require("../shortcuts"));
 var import_CashKeyboardSimple = __toESM(require("./CashKeyboardSimple"));
 var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 var import_decimal = __toESM(require("decimal.js"));
-var import_materials2 = require("@pisell/materials");
+var import_materials = require("@pisell/materials");
 var import_utils3 = require("@pisell/utils");
+var import_materials2 = require("@pisell/materials");
 var CashKeyboardIntact = (props) => {
   var _a, _b, _c;
   const {
@@ -59,7 +59,8 @@ var CashKeyboardIntact = (props) => {
     doneText,
     resetText,
     disabled,
-    hiddenChangeDue
+    hiddenChangeDue,
+    shortcutsSize
   } = props;
   const [internalValue, setInternalValue] = (0, import_ahooks.useControllableValue)(props);
   const [isShowModal, setIsShowModal] = (0, import_react.useState)(false);
@@ -129,7 +130,8 @@ var CashKeyboardIntact = (props) => {
         value: "pay",
         style: {
           color: "white",
-          backgroundColor: "#7F56DA"
+          backgroundColor: "#7F56DA",
+          gridColumn: "span 2"
         },
         onClick: () => {
           var _a2;
@@ -138,7 +140,7 @@ var CashKeyboardIntact = (props) => {
       }
     ];
     const userPresets = presets || [];
-    const maxUserPresets = 8 - defaultEndPresets.length;
+    const maxUserPresets = 7 - defaultEndPresets.length;
     const limitedUserPresets = userPresets.slice(0, maxUserPresets);
     return [...limitedUserPresets, ...defaultEndPresets];
   };
@@ -248,7 +250,7 @@ var CashKeyboardIntact = (props) => {
           )
         },
         /* @__PURE__ */ import_react.default.createElement(
-          import_materials2.AutoResizeText,
+          import_materials.AutoResizeText,
           {
             minFontSizePx: 10,
             maxFontSizePx: 18,
@@ -270,57 +272,53 @@ var CashKeyboardIntact = (props) => {
       {
         style: {
           ...getGridStyle(1),
-          padding: "6px 16px",
+          padding: "0px 16px",
           borderRadius: "8px",
           backgroundColor: "white",
-          boxShadow: "0px 1px 2px rgba(16, 24, 40, 0.06)",
+          boxShadow: "inset 0 2px 4px rgba(16, 24, 40, 0.08), inset 0 -2px 4px rgba(16, 24, 40, 0.08), inset 2px 0 4px rgba(16, 24, 40, 0.08), inset -2px 0 4px rgba(16, 24, 40, 0.08)",
           overflow: "hidden",
           maxWidth: 188,
-          cursor: "pointer"
+          cursor: "pointer",
+          border: "1px solid #7f56da",
+          borderBottom: "1px solid #7f56da"
         },
         onClick: () => {
           setIsShowModal(true);
         }
       },
       /* @__PURE__ */ import_react.default.createElement(
-        import_materials.VirtualInput,
+        "div",
         {
-          showCursor: false,
-          focused: true,
-          wrapperStyle: {
-            width: "100%"
+          className: "pisell-cash-keyboard-intact-container-top",
+          style: { ...getGridStyle(0), overflow: "hidden", padding: "5px 0" }
+        },
+        /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-label" }, mergedDisplayField.cashReceived.label),
+        /* @__PURE__ */ import_react.default.createElement(
+          "div",
+          {
+            className: "pisell-cash-keyboard-intact-container-top-value"
           },
-          topContent: /* @__PURE__ */ import_react.default.createElement(
-            "div",
+          /* @__PURE__ */ import_react.default.createElement(
+            import_materials.AutoResizeText,
             {
-              style: {
-                fontSize: "14px",
-                color: "#667085"
-              }
+              minFontSizePx: 10,
+              maxFontSizePx: 18,
+              fontSizePrecisionPx: 0.5,
+              style: { color: "#7f56da", textDecoration: "underline", textUnderlineOffset: "3px" }
             },
-            mergedDisplayField.cashReceived.label
+            internalValue ? (0, import_utils3.formatAmountWithOptions)(
+              internalValue || "",
+              amountSymbol,
+              {
+                value: internalValue,
+                hideDecimalForWholeNumbers: false,
+                precision: 2,
+                showCurrencySymbol: true
+              }
+            ) : ""
           ),
-          value: internalValue ? (0, import_utils3.formatAmountWithOptions)(
-            internalValue || "",
-            amountSymbol,
-            {
-              value: internalValue,
-              hideDecimalForWholeNumbers: false,
-              precision: 2,
-              showCurrencySymbol: true
-            }
-          ) : "",
-          height: 30,
-          fontSize: 20,
-          placeholder,
-          style: {
-            fontSize: "24px",
-            fontWeight: "bold",
-            border: "none",
-            background: "transparent",
-            width: "100%"
-          }
-        }
+          /* @__PURE__ */ import_react.default.createElement(import_materials2.Iconfont, { type: "pisell2-edit-05", style: { color: "#7f56da", fontSize: "18px", marginLeft: "4px", marginTop: "4px" } })
+        )
       )
     ), ((_c = mergedDisplayField.changeDue) == null ? void 0 : _c.visible) && /* @__PURE__ */ import_react.default.createElement(
       "div",
@@ -344,7 +342,7 @@ var CashKeyboardIntact = (props) => {
           )
         },
         /* @__PURE__ */ import_react.default.createElement(
-          import_materials2.AutoResizeText,
+          import_materials.AutoResizeText,
           {
             minFontSizePx: 10,
             maxFontSizePx: 18,
@@ -365,6 +363,7 @@ var CashKeyboardIntact = (props) => {
     )), /* @__PURE__ */ import_react.default.createElement(
       import_shortcuts.default,
       {
+        size: shortcutsSize || "default",
         presets: getDefaultPresets(),
         onChange: setInternalValue,
         disabled

package/lib/pro/priceKeyboard/components/cashKeyboard/index.js

@@ -48,7 +48,7 @@ var CashKeyboard = (props) => {
   );
   const { getData } = context.appHelper.utils;
   const amountSymbol = props.amountSymbol || (getData == null ? void 0 : getData("shop_symbol")) || "$";
-  const { variant = "intact", value, onChange, ...otherProps } = props;
+  const { variant = "intact", value, onChange, shortcutsSize, ...otherProps } = props;
   const [internalValue, setInternalValue] = (0, import_ahooks.useControllableValue)(props);
   if (variant === "intact") {
     return /* @__PURE__ */ import_react.default.createElement(
@@ -58,7 +58,8 @@ var CashKeyboard = (props) => {
         amountSymbol,
         value: internalValue,
         placeholder: `${amountSymbol}0`,
-        onChange: setInternalValue
+        onChange: setInternalValue,
+        shortcutsSize
       }
     );
   }

package/lib/pro/priceKeyboard/components/discountKeyboard/index.js

@@ -55,6 +55,7 @@ var DiscountKeyboardBase = (props) => {
     defaultValue,
     originalValue,
     selectType = "light",
+    tips,
     resetText,
     doneText,
     onEnter,
@@ -344,7 +345,13 @@ var DiscountKeyboardBase = (props) => {
       )
     );
   };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-discount" }, /* @__PURE__ */ import_react.default.createElement(
+  const renderTipsContent = () => {
+    if (tips) {
+      return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-tips" }, tips);
+    }
+    return null;
+  };
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-discount" }, renderTipsContent(), /* @__PURE__ */ import_react.default.createElement(
     import_antd.Segmented,
     {
       size: "large",