@pisell/private-materials 6.6.4 → 6.6.6

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

@@ -44,6 +44,7 @@ var import_utils2 = require("../../utils");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_passList = __toESM(require("./components/passList"));
 var import_passDetail = __toESM(require("./components/passDetail"));
+var import_tempHolderSelector = __toESM(require("../../components/walletList/tempHolderSelector"));
 var import_index = require("./index.less");
 var { Title } = import_antd.Typography;
 var KEYS = {
@@ -65,6 +66,8 @@ var WalletPassGallery = (props) => {
   const [currentItemId, setCurrentItemId] = (0, import_react.useState)(void 0);
   const [isOpenAddModal, setIsOpenAddModal] = (0, import_react.useState)(false);
   const [currentUnbindItem, setCurrentUnbindItem] = (0, import_react.useState)(null);
+  const [editHolderData, setEditHolderData] = (0, import_react.useState)(null);
+  const [updateHolderLoading, setUpdateHolderLoading] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
   const utils = ((_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) || {};
   const platform = (0, import_react.useMemo)(() => {
@@ -83,14 +86,17 @@ var WalletPassGallery = (props) => {
   });
   const _getAvailableList = (0, import_ahooks.useInfiniteScroll)(
     async (d) => {
-      const walletId = new URLSearchParams(window.location.search).get("id");
-      const res = await (0, import_serve.getWalletList)({
+      const _searchParams = new URLSearchParams(window.location.search);
+      const walletId = _searchParams.get("id");
+      const holderId = _searchParams.get("holder_id");
+      const res = await (0, import_serve.getWalletPassList)({
         available: 1,
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
         filter_wallet_id: walletId || void 0,
-        "with": ["customScheduleSnapshot"]
+        filter_holder_id: holderId || void 0,
+        with: ["holder.detail"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -110,14 +116,17 @@ var WalletPassGallery = (props) => {
   );
   const _getUnavailableList = (0, import_ahooks.useInfiniteScroll)(
     async (d) => {
-      const walletId = new URLSearchParams(window.location.search).get("id");
-      const res = await (0, import_serve.getWalletList)({
+      const _searchParams = new URLSearchParams(window.location.search);
+      const walletId = _searchParams.get("id");
+      const holderId = _searchParams.get("holder_id");
+      const res = await (0, import_serve.getWalletPassList)({
         available: 0,
         num: 20,
         skip: (d == null ? void 0 : d.nextId) || 1,
         tags: TAGS,
         filter_wallet_id: walletId || void 0,
-        "with": ["customScheduleSnapshot"]
+        filter_holder_id: holderId || void 0,
+        with: ["holder.detail"]
       });
       return {
         list: (res == null ? void 0 : res.list) || [],
@@ -135,24 +144,82 @@ var WalletPassGallery = (props) => {
   );
   (0, import_react.useEffect)(() => {
     const walletId = new URLSearchParams(window.location.search).get("id");
+    const passId = new URLSearchParams(window.location.search).get(
+      "wallet_pass_detail_id"
+    );
     if (walletId) {
       _getWalletDetail.runAsync(walletId);
     }
     const req1 = _getAvailableList.loadMoreAsync();
     const req2 = _getUnavailableList.loadMoreAsync();
-    Promise.all([req1, req2]).then(([data1, data2]) => {
-      if (platform === "h5") return;
-      const list = (data1 == null ? void 0 : data1.list) || [];
-      const firstAvailable = list[0];
-      if (firstAvailable) {
-        setCurrentItemId(firstAvailable.id);
-        return;
-      }
-      const list2 = (data2 == null ? void 0 : data2.list) || [];
-      const firstUnavailable = list2[0];
-      if (firstUnavailable) {
-        setCurrentItemId(firstUnavailable.id);
-        setActiveKey("unavailable");
+    let req3 = passId ? (0, import_serve.getWalletPassDetail)(passId, {
+      with: ["holder.detail"]
+    }) : Promise.resolve();
+    Promise.all([req1, req2, req3]).then(([data1, data2, data3]) => {
+      var _a2, _b2, _c2, _d2, _e2;
+      if (platform !== "h5") {
+        const list1 = (data1 == null ? void 0 : data1.list) || [];
+        const list2 = (data2 == null ? void 0 : data2.list) || [];
+        if (passId) {
+          const matchedInList1 = list1.find(
+            (item) => String(item.id) === passId
+          );
+          const matchedInList2 = list2.find(
+            (item) => String(item.id) === passId
+          );
+          if (matchedInList1 || matchedInList2) {
+            setCurrentItemId(Number(passId));
+            if (matchedInList2) {
+              setActiveKey("unavailable");
+            }
+          } else {
+            if (data3) {
+              if (data3.unified_available_status === 1) {
+                _getAvailableList.mutate((data) => ({
+                  ...data,
+                  list: [data3, ...(data == null ? void 0 : data.list) || []]
+                }));
+                setCurrentItemId(data3.id);
+              } else {
+                _getUnavailableList.mutate((data) => ({
+                  ...data,
+                  list: [data3, ...(data == null ? void 0 : data.list) || []]
+                }));
+                setCurrentItemId(data3.id);
+                setActiveKey("unavailable");
+              }
+            } else {
+              const firstAvailable = list1[0];
+              if (firstAvailable) {
+                setCurrentItemId(firstAvailable.id);
+              } else {
+                const firstUnavailable = list2[0];
+                if (firstUnavailable) {
+                  setCurrentItemId(firstUnavailable.id);
+                  setActiveKey("unavailable");
+                }
+              }
+            }
+          }
+          if (data3 && ((_a2 = data3.holder) == null ? void 0 : _a2.holder_type) === "form" && !((_b2 = data3.holder) == null ? void 0 : _b2.holder_id)) {
+            setEditHolderData({
+              wallet_pass_detail_id: passId,
+              customer_id: (_c2 = data3.holder) == null ? void 0 : _c2.customer_id,
+              form_id: (_e2 = (_d2 = data3.holder) == null ? void 0 : _d2.metadata) == null ? void 0 : _e2.custom_id
+            });
+          }
+        } else {
+          const firstAvailable = list1[0];
+          if (firstAvailable) {
+            setCurrentItemId(firstAvailable.id);
+          } else {
+            const firstUnavailable = list2[0];
+            if (firstUnavailable) {
+              setCurrentItemId(firstUnavailable.id);
+              setActiveKey("unavailable");
+            }
+          }
+        }
       }
     });
   }, []);
@@ -199,10 +266,6 @@ var WalletPassGallery = (props) => {
     const newId = key === KEYS.unavailable ? (_a2 = _unavailable[0]) == null ? void 0 : _a2.id : (_b2 = _avaliable[0]) == null ? void 0 : _b2.id;
     setCurrentItemId(newId);
   };
-  const _handleMenuChange = (key) => {
-    setActiveKey(key);
-    setCurrentItemId(void 0);
-  };
   const _resetSearchState = () => {
     setCurrentUnbindItem(null);
     _getUnbindList.mutate([]);
@@ -251,6 +314,53 @@ var WalletPassGallery = (props) => {
       });
     }
   };
+  const _handleHolderChange = (passId, holder) => {
+    if (_avaliable.find((item) => item.id === passId)) {
+      _getAvailableList.mutate((data) => {
+        const newList = data.list.map(
+          (item) => item.id === passId ? { ...item, holder } : item
+        );
+        return {
+          ...data,
+          list: newList
+        };
+      });
+    } else if (_unavailable.find((item) => item.id === passId)) {
+      _getUnavailableList.mutate((data) => {
+        const newList = data.list.map(
+          (item) => item.id === passId ? { ...item, holder } : item
+        );
+        return {
+          ...data,
+          list: newList
+        };
+      });
+    } else {
+      console.log("pass not found", passId);
+    }
+  };
+  const _handleBindHolder = async (holderId) => {
+    setUpdateHolderLoading(true);
+    const { wallet_pass_detail_id: passId } = editHolderData;
+    try {
+      const res = await (0, import_serve.updateWalletPassHolder)(passId, {
+        holder_type: "form",
+        holder_id: holderId
+      });
+      setEditHolderData(null);
+      if (holderId) {
+        if (res) {
+          _handleHolderChange == null ? void 0 : _handleHolderChange(Number(passId), res);
+        }
+      } else {
+        _handleHolderChange == null ? void 0 : _handleHolderChange(Number(passId), null);
+      }
+    } catch (error) {
+      console.error("Error updating wallet pass holder:", error);
+    } finally {
+      setUpdateHolderLoading(false);
+    }
+  };
   const _currentItem = (0, import_react.useMemo)(() => {
     if (!currentItemId) return null;
     const found1 = _avaliable.find(
@@ -281,7 +391,8 @@ var WalletPassGallery = (props) => {
           hasMore: !_getAvailableList.noMore,
           dataSource: _avaliable,
           value: currentItemId,
-          onChange: _handleCardClick
+          onChange: _handleCardClick,
+          onEditHolder: setEditHolderData
         }
       );
     }
@@ -293,7 +404,8 @@ var WalletPassGallery = (props) => {
         hasMore: !_getAvailableList.noMore,
         dataSource: _avaliable,
         value: currentItemId,
-        onChange: _handleCardClick
+        onChange: _handleCardClick,
+        onEditHolder: setEditHolderData
       }
     )), /* @__PURE__ */ import_react.default.createElement(ACol, { flex: "auto" }, /* @__PURE__ */ import_react.default.createElement(import_passDetail.default, { dataSource: _currentItem, platform })));
   };
@@ -307,7 +419,8 @@ var WalletPassGallery = (props) => {
           loading: _getUnavailableList.loadingMore,
           dataSource: _unavailable,
           value: currentItemId,
-          onChange: _handleCardClick
+          onChange: _handleCardClick,
+          onEditHolder: setEditHolderData
         }
       );
     }
@@ -319,7 +432,8 @@ var WalletPassGallery = (props) => {
         loading: _getUnavailableList.loadingMore,
         dataSource: _unavailable,
         value: currentItemId,
-        onChange: _handleCardClick
+        onChange: _handleCardClick,
+        onEditHolder: setEditHolderData
       }
     )), /* @__PURE__ */ import_react.default.createElement(ACol, { flex: "auto" }, /* @__PURE__ */ import_react.default.createElement(import_passDetail.default, { dataSource: _currentItem, platform })));
   };
@@ -442,7 +556,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,
@@ -495,6 +611,19 @@ var WalletPassGallery = (props) => {
         onChangeType: _resetSearchState
       }
     ), (_getUnbindList.data || []).map(renderSearchCard))
+  ), !!editHolderData && /* @__PURE__ */ import_react.default.createElement(
+    import_tempHolderSelector.default,
+    {
+      visible: true,
+      onCancel: () => {
+        setEditHolderData(null);
+      },
+      onConfirm: _handleBindHolder,
+      confirmLoading: updateHolderLoading,
+      formId: editHolderData == null ? void 0 : editHolderData.form_id,
+      customerId: editHolderData == null ? void 0 : editHolderData.customer_id,
+      value: editHolderData == null ? void 0 : editHolderData.holder_id
+    }
   ));
 };
 var walletPassGallery_default = WalletPassGallery;

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

@@ -87,6 +87,11 @@ declare const _default: {
         'wallet-pass-gallery.voucherExpireNote': string;
         'wallet-pass-gallery.viewMore': string;
         'wallet-pass-gallery.allLoaded': string;
+        'page.wallet.tempHolderSelector.title': string;
+        'page.wallet.tempHolderSelector.create': string;
+        'page.wallet.tempHolderSelector.confirm': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
     };
     'zh-CN': {
         'wallet-pass-gallery.rechargeableCard': string;
@@ -176,6 +181,11 @@ declare const _default: {
         'wallet-pass-gallery.voucherExpireNote': string;
         'wallet-pass-gallery.viewMore': string;
         'wallet-pass-gallery.allLoaded': string;
+        'page.wallet.tempHolderSelector.title': string;
+        'page.wallet.tempHolderSelector.create': string;
+        'page.wallet.tempHolderSelector.confirm': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
     };
     'zh-HK': {
         'wallet-pass-gallery.rechargeableCard': string;
@@ -265,6 +275,11 @@ declare const _default: {
         'wallet-pass-gallery.voucherExpireNote': string;
         'wallet-pass-gallery.viewMore': string;
         'wallet-pass-gallery.allLoaded': string;
+        'page.wallet.tempHolderSelector.title': string;
+        'page.wallet.tempHolderSelector.create': string;
+        'page.wallet.tempHolderSelector.confirm': string;
+        'page.wallet.notValidDate': string;
+        'page.wallet.includedDate': string;
     };
 };
 export default _default;

package/lib/plus/walletPassGallery/locales.js

@@ -116,7 +116,16 @@ var locales_default = {
     "wallet-pass-gallery.monthlyReset": "Counter resets on 1st of each month at midnight",
     "wallet-pass-gallery.voucherExpireNote": "Voucher will automatically expire when limit is reached",
     "wallet-pass-gallery.viewMore": "View More",
-    "wallet-pass-gallery.allLoaded": "All loaded"
+    "wallet-pass-gallery.allLoaded": "All loaded",
+    // TempHolderSelector
+    "page.wallet.tempHolderSelector.title": "Edit Holder",
+    "page.wallet.tempHolderSelector.create": "Create New",
+    "page.wallet.tempHolderSelector.confirm": "Confirm",
+    // temp
+    "page.wallet.notValidDate": "Not valid on",
+    // 不可用日期
+    "page.wallet.includedDate": "Included dates"
+    // 包含日期
   },
   "zh-CN": {
     "wallet-pass-gallery.rechargeableCard": "充值卡",
@@ -189,7 +198,7 @@ var locales_default = {
     "wallet-pass-gallery.loading": "正在加载钱包...",
     "wallet-pass-gallery.usageRules": "使用规则",
     "wallet-pass-gallery.usageRulesSubtitle": "请仔细阅读以下使用条件",
-    "wallet-pass-gallery.timeUsageLimits": "时间使用限制",
+    "wallet-pass-gallery.timeUsageLimits": "使用频次限制",
     "wallet-pass-gallery.totalQuantityControl": "总量控制",
     "wallet-pass-gallery.dailyLimit": "每日限制:",
     "wallet-pass-gallery.weeklyLimit": "每周限制:",
@@ -205,7 +214,16 @@ var locales_default = {
     "wallet-pass-gallery.monthlyReset": "每月1号0点自动重置计数",
     "wallet-pass-gallery.voucherExpireNote": "用完后此券将自动失效",
     "wallet-pass-gallery.viewMore": "查看更多",
-    "wallet-pass-gallery.allLoaded": "已全部加载"
+    "wallet-pass-gallery.allLoaded": "已全部加载",
+    // TempHolderSelector
+    "page.wallet.tempHolderSelector.title": "编辑持有人",
+    "page.wallet.tempHolderSelector.create": "创建新持有人",
+    "page.wallet.tempHolderSelector.confirm": "确定",
+    // temp
+    "page.wallet.notValidDate": "不可用日期",
+    // 不可用日期
+    "page.wallet.includedDate": "包含日期"
+    // 包含日期
   },
   "zh-HK": {
     "wallet-pass-gallery.rechargeableCard": "充值卡",
@@ -278,7 +296,7 @@ var locales_default = {
     "wallet-pass-gallery.loading": "正在加載錢包...",
     "wallet-pass-gallery.usageRules": "使用規則",
     "wallet-pass-gallery.usageRulesSubtitle": "請仔細閱讀以下使用條件",
-    "wallet-pass-gallery.timeUsageLimits": "時間使用限制",
+    "wallet-pass-gallery.timeUsageLimits": "使用頻次限制",
     "wallet-pass-gallery.totalQuantityControl": "總量控制",
     "wallet-pass-gallery.dailyLimit": "每日限制:",
     "wallet-pass-gallery.weeklyLimit": "每週限制:",
@@ -294,6 +312,15 @@ var locales_default = {
     "wallet-pass-gallery.monthlyReset": "每月1號0點自動重置計數",
     "wallet-pass-gallery.voucherExpireNote": "用完後此券將自動失效",
     "wallet-pass-gallery.viewMore": "查看更多",
-    "wallet-pass-gallery.allLoaded": "已全部加載"
+    "wallet-pass-gallery.allLoaded": "已全部加載",
+    // TempHolderSelector
+    "page.wallet.tempHolderSelector.title": "編輯持有人",
+    "page.wallet.tempHolderSelector.create": "創建新持有人",
+    "page.wallet.tempHolderSelector.confirm": "確定",
+    // temp
+    "page.wallet.notValidDate": "不可用日期",
+    // 不可用日期
+    "page.wallet.includedDate": "包含日期"
+    // 包含日期
   }
 };

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

@@ -16,6 +16,7 @@ export interface IWalletListParmsProps {
     num?: number;
     skip?: number;
     filter_wallet_id?: string;
+    filter_holder_id?: string;
     available: 0 | 1;
     with?: string[];
 }
@@ -86,7 +87,7 @@ export declare type ErrorCallback = () => void;
  * @returns Promise<{list: IWalletListItemProps[], count: number}> 钱包列表和总数
  * @throws 请求失败时抛出错误
  */
-export declare const getWalletList: (params?: IWalletListParmsProps) => Promise<{
+export declare const getWalletPassList: (params?: IWalletListParmsProps) => Promise<{
     list: IWalletListItemProps[];
     count: number;
 }>;
@@ -218,4 +219,17 @@ export declare const orderRechargeProduct: (params: OrderParams) => Promise<Orde
  * @date: 2025-11-03 15:30
  */
 export declare const getWalletDetail: (id: string | number) => Promise<any>;
+/**
+ * 更新卡券持有人
+ * @param id 卡券ID
+ * @param params 更新参数
+ * @returns 更新结果
+ */
+export declare const updateWalletPassHolder: (id: string, params: any) => Promise<any>;
+/**
+ * 获取卡券详情
+ * @param id 卡券ID
+ * @returns 卡券详情
+ */
+export declare const getWalletPassDetail: (id: string, params: any) => Promise<any>;
 export {};

package/lib/plus/walletPassGallery/serve.js

@@ -24,15 +24,17 @@ __export(serve_exports, {
   getDetailApi: () => getDetailApi,
   getUnbindList: () => getUnbindList,
   getWalletDetail: () => getWalletDetail,
-  getWalletList: () => getWalletList,
+  getWalletPassDetail: () => getWalletPassDetail,
+  getWalletPassList: () => getWalletPassList,
   goOrder: () => goOrder,
   orderRechargeProduct: () => orderRechargeProduct,
-  setRequest: () => setRequest
+  setRequest: () => setRequest,
+  updateWalletPassHolder: () => updateWalletPassHolder
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../utils");
 var import_utils2 = require("@pisell/utils");
-var getWalletList = async (params) => {
+var getWalletPassList = async (params) => {
   try {
     const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/lowcode/list`, params);
     return data || { list: [], count: 0 };
@@ -85,6 +87,14 @@ var orderRechargeProduct = async (params) => {
 var getWalletDetail = async (id) => {
   return import_utils.request.getRequest().get(`/h5/wallet/${id}`, {});
 };
+var updateWalletPassHolder = async (id, params) => {
+  const { data } = await import_utils.request.getRequest().post(`/h5/machinecode/${id}/bind-holder`, params);
+  return data;
+};
+var getWalletPassDetail = async (id, params) => {
+  const { data } = await import_utils.request.getRequest().get(`/h5/machinecode/lowcode/detail/${id}`, params);
+  return data;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   bindCodeToCustomer,
@@ -92,8 +102,10 @@ var getWalletDetail = async (id) => {
   getDetailApi,
   getUnbindList,
   getWalletDetail,
-  getWalletList,
+  getWalletPassDetail,
+  getWalletPassList,
   goOrder,
   orderRechargeProduct,
-  setRequest
+  setRequest,
+  updateWalletPassHolder
 });

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

@@ -0,0 +1,48 @@
+interface ScheduleTextResult {
+    validityTexts: string[];
+    excluded_date: string[];
+    included_date: string[];
+}
+declare type Locale = 'en' | 'zh-CN' | 'zh-HK';
+interface ScheduleItem {
+    id: number;
+    name: string | {
+        [key: string]: string;
+    };
+    type: 'standard' | 'time-slots' | 'designation';
+    start_time: string | null;
+    end_time: string | null;
+    repeat_type: 'none' | 'daily' | 'weekly';
+    repeat_rule: {
+        end: {
+            type: 'never' | 'date' | 'occurrence';
+            end_date: string | null;
+            occurrence: number | null;
+        };
+        frequency: number;
+        excluded_date: Array<{
+            start: string;
+            end: string;
+        }>;
+        included_date: any[];
+        frequency_date: number[];
+    } | null;
+    designation: Array<{
+        start_date: string;
+        start_time: string;
+        end_date: string;
+        end_time: string;
+    }> | null;
+    is_all: number;
+    time_slot: Array<{
+        start_time: string;
+        end_time: string;
+    }>;
+}
+/**
+ * 根据scheduleList格式化文案展示
+ * @param scheduleList 日程列表
+ * @returns 格式化后的文案结果数组，每个日程对应一个结果
+ */
+export declare function formatScheduleText(scheduleList: ScheduleItem[], locale?: Locale): ScheduleTextResult[];
+export {};