@pisell/private-materials 6.9.2 → 6.9.3

package/es/pro/priceKeyboard/components/paymentKeyboard/index.js

@@ -300,7 +300,8 @@ var PaymentKeyboardBase = function PaymentKeyboardBase(props) {
         padding: 16
       },
       bottomContent: renderBottomContent(),
-      preventBlurElements: [uniqueKeyboardId]
+      preventBlurElements: [uniqueKeyboardId],
+      selected: firstInputStatus.payment && !!internalPaymentValue
     });
   };
   var renderSurchargeDisplay = function renderSurchargeDisplay() {
@@ -327,7 +328,8 @@ var PaymentKeyboardBase = function PaymentKeyboardBase(props) {
       onFocus: function onFocus() {
         return setFocusedInput(KEYS.PERCENT);
       },
-      preventBlurElements: [uniqueKeyboardId]
+      preventBlurElements: [uniqueKeyboardId],
+      selected: firstInputStatus.percent && !!(internalSurchargeValue !== null && internalSurchargeValue !== void 0 && internalSurchargeValue.percent) && focusedInput !== KEYS.FIXED
     }), /*#__PURE__*/React.createElement("div", {
       style: {
         color: '#667085',
@@ -349,7 +351,8 @@ var PaymentKeyboardBase = function PaymentKeyboardBase(props) {
       onFocus: function onFocus() {
         return setFocusedInput(KEYS.FIXED);
       },
-      preventBlurElements: [uniqueKeyboardId]
+      preventBlurElements: [uniqueKeyboardId],
+      selected: firstInputStatus.fixed && !!(internalSurchargeValue !== null && internalSurchargeValue !== void 0 && internalSurchargeValue.fixed) && focusedInput === KEYS.FIXED
     }));
   };
   var customDisplay = function customDisplay() {

package/es/pro/skuDetailModal/index.js

@@ -20,7 +20,7 @@ import { locales } from '@pisell/utils';
 import Delete_wght300_24px from '@pisell/icon/es/Delete_wght300_24px';
 import localeTexts from "./locales";
 import "./index.less";
-import PisellNumberSelector from "../pisellNumberSelector";
+import NumericStepper from "../NumericStepper";
 import NoteModal from "../../plus/noteModal";
 import useEngineContext from "../../hooks/useEngineContext";
 import { DiscountKeyboard } from "../priceKeyboard";
@@ -201,8 +201,8 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
     return {
       open: function () {
         var _open = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(data) {
-          var _data$_extend, _data$_extend2, _data$_extend3, _data$_extend4, _data$_extend5, _data$_extend6, _data$_extend7, _data$_extend8, _data$_extend9, _data$_extend10, _data$_extend11, _data$_extend12, _data$_extend13;
-          var _ref5, _is_eject, _hydratedData$_extend, open_deposit, productDetail, apiData, basePrice, hydratedData, isEject, hydratedAny, _initialHasSkuOptions, _data, dataAny, initialHasSkuOptions;
+          var _data$_extend, _data$_extend2, _data$_extend3, _data$_extend4, _data$_extend5;
+          var _ref5, _is_eject, _hydratedData$_extend, open_deposit, productDetail, apiData, basePrice, hydratedData, isEject, hydratedAny, _initialHasSkuOptions, _data, recordSkuValue, dataAny, initialHasSkuOptions;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -300,26 +300,16 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
                 setNote((_data === null || _data === void 0 || (_data$_extend = _data._extend) === null || _data$_extend === void 0 ? void 0 : _data$_extend.note) || '');
                 setQuantity((_data === null || _data === void 0 || (_data$_extend2 = _data._extend) === null || _data$_extend2 === void 0 ? void 0 : _data$_extend2.quantity) || 1);
                 setDiscounts((_data === null || _data === void 0 ? void 0 : _data.discount_list) || []);
-                console.log({
+                recordSkuValue = (_data === null || _data === void 0 || (_data$_extend3 = _data._extend) === null || _data$_extend3 === void 0 ? void 0 : _data$_extend3._skuValue) || (_data === null || _data === void 0 || (_data$_extend4 = _data._extend) === null || _data$_extend4 === void 0 ? void 0 : _data$_extend4.other) || {
                   product_id: _data === null || _data === void 0 ? void 0 : _data.product_id,
-                  product_variant_id: (_data === null || _data === void 0 || (_data$_extend3 = _data._extend) === null || _data$_extend3 === void 0 || (_data$_extend3 = _data$_extend3.other) === null || _data$_extend3 === void 0 ? void 0 : _data$_extend3.product_variant_id) || 0,
-                  bundle: (_data === null || _data === void 0 || (_data$_extend4 = _data._extend) === null || _data$_extend4 === void 0 || (_data$_extend4 = _data$_extend4.other) === null || _data$_extend4 === void 0 ? void 0 : _data$_extend4.bundle) || [],
-                  option: (_data === null || _data === void 0 || (_data$_extend5 = _data._extend) === null || _data$_extend5 === void 0 || (_data$_extend5 = _data$_extend5.other) === null || _data$_extend5 === void 0 ? void 0 : _data$_extend5.option) || []
-                }, 'skuValue');
-                setSkuValue({
-                  product_id: _data === null || _data === void 0 ? void 0 : _data.product_id,
-                  product_variant_id: (_data === null || _data === void 0 || (_data$_extend6 = _data._extend) === null || _data$_extend6 === void 0 || (_data$_extend6 = _data$_extend6.other) === null || _data$_extend6 === void 0 ? void 0 : _data$_extend6.product_variant_id) || 0,
-                  bundle: (_data === null || _data === void 0 || (_data$_extend7 = _data._extend) === null || _data$_extend7 === void 0 || (_data$_extend7 = _data$_extend7.other) === null || _data$_extend7 === void 0 ? void 0 : _data$_extend7.bundle) || [],
-                  option: (_data === null || _data === void 0 || (_data$_extend8 = _data._extend) === null || _data$_extend8 === void 0 || (_data$_extend8 = _data$_extend8.other) === null || _data$_extend8 === void 0 ? void 0 : _data$_extend8.option) || []
-                });
-                setSkuDefaultValue({
-                  product_id: _data === null || _data === void 0 ? void 0 : _data.product_id,
-                  product_variant_id: (_data === null || _data === void 0 || (_data$_extend9 = _data._extend) === null || _data$_extend9 === void 0 || (_data$_extend9 = _data$_extend9.other) === null || _data$_extend9 === void 0 ? void 0 : _data$_extend9.product_variant_id) || 0,
-                  price: (_data === null || _data === void 0 || (_data$_extend10 = _data._extend) === null || _data$_extend10 === void 0 ? void 0 : _data$_extend10.price) || 0,
-                  bundle: (_data === null || _data === void 0 || (_data$_extend11 = _data._extend) === null || _data$_extend11 === void 0 || (_data$_extend11 = _data$_extend11.other) === null || _data$_extend11 === void 0 ? void 0 : _data$_extend11.bundle) || [],
-                  option: (_data === null || _data === void 0 || (_data$_extend12 = _data._extend) === null || _data$_extend12 === void 0 || (_data$_extend12 = _data$_extend12.other) === null || _data$_extend12 === void 0 ? void 0 : _data$_extend12.option) || []
-                });
-                setPriceOverride((_data === null || _data === void 0 || (_data$_extend13 = _data._extend) === null || _data$_extend13 === void 0 ? void 0 : _data$_extend13.priceOverride) || undefined);
+                  product_variant_id: 0,
+                  bundle: [],
+                  option: []
+                };
+                console.log(recordSkuValue, 'skuValue');
+                setSkuValue(recordSkuValue);
+                setSkuDefaultValue(recordSkuValue);
+                setPriceOverride((_data === null || _data === void 0 || (_data$_extend5 = _data._extend) === null || _data$_extend5 === void 0 ? void 0 : _data$_extend5.priceOverride) || null);
                 // setPriceOverride(getInitialPriceOverrideFromProductData({ productData: _data }))
                 setShowPriceAdjustModal(false);
                 // 默认进入：有 SKU 选择则从 step1 开始；否则从 step0（详情）开始
@@ -334,7 +324,7 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
                   });
                   setOpen(true);
                 }, 0);
-              case 48:
+              case 49:
               case "end":
                 return _context2.stop();
             }
@@ -502,7 +492,7 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
   var handleConfirm = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var _bookingState$booking;
-      var _procedureRef$current, _procedureRef$current2, requiredOptionValidation, shouldValidate, _skuOptionsSelectionR, _skuOptionsSelectionR2, isValid, _skuOptionsSelectionR3, _skuOptionsSelectionR4, _bookingState$booking2, _bookingState$booking3, _bookingState$booking4, _bookingState$booking5, _bookingState$booking6, _bookingState$booking7, latestSkuValue, updatedData, stockValidation, allowAddToCartWhenOutStock, enableDontShowAgainToday, hasStock, productId, shouldSkipAlert;
+      var _procedureRef$current, _procedureRef$current2, requiredOptionValidation, shouldValidate, _skuOptionsSelectionR, _skuOptionsSelectionR2, isValid, _skuOptionsSelectionR3, _skuOptionsSelectionR4, _updatedData$_extend, _bookingState$booking2, _bookingState$booking3, _bookingState$booking4, _bookingState$booking5, _bookingState$booking6, _bookingState$booking7, latestSkuValue, originTotal, updatedData, stockValidation, allowAddToCartWhenOutStock, enableDontShowAgainToday, hasStock, productId, shouldSkipAlert;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -548,13 +538,14 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
             return _context3.abrupt("return");
           case 19:
             if (!(productData && onConfirm)) {
-              _context3.next = 40;
+              _context3.next = 42;
               break;
             }
             /**
              * @description 优先从 SKUOptionsSelection ref 读取最新转换后的值
              */
             latestSkuValue = ((_skuOptionsSelectionR3 = skuOptionsSelectionRef.current) === null || _skuOptionsSelectionR3 === void 0 || (_skuOptionsSelectionR4 = _skuOptionsSelectionR3.getTransformValues) === null || _skuOptionsSelectionR4 === void 0 ? void 0 : _skuOptionsSelectionR4.call(_skuOptionsSelectionR3)) || skuValue || skuDefaultValue;
+            originTotal = new Decimal(unitPrice !== null && unitPrice !== void 0 ? unitPrice : 0).toNumber();
             updatedData = _objectSpread(_objectSpread({}, productData), {}, {
               discount_list: discounts || [],
               _extend: _objectSpread(_objectSpread({}, (productData === null || productData === void 0 ? void 0 : productData._extend) || {}), {}, {
@@ -568,11 +559,14 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
                 skuValue: getOtherFromSkuValue({
                   productData: productData,
                   skuValue: latestSkuValue
-                })
+                }),
+                origin_total: originTotal
               }, priceOverride !== null && typeof priceOverride !== 'undefined' ? {
                 priceOverride: priceOverride
               } : {})
             });
+            console.log('updatedData>>>>>>', updatedData, updatedData === null || updatedData === void 0 || (_updatedData$_extend = updatedData._extend) === null || _updatedData$_extend === void 0 ? void 0 : _updatedData$_extend.origin_total);
+
             /**
              * @description 库存校验（受全局配置控制）
              * - stock_validation === 1：启用库存校验
@@ -582,7 +576,7 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
             allowAddToCartWhenOutStock = Number((_bookingState$booking4 = bookingState === null || bookingState === void 0 || (_bookingState$booking5 = bookingState.bookingConfig) === null || _bookingState$booking5 === void 0 || (_bookingState$booking5 = _bookingState$booking5.config) === null || _bookingState$booking5 === void 0 || (_bookingState$booking5 = _bookingState$booking5.stock_setting) === null || _bookingState$booking5 === void 0 ? void 0 : _bookingState$booking5.allow_add_to_cart_when_out_stock) !== null && _bookingState$booking4 !== void 0 ? _bookingState$booking4 : 0);
             enableDontShowAgainToday = Number((_bookingState$booking6 = bookingState === null || bookingState === void 0 || (_bookingState$booking7 = bookingState.bookingConfig) === null || _bookingState$booking7 === void 0 || (_bookingState$booking7 = _bookingState$booking7.config) === null || _bookingState$booking7 === void 0 || (_bookingState$booking7 = _bookingState$booking7.stock_setting) === null || _bookingState$booking7 === void 0 ? void 0 : _bookingState$booking7.do_not_show_again_today) !== null && _bookingState$booking6 !== void 0 ? _bookingState$booking6 : 0);
             if (!(stockValidation === 1)) {
-              _context3.next = 38;
+              _context3.next = 40;
               break;
             }
             hasStock = handleCheckStock({
@@ -590,33 +584,33 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
               data: productData
             });
             if (hasStock) {
-              _context3.next = 38;
+              _context3.next = 40;
               break;
             }
             if (!(allowAddToCartWhenOutStock !== 1)) {
-              _context3.next = 31;
+              _context3.next = 33;
               break;
             }
             Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.skuOptionsSelection.variantItemCard.soldOut'));
             return _context3.abrupt("return");
-          case 31:
+          case 33:
             // 缺货允许加入购物车：命中「今天不再提示」则直接提交
             productId = Number((productData === null || productData === void 0 ? void 0 : productData.product_id) || 0);
             shouldSkipAlert = enableDontShowAgainToday === 1 && hasHiddenStockAlertForToday({
               productId: productId
             });
             if (shouldSkipAlert) {
-              _context3.next = 38;
+              _context3.next = 40;
               break;
             }
             pendingConfirmDataRef.current = updatedData;
             setStockAlertDontShowAgainChecked(false);
             setStockAlertOpen(true);
             return _context3.abrupt("return");
-          case 38:
+          case 40:
             onConfirm(updatedData);
             modalCloseAction();
-          case 40:
+          case 42:
           case "end":
             return _context3.stop();
         }
@@ -760,8 +754,6 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
     }, currentStep === 0 && /*#__PURE__*/React.createElement("div", {
       className: "sku-detail-right-content-detail"
     }, /*#__PURE__*/React.createElement("div", {
-      className: "sku-detail-right-content-detail-title"
-    }, (productData === null || productData === void 0 ? void 0 : productData.title) || ''), /*#__PURE__*/React.createElement("div", {
       className: "sku-detail-right-content-detail-description"
     }, productData !== null && productData !== void 0 && productData.subtitle ? /*#__PURE__*/React.createElement("div", {
       className: "sku-detail-right-content-detail-subtitle"
@@ -770,7 +762,14 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
       dangerouslySetInnerHTML: {
         __html: productData.description
       }
-    }) : null)), currentStep === 1 && hasSkuOptions && /*#__PURE__*/React.createElement(SKUOptionsSelection, {
+    }) : null, (productData === null || productData === void 0 ? void 0 : productData.description) === '' && !hasSkuOptions && /*#__PURE__*/React.createElement("div", {
+      className: "sku-detail-right-content-detail-placeholder"
+    }, /*#__PURE__*/React.createElement("img", {
+      width: 300,
+      height: 300,
+      src: "https://static.pisellcdn.com/sku_empty.png",
+      alt: "placeholder"
+    }), /*#__PURE__*/React.createElement("p", null, "No additional options for this item")))), currentStep === 1 && hasSkuOptions && /*#__PURE__*/React.createElement(SKUOptionsSelection, {
       ref: skuOptionsSelectionRef,
       dataSource: productData,
       value: skuDefaultValue,
@@ -782,6 +781,9 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
           lineClamp: 1
         }
       },
+      customConfig: {
+        modalWidth: '680px'
+      },
       onChange: function onChange(v) {
         console.log('SKUOptionsSelectionOnChange', v);
         setSkuValue(v);
@@ -832,13 +834,14 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
     onCancel: handleCancel,
     closable: false,
     destroyOnClose: true,
-    width: 880,
+    width: "80%",
     className: "pisell-sku-detail-modal"
   }, /*#__PURE__*/React.createElement(PisellProcedure, {
     ref: procedureRef,
     className: "pisell-sku-procedure",
     mode: "modal",
     defaultCurrent: currentStep,
+    layoutMode: "ratio",
     onStepsChange: function onStepsChange(result) {
       // 动态 steps 情况下，保护 currentStep 不越界
       var nextStep = Math.min(Number(result.currentStep || 0), maxStepIndex);
@@ -875,15 +878,12 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
         className: "quantity-section"
       }, /*#__PURE__*/React.createElement("div", {
         className: "quantity-section-title"
-      }, locales.getText('pisell2.text.sku.detail.modal.quantity')), /*#__PURE__*/React.createElement(PisellNumberSelector, {
+      }, locales.getText('pisell2.text.sku.detail.modal.quantity')), /*#__PURE__*/React.createElement(NumericStepper, {
+        variant: "capsule",
         value: quantity,
-        width: "120px",
         onChange: handleQuantityChange,
         min: 1,
-        max: 99999,
-        step: 1,
-        size: "middle",
-        enablePriceAdjust: true
+        max: 99999
       })),
       actions: /*#__PURE__*/React.createElement("div", {
         className: "sku-detail-content-footer"
@@ -940,11 +940,11 @@ var SkuDetailModal = function SkuDetailModal(_ref, ref) {
     // 允许一口价超出原价
     ,
     enableExceedMaxAmount: true,
-    originalValue: displayUnitPrice || 0,
+    originalValue: subtotal.toNumber() || 0,
     defaultValue: displayUnitPrice || 0,
     onEnter: function onEnter(discountAmount) {
       // 将折扣值转化为最终“单价”
-      var nextUnitPrice = new Decimal(displayUnitPrice || 0).minus(discountAmount).toNumber();
+      var nextUnitPrice = subtotal.minus(discountAmount).toNumber();
       handlePriceAdjustConfirm(nextUnitPrice);
     },
     selectType: "dark"
@@ -1065,15 +1065,16 @@ function getSelectedUnitPrice(params) {
       return Number(item === null || item === void 0 ? void 0 : item.id) === Number(skuValue.product_variant_id);
     });
     if (variantItem) {
-      var _ref8, _variantItem$price;
-      price = new Decimal((_ref8 = (_variantItem$price = variantItem === null || variantItem === void 0 ? void 0 : variantItem.price) !== null && _variantItem$price !== void 0 ? _variantItem$price : variantItem === null || variantItem === void 0 ? void 0 : variantItem.base_price) !== null && _ref8 !== void 0 ? _ref8 : 0);
+      var _ref8, _variantItem$base_pri;
+      price = new Decimal((_ref8 = (_variantItem$base_pri = variantItem === null || variantItem === void 0 ? void 0 : variantItem.base_price) !== null && _variantItem$base_pri !== void 0 ? _variantItem$base_pri : variantItem === null || variantItem === void 0 ? void 0 : variantItem.original_price) !== null && _ref8 !== void 0 ? _ref8 : 0);
     }
   }
 
   // bundle（套餐）
   if (Array.isArray(skuValue === null || skuValue === void 0 ? void 0 : skuValue.bundle) && skuValue.bundle.length > 0) {
     price = skuValue.bundle.reduce(function (accumulator, currentValue) {
-      var currentPrice = new Decimal((currentValue === null || currentValue === void 0 ? void 0 : currentValue.price) || 0);
+      var _ref9, _currentValue$origina;
+      var currentPrice = new Decimal((_ref9 = (_currentValue$origina = currentValue === null || currentValue === void 0 ? void 0 : currentValue.original_price) !== null && _currentValue$origina !== void 0 ? _currentValue$origina : currentValue === null || currentValue === void 0 ? void 0 : currentValue.price) !== null && _ref9 !== void 0 ? _ref9 : 0);
       var currentNum = new Decimal((currentValue === null || currentValue === void 0 ? void 0 : currentValue.num) || 0);
       return accumulator.add(currentPrice.mul(currentNum));
     }, price);
@@ -1082,7 +1083,8 @@ function getSelectedUnitPrice(params) {
   // option（单规格）
   if (Array.isArray(skuValue === null || skuValue === void 0 ? void 0 : skuValue.option) && skuValue.option.length > 0) {
     price = skuValue.option.reduce(function (accumulator, currentValue) {
-      var currentPrice = new Decimal((currentValue === null || currentValue === void 0 ? void 0 : currentValue.price) || 0);
+      var _ref10, _currentValue$origina2;
+      var currentPrice = new Decimal((_ref10 = (_currentValue$origina2 = currentValue === null || currentValue === void 0 ? void 0 : currentValue.original_price) !== null && _currentValue$origina2 !== void 0 ? _currentValue$origina2 : currentValue === null || currentValue === void 0 ? void 0 : currentValue.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
       var currentNum = new Decimal((currentValue === null || currentValue === void 0 ? void 0 : currentValue.num) || 0);
       return accumulator.add(currentPrice.mul(currentNum));
     }, price);
@@ -1097,19 +1099,19 @@ function getSelectedUnitPrice(params) {
 function getOtherFromSkuValue(params) {
   var productData = params.productData,
     skuValue = params.skuValue;
-  var other = {
+  var other = _objectSpread(_objectSpread({}, skuValue || {}), {}, {
     product_variant_id: (skuValue === null || skuValue === void 0 ? void 0 : skuValue.product_variant_id) || 0,
     bundle: (skuValue === null || skuValue === void 0 ? void 0 : skuValue.bundle) || [],
     option: (skuValue === null || skuValue === void 0 ? void 0 : skuValue.option) || []
-  };
+  });
   if (other.product_variant_id && productData) {
     var _variant3;
     var variantItem = productData === null || productData === void 0 || (_variant3 = productData.variant) === null || _variant3 === void 0 ? void 0 : _variant3.find(function (item) {
       return Number(item === null || item === void 0 ? void 0 : item.id) === Number(other.product_variant_id);
     });
     if (variantItem) {
-      var _ref9, _variantItem$price2;
-      other.price = Number((_ref9 = (_variantItem$price2 = variantItem === null || variantItem === void 0 ? void 0 : variantItem.price) !== null && _variantItem$price2 !== void 0 ? _variantItem$price2 : variantItem === null || variantItem === void 0 ? void 0 : variantItem.base_price) !== null && _ref9 !== void 0 ? _ref9 : 0);
+      var _ref11, _variantItem$price;
+      other.price = Number((_ref11 = (_variantItem$price = variantItem === null || variantItem === void 0 ? void 0 : variantItem.price) !== null && _variantItem$price !== void 0 ? _variantItem$price : variantItem === null || variantItem === void 0 ? void 0 : variantItem.base_price) !== null && _ref11 !== void 0 ? _ref11 : 0);
     }
   }
   return other;
@@ -1122,12 +1124,12 @@ function getOtherFromSkuValue(params) {
  * - 否则返回 null（表示未设置手动改价）
  */
 function getInitialPriceOverrideFromProductData(params) {
-  var _extend, _extend2, _ref10, _extend$price, _extend3;
+  var _extend, _extend2, _ref12, _extend$price, _extend3;
   var data = params.productData;
   if (!data) return null;
   var total = Number(data === null || data === void 0 || (_extend = data._extend) === null || _extend === void 0 ? void 0 : _extend.total);
   var originTotal = Number(data === null || data === void 0 || (_extend2 = data._extend) === null || _extend2 === void 0 ? void 0 : _extend2.origin_total);
-  var basePrice = Number((_ref10 = (_extend$price = data === null || data === void 0 || (_extend3 = data._extend) === null || _extend3 === void 0 ? void 0 : _extend3.price) !== null && _extend$price !== void 0 ? _extend$price : data === null || data === void 0 ? void 0 : data.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
+  var basePrice = Number((_ref12 = (_extend$price = data === null || data === void 0 || (_extend3 = data._extend) === null || _extend3 === void 0 ? void 0 : _extend3.price) !== null && _extend$price !== void 0 ? _extend$price : data === null || data === void 0 ? void 0 : data.price) !== null && _ref12 !== void 0 ? _ref12 : 0);
   if (!Number.isFinite(total)) return null;
   if (Number.isFinite(originTotal) && total !== originTotal) return total;
   if (Number.isFinite(basePrice) && total !== basePrice) return total;

package/es/pro/skuDetailModal/index.less

@@ -3,16 +3,43 @@
    * 固定弹窗高度，确保内部滚动容器有“可计算的最大高度”
    * 否则内容会把 modal 撑开，overflow-y: auto 无法生效（看起来就“滚不动”）
    */
-  height: 684px;
+  height: 884px;
+  width: 80%!important;
 
   // PisellModal（PC）内容容器：固定高度，内部 body 使用 flex 占满剩余空间
   .pisell-lowcode-modal-content {
-    height: 684px;
-    max-height: 684px!important;
+    width: 100% !important;
+    height: 884px;
+    max-height: 884px!important;
+  }
+
+  /**
+   * @description 矮屏设备适配（例如 1366×763）
+   * - 当屏幕高度本身低于 884px 时，整体弹窗高度下调，避免弹窗显示不全
+   * - 同步调整右侧滚动容器最大高度，确保滚动区域可用
+   */
+  @media screen and (max-height: 883px) {
+    height: 720px;
+
+    .pisell-lowcode-modal-content {
+      height: 720px;
+      max-height: 720px !important;
+    }
+
+    .sku-detail-right-content {
+      /**
+       * @description
+       * 同文件下方存在 `.sku-detail-right-content { max-height: 730px; }`
+       * 且位置更靠后（同等优先级会覆盖本规则）。
+       * 这里加 `!important` 确保矮屏媒体查询命中时右侧滚动容器高度能够正确收缩。
+       */
+      max-height: 566px !important;
+    }
   }
 
   // SkuDetailModal 内部使用自定义滚动容器（右侧内容区），避免整块 modal body 滚动
   .pisell-lowcode-modal-body {
+    width: 100% !important;
     overflow: hidden !important;
     min-height: 0;
   }
@@ -37,7 +64,7 @@
     flex: 1;
     min-height: 0;
     overflow-y: auto;
-    max-height: 530px;
+    max-height: 730px;
     /**
      * @description
      * 让滚动条不要贴着内容（尤其是 macOS overlay scrollbar 会覆盖内容）
@@ -427,3 +454,18 @@
   position: relative;
   z-index: 10000; // 确保键盘在遮罩之上
 }
+
+.sku-detail-right-content-detail-placeholder {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  color: #667085;
+
+  p {
+    margin: 0;
+    text-align: center;
+    font-size: 16px;
+  }
+}

package/es/pro/skuDetailModal/types.d.ts

@@ -247,6 +247,13 @@ export interface ExtendData {
         };
     }>>;
     note?: string;
+    _skuValue?: {
+        bundle: any[];
+        option: any[];
+        product_id: number;
+        product_variant_id: number;
+    };
+    priceOverride?: number;
 }
 export interface TimeObj {
     timeSlices: TimeSlice[];

package/lib/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/lib/components/Sales/Cart/index.js

@@ -225,7 +225,7 @@ var CartProvider = ({ children }) => {
     });
   };
   const createCartItemData = () => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
     const _cartData = getCurrentData().cartData;
     if (_cartData.currentCartItem) {
       const {
@@ -241,16 +241,24 @@ var CartProvider = ({ children }) => {
       const endDateInfo = (_g = (_f = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _f.selectDate) == null ? void 0 : _g.endDateInfo;
       const endTime = (_j = (_i = (_h = endDateInfo == null ? void 0 : endDateInfo.times) == null ? void 0 : _h.slice(-1)) == null ? void 0 : _i[0]) == null ? void 0 : _j.end_at;
       const num = 1;
-      const { totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(
+      const { price, totalPrice, originTotal, is_charge_tax } = (0, import_utils3.handleProductInfo)(
         eventDetail,
         num
       );
+      const transformProduct = (_temp) => {
+        var _a2;
+        if (!((_a2 = _temp == null ? void 0 : _temp.variant) == null ? void 0 : _a2.length)) {
+          return { ..._temp || {}, variant: [] };
+        }
+        return _temp;
+      };
       const newCartItem = {
         _id,
         id: eventItem.id,
         name: eventItem.title,
-        price: totalPrice,
+        price,
         // eventBooking中售价和总价保持一致，因为数量为1
+        origin_price: price,
         total: totalPrice,
         // 排除原始价格为0的场景
         origin_total: isNaN(originTotal) || originTotal === 0 ? void 0 : originTotal,
@@ -271,6 +279,10 @@ var CartProvider = ({ children }) => {
         end_time: endTime ? (0, import_dayjs.default)(endTime || "").format("HH:mm") : "",
         custom_day_count: ((_m = (_l = (_k = eventItem == null ? void 0 : eventItem.eventDetail) == null ? void 0 : _k.selectDate) == null ? void 0 : _l.dates) == null ? void 0 : _m.length) || 0,
         is_charge_tax,
+        selectedBundle: (_n = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _n.bundle,
+        selectedOptions: (_o = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _o.options,
+        isNormalProduct: true,
+        // 是否是普通商品，eventBooking中接入的都是普通商品
         _originData: {
           ..._cartData.currentCartItem._originData,
           product: {
@@ -293,16 +305,22 @@ var CartProvider = ({ children }) => {
           event_unique_identifier: _id
           // 传递给接口用于商品可用性检测的比对
         },
-        _productDetail: eventDetail.productDetail
+        _productDetail: eventDetail.productDetail,
+        _productOrigin: transformProduct(
+          ((_p = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _p.origin) || bookingOptionData
+        ),
+        _productInit: transformProduct(
+          ((_q = eventDetail == null ? void 0 : eventDetail.productDetail) == null ? void 0 : _q.origin) || bookingOptionData
+        )
       };
       newCartItem.deposit = (0, import_utils3.handleProductDeposit)(newCartItem, eventDetail, num);
       const originData = (0, import_utils3.handleCartItemOrigin)(newCartItem, eventDetail);
       newCartItem._originData = originData;
       if (holderItem == null ? void 0 : holderItem._originData) {
         newCartItem._originData.holder = {
-          customer_id: (_n = getUserInfo()) == null ? void 0 : _n.id,
-          form_id: (_o = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _o.form_id,
-          form_record: ((_p = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _p.form_record_id) ? [(_q = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _q.form_record_id] : null
+          customer_id: (_r = getUserInfo()) == null ? void 0 : _r.id,
+          form_id: (_s = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _s.form_id,
+          form_record: ((_t = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _t.form_record_id) ? [(_u = holderItem == null ? void 0 : holderItem._originData) == null ? void 0 : _u.form_record_id] : null
         };
       }
       return newCartItem;

package/lib/components/Sales/Cart/utils.d.ts

@@ -1,10 +1,15 @@
 import Decimal from 'decimal.js';
 import { ICalculatePriceParams } from './types';
 export declare const handleProductInfo: (eventDetail: any, num: number) => {
+    price: number;
     totalPrice: number;
     originTotal: any;
     is_charge_tax: any;
 };
+/**
+ * 获取商品价格
+ */
+export declare const getPrice: (params: ICalculatePriceParams) => number;
 /**
  * 获取商品总价
  * @description 当前总价计算基于商品数量为1

package/lib/components/Sales/Cart/utils.js

@@ -33,6 +33,7 @@ __export(utils_exports, {
   formatBundleToOrigin: () => formatBundleToOrigin,
   formatOptionsToOrigin: () => formatOptionsToOrigin,
   getOriginTotalPrice: () => getOriginTotalPrice,
+  getPrice: () => getPrice,
   getProductDeposit: () => getProductDeposit,
   getTotalPrice: () => getTotalPrice,
   handleCartItemOrigin: () => handleCartItemOrigin,
@@ -45,6 +46,7 @@ var handleProductInfo = (eventDetail, num) => {
   var _a;
   const { productDetail, bookingOptionItem } = eventDetail;
   const normalProduct = bookingOptionItem == null ? void 0 : bookingOptionItem._originData;
+  let price = Number((normalProduct == null ? void 0 : normalProduct.price) || 0);
   let totalPrice = Number((normalProduct == null ? void 0 : normalProduct.price) || "");
   let originTotal = Number((normalProduct == null ? void 0 : normalProduct.original_price) || "");
   let is_charge_tax = normalProduct == null ? void 0 : normalProduct.is_charge_tax;
@@ -58,10 +60,19 @@ var handleProductInfo = (eventDetail, num) => {
       is_charge_tax = variant == null ? void 0 : variant.is_charge_tax;
     }
     const params = { product: origin, variant, bundle, options, num };
+    price = getPrice(params);
     totalPrice = getTotalPrice(params);
     originTotal = getOriginTotalPrice(params);
   }
-  return { totalPrice, originTotal, is_charge_tax };
+  return { price, totalPrice, originTotal, is_charge_tax };
+};
+var getPrice = (params) => {
+  const { product, variant } = params;
+  let price = Number(product.price);
+  if (variant) {
+    price = Number(variant == null ? void 0 : variant.price);
+  }
+  return price;
 };
 var getTotalPrice = (params) => {
   const { product, bundle, options, variant } = params;
@@ -270,6 +281,7 @@ var calculateProductDeposit = (params) => {
   formatBundleToOrigin,
   formatOptionsToOrigin,
   getOriginTotalPrice,
+  getPrice,
   getProductDeposit,
   getTotalPrice,
   handleCartItemOrigin,

package/lib/components/Sales/Summary/utils.d.ts

@@ -30,7 +30,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

package/lib/components/Sales/Summary/utils.js

@@ -41,9 +41,7 @@ var calculateSubtotal = (items) => {
     return "0.00";
   }
   const subtotal = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.price || 0);
-    const quantity = new import_decimal.default(item.quantity || 1);
-    return sum.plus(price.times(quantity));
+    return sum.plus(item.total || 0);
   }, new import_decimal.default(0));
   return subtotal.toFixed(2);
 };
@@ -54,7 +52,7 @@ var calculateTaxFee = (shopInfo, items) => {
   const { is_price_include_tax, tax_rate } = shopInfo || {};
   console.log("shopInfo>>>", is_price_include_tax, tax_rate);
   const totalTaxFee = items.reduce((sum, item) => {
-    const price = new import_decimal.default(item.price || 0);
+    const price = new import_decimal.default(item.total || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);
     const productTaxRate = price.times(taxRate).times((item == null ? void 0 : item.is_charge_tax) || 0).div(taxRate.times(is_price_include_tax || 0).plus(1));
     return sum.plus(productTaxRate);

package/lib/components/appointmentBooking/components/Header/index.js

@@ -114,20 +114,15 @@ var Header = () => {
         isSkip: false
       });
     }
-    if ((prevStepData == null ? void 0 : prevStepData.key) === "select-service") {
+    const isServiceStep = (prevStepData == null ? void 0 : prevStepData.key) === "select-service";
+    const isResourceStep = (prevStepData == null ? void 0 : prevStepData.key) === "select-resource";
+    if (isServiceStep || isResourceStep) {
       stepList.forEach((item) => {
         if (item.key.startsWith("select-resource_") || item.key.startsWith("fill-form_")) {
           removeStep(item.key);
         }
       });
     }
-    if ((prevStepData == null ? void 0 : prevStepData.key) === "select-resource") {
-      stepList.forEach((item) => {
-        if (item.key.startsWith("fill-form_")) {
-          removeStep(item.key);
-        }
-      });
-    }
   };
   const handleClose = () => {
     var _a2, _b;

package/lib/components/appointmentBooking/components/Services/index.js

@@ -84,7 +84,11 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       type: "pisell1.productDetail",
       data: {
         detail: { ...item, open_deposit: 1 },
-        setting: { can_input: true, item_max_length: isShowProductDetailStepper, is_detail_open: clickType === "cover" }
+        setting: {
+          can_input: true,
+          item_max_length: isShowProductDetailStepper,
+          is_detail_open: clickType === "cover"
+        }
       },
       callback: async (data) => {
         var _a, _b;

package/lib/components/appointmentBooking/components/TimeSlicing/components/SelectDateOS.d.ts

@@ -0,0 +1,2 @@
+declare const SelectDate: (props: any) => JSX.Element | null;
+export default SelectDate;