@pisell/private-materials 3.3.26 → 3.3.27

package/lib/components/pay/toC/model.js

@@ -32,6 +32,10 @@ var defaultState = {
   payCallback: () => {
   },
   history: null,
+  walletSetting: {
+    name: "",
+    popup_status: null
+  },
   payGroup: {
     wait_amount: 0
   }
@@ -48,6 +52,12 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
       (0, import_payGroup.syncPayGroupToStorage)(res);
       return { ...state, payGroup: res };
     },
+    setWalletSetting(state, payload) {
+      return { ...state, walletSetting: {
+        ...state.walletSetting,
+        ...payload
+      } };
+    },
     init(state, payload) {
       return { ...defaultState, ...payload };
     }

package/lib/components/pay/toC/serve.d.ts

@@ -32,3 +32,26 @@ export declare const getPaymentInit: (values: {
     order_id?: string;
     amount?: number;
 }) => Promise<any>;
+/**
+ * @title: 获取钱包名称和弹窗状态
+ * @description:
+ * @param {object} values
+ * @return {*}
+ * @Author: shengjie.zuo
+ * @member: 马天宇
+ * @Date: 2025-02-21 10:42
+ */
+export declare const getWalletNameAndPopupStatus: (values: {
+    setting_type?: string;
+}) => Promise<{
+    wallet: {
+        name?: {
+            en: string;
+            'zh-CN': string;
+            'zh-HK': string;
+        };
+    };
+    wallet_setting: {
+        popup_status?: 1 | 0;
+    };
+}>;

package/lib/components/pay/toC/serve.js

@@ -21,7 +21,8 @@ var serve_exports = {};
 __export(serve_exports, {
   getPaymentInit: () => getPaymentInit,
   getPaymentList: () => getPaymentList,
-  getPaymentsAndWalletPass: () => getPaymentsAndWalletPass
+  getPaymentsAndWalletPass: () => getPaymentsAndWalletPass,
+  getWalletNameAndPopupStatus: () => getWalletNameAndPopupStatus
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
@@ -35,9 +36,7 @@ var getPaymentList = async (values) => {
   );
   let arr = [];
   if ((0, import_utils2.isWx)()) {
-    arr = arr.concat([
-      "mw.google"
-    ]);
+    arr = arr.concat(["mw.google"]);
   }
   if (!(0, import_utils2.isWx)()) {
     arr = arr.concat(["globepay.wechat.jsapi", "superpay.wechat.h5"]);
@@ -60,7 +59,9 @@ var getPaymentList = async (values) => {
 };
 var getPaymentsAndWalletPass = async (values) => {
   let { data } = await import_utils.request.getRequest().get("/h5/pay/order/payments-and-walletpass", values);
-  const walletPass = (data.payment_list || []).find((d) => d.service === "pisell.wallet_pass");
+  const walletPass = (data.payment_list || []).find(
+    (d) => d.service === "pisell.wallet_pass"
+  );
   return {
     ...data,
     walletPass
@@ -70,9 +71,14 @@ var getPaymentInit = async (values) => {
   let { data } = await import_utils.request.getRequest().post("/h5/pay/payment/init", values);
   return data;
 };
+var getWalletNameAndPopupStatus = async (values) => {
+  const { data } = await import_utils.request.getRequest().get("/h5/wallet/setting", values);
+  return data;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getPaymentInit,
   getPaymentList,
-  getPaymentsAndWalletPass
+  getPaymentsAndWalletPass,
+  getWalletNameAndPopupStatus
 });

package/lib/components/pay/toC/utils.d.ts

@@ -1,4 +1,5 @@
 import { PayGroup } from "./model";
+import { WalletPassDataType } from "./PaymentMethods/WalletPass/serve";
 /**
  * 计算walletPass列表数据的总金额
  * @param list
@@ -21,7 +22,7 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
     order_id: string;
     payment_group_id: number;
     payments: {
-        amount: any;
+        amount: string;
         wallet_pass_use_value: any;
         voucher_id: any;
         tag: any;
@@ -47,3 +48,4 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
  */
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
+export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;

package/lib/components/pay/toC/utils.js

@@ -23,6 +23,7 @@ __export(utils_exports, {
   formatFranchiseeRoute: () => formatFranchiseeRoute,
   formatWalletPassList2PreparePayments: () => formatWalletPassList2PreparePayments,
   formatWalletPassParams: () => formatWalletPassParams,
+  getAvailableMaxAmount: () => getAvailableMaxAmount,
   getFranchiseeShopId: () => getFranchiseeShopId,
   getIsWalletPassAndTripartitePayment: () => getIsWalletPassAndTripartitePayment,
   isFranchiseeShop: () => isFranchiseeShop
@@ -31,13 +32,13 @@ module.exports = __toCommonJS(utils_exports);
 var import_decimal = require("decimal.js");
 var import_status = require("./status");
 var calcWalletPassListAmount = (list) => {
-  return list.reduce((pre, cur) => pre.add(new import_decimal.Decimal(String(cur.available_max_amount || 0))), new import_decimal.Decimal("0")).toNumber();
+  return list.reduce((pre, cur) => pre.add(new import_decimal.Decimal(String(getAvailableMaxAmount(cur) || 0))), new import_decimal.Decimal("0")).toNumber();
 };
 var formatWalletPassList2PreparePayments = (list) => {
   return (list || []).map((item) => {
     return {
       voucher_id: item.id || 0,
-      amount: Number(item.available_max_amount) || 0,
+      amount: Number(getAvailableMaxAmount(item)) || 0,
       tag: item.tag || ""
     };
   });
@@ -46,7 +47,7 @@ var formatWalletPassParams = (payGroup) => {
   const { order_id, payment_group_id, walletPass } = payGroup;
   const payments = (walletPass == null ? void 0 : walletPass.cards.map((item) => {
     return {
-      amount: item.available_max_amount,
+      amount: getAvailableMaxAmount(item),
       wallet_pass_use_value: item.available_max_par_value,
       voucher_id: item.id,
       tag: item.tag,
@@ -81,12 +82,16 @@ var formatFranchiseeRoute = (url, history) => {
   }
   return url;
 };
+var getAvailableMaxAmount = (data) => {
+  return data.tag !== "point_card" ? data.available_max_amount : data == null ? void 0 : data.recommended_usage_amount;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   calcWalletPassListAmount,
   formatFranchiseeRoute,
   formatWalletPassList2PreparePayments,
   formatWalletPassParams,
+  getAvailableMaxAmount,
   getFranchiseeShopId,
   getIsWalletPassAndTripartitePayment,
   isFranchiseeShop

package/lib/components/productSelect/components/productGroup/index.less

@@ -1,7 +1,6 @@
 .pisell-product-select-group {
   .group-title {
     color: var(--ps-category-text-color, #000);
-    font-family: Inter;
     font-size: 18px;
     font-style: normal;
     font-weight: 600;
@@ -84,7 +83,6 @@
         background: var(--Error-100, #fee4e2);
         color: var(--Error-700, #b42318);
         text-align: center;
-        font-family: Inter;
         font-size: 14px;
         font-style: normal;
         font-weight: 500;
@@ -114,8 +112,7 @@
       row-gap: 8px;
       min-height: 92px;
       .title {
-        color: var(--ps-card-text, #1B1B1B);
-        font-family: Inter;
+        color: var(--ps-card-text, #1b1b1b);
         font-size: 18px;
         font-style: normal;
         font-weight: 600;
@@ -130,9 +127,8 @@
       .stock,
       .specs {
         overflow: hidden;
-        color: var(--ps-color-text-secondary, #4E4E4E);
+        color: var(--ps-color-text-secondary, #4e4e4e);
         text-overflow: ellipsis;
-        font-family: Inter;
         font-size: 14px;
         font-style: normal;
         font-weight: 500;
@@ -161,7 +157,6 @@
           mix-blend-mode: multiply;
           color: var(--Error-700, #b42318);
           text-align: center;
-          font-family: Inter;
           font-size: 14px;
           font-style: normal;
           font-weight: 500;
@@ -174,16 +169,14 @@
         gap: 8px;
       }
       .price {
-        color: var(--ps-card-text, #1B1B1B);
-        font-family: Inter;
+        color: var(--ps-card-text, #1b1b1b);
         font-size: 18px;
         font-style: normal;
         font-weight: 600;
         line-height: 28px;
       }
       .original-price {
-        color: var(--ps-color-text-secondary, #4E4E4E);
-        font-family: Inter;
+        color: var(--ps-color-text-secondary, #4e4e4e);
         font-size: 16px;
         font-style: normal;
         font-weight: 400;
@@ -197,7 +190,6 @@
 
       .remark {
         color: var(--Warning-600, #dc6803);
-        font-family: Inter;
         font-size: 14px;
         font-style: normal;
         font-weight: 600;

package/lib/components/productSelect/index.less

@@ -50,7 +50,7 @@
 
     .booking-pisell-tabs-tab {
       .booking-pisell-tabs-tab-content {
-        background: var(--ps-tab-item-bg, #FFFFFF) !important;
+        background: var(--ps-tab-item-bg, #ffffff) !important;
         font-weight: 400;
       }
     }

package/lib/components/ruleSetting/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/lib/components/ticketBooking/components/addServiceVariant/addService.js

@@ -47,7 +47,7 @@ var import_serviceManager = require("../../../booking/info/service/serviceManage
 var import_productSelect = __toESM(require("../../../productSelect"));
 var import_index = require("./index.less");
 var AddSerivce = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   const { onEdit, state, dispatch, renderMode = "current" } = props;
   const [loading, setLoading] = (0, import_react.useState)(false);
   const context = (0, import_useEngineContext.default)();
@@ -63,6 +63,10 @@ var AddSerivce = (props) => {
     state == null ? void 0 : state.renderType
   );
   const [currentProduct, setCurrentProduct] = (0, import_react.useState)(null);
+  const customerId = (0, import_react.useMemo)(() => {
+    var _a2, _b2;
+    return ((_b2 = (_a2 = state.client) == null ? void 0 : _a2.value) == null ? void 0 : _b2.id) || void 0;
+  }, [(_g = (_f = state.client) == null ? void 0 : _f.value) == null ? void 0 : _g.id]);
   const setDefaultService = async (list) => {
     if (state.renderType !== "eventBooking") {
       return;
@@ -134,11 +138,8 @@ var AddSerivce = (props) => {
       with_count: ["bundleGroup", "optionGroup"],
       order_by_string: "sort:desc",
       status: "published",
-      ...state.isBookingCreatePage ? { schedule_date: params == null ? void 0 : params.schedule_date } : {
-        _config: {
-          useCache: true
-        }
-      }
+      schedule_date: params == null ? void 0 : params.schedule_date,
+      customer_id: params == null ? void 0 : params.customer_id
     });
     setLoading(false);
     if (!state.service.addModal) {
@@ -173,6 +174,7 @@ var AddSerivce = (props) => {
             package: true
           },
           is_eject: isEject ? 1 : 0,
+          customer_id: customerId,
           isOS: isSession
         },
         onCancel: () => {
@@ -269,20 +271,15 @@ var AddSerivce = (props) => {
       }
     }
     return _list;
-  }, [(_f = state.service) == null ? void 0 : _f.services, state == null ? void 0 : state.activeCartId]);
+  }, [(_h = state.service) == null ? void 0 : _h.services, state == null ? void 0 : state.activeCartId]);
   const currentDate = (0, import_react.useMemo)(() => {
     return state.date.value.format("YYYY-MM-DD");
   }, [state.date.value]);
   (0, import_react.useEffect)(() => {
     if (renderMode === "current") {
-      getServices({ schedule_date: currentDate });
-    }
-  }, [renderMode, currentDate]);
-  (0, import_react.useEffect)(() => {
-    if (state.renderType === "eventBooking" && state.modalOpen) {
-      getServices({ schedule_date: currentDate });
+      getServices({ schedule_date: currentDate, customer_id: customerId });
     }
-  }, [state.renderType, state.modalOpen]);
+  }, [renderMode, currentDate, customerId]);
   return (0, import_react.useMemo)(() => {
     if (renderMode === "current") {
       return /* @__PURE__ */ import_react.default.createElement(
@@ -295,13 +292,13 @@ var AddSerivce = (props) => {
           },
           onChange: handleSelectProduct,
           value: currentProduct == null ? void 0 : currentProduct.id,
-          loading
+          loading: !renderList.length && loading
         }
       );
     }
     return null;
   }, [
-    (_h = (_g = state.service) == null ? void 0 : _g.cacheItem) == null ? void 0 : _h.autoClose,
+    (_j = (_i = state.service) == null ? void 0 : _i.cacheItem) == null ? void 0 : _j.autoClose,
     state.service.addModal,
     import_utils.locales,
     renderList,

package/lib/components/ticketBooking/components/menuBar/index.less

@@ -61,7 +61,6 @@
     > div {
       color: #fff;
       text-align: center;
-      font-family: Inter;
       font-size: 8px;
       font-style: normal;
       font-weight: 400;

package/lib/components/ticketBooking/components/ticketBooking/index.less

@@ -1,11 +1,9 @@
 .pisell-ticket-booking-wrapper {
-
-
   .pisell-lowcode__booking-tab-pane-footer {
     padding: 16px;
   }
   .create-booking-page-info-wrap-create {
-    background-color: #1B1B1B;
+    background-color: #1b1b1b;
     .booking-info {
       .booking-info-create-new,
       .pisell-lowcode__booking-field-title,
@@ -15,4 +13,4 @@
       }
     }
   }
-}
+}

package/lib/hooks/useLocale.d.ts

@@ -0,0 +1,2 @@
+declare const useLocale: () => any;
+export default useLocale;

package/lib/hooks/useLocale.js

@@ -0,0 +1,41 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/hooks/useLocale.ts
+var useLocale_exports = {};
+__export(useLocale_exports, {
+  default: () => useLocale_default
+});
+module.exports = __toCommonJS(useLocale_exports);
+var import_useEngineContext = __toESM(require("./useEngineContext"));
+var useLocale = () => {
+  var _a, _b;
+  const context = (0, import_useEngineContext.default)();
+  return ((_b = (_a = context == null ? void 0 : context.engine) == null ? void 0 : _a.props) == null ? void 0 : _b.locale) || "en";
+};
+var useLocale_default = useLocale;

package/lib/hooks/useLoginUser.d.ts

@@ -0,0 +1,2 @@
+declare const useLoginUser: () => any;
+export default useLoginUser;

package/lib/hooks/useLoginUser.js

@@ -0,0 +1,50 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+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 __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/hooks/useLoginUser.ts
+var useLoginUser_exports = {};
+__export(useLoginUser_exports, {
+  default: () => useLoginUser_default
+});
+module.exports = __toCommonJS(useLoginUser_exports);
+var import_react = require("react");
+var import_useEngineContext = __toESM(require("./useEngineContext"));
+var useLoginUser = () => {
+  const context = (0, import_useEngineContext.default)();
+  const { store, storage, getStore } = context.appHelper.utils || {};
+  const user = (0, import_react.useMemo)(() => {
+    var _a, _b, _c;
+    const _store = getStore();
+    let userInfo = (_c = (_b = (_a = _store.getState) == null ? void 0 : _a.call(_store)) == null ? void 0 : _b.global) == null ? void 0 : _c.userInfo;
+    const localUserInfo = JSON.parse((storage == null ? void 0 : storage.get("customer")) || "{}");
+    userInfo = (userInfo == null ? void 0 : userInfo.id) ? userInfo : localUserInfo;
+    return userInfo;
+  }, [store]);
+  return user;
+};
+var useLoginUser_default = useLoginUser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.26",
+  "version": "3.3.27",
   "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/materials": "3.3.7",
-    "@pisell/icon": "0.0.11",
+    "@pisell/materials": "3.3.8",
     "@pisell/utils": "1.0.42",
+    "@pisell/icon": "0.0.11",
     "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {