@pisell/private-materials 6.1.7 → 6.1.8

package/lib/components/pay/toC/PaymentMethods/index.js

@@ -86,6 +86,15 @@ var PaymentMethods = (props, ref) => {
     var _a2, _b2;
     const waitAmount = (payGroup == null ? void 0 : payGroup.wait_amount) || 0;
     const cards = (_b2 = (_a2 = payGroup == null ? void 0 : payGroup.walletPass) == null ? void 0 : _a2.cards) == null ? void 0 : _b2.length;
+    (0, import_utils2.sendWarningLog)({
+      title: "支付初始化",
+      content: [
+        { key: "type", value: type },
+        { key: "payGroup", value: JSON.stringify(payGroup) },
+        { key: "waitAmount", value: waitAmount },
+        { key: "cards", value: cards }
+      ]
+    });
     if (cards && (waitAmount <= 0 || isOfflinePayment(type))) {
       try {
         await (0, import_serve.walletPassPay)((0, import_utils.formatWalletPassParams)(payGroup));
@@ -98,6 +107,14 @@ var PaymentMethods = (props, ref) => {
           }
         });
       } catch (err) {
+        (0, import_utils2.sendWarningLog)({
+          title: "钱包支付失败 catch",
+          content: [
+            { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+            { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+            { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+          ]
+        });
         return props.payCallback({
           key: "fail",
           data: {
@@ -109,8 +126,19 @@ var PaymentMethods = (props, ref) => {
       }
     }
     if (waitAmount <= 0) {
-      (0, import_payGroup.removePayGroupFromStorage)(payGroup.order_id);
-      props.payCallback({ key: "success" });
+      try {
+        (0, import_payGroup.removePayGroupFromStorage)(payGroup.order_id);
+        props.payCallback({ key: "success" });
+      } catch (err) {
+        (0, import_utils2.sendWarningLog)({
+          title: "跳转成功页面 catch",
+          content: [
+            { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+            { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+            { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+          ]
+        });
+      }
       return;
     }
     await onPayByType({ type, payGroup });

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

@@ -208,6 +208,14 @@ var ToCPay = (props, ref) => {
         payment_priority: data.payment_priority
       };
     } catch (err) {
+      (0, import_utils.sendWarningLog)({
+        title: "创建交易组失败 paymentInit catch",
+        content: [
+          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+        ]
+      });
       setSubmitLoading(false);
       payCallback({
         key: "fail",
@@ -243,16 +251,28 @@ var ToCPay = (props, ref) => {
   };
   const onSubmit = async (newOrderId) => {
     var _a2;
-    let newPayGroup = state.payGroup;
-    const result = await getIsShowDetectIncognitoConfirm(newPayGroup);
-    if (result) {
-      setShowDetectIncognitoConfirm(true);
-      return;
-    }
-    if (!((_a2 = state.payGroup) == null ? void 0 : _a2.payment_group_id)) {
-      newPayGroup = await paymentInit(newOrderId);
+    try {
+      let newPayGroup = state.payGroup;
+      const result = await getIsShowDetectIncognitoConfirm(newPayGroup);
+      if (result) {
+        setShowDetectIncognitoConfirm(true);
+        return;
+      }
+      if (!((_a2 = state.payGroup) == null ? void 0 : _a2.payment_group_id)) {
+        newPayGroup = await paymentInit(newOrderId);
+      }
+      handlePaymentByType(void 0, newPayGroup);
+    } catch (err) {
+      console.log("err", err);
+      (0, import_utils.sendWarningLog)({
+        title: "提交支付失败 onSubmit catch",
+        content: [
+          { key: "错误信息", value: (err == null ? void 0 : err.message) || "未知错误" },
+          { key: "错误堆栈", value: (err == null ? void 0 : err.stack) || "无堆栈信息" },
+          { key: "错误类型", value: (err == null ? void 0 : err.name) || "未知错误类型" }
+        ]
+      });
     }
-    handlePaymentByType(void 0, newPayGroup);
   };
   const paymentTypeChange = (payload) => {
     dispatch({

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

@@ -35,6 +35,7 @@ declare const _default: {
         'tocPay.text.done': string;
         'tocPay.text.manageCard': string;
         'tocPay.text.waitingForBankVerification': string;
+        'tocPay.text.successBack': string;
         'tocPay.text.redirectingToAlipay': string;
         'tocPay.text.redirectingToPaypal': string;
         'tocPay.text.redirectingToWeChatPay': string;
@@ -130,6 +131,7 @@ declare const _default: {
         'tocPay.text.done': string;
         'tocPay.text.manageCard': string;
         'tocPay.text.waitingForBankVerification': string;
+        'tocPay.text.successBack': string;
         'tocPay.text.redirectingToAlipay': string;
         'tocPay.text.redirectingToPaypal': string;
         'tocPay.text.redirectingToWeChatPay': string;
@@ -224,6 +226,7 @@ declare const _default: {
         'tocPay.text.done': string;
         'tocPay.text.manageCard': string;
         'tocPay.text.waitingForBankVerification': string;
+        'tocPay.text.successBack': string;
         'tocPay.text.redirectingToAlipay': string;
         'tocPay.text.redirectingToPaypal': string;
         'tocPay.text.redirectingToWeChatPay': string;

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

@@ -59,6 +59,7 @@ var locales_default = {
     "tocPay.text.done": "Done",
     "tocPay.text.manageCard": "Manage card",
     "tocPay.text.waitingForBankVerification": "Waiting for bank verification, please wait for 5-10 seconds. You may be redirected to the card issuing bank’s verification page to authorize this payment.",
+    "tocPay.text.successBack": "Payment completed, return to order",
     "tocPay.text.redirectingToAlipay": "Redirecting to Alipay, please wait...",
     "tocPay.text.redirectingToPaypal": "Redirecting to Paypal, please wait...",
     "tocPay.text.redirectingToWeChatPay": "Redirecting to WeChat Pay, please wait...",
@@ -154,6 +155,7 @@ var locales_default = {
     "tocPay.text.done": "完成",
     "tocPay.text.manageCard": "管理卡片",
     "tocPay.text.waitingForBankVerification": "正在等待银行校验，请静候5-10秒左右。您可能被转入开卡行的持卡人校验页面来授权本次支付。",
+    "tocPay.text.successBack": "已支付完成返回查看订单",
     "tocPay.text.redirectingToAlipay": "正在转入支付宝支付，请稍候...",
     "tocPay.text.redirectingToPaypal": "正在转入Paypal支付，请稍候...",
     "tocPay.text.redirectingToWeChatPay": "正在转入微信支付，请稍候...",
@@ -248,6 +250,7 @@ var locales_default = {
     "tocPay.text.done": "完成",
     "tocPay.text.manageCard": "管理卡片",
     "tocPay.text.waitingForBankVerification": "正在等待銀行校驗，請靜候5-10秒左右。您可能被轉入開卡行的持卡人校驗頁面來授權本次支付。",
+    "tocPay.text.successBack": "已支付完成返回查看訂單",
     "tocPay.text.redirectingToAlipay": "正在轉入支付寶支付，請稍候...",
     "tocPay.text.redirectingToPaypal": "正在轉入Paypal支付，請稍候...",
     "tocPay.text.redirectingToWeChatPay": "正在轉入微信支付，請稍候...",

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

@@ -39,7 +39,15 @@ var import_ahooks = require("ahooks");
 var import_utils = require("@pisell/utils");
 var import_tabs = __toESM(require("./tabs"));
 var import_productGroup = __toESM(require("../productGroup"));
-var io = null;
+var getOffsetTopRelativeToScrollContainer = (targetElement, scrollContainer) => {
+  if (!targetElement || !scrollContainer) return 0;
+  if (targetElement === scrollContainer) {
+    return 0;
+  }
+  const targetRect = targetElement.getBoundingClientRect();
+  const containerRect = scrollContainer.getBoundingClientRect();
+  return targetRect.top - containerRect.top + scrollContainer.scrollTop;
+};
 var TabProduct = (props) => {
   const {
     showTab = true,
@@ -48,6 +56,7 @@ var TabProduct = (props) => {
     onChange,
     amountSymbol = "$",
     scrollDom,
+    offsetDom,
     value: currentProductId,
     loading,
     emptyDescription,
@@ -55,6 +64,8 @@ var TabProduct = (props) => {
   } = props;
   const tabsRef = (0, import_react.useRef)();
   const [currentGroupId, setCurrentGroupId] = (0, import_react.useState)(1);
+  const tabLocatingRef = (0, import_react.useRef)(false);
+  const ioRef = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
     if (list == null ? void 0 : list.length) {
       setCurrentGroupId(list[0].id);
@@ -62,6 +73,9 @@ var TabProduct = (props) => {
         handleObserver();
       });
     }
+    return () => {
+      handleUnobserver();
+    };
   }, [list]);
   const debouncedScroll = (0, import_ahooks.useDebounceFn)(
     (id) => {
@@ -75,18 +89,23 @@ var TabProduct = (props) => {
     const _marginTop = 270;
     const _marginBottom = window.innerHeight - 70 - 200 - 70;
     const _rootMargin = `${_marginTop * -1}px 0px ${_marginBottom * -1}px 0px`;
-    io = new IntersectionObserver(
+    ioRef.current = new IntersectionObserver(
       (entries) => {
-        var _a, _b;
+        var _a;
         const enteringEntries = entries.filter((entry) => entry.isIntersecting);
         if (enteringEntries.length > 0) {
           const topMostEntry = enteringEntries.reduce((top, current) => {
             return current.boundingClientRect.top < top.boundingClientRect.top ? current : top;
           });
-          const [name, id] = (_b = (_a = topMostEntry == null ? void 0 : topMostEntry.target) == null ? void 0 : _a.id) == null ? void 0 : _b.split("-");
-          const newGroupId = Number(id);
-          setCurrentGroupId(newGroupId);
-          debouncedScroll.run(id);
+          const targetId = (_a = topMostEntry == null ? void 0 : topMostEntry.target) == null ? void 0 : _a.id;
+          if (targetId) {
+            const [name, id] = targetId.split("-");
+            const newGroupId = Number(id);
+            if (!tabLocatingRef.current && !isNaN(newGroupId)) {
+              setCurrentGroupId(newGroupId);
+              debouncedScroll.run(id);
+            }
+          }
         }
       },
       {
@@ -94,24 +113,28 @@ var TabProduct = (props) => {
         rootMargin: _rootMargin
       }
     );
-    if (list == null ? void 0 : list.length) {
+    if ((list == null ? void 0 : list.length) && ioRef.current) {
       for (const item of list) {
         const _item = document.querySelector(`#list-${item.id}`);
         if (_item) {
-          io.observe(_item);
+          ioRef.current.observe(_item);
         }
       }
     }
   });
   const handleUnobserver = (0, import_ahooks.useMemoizedFn)(() => {
-    if ((list == null ? void 0 : list.length) && io) {
+    if ((list == null ? void 0 : list.length) && ioRef.current) {
       for (const item of list) {
         const _item = document.querySelector(`#list-${item.id}`);
         if (_item) {
-          io.unobserve(_item);
+          ioRef.current.unobserve(_item);
         }
       }
     }
+    if (ioRef.current) {
+      ioRef.current.disconnect();
+      ioRef.current = null;
+    }
   });
   const renderContent = () => {
     if (loading) {
@@ -126,7 +149,7 @@ var TabProduct = (props) => {
       );
     }
     return list.map((item, i) => {
-      return /* @__PURE__ */ import_react.default.createElement("div", { id: `list-${item.id}`, key: i }, /* @__PURE__ */ import_react.default.createElement(
+      return /* @__PURE__ */ import_react.default.createElement("div", { id: `list-${item.id}`, key: `list-${item.id}` }, /* @__PURE__ */ import_react.default.createElement(
         import_productGroup.default,
         {
           onSelectProduct: onChange,
@@ -148,7 +171,7 @@ var TabProduct = (props) => {
       }
     ), /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-pisell-tabs-content" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton.Button, { active: true, size: "large", shape: "round" })));
   }, []);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showTab ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-tabs-wrapper" }, loading ? tabSkeleton : /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showTab && list && list.length > 1 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-tabs-wrapper" }, loading ? tabSkeleton : /* @__PURE__ */ import_react.default.createElement(
     import_tabs.default,
     {
       ref: tabsRef,
@@ -157,33 +180,47 @@ var TabProduct = (props) => {
       tab: currentGroupId,
       onChange: (e) => {
         var _a;
-        let comWrapper = document.querySelector(
-          ".pisell-product-select-wrapper"
-        );
-        let categoryDom = document.querySelector(
-          ".pisell-product-select-tabs-wrapper"
-        );
-        let wrapperOffsetTop = comWrapper.offsetTop;
-        let top = 0;
-        if (categoryDom) {
-          top = categoryDom.offsetHeight;
-        }
-        const dom = document == null ? void 0 : document.querySelector("#list-" + e);
-        const main = document == null ? void 0 : document.querySelector(scrollDom);
-        if (dom && main) {
-          if (e === ((_a = list[0]) == null ? void 0 : _a.id)) {
-            main.scrollTop = 0;
-          } else {
-            main.scrollTop = dom.offsetTop - top - wrapperOffsetTop;
+        try {
+          const productSelectWrapper = document.querySelector(
+            ".pisell-product-select-wrapper"
+          );
+          const tabsWrapper = document.querySelector(
+            ".pisell-product-select-tabs-wrapper"
+          );
+          let tabsHeight = 0;
+          if (tabsWrapper) {
+            tabsHeight = tabsWrapper.offsetHeight;
+          }
+          const targetListElement = document == null ? void 0 : document.querySelector("#list-" + e);
+          const scrollContainer = scrollDom ? document == null ? void 0 : document.querySelector(scrollDom) : null;
+          const offsetElement = offsetDom ? document == null ? void 0 : document.querySelector(offsetDom) : null;
+          const extraOffset = offsetElement ? offsetElement.clientHeight : 0;
+          handleUnobserver();
+          tabLocatingRef.current = true;
+          if (targetListElement && scrollContainer) {
+            if (e === ((_a = list[0]) == null ? void 0 : _a.id)) {
+              if (productSelectWrapper) {
+                const wrapperOffsetTop = getOffsetTopRelativeToScrollContainer(productSelectWrapper, scrollContainer);
+                scrollContainer.scrollTop = wrapperOffsetTop - extraOffset;
+              }
+            } else {
+              const listOffsetTop = getOffsetTopRelativeToScrollContainer(targetListElement, scrollContainer);
+              scrollContainer.scrollTop = listOffsetTop - tabsHeight - extraOffset;
+            }
           }
+          setCurrentGroupId(e);
+          debouncedScroll.run(e);
+          setTimeout(() => {
+            tabLocatingRef.current = false;
+            handleObserver();
+          }, 500);
+        } catch (error) {
+          console.error("Tab onChange error:", error);
+          tabLocatingRef.current = false;
+          setCurrentGroupId(e);
         }
-        handleUnobserver();
-        setCurrentGroupId(e);
-        setTimeout(() => {
-          handleObserver();
-        }, 1e3);
       }
     }
-  )) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-product-list" }, renderContent()));
+  )) : /* @__PURE__ */ import_react.default.createElement("p", null, /* @__PURE__ */ import_react.default.createElement("br", null)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-product-list" }, renderContent()));
 };
 var TabProduct_default = TabProduct;

package/lib/components/productSelect/components/TabProduct/tabs/index.less

@@ -107,6 +107,7 @@
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
+        user-select: none;
       }
 
       &:hover {

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

@@ -14,6 +14,8 @@ interface ProductSelectProps {
     value?: number;
     loading?: boolean;
     scrollDom?: string;
+    /** 某些设置了固定头部的情况 */
+    offsetDom?: string;
     style?: React.CSSProperties;
     emptyDescription?: string;
     token?: Partial<ProductSelectToken>;

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,7 @@ 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 Product = (props) => {
   const { id, lists, isAdd = true } = props;
   const { state, onAction, onChange } = (0, import_useContext.useContext)();
@@ -52,13 +53,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,
@@ -88,12 +92,26 @@ var Product = (props) => {
     },
     [clearCart, lists, productParams, hideAddBtn, isAdd, platform]
   );
+  const getProductCardStyleProps = (type) => {
+    const conf = productCardStyleConfig[`${type}_product_card_style`];
+    return {
+      isShowImage: conf == null ? void 0 : conf.show_product_image,
+      isShowDelete: conf == null ? void 0 : conf.show_remove_button
+    };
+  };
   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 = isRetail ? import_materials.ProductCard.V2 : import_materials.ProductCard;
+      }
       return /* @__PURE__ */ import_react.default.createElement(
-        import_materials.ProductCard,
+        Comp,
         {
+          type: isRetail ? "a2" : void 0,
           key: item._id,
           dataSource: item,
           onAction: (e) => onAction == null ? void 0 : onAction(e),
@@ -105,7 +123,8 @@ 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")
         }
       );
     }), !hideAddBtn && platform !== "h5" && isAdd ? (0, import_useAddService.default)(id, "more") : null);

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;