@pisell/private-materials 6.3.15 → 6.4.1

package/lib/components/pay/toB/types/storeTypes.js

@@ -0,0 +1,36 @@
+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/pay/toB/types/storeTypes.ts
+var storeTypes_exports = {};
+__export(storeTypes_exports, {
+  PayMethodCode: () => PayMethodCode
+});
+module.exports = __toCommonJS(storeTypes_exports);
+var PayMethodCode = /* @__PURE__ */ ((PayMethodCode2) => {
+  PayMethodCode2["CASHMANUAL"] = "CASHMANUAL";
+  PayMethodCode2["EFTPOS_PAYO"] = "EFTPOS_PAYO";
+  PayMethodCode2["EFTPOS_WINDCAVE"] = "EFTPOS_WINDCAVE";
+  PayMethodCode2["EFTPOS_TYRO"] = "EFTPOS_TYRO";
+  PayMethodCode2["EFTPOS_LINKLY"] = "EFTPOS_LINKLY";
+  return PayMethodCode2;
+})(PayMethodCode || {});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  PayMethodCode
+});

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/Content.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import './index.less';
 declare type PaymentStatusProps = {
     onChange: (status: 'succeeded' | 'processing' | 'requires_payment_method' | 'error') => void;
 };

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/Content.js

@@ -35,7 +35,7 @@ module.exports = __toCommonJS(Content_exports);
 var import_react = __toESM(require("react"));
 var import_react_stripe_js = require("@stripe/react-stripe-js");
 var import_useEngineContext = __toESM(require("../../../../../../../hooks/useEngineContext"));
-var import_index = __toESM(require("./index.less"));
+var import_index = require("./index.less");
 var PaymentStatus = ({ onChange }) => {
   var _a;
   const stripe = (0, import_react_stripe_js.useStripe)();
@@ -63,14 +63,14 @@ var PaymentStatus = ({ onChange }) => {
       }
     });
   }, [stripe]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: import_index.default["page-loading-wrap"] }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-page-loading-wrap" }, /* @__PURE__ */ import_react.default.createElement(
     "img",
     {
       loading: "lazy",
-      className: import_index.default["logo"],
+      className: "pisell-lowcode-logo",
       src: config.static + "/static/payment-loading.svg",
       alt: ""
     }
-  ), /* @__PURE__ */ import_react.default.createElement("div", { className: import_index.default["title"] }, "请稍候"));
+  ), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-title" }, "请稍候"));
 };
 var Content_default = PaymentStatus;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,2 +1,3 @@
+import './index.less';
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.js

@@ -39,7 +39,7 @@ var import_StripeSDK = __toESM(require("../../../../../../StripeSDK"));
 var import_Content = __toESM(require("./Content"));
 var import_utils = require("../../../../../../../utils/index");
 var import_serve = require("./serve");
-var import_index = __toESM(require("./index.less"));
+var import_index = require("./index.less");
 var StripePayment = () => {
   var _a;
   const history = useHistory();
@@ -93,7 +93,7 @@ var StripePayment = () => {
   const _title = (0, import_react.useMemo)(() => {
     return decodeURIComponent(query.payment_method || "");
   }, [query]);
-  return /* @__PURE__ */ React.createElement("div", { className: import_index.default["stripe-payment-page"] }, /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement("div", { className: "pisell-lowcode-stripe-payment-page" }, /* @__PURE__ */ React.createElement(
     import_NavBar.default,
     {
       name: _title,

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.less

@@ -1,4 +1,4 @@
-.stripe-payment-page {
+.pisell-lowcode-stripe-payment-page {
   background-color: #ffffff;
   height: 100%;
   width: 100%;
@@ -6,7 +6,7 @@
   overflow-y: scroll;
 }
 
-.page-loading-wrap {
+.pisell-lowcode-page-loading-wrap {
   position: fixed;
   width: 100%;
   height: calc(100% - 44px);
@@ -17,13 +17,13 @@
   flex-direction: column;
   align-items: center;
 
-  .logo {
+  .pisell-lowcode-logo {
     margin-top: 199px;
     width: 140px;
     height: 140px;
   }
 
-  .title {
+  .pisell-lowcode-title {
     margin-top: 20px;
     font-size: 20px;
     font-weight: bold;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

@@ -1,2 +1,3 @@
+import './index.less';
 declare const PageLoading: () => JSX.Element;
 export default PageLoading;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.js

@@ -33,16 +33,16 @@ __export(PageLoading_exports, {
 });
 module.exports = __toCommonJS(PageLoading_exports);
 var import_configs = __toESM(require("../../../../../../../../configs/index"));
-var import_index = __toESM(require("./index.less"));
+var import_index = require("./index.less");
 var import_formatMessage = require("../../../../../../../../utils/formatMessage");
 var PageLoading = () => {
-  return /* @__PURE__ */ React.createElement("div", { className: import_index.default["page-loading-wrap"] }, /* @__PURE__ */ React.createElement(
+  return /* @__PURE__ */ React.createElement("div", { className: "pisell-lowcode-page-loading-wrap" }, /* @__PURE__ */ React.createElement(
     "img",
     {
-      className: import_index.default["logo"],
+      className: "pisell-lowcode-logo",
       src: import_configs.default.static + "/static/stripe_loading.gif",
       alt: ""
     }
-  ), /* @__PURE__ */ React.createElement("div", { className: import_index.default["title"] }, (0, import_formatMessage.getText)("payment.text.miniapp.stripe.loading")));
+  ), /* @__PURE__ */ React.createElement("div", { className: "pisell-lowcode-title" }, (0, import_formatMessage.getText)("payment.text.miniapp.stripe.loading")));
 };
 var PageLoading_default = PageLoading;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.less

@@ -1,4 +1,4 @@
-.page-loading-wrap {
+.pisell-lowcode-page-loading-wrap {
   position: fixed;
   width: 100%;
   height: calc(100% - 44px);
@@ -9,13 +9,13 @@
   flex-direction: column;
   align-items: center;
 
-  .logo {
+  .pisell-lowcode-logo {
     margin-top: 150px;
     width: 140px;
     height: 140px;
   }
 
-  .title {
+  .pisell-lowcode-title {
     margin-top: 20px;
     padding: 0 40px;
     text-align: center;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts

@@ -1,2 +1,3 @@
+import './index.less';
 declare const PaymentRequestForm: () => JSX.Element | null;
 export default PaymentRequestForm;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.js

@@ -34,7 +34,7 @@ __export(PaymentRequestForm_exports, {
 module.exports = __toCommonJS(PaymentRequestForm_exports);
 var import_react = __toESM(require("react"));
 var import_react_stripe_js = require("@stripe/react-stripe-js");
-var import_index = __toESM(require("./index.less"));
+var import_index = require("./index.less");
 var useOptions = (paymentRequest) => {
   const options = (0, import_react.useMemo)(
     () => ({
@@ -101,7 +101,7 @@ var PaymentRequestForm = () => {
   if (!paymentRequest) {
     return null;
   }
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: import_index.default["PaymentRequestButton"] }, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: styles["PaymentRequestButton"] }, /* @__PURE__ */ import_react.default.createElement(
     import_react_stripe_js.PaymentRequestButtonElement,
     {
       className: "PaymentRequestButton",

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.less

@@ -1,4 +1,4 @@
-.setup-form {
+.pisell-lowcode-setup-form {
   background-color: #ffffff;
   height: calc(100% - 44px);
   width: 100%;
@@ -7,14 +7,14 @@
   padding: 15px;
   position: relative;
 
-  .setup-form-content {
+  .pisell-lowcode-setup-form-content {
     background-color: #f7fafd;
     padding: 7px !important;
     border-radius: 4px;
   }
 }
 
-.stripe-payment-btn {
+.pisell-lowcode-stripe-payment-btn {
   width: 335px;
   margin: 40px auto 0;
   border-radius: 27px !important;

package/lib/components/productSelect/components/TabProduct/index.js

@@ -44,9 +44,15 @@ var getOffsetTopRelativeToScrollContainer = (targetElement, scrollContainer) =>
   if (targetElement === scrollContainer) {
     return 0;
   }
+  const bodyTransform = getComputedStyle(document.body).transform;
+  let scaleY = 1;
+  if (bodyTransform !== "none") {
+    const matrix = new DOMMatrix(bodyTransform);
+    scaleY = matrix.d;
+  }
   const targetRect = targetElement.getBoundingClientRect();
   const containerRect = scrollContainer.getBoundingClientRect();
-  return targetRect.top - containerRect.top + scrollContainer.scrollTop;
+  return targetRect.top / scaleY - containerRect.top / scaleY + scrollContainer.scrollTop;
 };
 var TabProduct = (props) => {
   const {

package/lib/components/productSelect/components/pisellPriceText/index.js

@@ -37,7 +37,7 @@ var import_materials = require("@pisell/materials");
 var import_classnames = __toESM(require("classnames"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var index = (props) => {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const context = (0, import_useEngineContext.default)();
   const { value } = props;
   const locale = ((_b = (_a = context.appHelper.utils) == null ? void 0 : _a.storage) == null ? void 0 : _b.get("umi_locale")) || "en";
@@ -57,7 +57,13 @@ var index = (props) => {
       }
     },
     _prefix
-  ) : null, /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText.Amount, { value }), _suffix ? /* @__PURE__ */ import_react.default.createElement(
+  ) : null, /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellText.Amount,
+    {
+      value,
+      symbol: (_d = (_c = context.appHelper.utils) == null ? void 0 : _c.getData) == null ? void 0 : _d.call(_c, "shop_symbol")
+    }
+  ), _suffix ? /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       style: {

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

@@ -71,6 +71,12 @@ var ProductGroup = ({
     }
     return `${import_utils.locales.getText("pisell2.product-select.stock")}：${item.stock_quantity}`;
   };
+  const getTextCover = (title) => {
+    if (!title) return "";
+    const cleanTitle = title.trim();
+    if (cleanTitle.length === 0) return "";
+    return cleanTitle.substring(0, 2).toUpperCase();
+  };
   const renderPrice = (item) => {
     const {
       price: _price,
@@ -93,11 +99,12 @@ var ProductGroup = ({
       className: (0, import_classnames.default)("product-card", {
         selected: currentProductId && item.id === currentProductId
       }),
-      onClick: () => {
+      onPointerUp: () => {
+        console.log("进入 renderItem onClick");
         onSelectProduct == null ? void 0 : onSelectProduct(item);
       }
     },
-    isProductCover && item.cover ? /* @__PURE__ */ import_react.default.createElement(
+    isProductCover ? /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: "card-left",
@@ -106,13 +113,20 @@ var ProductGroup = ({
           height: imgHeight || "auto"
         }
       },
-      /* @__PURE__ */ import_react.default.createElement(
+      item.cover ? /* @__PURE__ */ import_react.default.createElement(
         "img",
         {
           loading: "lazy",
-          src: item.cover,
+          src: import_utils.image.ali(item.cover, 360),
           style: { borderRadius: radius }
         }
+      ) : /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: "text-cover",
+          style: { borderRadius: radius }
+        },
+        getTextCover(item.title)
       )
     ) : null,
     /* @__PURE__ */ import_react.default.createElement("div", { className: "card-right" }, !!isTitle ? /* @__PURE__ */ import_react.default.createElement("div", { className: "title" }, item.title) : null, !!isSubtitle && item.subtitle ? /* @__PURE__ */ import_react.default.createElement("div", { className: "subtitle" }, item.subtitle) : null, !!isStock && !!item.is_track ? /* @__PURE__ */ import_react.default.createElement("div", { className: "stock" }, getStockText(item)) : null, renderPrice(item))

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

@@ -106,6 +106,23 @@
         height: 100%;
         object-fit: cover;
       }
+
+      .text-cover {
+        width: 100%;
+        height: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        background: #dedede;
+        color: #6c6c6c;
+        font-size: 60px;
+        font-weight: 600;
+        text-align: center;
+        line-height: 1;
+        letter-spacing: 1px;
+        border-radius: 8px;
+        box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+      }
     }
 
     .card-right {

package/lib/components/schedules/utils.d.ts

@@ -17,6 +17,6 @@ declare let modal: Omit<ModalStaticFunctions, "warn">;
 export declare const setModal: (m: Omit<ModalStaticFunctions, "warn">) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
+  request = {};
   constructor() {
-    this.request = {};
   }
   setRequest(val) {
     this.request = val;

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -38,6 +38,8 @@ var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var import_useContext = require("../../hooks/useContext");
 var import_useAddService = __toESM(require("../../hooks/useAddService"));
 var import_ahooks = require("ahooks");
+var import_utils = require("../../../booking/info/service2/utils");
+var import_pisellNumberSelector = __toESM(require("../../../../pro/pisellNumberSelector"));
 var Product = (props) => {
   const { id, lists, isAdd = true } = props;
   const { state, onAction, onChange } = (0, import_useContext.useContext)();
@@ -52,13 +54,16 @@ var Product = (props) => {
     isShowChangeHolder,
     isShowHolder,
     isShowAddHolderButton,
-    isShowEditProduct
+    isShowEditProduct,
+    productCardStyleConfig = {}
   } = state;
   const clearCart = (0, import_useClearCart.default)(id);
-  const handleChange = (0, import_ahooks.useMemoizedFn)((item, type, other) => {
-    if (disabledEdit && !(other == null ? void 0 : other.disabled)) return;
-    onChange(item, type, other);
-  });
+  const handleChange = (0, import_ahooks.useMemoizedFn)(
+    (item, type, other) => {
+      if (disabledEdit && !(other == null ? void 0 : other.disabled)) return;
+      onChange(item, type, other);
+    }
+  );
   const productParams = (0, import_react.useMemo)(() => {
     return {
       isShowNote,
@@ -82,18 +87,53 @@ var Product = (props) => {
     isShowChangeHolder,
     isShowEditProduct
   ]);
-  (0, import_ahooks.useTrackedEffect)(
-    (changes) => {
-      console.log("Index of changed dependencies: ", changes);
-    },
-    [clearCart, lists, productParams, hideAddBtn, isAdd, platform]
+  const getProductCardStyleProps = (0, import_ahooks.useMemoizedFn)(
+    (type) => {
+      const conf = productCardStyleConfig[`${type}_product_card_style`];
+      if (state.scenario !== "booking2") return {};
+      return {
+        isShowImage: conf == null ? void 0 : conf.show_product_image,
+        isShowDelete: conf == null ? void 0 : conf.show_remove_button,
+        disabledEdit: true
+      };
+    }
   );
   return (0, import_react.useMemo)(() => {
     console.log("render cart");
     return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content" }, clearCart, lists == null ? void 0 : lists.map((item) => {
+      let Comp = import_materials.ProductCard;
+      let isRetail;
+      if (state.scenario === "booking2") {
+        isRetail = (0, import_utils.isNormalProductByDurationSchedule)(item == null ? void 0 : item._origin);
+        Comp = import_materials.ProductCard.V2;
+      }
       return /* @__PURE__ */ import_react.default.createElement(
-        import_materials.ProductCard,
+        Comp,
         {
+          type: isRetail ? "a2" : "a5",
+          rightActions: [
+            {
+              key: "update_number",
+              text: /* @__PURE__ */ import_react.default.createElement(
+                import_pisellNumberSelector.default,
+                {
+                  enablePriceAdjust: true,
+                  min: 1,
+                  className: "pisell-sku-card__pisell-number-setter",
+                  value: item == null ? void 0 : item.num,
+                  onChange: (value) => {
+                    if (value < 1) {
+                      handleChange(item, "num", { num: 1 });
+                    } else {
+                      handleChange(item, "num", { num: value });
+                    }
+                  }
+                }
+              ),
+              color: "#667085"
+            }
+          ],
+          escapeDom: ".pisell-number-selector-popover",
           key: item._id,
           dataSource: item,
           onAction: (e) => onAction == null ? void 0 : onAction(e),
@@ -105,7 +145,9 @@ var Product = (props) => {
           onChangeResource: (e) => handleChange(item, "change_resource", e),
           onChangeHolder: (e) => handleChange(item, "change_holder", e),
           onAddHolder: (e) => handleChange(item, "add_holder", e),
-          ...productParams
+          ...productParams,
+          ...getProductCardStyleProps(isRetail ? "retail" : "appointment"),
+          scenario: state.scenario
         }
       );
     }), !hideAddBtn && platform !== "h5" && isAdd ? (0, import_useAddService.default)(id, "more") : null);

package/lib/components/shoppingCart/components/Cart/index.less

@@ -18,7 +18,7 @@
   .pisell-lowcode__shopping-cart-content {
     display: flex;
     flex-direction: column;
-    gap: 16px;
+    gap: 8px;
 
     .pisell-lowcode-product-card {
       margin-bottom: 0;
@@ -66,3 +66,17 @@
   //  align-items: start;
   //}
 }
+
+.pisell-sku-card__pisell-number-setter {
+  width: 110px;
+
+  .pisell-number-selector-btn {
+    flex-shrink: 0;
+  }
+
+  .pisell-number-selector-number {
+    min-width: unset !important;
+    padding: 0 !important;
+    flex: 1;
+  }
+}

package/lib/components/shoppingCart/type.d.ts

@@ -33,6 +33,7 @@ export interface shoppingCartProps {
     productParams?: productProps;
     isHideClearCart?: boolean;
     isParallelResource?: boolean;
+    scenario?: 'booking2';
 }
 /**
  * @title: 商品卡片

package/lib/components/subTotal/index.less

@@ -14,7 +14,7 @@
 
   .pisell-lowcode__subtotal-item-label {
     color: var(--Base-Black, #000);
-    font-size: 16px;
+    font-size: 14px;
     font-style: normal;
     font-weight: 500;
     line-height: 24px;

package/lib/components/subTotal/locales.js

@@ -38,7 +38,7 @@ var locales_default = {
   },
   "zh-CN": {
     "pisell2.subtotal.deposit": "定金",
-    "pisell2.subtotal.total": "总价",
+    "pisell2.subtotal.total": "总计",
     "pisell2.subtotal.subtotal": "小计",
     "pisell2.subtotal.tax": "税",
     "pisell2.subtotal.delivery-fee": "配送费",
@@ -51,7 +51,7 @@ var locales_default = {
   },
   "zh-HK": {
     "pisell2.subtotal.deposit": "定金",
-    "pisell2.subtotal.total": "總價",
+    "pisell2.subtotal.total": "總計",
     "pisell2.subtotal.subtotal": "小計",
     "pisell2.subtotal.tax": "稅",
     "pisell2.subtotal.delivery-fee": "配送費",