@pisell/private-materials 3.3.67 → 3.3.69

package/lib/components/ticketBooking/utils/index.d.ts

@@ -12,8 +12,12 @@ export declare const restoreProductOtherData: (data: any) => {
     product_variant_id: number;
     quantity: number;
 } | undefined;
-export declare const addService: (list: any[], addItem: any) => {
+export declare const addService: (list: any[], addItem: any, state: any) => {
     list: any[];
     quantity: any;
 };
 export declare const addServiceScroll: (rowKey: string, cacheItem: any) => void;
+export declare const getCartProductOverlay: (state: any) => any;
+export declare const getIsOverlayProduct: (item: any, state: any) => any;
+export declare const getIsShowNumber: (item: any, state: any) => any;
+export declare const genServiceKey: (item: any) => string;

package/lib/components/ticketBooking/utils/index.js

@@ -33,8 +33,12 @@ __export(utils_exports, {
   addServiceScroll: () => addServiceScroll,
   formatBookingList: () => formatBookingList,
   formatDateToStr: () => formatDateToStr,
+  genServiceKey: () => genServiceKey,
+  getCartProductOverlay: () => getCartProductOverlay,
   getDefaultStartParam: () => getDefaultStartParam,
   getDisabledEdit: () => getDisabledEdit,
+  getIsOverlayProduct: () => getIsOverlayProduct,
+  getIsShowNumber: () => getIsShowNumber,
   getNextTimeSlice: () => getNextTimeSlice,
   restoreProductOtherData: () => restoreProductOtherData
 });
@@ -124,13 +128,16 @@ var restoreProductOtherData = (data) => {
   };
 };
 var isSameProduct = (a, b) => {
-  var _a, _b, _c, _d;
-  return ((_b = (_a = a._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.rowKey) === ((_d = (_c = b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.rowKey);
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  if ((0, import_utils.isNormalProductByDurationSchedule)(a) && (0, import_utils.isNormalProductByDurationSchedule)(b)) {
+    return ((_b = (_a = a._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.rowKey) === ((_d = (_c = b._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.rowKey);
+  }
+  return ((_f = (_e = a._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.rowKey) === ((_h = (_g = b._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.rowKey) && a._serviceKey === b._serviceKey;
 };
-var addService = (list, addItem) => {
+var addService = (list, addItem, state) => {
   let value = list;
   let count;
-  if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem)) {
+  if (!(0, import_utils.isNormalProductByDurationSchedule)(addItem) && !getIsOverlayProduct(addItem, state)) {
     value.push(addItem);
     count = addItem._extend.quantity;
   } else {
@@ -183,14 +190,47 @@ var addServiceScroll = (rowKey, cacheItem) => {
     }
   });
 };
+var getCartProductOverlay = (state) => {
+  var _a, _b, _c;
+  return ((_c = (_b = (_a = state == null ? void 0 : state.bookingConfig) == null ? void 0 : _a.config) == null ? void 0 : _b.basic) == null ? void 0 : _c.cart_product_overlay) || { type: "product_all" };
+};
+var getIsOverlayProduct = (item, state) => {
+  const { type, product_ids } = getCartProductOverlay(state);
+  if (type === "product_all") {
+    return true;
+  }
+  return product_ids.includes(item.product_id || item.id);
+};
+var getIsShowNumber = (item, state) => {
+  const isBookingTicket2 = state.isBookingTicket2;
+  return (0, import_utils.isNormalProductByDurationSchedule)(item) || isBookingTicket2 && getIsOverlayProduct(item, state);
+};
+var genServiceKey = (item) => {
+  var _a, _b, _c;
+  const product_id = item.product_id;
+  const durationKey = (_a = item._extend) == null ? void 0 : _a.duration;
+  const start_time = (_b = item._extend) == null ? void 0 : _b.start_time;
+  const total = (_c = item._extend) == null ? void 0 : _c.total;
+  let resourceKey = "";
+  Object.values(item._extend.resource).forEach((resources) => {
+    resources.forEach((resource) => {
+      resourceKey += `${resource.relation_id}`;
+    });
+  });
+  return `${product_id}-${durationKey}-${resourceKey}-${start_time}-${total}`;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addService,
   addServiceScroll,
   formatBookingList,
   formatDateToStr,
+  genServiceKey,
+  getCartProductOverlay,
   getDefaultStartParam,
   getDisabledEdit,
+  getIsOverlayProduct,
+  getIsShowNumber,
   getNextTimeSlice,
   restoreProductOtherData
 });

package/lib/components/wallet/hooks/useWalletCard.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IWalletListItemProps } from '../serve';
 /**
  * 钱包卡片Hook的参数

package/lib/components/walletList/index.js

@@ -40,6 +40,8 @@ var import_useEngineContext = __toESM(require("./../../hooks/useEngineContext"))
 var import_serve = require("./serve");
 var import_utils = require("@pisell/utils");
 var import_utils2 = require("./../../utils");
+var import_status = require("./status");
+var import_locales = __toESM(require("./locales"));
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
 var import_types = require("./types");
@@ -98,7 +100,7 @@ var DEFAULT_WALLET_CARD = {
       original: "Level",
       "zh-CN": "Level",
       "zh-HK": "Level",
-      "en": "Level"
+      en: "Level"
     },
     metadata: {
       barcodetype: "barCode",
@@ -121,7 +123,7 @@ var WalletList = (0, import_model.Provider)((props) => {
   const context = (0, import_useEngineContext.default)();
   const { constants, utils } = context.appHelper || {};
   const dvaStore = (_b = (_a = utils == null ? void 0 : utils.getStore) == null ? void 0 : _a.call(utils)) == null ? void 0 : _b.getState();
-  import_utils.locales.init({}, ((_c = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _c.translateLocale) || "en");
+  import_utils.locales.init(import_locales.default, ((_c = dvaStore == null ? void 0 : dvaStore.core) == null ? void 0 : _c.translateLocale) || "en");
   const isMountedRef = (0, import_react.useRef)(true);
   const carouselRef = (0, import_react.useRef)(null);
   const { store } = utils;
@@ -129,23 +131,32 @@ var WalletList = (0, import_model.Provider)((props) => {
   const prevButtonRef = (0, import_react.useRef)(null);
   const nextButtonRef = (0, import_react.useRef)(null);
   const [currentIndex, setCurrentIndex] = (0, import_react.useState)(0);
+  const [walletShopList, setWalletShopList] = (0, import_react.useState)([]);
   const requestIdRef = (0, import_react.useRef)("");
+  const pubsub = utils == null ? void 0 : utils.pubsub;
   const isUserLoggedIn = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return !!((_b2 = (_a2 = utils == null ? void 0 : utils.token) == null ? void 0 : _a2.get) == null ? void 0 : _b2.call(_a2)) || false;
   }, [store]);
-  const {
-    list = [],
-    error,
-    authError,
-    hasAttempted,
-    isLoggedIn
-  } = state;
+  const { list = [], error, authError, hasAttempted, isLoggedIn } = state;
   (0, import_react.useEffect)(() => {
     if (utils == null ? void 0 : utils.request) {
       import_utils2.request.setRequest(utils.request);
     }
   }, [utils == null ? void 0 : utils.request]);
+  (0, import_react.useEffect)(() => {
+    if (isUserLoggedIn) {
+      (0, import_serve.getWalletShopList)({ skip: 1, num: 50 }).then((res) => {
+        pubsub.publish("wallet:shopList", res);
+      });
+      const subscription = pubsub.subscribe("wallet:shopList", (res) => {
+        setWalletShopList((res == null ? void 0 : res.list) || []);
+      });
+      return () => {
+        subscription.unsubscribe();
+      };
+    }
+  }, [isUserLoggedIn]);
   (0, import_react.useEffect)(() => {
     return () => {
       isMountedRef.current = false;
@@ -285,7 +296,7 @@ var WalletList = (0, import_model.Provider)((props) => {
         (0, import_serve.getWalletBalance)()
       ]);
       if (!isMountedRef.current || requestIdRef.current !== requestId) return;
-      if (walletListData && walletListData.length > 0) {
+      if (walletListData) {
         try {
           saveToLocalStorage(STORAGE_KEY, walletListData);
         } catch (e) {
@@ -301,7 +312,8 @@ var WalletList = (0, import_model.Provider)((props) => {
       }
       if (!walletBalanceData || Array.isArray(walletListData) && walletListData.length === 0) {
         setTimeout(async () => {
-          if (!isMountedRef.current || requestIdRef.current !== requestId) return;
+          if (!isMountedRef.current || requestIdRef.current !== requestId)
+            return;
           try {
             let retryBalanceData = walletBalanceData;
             let retryListData = walletListData;
@@ -311,7 +323,10 @@ var WalletList = (0, import_model.Provider)((props) => {
                 try {
                   saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
                 } catch (e) {
-                  console.error("Error saving retry balance to localStorage:", e);
+                  console.error(
+                    "Error saving retry balance to localStorage:",
+                    e
+                  );
                 }
               }
             }
@@ -469,11 +484,24 @@ var WalletList = (0, import_model.Provider)((props) => {
   const renderBalanceCard = (0, import_react.useCallback)((balance) => {
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-balance-card", key: balance.id }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-header" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-title" }, balance.name), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-value" }, balance.value)), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-card-content" }, balance.items && balance.items.map((item) => /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item", key: item.key }, /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-label" }, item.label), /* @__PURE__ */ import_react.default.createElement("div", { className: "balance-item-value" }, item.value)))));
   }, []);
+  const isShowGuide = (0, import_react.useMemo)(() => {
+    var _a2;
+    if (((_a2 = globalState == null ? void 0 : globalState.walletGuideConfig) == null ? void 0 : _a2.show) === 0) return false;
+    return (walletShopList == null ? void 0 : walletShopList.length) > 0 && !(list == null ? void 0 : list.length);
+  }, [walletShopList, list, globalState == null ? void 0 : globalState.walletGuideConfig]);
   const renderContent = () => {
-    if (list.length === 0) {
+    if (list.length === 0 && !isShowGuide) {
       return null;
     }
-    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-list-container" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-content" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Carousel, { ref: carouselRef, ...carouselProps }, list.map((item) => renderWalletCard(item)))), list && list.length > 1 && isUserLoggedIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-navigation" }, /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-wallet-list-container" }, /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-content" }, isShowGuide ? /* @__PURE__ */ import_react.default.createElement(
+      import_materials.WalletCard,
+      {
+        key: (0, import_utils.getUniqueId)(),
+        isGuide: true,
+        ...globalState,
+        walletGuideConfig: (globalState == null ? void 0 : globalState.walletGuideConfig) || (0, import_status.defaultWalletGuideConfig)()
+      }
+    ) : /* @__PURE__ */ import_react.default.createElement(import_materials.Carousel, { ref: carouselRef, ...carouselProps }, list.map((item) => renderWalletCard(item)))), list && list.length > 1 && isUserLoggedIn && /* @__PURE__ */ import_react.default.createElement("div", { className: "wallet-navigation" }, /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: `wallet-nav-button wallet-prev ${currentIndex === 0 ? "disabled" : ""}`,

package/lib/components/walletList/locales.d.ts

@@ -0,0 +1,18 @@
+declare const _default: {
+    en: {
+        'page.wallet.guide.title': string;
+        'page.wallet.guide.subtitle': string;
+        'page.wallet.guide.button': string;
+    };
+    'zh-CN': {
+        'page.wallet.guide.title': string;
+        'page.wallet.guide.subtitle': string;
+        'page.wallet.guide.button': string;
+    };
+    'zh-HK': {
+        'page.wallet.guide.title': string;
+        'page.wallet.guide.subtitle': string;
+        'page.wallet.guide.button': string;
+    };
+};
+export default _default;

package/lib/components/walletList/locales.js

@@ -0,0 +1,41 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/walletList/locales.ts
+var locales_exports = {};
+__export(locales_exports, {
+  default: () => locales_default
+});
+module.exports = __toCommonJS(locales_exports);
+var locales_default = {
+  "en": {
+    "page.wallet.guide.title": "Activate Now!",
+    "page.wallet.guide.subtitle": "Unlock membership benefits now",
+    "page.wallet.guide.button": "Get Your Reward"
+  },
+  "zh-CN": {
+    "page.wallet.guide.title": "待解锁权益",
+    "page.wallet.guide.subtitle": "成为专属会员，即可享受更多权益",
+    "page.wallet.guide.button": "点击获取"
+  },
+  "zh-HK": {
+    "page.wallet.guide.title": "待解鎖權益",
+    "page.wallet.guide.subtitle": "成為專屬會員，即可享受更多權益",
+    "page.wallet.guide.button": "點擊獲取"
+  }
+};

package/lib/components/walletList/serve.d.ts

@@ -10,3 +10,11 @@ export declare const getWalletList: () => Promise<WalletPass[]>;
  * @returns
  */
 export declare const getWalletBalance: () => Promise<WalletBalance | null>;
+/**
+ * @title: 获取钱包店铺列表
+ * @description:
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-06-09 11:12
+ */
+export declare const getWalletShopList: (params: any) => Promise<any>;

package/lib/components/walletList/serve.js

@@ -20,7 +20,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var serve_exports = {};
 __export(serve_exports, {
   getWalletBalance: () => getWalletBalance,
-  getWalletList: () => getWalletList
+  getWalletList: () => getWalletList,
+  getWalletShopList: () => getWalletShopList
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("./../../utils");
@@ -40,8 +41,20 @@ var getWalletBalance = async () => {
     return null;
   }
 };
+var getWalletShopList = async (params) => {
+  try {
+    const { data } = await import_utils.request.getRequest().get("/h5/wallet/shop/list", params || {}, {
+      abort: true,
+      useCache: true
+    });
+    return data || null;
+  } catch (error) {
+    return null;
+  }
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getWalletBalance,
-  getWalletList
+  getWalletList,
+  getWalletShopList
 });

package/lib/components/walletList/status.d.ts

@@ -0,0 +1,38 @@
+/**
+ * @title: 默认引导页配置
+ * @description:
+ * @param {any} locales
+ * @return {any}
+ * @Author: WangHan
+ * @Date: 2025-06-09 14:22
+ */
+export declare const defaultWalletGuideConfig: () => {
+    show: number;
+    align: string;
+    backgroundColor: string;
+    backgroundImage: string;
+    backgroundImageAlt: string;
+    buttonColor: string;
+    buttonBorderColor: string;
+    titleConfig: {
+        size: number;
+        color: string;
+        weight: number;
+        style: string;
+        text: any;
+    };
+    subtitleConfig: {
+        size: number;
+        color: string;
+        weight: number;
+        style: string;
+        text: any;
+    };
+    buttonConfig: {
+        size: number;
+        color: string;
+        weight: number;
+        style: string;
+        text: any;
+    };
+};

package/lib/components/walletList/status.js

@@ -0,0 +1,66 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/walletList/status.ts
+var status_exports = {};
+__export(status_exports, {
+  defaultWalletGuideConfig: () => defaultWalletGuideConfig
+});
+module.exports = __toCommonJS(status_exports);
+var import_utils = require("@pisell/utils");
+var defaultWalletGuideConfig = () => {
+  return {
+    show: 1,
+    //文字居中
+    align: "center",
+    //背景颜色
+    backgroundColor: "",
+    backgroundImage: "",
+    backgroundImageAlt: "",
+    buttonColor: "rgba(127,86,217,1)",
+    buttonBorderColor: "rgba(127,86,217,1)",
+    // 标题配置
+    titleConfig: {
+      size: 18,
+      color: "rgba(255,255,255,1)",
+      weight: 600,
+      style: "normal",
+      text: import_utils.locales.getText("page.wallet.guide.title")
+    },
+    // 副标题配置
+    subtitleConfig: {
+      size: 14,
+      color: "rgba(208,213,221,1)",
+      weight: 400,
+      style: "normal",
+      text: import_utils.locales.getText("page.wallet.guide.subtitle")
+    },
+    // 按钮配置
+    buttonConfig: {
+      size: 14,
+      color: "rgba(255,255,255,1)",
+      weight: 600,
+      style: "normal",
+      text: import_utils.locales.getText("page.wallet.guide.button")
+    }
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defaultWalletGuideConfig
+});

package/lib/components/workSpaceList/components/Modal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Modal as AntModal, ModalFuncProps as AntModalFuncProps, ModalProps as AntModalProps } from 'antd';
 import './index.less';
 interface ModalProps extends AntModalProps {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.67",
+  "version": "3.3.69",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,9 +59,9 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/utils": "1.0.42",
-    "@pisell/materials": "3.3.26",
+    "@pisell/materials": "3.3.27",
     "@pisell/icon": "0.0.11",
+    "@pisell/utils": "1.0.42",
     "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {