@pisell/private-materials 6.3.14 → 6.4.1

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

@@ -24,7 +24,12 @@ var getOffsetTopRelativeToScrollContainer = function getOffsetTopRelativeToScrol
   if (targetElement === scrollContainer) {
     return 0;
   }
-
+  var bodyTransform = getComputedStyle(document.body).transform;
+  var scaleY = 1;
+  if (bodyTransform !== 'none') {
+    var matrix = new DOMMatrix(bodyTransform);
+    scaleY = matrix.d;
+  }
   // 使用getBoundingClientRect计算相对偏移量
   var targetRect = targetElement.getBoundingClientRect();
   var containerRect = scrollContainer.getBoundingClientRect();
@@ -32,7 +37,7 @@ var getOffsetTopRelativeToScrollContainer = function getOffsetTopRelativeToScrol
   // targetRect.top - containerRect.top 得到目标元素相对于容器顶部的可视距离
   // 考虑容器已经滚动的距离 再加上scrollContainer.scrollTop
   // 这样得到的是目标元素在容器内容中的绝对位置
-  return targetRect.top - containerRect.top + scrollContainer.scrollTop;
+  return targetRect.top / scaleY - containerRect.top / scaleY + scrollContainer.scrollTop;
 };
 var TabProduct = function TabProduct(props) {
   var _props$showTab = props.showTab,

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

@@ -9,7 +9,7 @@ import { PisellText } from '@pisell/materials';
 import classNames from 'classnames';
 import useEngineContext from "../../../../hooks/useEngineContext";
 var index = function index(props) {
-  var _context$appHelper$ut;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3;
   var context = useEngineContext();
   var value = props.value;
   var locale = ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.storage) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.get('umi_locale')) || 'en';
@@ -31,7 +31,8 @@ var index = function index(props) {
       marginRight: 4
     }
   }, _prefix) : null, /*#__PURE__*/React.createElement(PisellText.Amount, {
-    value: value
+    value: value,
+    symbol: (_context$appHelper$ut2 = context.appHelper.utils) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getData) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.call(_context$appHelper$ut2, 'shop_symbol')
   }), _suffix ? /*#__PURE__*/React.createElement("span", {
     style: {
       fontSize: '0.65em',

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

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import GridLayout from "../gridLayout";
-import { locales } from '@pisell/utils';
+import { image as imageAli, locales } from '@pisell/utils';
 import { Skeleton } from 'antd';
 import Decimal from 'decimal.js';
 import "./index.less";
@@ -55,6 +55,17 @@ var ProductGroup = function ProductGroup(_ref) {
     }
     return "".concat(locales.getText('pisell2.product-select.stock'), "\uFF1A").concat(item.stock_quantity);
   };
+
+  // 获取商品名称的前两个字符作为文字封面
+  var getTextCover = function getTextCover(title) {
+    if (!title) return '';
+    // 移除首尾空格并取前两个字符
+    var cleanTitle = title.trim();
+    if (cleanTitle.length === 0) return '';
+
+    // 取前两个字符（无论是中文、英文还是其他字符）
+    return cleanTitle.substring(0, 2).toUpperCase();
+  };
   var renderPrice = function renderPrice(item) {
     var _price = item.price,
       _original_price = item.original_price,
@@ -86,22 +97,28 @@ var ProductGroup = function ProductGroup(_ref) {
       className: classNames('product-card', {
         selected: currentProductId && item.id === currentProductId
       }),
-      onClick: function onClick() {
+      onPointerUp: function onPointerUp() {
+        console.log('进入 renderItem onClick');
         onSelectProduct === null || onSelectProduct === void 0 || onSelectProduct(item);
       }
-    }, isProductCover && item.cover ? /*#__PURE__*/React.createElement("div", {
+    }, isProductCover ? /*#__PURE__*/React.createElement("div", {
       className: "card-left",
       style: {
         width: imgWidth || 'auto',
         height: imgHeight || 'auto'
       }
-    }, /*#__PURE__*/React.createElement("img", {
+    }, item.cover ? /*#__PURE__*/React.createElement("img", {
       loading: "lazy",
-      src: item.cover,
+      src: imageAli.ali(item.cover, 360),
+      style: {
+        borderRadius: radius
+      }
+    }) : /*#__PURE__*/React.createElement("div", {
+      className: "text-cover",
       style: {
         borderRadius: radius
       }
-    })) : null, /*#__PURE__*/React.createElement("div", {
+    }, getTextCover(item.title))) : null, /*#__PURE__*/React.createElement("div", {
       className: "card-right"
     }, !!isTitle ? /*#__PURE__*/React.createElement("div", {
       className: "title"

package/es/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/es/components/shoppingCart/components/Cart/Product.js

@@ -5,7 +5,9 @@ import { ProductCard } from '@pisell/materials';
 import useClearCart from "../../hooks/useClearCart";
 import { useContext } from "../../hooks/useContext";
 import useAddService from "../../hooks/useAddService";
-import { useMemoizedFn, useTrackedEffect } from "ahooks";
+import { useMemoizedFn } from 'ahooks';
+import { isNormalProductByDurationSchedule } from "../../../booking/info/service2/utils";
+import PisellNumberSelector from "../../../../pro/pisellNumberSelector";
 var Product = function Product(props) {
   var id = props.id,
     lists = props.lists,
@@ -25,7 +27,9 @@ var Product = function Product(props) {
     isShowChangeHolder = state.isShowChangeHolder,
     isShowHolder = state.isShowHolder,
     isShowAddHolderButton = state.isShowAddHolderButton,
-    isShowEditProduct = state.isShowEditProduct;
+    isShowEditProduct = state.isShowEditProduct,
+    _state$productCardSty = state.productCardStyleConfig,
+    productCardStyleConfig = _state$productCardSty === void 0 ? {} : _state$productCardSty;
   var clearCart = useClearCart(id);
 
   /**
@@ -53,15 +57,50 @@ var Product = function Product(props) {
       isShowEditProduct: isShowEditProduct
     };
   }, [isShowNote, isShowPackageNote, disabledEdit, isShowChangeResource, isShowDelete, isShowHolder, isShowAddHolderButton, isShowChangeHolder, isShowEditProduct]);
-  useTrackedEffect(function (changes) {
-    console.log('Index of changed dependencies: ', changes);
-  }, [clearCart, lists, productParams, hideAddBtn, isAdd, platform]);
+  var getProductCardStyleProps = useMemoizedFn(function (type) {
+    var conf = productCardStyleConfig["".concat(type, "_product_card_style")];
+    if (state.scenario !== 'booking2') return {};
+    return {
+      isShowImage: conf === null || conf === void 0 ? void 0 : conf.show_product_image,
+      isShowDelete: conf === null || conf === void 0 ? void 0 : conf.show_remove_button,
+      disabledEdit: true
+    };
+  });
   return useMemo(function () {
     console.log('render cart');
     return /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__shopping-cart-content"
     }, clearCart, lists === null || lists === void 0 ? void 0 : lists.map(function (item) {
-      return /*#__PURE__*/React.createElement(ProductCard, _extends({
+      var Comp = ProductCard;
+      var isRetail;
+      if (state.scenario === 'booking2') {
+        isRetail = isNormalProductByDurationSchedule(item === null || item === void 0 ? void 0 : item._origin);
+        Comp = ProductCard.V2;
+      }
+      return /*#__PURE__*/React.createElement(Comp, _extends({
+        type: isRetail ? 'a2' : 'a5',
+        rightActions: [{
+          key: 'update_number',
+          text: /*#__PURE__*/React.createElement(PisellNumberSelector, {
+            enablePriceAdjust: true,
+            min: 1,
+            className: "pisell-sku-card__pisell-number-setter",
+            value: item === null || item === void 0 ? void 0 : item.num,
+            onChange: function 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: function onAction(e) {
@@ -95,7 +134,9 @@ var Product = function Product(props) {
         onAddHolder: function onAddHolder(e) {
           return handleChange(item, 'add_holder', e);
         }
-      }, productParams));
+      }, productParams, getProductCardStyleProps(isRetail ? 'retail' : 'appointment'), {
+        scenario: state.scenario
+      }));
     }), !hideAddBtn && platform !== 'h5' && isAdd ? useAddService(id, 'more') : null);
   }, [clearCart, lists, productParams, hideAddBtn, isAdd, platform]);
 };

package/es/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/es/components/shoppingCart/type.d.ts

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

package/es/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/es/components/subTotal/locales.js

@@ -14,7 +14,7 @@ export default {
   },
   'zh-CN': {
     'pisell2.subtotal.deposit': "定金",
-    'pisell2.subtotal.total': "总价",
+    'pisell2.subtotal.total': "总计",
     'pisell2.subtotal.subtotal': "小计",
     'pisell2.subtotal.tax': "税",
     'pisell2.subtotal.delivery-fee': "配送费",
@@ -27,7 +27,7 @@ export default {
   },
   'zh-HK': {
     'pisell2.subtotal.deposit': "定金",
-    'pisell2.subtotal.total': "總價",
+    'pisell2.subtotal.total': "總計",
     'pisell2.subtotal.subtotal': "小計",
     'pisell2.subtotal.tax': "稅",
     'pisell2.subtotal.delivery-fee': "配送費",