@pisell/private-materials 6.3.124 → 6.3.126

package/es/components/booking/info/service/editService/BookingList/index.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
 declare const BookingList: ({ items }: {
     items: any[];
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default BookingList;

package/es/components/booking/info/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
 export default _default;

package/es/components/booking/info/service/index.less

@@ -8,10 +8,8 @@
     line-height: 24px; /* 150% */
     display: flex;
     align-items: center;
-    margin-bottom: 16px !important;
-    // padding: 12px 0;
-    padding: 0 !important;
-    width: max-content;
+    margin-bottom: 4px;
+    padding: 12px 0;
     .anticon {
       font-size: 18px;
       margin-right: 6px;

package/es/components/booking/info/service/like/index.d.ts

@@ -1,9 +1,8 @@
-import React from "react";
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;
     status: string;
     onChange?: any;
     className?: string | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default Like;

package/es/components/booking/info/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/info/service/serviceList/index.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default ServiceList;

package/es/components/booking/info/service2/Lists.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const Lists: ({ onEdit, onChange }: any) => React.JSX.Element;
+declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

package/es/components/booking/info/service2/index.d.ts

@@ -3,4 +3,4 @@ export declare const Service2Context: React.Context<any>;
 export declare const Service2Cart: ({ hideAdd, hideEdit, }: {
     hideAdd?: boolean | undefined;
     hideEdit?: boolean | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;

package/es/components/booking/info/service2/utils.d.ts

@@ -245,4 +245,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => never[] | Promise<any>;
+export declare const updateServicePrice: (state: any) => Promise<any> | never[];

package/es/components/booking/info/service2/utils.js

@@ -215,14 +215,12 @@ export var handleChangeHolder = function handleChangeHolder(products, currentIte
 var handleAddHolder = function handleAddHolder() {};
 var handleLike = function handleLike(products, currentItem, other) {
   return products.map(function (item) {
-    var _item$_extend3, _item$_extend4;
-    var isSameGroup = (item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.groupId) && ((_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.groupId) === (currentItem === null || currentItem === void 0 ? void 0 : currentItem.serviceId);
     if (currentItem.isParallelResource) {
-      if (item._id === currentItem.serviceId || isSameGroup) {
-        var _item$_extend5, _item$_extend6;
+      if (item._id === currentItem.serviceId) {
+        var _item$_extend3, _item$_extend4;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
-            resource: _objectSpread(_objectSpread({}, (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.resource), {}, _defineProperty({}, currentItem.resourceId, (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.resource[currentItem.resourceId].map(function (item) {
+            resource: _objectSpread(_objectSpread({}, (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.resource), {}, _defineProperty({}, currentItem.resourceId, (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.resource[currentItem.resourceId].map(function (item) {
               return _objectSpread(_objectSpread({}, item), {}, {
                 like_status: other.like_status
               });
@@ -232,7 +230,7 @@ var handleLike = function handleLike(products, currentItem, other) {
       }
       return item;
     } else {
-      if (item._id === currentItem._id || isSameGroup) {
+      if (item._id === currentItem._id) {
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
             like_status: other.like_status
@@ -247,16 +245,14 @@ var handleLike = function handleLike(products, currentItem, other) {
 // 更新资源
 var handleChangeResource = function handleChangeResource(products, currentItem, other, state) {
   return products.map(function (item) {
-    var _item$_extend7, _item$_extend8, _currentItem$_origin2;
     var _ref = other || {},
       props = _ref.props,
       value = _ref.value;
     var _ref2 = props || {},
       isParallelResource = _ref2.isParallelResource,
       resourceId = _ref2.resourceId;
-    var isSameGroup = (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.groupId) && ((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.groupId) === (currentItem === null || currentItem === void 0 || (_currentItem$_origin2 = currentItem._origin) === null || _currentItem$_origin2 === void 0 || (_currentItem$_origin2 = _currentItem$_origin2._extend) === null || _currentItem$_origin2 === void 0 ? void 0 : _currentItem$_origin2.groupId);
     if (isParallelResource) {
-      if (item._id === currentItem._id || isSameGroup) {
+      if (item._id === currentItem._id) {
         var hasDataItem = getProductExtend({
           cacheItem: _objectSpread(_objectSpread({}, item), {}, {
             new: 0
@@ -290,7 +286,7 @@ var handleChangeResource = function handleChangeResource(products, currentItem,
       }
       return item;
     } else {
-      if (item._id === currentItem._id || isSameGroup) {
+      if (item._id === currentItem._id) {
         var _resourceItem$_extend;
         var resourceItem = currentResource(state, other.id, item);
         var _ref3 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {},
@@ -349,8 +345,8 @@ export var updateServices = function updateServices(state, currentItem, type, ot
   if (type === 'delete_holders') {
     var _products2;
     products = (_products2 = products) === null || _products2 === void 0 ? void 0 : _products2.filter(function (item) {
-      var _item$_extend9;
-      return (item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.holder_id) !== other;
+      var _item$_extend5;
+      return (item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id) !== other;
     });
   }
 
@@ -551,7 +547,7 @@ export var isAllNormalProductByState = function isAllNormalProductByState(state)
   return isAllNormalProduct(state.service.value);
 };
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
-  var _formData$, _item$_extend11, _item$_extend12, _item$_extend13, _item$_extend14, _item$_extend15;
+  var _formData$, _item$_extend7, _item$_extend8, _item$_extend9, _item$_extend10, _item$_extend11;
   var pet = state.pet,
     service = state.service;
   var _ref8 = pet || {},
@@ -594,7 +590,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
       };
     });
   } else {
-    var _item$_extend10;
+    var _item$_extend6;
     var _ref10 = service || {},
       resourcesOrigin = _ref10.resourcesOrigin;
     var resource = formatResources({
@@ -605,7 +601,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     multiResources = [{
       _id: item._id,
       id: item._extend.resource,
-      status: ((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.like_status) || 'common',
+      status: ((_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.like_status) || 'common',
       lists: mapListItems(resource)
     }];
   }
@@ -626,10 +622,10 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     holderMode: (item === null || item === void 0 ? void 0 : item._extend.quantity) > 1 ? 'multiple' : undefined,
     isErrorHolder: getIsSubjectRequire(state),
     addHolderButtonText: (formData === null || formData === void 0 || (_formData$ = formData[0]) === null || _formData$ === void 0 || (_formData$ = _formData$.form) === null || _formData$ === void 0 ? void 0 : _formData$.title) || "",
-    holder_id: item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.holder_id,
-    start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.startDate : "",
-    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.endDate) || (item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.end_date) : "",
-    rowKey: "rowKey-".concat(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.rowKey)
+    holder_id: item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.holder_id,
+    start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.startDate : "",
+    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.endDate) || (item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.end_date) : "",
+    rowKey: "rowKey-".concat(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.rowKey)
   }, parallelResourceOtherParams);
 };
 var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
@@ -652,18 +648,18 @@ export var formatProducts = function formatProducts(lists, state) {
   var normalList = [];
   var groupList = [];
   var formItem = function formItem(item) {
-    var _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28, _resourceItem, _item$_extend29, _item$_extend30, _item$_extend31, _item$_extend32, _item$_extend33;
+    var _item$_extend12, _item$_extend13, _item$_extend14, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24, _resourceItem, _item$_extend25, _item$_extend26, _item$_extend27, _item$_extend28, _item$_extend29;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
-    var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.holder_id);
-    var options = formatOptions(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.option);
-    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 || (_item$_extend18 = _item$_extend18.other) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.bundle);
+    var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.holder_id);
+    var options = formatOptions(item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 || (_item$_extend13 = _item$_extend13.other) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.option);
+    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 || (_item$_extend14 = _item$_extend14.other) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.bundle);
     // 是否是普通商品
     var isNormalProduct = !appointmentTypes.includes(item === null || item === void 0 ? void 0 : item.extension_type) || (state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking';
     var resourceItem = {};
     var errorMessage = '';
     if (_isDayBookingProduct || isGeneral) {
-      var _item$_extend19;
-      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.resource, state);
+      var _item$_extend15;
+      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
     var generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
@@ -671,31 +667,31 @@ export var formatProducts = function formatProducts(lists, state) {
       id: item === null || item === void 0 ? void 0 : item.id,
       _id: item === null || item === void 0 ? void 0 : item._id,
       name: item === null || item === void 0 ? void 0 : item.title,
-      price: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.price,
+      price: item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.price,
       totalDifference: getProductDiscountProductDiscountDifference(item),
-      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.total, item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.relation_details),
-      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.origin_total, item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.relation_details),
+      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
+      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.origin_total, item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.relation_details),
       num: item === null || item === void 0 ? void 0 : item._extend.quantity,
       image: item === null || item === void 0 ? void 0 : item.cover,
       isShowNote: true,
       note: item === null || item === void 0 ? void 0 : item.note,
-      like_status: item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.like_status,
+      like_status: item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.like_status,
       bundle: bundle,
       options: options,
       errorMessage: errorMessage,
-      product_option_string: item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 || (_item$_extend26 = _item$_extend26.other) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.product_option_string,
-      discount_reason: item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.discount_reason,
-      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.resource,
+      product_option_string: item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 || (_item$_extend22 = _item$_extend22.other) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.product_option_string,
+      discount_reason: item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.discount_reason,
+      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.resource,
       relation_form_name: isNormalProduct ? '' : ((_resourceItem = resourceItem) === null || _resourceItem === void 0 ? void 0 : _resourceItem.labelText) || item.relation_form_name,
       holder_title: clientTitle,
-      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.start_date : '',
-      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.end_date : '',
-      holder_id: (item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.holder_id) || 0,
+      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.start_date : '',
+      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.end_date : '',
+      holder_id: (item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.holder_id) || 0,
       isNormalProduct: isNormalProduct,
       locale: state.locale,
       symbol: state.amountSymbol,
-      relation_products: (item === null || item === void 0 || (_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.relation_details) || [],
-      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend33 = item._extend) === null || _item$_extend33 === void 0 ? void 0 : _item$_extend33.items) || [])
+      relation_products: (item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.items) || [])
     }, generalParams), {}, {
       _origin: item
     });
@@ -704,8 +700,8 @@ export var formatProducts = function formatProducts(lists, state) {
   if (isRenderGroup) {
     // 将商品分为组商品和非组商品
     lists.forEach(function (item) {
-      var _item$_extend34;
-      if (!(item !== null && item !== void 0 && (_item$_extend34 = item._extend) !== null && _item$_extend34 !== void 0 && _item$_extend34.groupId)) {
+      var _item$_extend30;
+      if (!(item !== null && item !== void 0 && (_item$_extend30 = item._extend) !== null && _item$_extend30 !== void 0 && _item$_extend30.groupId)) {
         normalList.push(formItem(item));
       } else {
         groupList.push(item);
@@ -714,8 +710,8 @@ export var formatProducts = function formatProducts(lists, state) {
 
     // 根据item._extend.groupId 进行分组
     var groups = groupList.reduce(function (prev, item) {
-      var _item$_extend35;
-      var groupId = item === null || item === void 0 || (_item$_extend35 = item._extend) === null || _item$_extend35 === void 0 ? void 0 : _item$_extend35.groupId;
+      var _item$_extend31;
+      var groupId = item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.groupId;
       if (!prev[groupId]) {
         prev[groupId] = [];
       }
@@ -883,8 +879,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend36;
-        return ((_item$_extend36 = item._extend) === null || _item$_extend36 === void 0 ? void 0 : _item$_extend36.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend32;
+        return ((_item$_extend32 = item._extend) === null || _item$_extend32 === void 0 ? void 0 : _item$_extend32.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });

package/es/components/booking/info2/service/actions/index.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default Actions;

package/es/components/booking/info2/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {
@@ -8,5 +7,5 @@ interface AddServiceProps {
     drawerProps?: PisellDrawerProps;
     renderMode?: 'current' | 'drawer';
 }
-declare const Info: (props: AddServiceProps) => React.JSX.Element;
+declare const Info: (props: AddServiceProps) => JSX.Element;
 export default Info;

package/es/components/booking/info2/service/addService/mock.d.ts

@@ -103,8 +103,6 @@ declare const _default: {
                 en: string;
                 "zh-CN": string;
                 "zh-HK": string;
-                ja: string;
-                pt: string;
                 original: string;
             };
             id: number;

package/es/components/booking/info2/service/addService/mock.js

@@ -183,8 +183,6 @@ export default {
         "en": "",
         "zh-CN": "",
         "zh-HK": "",
-        "ja": "",
-        "pt": "",
         "original": "成人"
       },
       id: 1,
@@ -195,8 +193,6 @@ export default {
         "en": "",
         "zh-CN": "",
         "zh-HK": "",
-        "ja": "",
-        "pt": "",
         "original": "儿童"
       },
       id: 2,

package/es/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import '../../../info/service/addTimeModal/index.less';
-declare const AddTimeModal: () => React.JSX.Element;
+declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/es/components/booking/info2/service/contactInfoMode/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const ContactInfoMode: () => React.JSX.Element;
+declare const ContactInfoMode: () => JSX.Element;
 export default ContactInfoMode;

package/es/components/booking/info2/service/editService/index.js

@@ -36,8 +36,6 @@ import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
-import { Decimal } from "decimal.js";
-import { setProductPrice } from "./utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI10, _state$bookingConfig5, _state$service$cacheI11, _state$service$cacheI12, _state$service9, _state$service$resour2, _state$service$cacheI13, _state$service$cacheI14;
@@ -220,7 +218,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend, _item2, _item$_extend2;
+    var _resourcesRef$current, _item$_extend;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -251,41 +249,13 @@ var Info = function Info(_, ref) {
       endDate = _getServiceTimes.endDate;
     _extend.startDate = startDate;
     _extend.endDate = endDate;
-    if (isChangeTotal.current) {
-      var _extend$other, _extend$other2;
-      // 计算折扣比例
-      var discountRatio = new Decimal(values.total).div(_item._extend.origin_total);
-
-      // 处理子商品
-      var _bundles = (_extend === null || _extend === void 0 || (_extend$other = _extend.other) === null || _extend$other === void 0 ? void 0 : _extend$other.bundle) || [];
-      var childProductsTotal = new Decimal(0);
-      if (_bundles.length > 0) {
-        _bundles.forEach(function (bundle) {
-          // 计算子商品折扣后的单价（保留两位小数）
-          var discountedPrice = new Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
-          bundle.bundle_selling_price = discountedPrice.toNumber();
-
-          // 累计子商品折扣后总价
-          childProductsTotal = childProductsTotal.add(discountedPrice.mul(bundle.quantity));
-        });
-      }
-
-      // 计算主商品折扣后的单价
-      var mainProductTotal = new Decimal(values.total).sub(childProductsTotal);
-      var mainProductQuantity = ((_extend$other2 = _extend.other) === null || _extend$other2 === void 0 ? void 0 : _extend$other2.quantity) || _extend.quantity || 1;
-      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
-    }
     if (_extend.bundle_edit !== undefined) {
       _extend.bundle_edit = 1;
     }
     _item._extend = _extend;
     _item._time = new Date().getTime();
     _item._serviceKey = genServiceKey(_item);
-    var _id = (_item2 = _item) === null || _item2 === void 0 ? void 0 : _item2._id;
-    _item = setProductPrice(_item, {
-      newTotal: values.total,
-      origin_total: (_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.origin_total
-    });
+    var _id = _item === null || _item === void 0 ? void 0 : _item._id;
 
     // 判断是新增还是编辑
     if (!_list.some(function (d) {
@@ -483,11 +453,11 @@ var Info = function Info(_, ref) {
     var isSession = isSessionProduct(item);
     var sessionValue = {};
     if (isSession) {
-      var _item$_extend3, _item$_extend4, _item$_extend5;
+      var _item$_extend2, _item$_extend3, _item$_extend4;
       sessionValue.startEndTime = {
-        startDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.start_date,
-        endDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.end_date,
-        duration: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.duration
+        startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
+        duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
       };
     }
 

package/es/components/booking/info2/service/editService/utils.d.ts

@@ -11,18 +11,3 @@ export declare const getAutoAllocationStorage: (id: string | number) => any;
 export declare const setAutoAllocationStorage: (data: {
     [key: string]: boolean;
 }) => void;
-/**
- * 手动折扣后给商品价格和子商品价格重新计算
- *
- * 计算逻辑：
- * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
- * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
- *
- * @param cacheItem - 缓存的商品项
- * @param newTotal - 折扣后的新总价
- * @param origin_total - 原始总价
- */
-export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total }: {
-    newTotal: number;
-    origin_total: number;
-}) => any;

package/es/components/booking/info2/service/editService/utils.js

@@ -15,9 +15,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 
 import { isBoolean } from "@pisell/utils";
-import { getTimeObj } from "../addService/utils";
-import { Decimal } from "decimal.js";
-import { isArr } from "@pisell/utils";
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
@@ -55,77 +52,4 @@ export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
   } else {
     localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread({}, data)));
   }
-};
-
-/**
- * 手动折扣后给商品价格和子商品价格重新计算
- *
- * 计算逻辑：
- * 1. 子商品（bundle + option）按折扣比例计算，直接截取两位小数（不四舍五入）
- * 2. 主商品价格 = newTotal - 所有子商品价格总和（确保总价精确等于 newTotal）
- *
- * @param cacheItem - 缓存的商品项
- * @param newTotal - 折扣后的新总价
- * @param origin_total - 原始总价
- */
-export var setProductPrice = function setProductPrice(cacheItem, _ref2) {
-  var _cacheItem$discount_l, _cacheItem$_extend$ot, _cacheItem$_extend$ot2, _cacheItem$_extend$ot4, _cacheItem$_extend$ot5;
-  var newTotal = _ref2.newTotal,
-    origin_total = _ref2.origin_total;
-  if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$discount_l = cacheItem.discount_list) !== null && _cacheItem$discount_l !== void 0 && _cacheItem$discount_l.length && ((cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.discount_list) || []).some(function (item) {
-    return ['good_pass', 'discount_card', 'product_discount_card'].includes(item.type);
-  })) {
-    return cacheItem;
-  }
-  if (cacheItem.discount_amount) {
-    return cacheItem;
-  }
-
-  // 计算折扣比例
-  var discountRatio = new Decimal(newTotal).div(new Decimal(origin_total));
-
-  // 用于累加子商品总价c
-  var subTotal = new Decimal(0);
-
-  // 处理 bundle 子商品
-  if ((_cacheItem$_extend$ot = cacheItem._extend.other) !== null && _cacheItem$_extend$ot !== void 0 && _cacheItem$_extend$ot.bundle && isArr((_cacheItem$_extend$ot2 = cacheItem._extend.other) === null || _cacheItem$_extend$ot2 === void 0 ? void 0 : _cacheItem$_extend$ot2.bundle)) {
-    var _cacheItem$_extend$ot3;
-    (_cacheItem$_extend$ot3 = cacheItem._extend.other) === null || _cacheItem$_extend$ot3 === void 0 || (_cacheItem$_extend$ot3 = _cacheItem$_extend$ot3.bundle) === null || _cacheItem$_extend$ot3 === void 0 || _cacheItem$_extend$ot3.forEach(function (bundle) {
-      var _ref3, _bundle$num;
-      // 计算新价格，直接截取两位小数（不四舍五入）
-      var newPrice = new Decimal(bundle.original_price || bundle.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
-
-      // 获取数量，优先取 num，再取 quantity，默认为 1
-      var quantity = (_ref3 = (_bundle$num = bundle.num) !== null && _bundle$num !== void 0 ? _bundle$num : bundle.quantity) !== null && _ref3 !== void 0 ? _ref3 : 1;
-
-      // 累加到子商品总价
-      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
-
-      // 设置新价格
-      bundle.price = newPrice;
-    });
-  }
-
-  // 处理 option 子商品
-  if ((_cacheItem$_extend$ot4 = cacheItem._extend.other) !== null && _cacheItem$_extend$ot4 !== void 0 && _cacheItem$_extend$ot4.option && isArr((_cacheItem$_extend$ot5 = cacheItem._extend.other) === null || _cacheItem$_extend$ot5 === void 0 ? void 0 : _cacheItem$_extend$ot5.option)) {
-    var _cacheItem$_extend$ot6;
-    (_cacheItem$_extend$ot6 = cacheItem._extend.other) === null || _cacheItem$_extend$ot6 === void 0 || (_cacheItem$_extend$ot6 = _cacheItem$_extend$ot6.option) === null || _cacheItem$_extend$ot6 === void 0 || _cacheItem$_extend$ot6.forEach(function (option) {
-      var _ref4, _option$num;
-      // 计算新价格，直接截取两位小数（不四舍五入）
-      var newPrice = new Decimal(option.price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_DOWN).toNumber();
-
-      // 获取数量，优先取 num，再取 quantity，默认为 1
-      var quantity = (_ref4 = (_option$num = option.num) !== null && _option$num !== void 0 ? _option$num : option.quantity) !== null && _ref4 !== void 0 ? _ref4 : 1;
-
-      // 累加到子商品总价
-      subTotal = subTotal.add(new Decimal(newPrice).mul(quantity));
-
-      // 设置新价格
-      option.price = newPrice;
-    });
-  }
-
-  // 主商品价格 = newTotal - 子商品总价（让主商品吸收精度误差，确保总价精确）
-  cacheItem._extend.price = new Decimal(newTotal).sub(subTotal).toNumber();
-  return cacheItem;
 };

package/es/components/booking/info2/service/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../info/service/index.less';
-declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => JSX.Element>;
 export default _default;

package/es/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/info2/service/serviceList/index.d.ts

@@ -1,6 +1,5 @@
-import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default ServiceList;