@pisell/private-materials 6.7.7 → 6.7.9

package/lib/index.d.ts

@@ -23,7 +23,6 @@ export { default as EftposPay } from './components/eftposPay';
 export { default as ToCPay } from './components/pay/toC';
 export { default as ToBPay } from './components/pay/toB';
 export { default as Eftpos } from './components/eftpos';
-export { default as Wallet } from './components/wallet';
 export { default as WalletList } from './components/walletList';
 export { default as BookingDashboard } from './components/booking/dashboard';
 export { default as PisellSelectCustomerModal } from './components/pisellSelectCustomerModal';
@@ -70,7 +69,4 @@ export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';
 export { default as WalletEditor } from './plus/walletEditor';
 export { default as WalletPassGallery } from './plus/walletPassGallery';
-export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
-export { default as SettingsRegistry } from './components/systemSettings/registry';
 export { default as WebPosLogin } from './plus/webPosLogin';
-export { default as PaymentModal } from './components/checkout/plugin';

package/lib/index.js

@@ -74,7 +74,6 @@ __export(src_exports, {
   OnlineShopAuth: () => import_admin.OnlineShopAuth,
   OrgAdminAuth: () => import_admin.OrgAdminAuth,
   POSOperatorAuth: () => import_admin.POSOperatorAuth,
-  PaymentModal: () => import_plugin.default,
   PinModal: () => import_pinModal.default,
   PinVerifyModal: () => import_pinVerifyModal.default,
   PisellSelectCustomerModal: () => import_pisellSelectCustomerModal.default,
@@ -93,7 +92,6 @@ __export(src_exports, {
   SaasLogin: () => import_saasLogin.default,
   SaasRegister: () => import_saasRegister.default,
   Schedules: () => import_schedules.default,
-  SettingsRegistry: () => import_registry.default,
   ShoppingCart: () => import_shoppingCart.default,
   SkuCard: () => import_SkuCard.default,
   SkuList: () => import_list.ResponsiveList,
@@ -105,10 +103,8 @@ __export(src_exports, {
   ToCPay: () => import_toC.default,
   VerticalAddService: () => import_addServiceVariant.default,
   VerticalClient: () => import_clientVariant.VerticalClient,
-  Wallet: () => import_wallet.default,
   WalletEditor: () => import_walletEditor.default,
   WalletList: () => import_walletList.default,
-  WalletPassDetail: () => import_passDetail.default,
   WalletPassGallery: () => import_walletPassGallery.default,
   WebPosLogin: () => import_webPosLogin.default,
   WorkspaceList: () => import_workSpaceList.default,
@@ -142,7 +138,6 @@ var import_eftposPay = __toESM(require("./components/eftposPay"));
 var import_toC = __toESM(require("./components/pay/toC"));
 var import_toB = __toESM(require("./components/pay/toB"));
 var import_eftpos = __toESM(require("./components/eftpos"));
-var import_wallet = __toESM(require("./components/wallet"));
 var import_walletList = __toESM(require("./components/walletList"));
 var import_dashboard = __toESM(require("./components/booking/dashboard"));
 var import_pisellSelectCustomerModal = __toESM(require("./components/pisellSelectCustomerModal"));
@@ -188,10 +183,7 @@ var import_contactInfoModal = __toESM(require("./plus/contactInfoModal"));
 var import_Login2 = require("./pro/Login2.0");
 var import_walletEditor = __toESM(require("./plus/walletEditor"));
 var import_walletPassGallery = __toESM(require("./plus/walletPassGallery"));
-var import_passDetail = __toESM(require("./plus/walletPassGallery/components/passDetail"));
-var import_registry = __toESM(require("./components/systemSettings/registry"));
 var import_webPosLogin = __toESM(require("./plus/webPosLogin"));
-var import_plugin = __toESM(require("./components/checkout/plugin"));
 import_dayjs.default.extend(import_weekday.default);
 import_dayjs.default.extend(import_localeData.default);
 // Annotate the CommonJS export names for ESM import in node:
@@ -241,7 +233,6 @@ import_dayjs.default.extend(import_localeData.default);
   OnlineShopAuth,
   OrgAdminAuth,
   POSOperatorAuth,
-  PaymentModal,
   PinModal,
   PinVerifyModal,
   PisellSelectCustomerModal,
@@ -260,7 +251,6 @@ import_dayjs.default.extend(import_localeData.default);
   SaasLogin,
   SaasRegister,
   Schedules,
-  SettingsRegistry,
   ShoppingCart,
   SkuCard,
   SkuList,
@@ -272,10 +262,8 @@ import_dayjs.default.extend(import_localeData.default);
   ToCPay,
   VerticalAddService,
   VerticalClient,
-  Wallet,
   WalletEditor,
   WalletList,
-  WalletPassDetail,
   WalletPassGallery,
   WebPosLogin,
   WorkspaceList,

package/lib/plus/clientCard/locales.js

@@ -24,9 +24,9 @@ __export(locales_exports, {
 module.exports = __toCommonJS(locales_exports);
 var locales_default = {
   en: {
-    "pisell2.text.add-client": "Add Customer",
-    "pisell2.text.change-client": "Change Customer",
-    "pisell2.text.remove-client": " Remove Customer"
+    "pisell2.text.add-client": "Add client",
+    "pisell2.text.change-client": "Change Client",
+    "pisell2.text.remove-client": " Remove Client"
   },
   "zh-CN": {
     "pisell2.text.add-client": "添加客户",

package/lib/plus/clinetSearch/index.js

@@ -66,7 +66,7 @@ var ClientSearch = (0, import_react.forwardRef)(
       (_a2 = addClientRef.current) == null ? void 0 : _a2.reset();
     };
     const renderListHeader = () => {
-      return /* @__PURE__ */ import_react.default.createElement("div", { className: "client-search-list-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 180 } }, import_utils.locales.getText("pisell2.text.client-search.name")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 110 } }, import_utils.locales.getText("pisell2.text.client-search.register-time")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 125 } }, import_utils.locales.getText("pisell2.text.client-search.membership")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 180 } }, import_utils.locales.getText("pisell2.text.client-search.contact-info")));
+      return /* @__PURE__ */ import_react.default.createElement("div", { className: "client-search-list-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 110 } }, import_utils.locales.getText("pisell2.text.client-search.name")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 110 } }, import_utils.locales.getText("pisell2.text.client-search.register-time")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 120 } }, import_utils.locales.getText("pisell2.text.client-search.phone")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 135 } }, import_utils.locales.getText("pisell2.text.client-search.email")), /* @__PURE__ */ import_react.default.createElement("div", { className: "header-item", style: { width: 120 } }, import_utils.locales.getText("pisell2.text.client-search.membership")));
     };
     const renderResults = (searchResults) => {
       return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, (searchResults == null ? void 0 : searchResults.length) ? renderListHeader() : null, /* @__PURE__ */ import_react.default.createElement(
@@ -111,7 +111,7 @@ var ClientSearch = (0, import_react.forwardRef)(
             {
               dataSource: searchResults,
               renderItem: (item, index) => {
-                var _a2, _b2, _c2, _d, _e, _f, _g, _h;
+                var _a2, _b2;
                 const membershipText = (_b2 = (_a2 = item.latest_wallet_detail) == null ? void 0 : _a2.wallet) == null ? void 0 : _b2.name;
                 return /* @__PURE__ */ import_react.default.createElement(
                   import_antd.List.Item,
@@ -126,7 +126,10 @@ var ClientSearch = (0, import_react.forwardRef)(
                       onClick: () => onRowClick == null ? void 0 : onRowClick(item, index || 0),
                       style: { cursor: "pointer" }
                     },
-                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 180 } }, /* @__PURE__ */ import_react.default.createElement(import_clientName.default, { dataSource: item }), /* @__PURE__ */ import_react.default.createElement("div", null, item.phone || "-"), /* @__PURE__ */ import_react.default.createElement(
+                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 110 } }, /* @__PURE__ */ import_react.default.createElement(import_clientName.default, { dataSource: item })),
+                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 110 } }, (0, import_dayjs.default)(item.created_at).format("YYYY-MM-DD") || "-"),
+                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 120 } }, item.phone || "-"),
+                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 135 } }, /* @__PURE__ */ import_react.default.createElement(
                       "div",
                       {
                         style: {
@@ -137,8 +140,7 @@ var ClientSearch = (0, import_react.forwardRef)(
                       },
                       item.email || "-"
                     )),
-                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 110 } }, (0, import_dayjs.default)(item.created_at).format("YYYY-MM-DD") || "-"),
-                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 125 } }, membershipText && (translationOriginal == null ? void 0 : translationOriginal(membershipText)) ? /* @__PURE__ */ import_react.default.createElement(
+                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 120 } }, membershipText && (translationOriginal == null ? void 0 : translationOriginal(membershipText)) ? /* @__PURE__ */ import_react.default.createElement(
                       import_antd.Tag,
                       {
                         color: "gold",
@@ -154,18 +156,7 @@ var ClientSearch = (0, import_react.forwardRef)(
                         }
                       },
                       translationOriginal == null ? void 0 : translationOriginal(membershipText)
-                    ) : "-"),
-                    /* @__PURE__ */ import_react.default.createElement("div", { className: "item-cell", style: { width: 180 } }, /* @__PURE__ */ import_react.default.createElement(import_clientName.default, { dataSource: (_c2 = item == null ? void 0 : item.contacts_info) == null ? void 0 : _c2.value }), ((_f = (_e = (_d = item == null ? void 0 : item.contacts_info) == null ? void 0 : _d.value) == null ? void 0 : _e.phone) == null ? void 0 : _f.phone) || "-", /* @__PURE__ */ import_react.default.createElement(
-                      "div",
-                      {
-                        style: {
-                          overflow: "hidden",
-                          textOverflow: "ellipsis",
-                          whiteSpace: "nowrap"
-                        }
-                      },
-                      ((_h = (_g = item == null ? void 0 : item.contacts_info) == null ? void 0 : _g.value) == null ? void 0 : _h.email) || "-"
-                    ))
+                    ) : "-")
                   )
                 );
               }

package/lib/plus/clinetSearch/locales.d.ts

@@ -31,7 +31,6 @@ declare const _default: {
         'pisell2.text.client-search.phone': string;
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
-        'pisell2.text.client-search.contact-info': string;
     };
     'zh-CN': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -65,7 +64,6 @@ declare const _default: {
         'pisell2.text.client-search.phone': string;
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
-        'pisell2.text.client-search.contact-info': string;
     };
     'zh-HK': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -99,7 +97,6 @@ declare const _default: {
         'pisell2.text.client-search.phone': string;
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
-        'pisell2.text.client-search.contact-info': string;
     };
 };
 export default _default;

package/lib/plus/clinetSearch/locales.js

@@ -41,7 +41,7 @@ var locales_default = {
     "pisell2.text.save": "Save",
     "pisell2.text.save-and-select": "Save and select",
     "pisell2.text.no-results-found": "No results found.",
-    "pisell2.text.create-new-client": "Create new customer",
+    "pisell2.text.create-new-client": "Create new client",
     "pisell2.text.result-found": "Result found",
     "pisell2.text.personnel-list": "Personnel list",
     "pisell2.text.load-more": "Load more",
@@ -54,8 +54,7 @@ var locales_default = {
     "pisell2.text.client-search.register-time": "Registration Time",
     "pisell2.text.client-search.phone": "Phone Number",
     "pisell2.text.client-search.email": "Email Address",
-    "pisell2.text.client-search.membership": "Membership",
-    "pisell2.text.client-search.contact-info": "Contact info"
+    "pisell2.text.client-search.membership": "Membership"
   },
   "zh-CN": {
     "pisell2.text.leave-empty-for-walk-in": "如未注册游客则留空",
@@ -88,8 +87,7 @@ var locales_default = {
     "pisell2.text.client-search.register-time": "注册时间",
     "pisell2.text.client-search.phone": "电话号码",
     "pisell2.text.client-search.email": "邮箱",
-    "pisell2.text.client-search.membership": "会员",
-    "pisell2.text.client-search.contact-info": "联系信息"
+    "pisell2.text.client-search.membership": "会员"
   },
   "zh-HK": {
     "pisell2.text.leave-empty-for-walk-in": "如未註冊遊客則留空",
@@ -122,7 +120,6 @@ var locales_default = {
     "pisell2.text.client-search.register-time": "註冊時間",
     "pisell2.text.client-search.phone": "電話號碼",
     "pisell2.text.client-search.email": "電郵地址",
-    "pisell2.text.client-search.membership": "會員",
-    "pisell2.text.client-search.contact-info": "聯繫信息"
+    "pisell2.text.client-search.membership": "會員"
   }
 };

package/lib/plus/clinetSearch/types.d.ts

@@ -10,18 +10,6 @@ export interface ClientData {
     nickname: string;
     shop_id: number;
     updated_at: string;
-    contacts_info: {
-        value: {
-            first_name?: string;
-            last_name?: string;
-            phone?: {
-                phone?: string;
-                country_calling_code?: string;
-                country_code?: string;
-            };
-            email?: string;
-        };
-    };
 }
 export interface ClientSearchProps {
     dataSource?: any;

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

@@ -160,13 +160,13 @@ var FooterButtons = ({
         )
       );
     }
-    const className = `pisell-wallet-pass-gallery_footer-buttons`;
+    const buttonCount = buttons.length;
+    const className = `pisell-wallet-pass-gallery_footer-buttons pisell-wallet-pass-gallery_footer-buttons-count-${buttonCount}`;
     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,38 +1,83 @@
 .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: -24px;
-  margin-right: -24px;
+  margin-left: -20px;
+  margin-right: -20px;
   &-buttons {
     display: flex;
     gap: 12px;
     width: 100%;
 
-    .pisell-wallet-pass-gallery_footer-buttons-item-secondary {
-      overflow: hidden;
-      display: inline-block;
+
+.pisell-wallet-pass-gallery_footer-buttons-item-secondary{
+    overflow: hidden;
+    display: flex;
+    >span{
+      display: block;
+      // width: 100%;
+      flex:1;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
       text-wrap: nowrap;
-      > span {
-        display: inline;
-      }
     }
+}
 
-    .pisell-wallet-pass-gallery_footer-buttons-item {
-      flex-grow: 1;
-    }
 
+    // 按钮数量样式
+    // 单个按钮占满宽度
+    &-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);
+      }
+    }
+    
+    // 三个按钮各占三分之一
+    &-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%;
+    }
+    
     &-item {
       // 修饰符：主按钮
       &-primary {
-        background-color: var(--theme-color, #7f56d9);
+        background-color: var(--theme-color, #7F56D9);
       }
-
+      
       // 修饰符：次按钮
       &-secondary {
         background-color: #fff;
@@ -45,4 +90,4 @@
 
 .pisell-wallet-pass-gallery_footer:empty {
   display: none;
-}
+}

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

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

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

@@ -48,26 +48,19 @@ 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, _j, _k, _l, _m, _n, _o, _p, _q;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+  if (!props.dataSource) return null;
   const { symbol = "$" } = (0, import_materials.usePisellConfig)();
-  const { dataSource, platform = "pc", showTimeLine = true } = props;
+  const { dataSource, platform = "pc" } = 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 { 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 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 {
     id = "",
     code = "",
@@ -76,22 +69,17 @@ var PassDetail = (props) => {
     encoded = "",
     balance,
     expire_date = "",
-    product = {},
-    custom_schedule_snapshot,
-    customer_id
+    product = {}
   } = dataSource || {};
   const {
     description = "",
     extension_data = [],
     customer_order_behavior_count = 0
   } = product || {};
-  const _getDetail = (0, import_ahooks.useRequest)(() => (0, import_serve.getDetailApi)({ id, apiPrefix, order_behavior_count_customer_id: customer_id }), {
+  const _getDetail = (0, import_ahooks.useRequest)(() => (0, import_serve.getDetailApi)({ id }), {
     ready: !!id,
-    refreshDeps: [id, customer_id]
+    refreshDeps: [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");
@@ -123,29 +111,7 @@ var PassDetail = (props) => {
     return () => clearTimeout(timeoutId);
   }, []);
   const descs = (0, import_react.useMemo)(() => {
-    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);
-    }
+    var _a2;
     let data = [
       {
         label: import_utils.locales.getText("wallet-pass-gallery.cardName"),
@@ -158,11 +124,11 @@ var PassDetail = (props) => {
       },
       {
         label: import_utils.locales.getText("wallet-pass-gallery.validDate"),
-        value: expireText
+        value: expire_date ? expire_date : import_utils.locales.getText("wallet-pass-gallery.expireDate")
       }
     ];
     if (tag === "product_discount_card") {
-      const isFixedAmount = ((_c2 = dataSource.metadata) == null ? void 0 : _c2.discount_card_type) === "fixed_amount";
+      const isFixedAmount = ((_a2 = dataSource.metadata) == null ? void 0 : _a2.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)}%` : ""
@@ -229,19 +195,14 @@ 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-with-footer`]: platform === "h5" && tag === "gift_card"
-        }
+        `pisell-wallet-pass-gallery_detail-${platform}`
       )
     },
     /* @__PURE__ */ import_react.default.createElement(
@@ -276,7 +237,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" && ((_n = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _n.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" && ((_f = dataSource == null ? void 0 : dataSource.machinecode_config) == null ? void 0 : _f.hide_recharge) === 0 && /* @__PURE__ */ import_react.default.createElement(
           import_antd.Button,
           {
             type: "primary",
@@ -308,9 +269,9 @@ var PassDetail = (props) => {
   ), platform === "h5" && tag === "gift_card" ? /* @__PURE__ */ import_react.default.createElement(
     import_footerButton.default,
     {
-      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,
+      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,
       platform
     }
   ) : null, /* @__PURE__ */ import_react.default.createElement(

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

@@ -18,10 +18,6 @@
     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,7 +51,6 @@ 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]);
@@ -60,7 +59,6 @@ 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) || "",
@@ -89,14 +87,11 @@ 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,
@@ -110,8 +105,7 @@ var Recharge = ({
           block: true,
           size: "large",
           onClick: handleRecharge,
-          disabled: !(chargeItem == null ? void 0 : chargeItem.id),
-          loading
+          disabled: !(chargeItem == null ? void 0 : chargeItem.id)
         },
         import_utils.locales.getText("wallet-pass-gallery.recharge")
       )

package/lib/plus/walletPassGallery/index.js

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

package/lib/plus/walletPassGallery/serve.d.ts

@@ -17,7 +17,6 @@ export interface IWalletListParmsProps {
     skip?: number;
     filter_wallet_id?: string;
     available: 0 | 1;
-    with?: string[];
 }
 /**
  * 钱包列表项属性接口
@@ -172,8 +171,6 @@ export declare const getAssetList: (params: IAssetListProps) => Promise<{
  */
 export declare const getDetailApi: (params: {
     id: string;
-    order_behavior_count_customer_id: string;
-    apiPrefix: string;
 }) => Promise<IDetailResponse>;
 /**
  * 详情响应数据结构，供组件消费

package/lib/plus/walletPassGallery/serve.js

@@ -69,12 +69,11 @@ var getAssetList = async (params) => {
   return data;
 };
 var getDetailApi = async (params) => {
-  const { data } = await import_utils.request.getRequest().get(`${params.apiPrefix || "/h5"}/machinecode/lowcode/detail/${params.id}`, {
+  const { data } = await import_utils.request.getRequest().get(`/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;
 };