@pisell/private-materials 6.2.30 → 6.3.1

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

@@ -1,5 +1,5 @@
 .pisell-lowcode__booking-service-wrap {
-  margin-top: 12px;
+  margin-top: 16px;
   .pisell-lowcode__booking-service-clear-btn {
     cursor: pointer;
     margin-top: -12px;

package/es/components/booking/info/service/like/index.js

@@ -19,7 +19,7 @@ var Like = function Like(_ref) {
       }
       e.preventDefault();
       e.stopPropagation();
-      onChange === null || onChange === void 0 || onChange(status === "like" ? "common" : "like");
+      onChange === null || onChange === void 0 ? void 0 : onChange(status === "like" ? "common" : "like");
     }
   });
 };

package/es/components/booking/info/service/serviceItem/index.js

@@ -39,7 +39,7 @@ var ServiceItem = function ServiceItem(_ref) {
     icon: /*#__PURE__*/React.createElement(Iconfont, {
       type: "pisell2-trash-01"
     })
-  })), d.id || d.isCustomItem ? /*#__PURE__*/React.createElement("div", {
+  })), d.id ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-title"
   }, d.title) : null, d._extend ? /*#__PURE__*/React.createElement(React.Fragment, null, state.renderType !== 'eventBooking' && /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-date"
@@ -59,7 +59,7 @@ var ServiceItem = function ServiceItem(_ref) {
     renderItem: function renderItem(item) {
       return renderBundles(item, state.amountSymbol);
     }
-  }) : null, d.id || d.isCustomItem ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }) : null, d.id ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-price-wrap"
   }, /*#__PURE__*/React.createElement("span", {
     className: "pisell-lowcode__booking-service-item-price"

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

@@ -58,7 +58,6 @@ export declare const getIsSubjectRequire: (state: any) => boolean;
 export declare const isNormalProductByDurationSchedule: (item: any) => boolean;
 export declare const isAllNormalProduct: (items: any[]) => boolean;
 export declare const isAllNormalProductByState: (state: any) => boolean;
-export declare const genRowKey: (key: string) => string;
 /**
  * @title: 格式化商品数据
  * @description:
@@ -72,7 +71,6 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     id: any;
     _id: any;
     name: any;
-    title: any;
     price: any;
     total: number;
     origin_total: number;
@@ -93,8 +91,6 @@ export declare const formatProducts: (lists: any[], state: any, isRenderGroup?:
     end_date: any;
     holder_id: any;
     isNormalProduct: boolean;
-    isCustomItem: any;
-    vouchersApplicable: any;
     locale: any;
     symbol: any;
     relation_products: any;

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

@@ -365,15 +365,6 @@ export var updateServices = function updateServices(state, currentItem, type, ot
     products = handleChangeResource(products, currentItem, other, state);
     return products;
   }
-  if (type === 'num') {
-    return products.map(function (product) {
-      if (product._id === currentItem._id) {
-        product._extend.quantity = other.num;
-        return product;
-      }
-      return product;
-    });
-  }
 
   // 更新商品的holder_id
   if (type === 'update_holders') {
@@ -438,7 +429,6 @@ var formatBundle = function formatBundle(bundle) {
     return {
       id: item === null || item === void 0 ? void 0 : item.id,
       title: item === null || item === void 0 ? void 0 : item.title,
-      cover: item === null || item === void 0 ? void 0 : item.cover,
       num: item === null || item === void 0 ? void 0 : item.num,
       price: item === null || item === void 0 ? void 0 : item.price,
       total: item === null || item === void 0 ? void 0 : item.price,
@@ -541,7 +531,7 @@ export var getIsSubjectRequire = function getIsSubjectRequire(state) {
 // 非预约商品 通过时长和日程判断是否是普通商品
 export var isNormalProductByDurationSchedule = function isNormalProductByDurationSchedule(item) {
   var _item$schedules, _item$scheduleIds;
-  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !(item !== null && item !== void 0 && (_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
+  return !(item !== null && item !== void 0 && item.duration) && !(item !== null && item !== void 0 && (_item$schedules = item.schedules) !== null && _item$schedules !== void 0 && _item$schedules.length) && !((_item$scheduleIds = item['schedule.ids']) !== null && _item$scheduleIds !== void 0 && _item$scheduleIds.length);
 };
 
 // 是否全部是普通商品
@@ -553,9 +543,6 @@ export var isAllNormalProduct = function isAllNormalProduct(items) {
 export var isAllNormalProductByState = function isAllNormalProductByState(state) {
   return isAllNormalProduct(state.service.value);
 };
-export var genRowKey = function genRowKey(key) {
-  return "rowKey-".concat(key);
-};
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
   var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
   var pet = state.pet,
@@ -634,7 +621,7 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,
     start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate : "",
     end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date) : "",
-    rowKey: genRowKey(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
+    rowKey: "rowKey-".concat(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
   }, parallelResourceOtherParams);
 };
 var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
@@ -676,8 +663,6 @@ 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,
-      title: item === null || item === void 0 ? void 0 : item.title,
-      // 购物车显示需要 title 字段
       price: item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price,
       total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.relation_details),
       origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.origin_total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
@@ -698,10 +683,6 @@ export var formatProducts = function formatProducts(lists, state) {
       end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date : '',
       holder_id: (item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id) || 0,
       isNormalProduct: isNormalProduct,
-      isCustomItem: item === null || item === void 0 ? void 0 : item.isCustomItem,
-      // 添加自定义商品标识
-      vouchersApplicable: item === null || item === void 0 ? void 0 : item.vouchersApplicable,
-      // 是否适用优惠券/折扣
       locale: state.locale,
       symbol: state.amountSymbol,
       relation_products: (item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.relation_details) || [],

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

@@ -15,6 +15,7 @@ import Pet from "../info/pet";
 import DateCom from "../info/date";
 import Footer from "../components/footer";
 import TabPane from "../components/tabPane";
+import AddNote from "../notes/addNote";
 import Header from "../info/header";
 import localeTexts from "../locales";
 import { locales } from '@pisell/utils';
@@ -33,8 +34,6 @@ import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
 import { useDebounceEffect } from 'ahooks';
-import CartClientCard from "./cartClientCard";
-import { Iconfont } from '@pisell/materials';
 var defaultModules = {
   client: 1,
   date: 1,
@@ -44,7 +43,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state3, _modal$state5, _context$appHelper4, _modal$state6;
+  var _modal$state2, _modal$state4, _modal$state6, _context$appHelper4, _modal$state7;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -119,20 +118,22 @@ var Info = Provider(function (props) {
     });
   }, [globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, modal.state, modal.dispatch, globalState === null || globalState === void 0 ? void 0 : globalState.renderType]);
   var notes = useMemo(function () {
+    var _modal$state3;
     if (!modules.note) {
       return null;
     }
-    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' ? /*#__PURE__*/React.createElement(Notes, null) : null :
-    // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
-    null;
-  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote]);
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' ? /*#__PURE__*/React.createElement(Notes, null) : null : /*#__PURE__*/React.createElement(AddNote, {
+      value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote,
+      onChange: addNote
+    });
+  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state4 = modal.state) === null || _modal$state4 === void 0 || (_modal$state4 = _modal$state4.notes) === null || _modal$state4 === void 0 ? void 0 : _modal$state4.orderNote]);
   var currentDate = useMemo(function () {
-    var _modal$state4;
-    if ((_modal$state4 = modal.state) !== null && _modal$state4 !== void 0 && (_modal$state4 = _modal$state4.date) !== null && _modal$state4 !== void 0 && _modal$state4.value) {
+    var _modal$state5;
+    if ((_modal$state5 = modal.state) !== null && _modal$state5 !== void 0 && (_modal$state5 = _modal$state5.date) !== null && _modal$state5 !== void 0 && _modal$state5.value) {
       return modal.state.date.value.format('YYYY-MM-DD');
     }
     return null;
-  }, [(_modal$state5 = modal.state) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.date) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.value) === null || _modal$state5 === void 0 ? void 0 : _modal$state5.format('YYYY-MM-DD')]);
+  }, [(_modal$state6 = modal.state) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.date) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.value) === null || _modal$state6 === void 0 ? void 0 : _modal$state6.format('YYYY-MM-DD')]);
 
   /**
    * @title: 获取资源列表数据
@@ -265,42 +266,19 @@ var Info = Provider(function (props) {
         })
       });
     }
-  }), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, {
-    style: {
-      height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
-    },
+  }), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
+    style: style,
     header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {
       state: modal.state,
       dispatch: modal.dispatch,
       source: "info"
-    }),
-    bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode)),
-    state: modal.state,
-    dispatch: modal.dispatch,
-    source: "info"
-  }, /*#__PURE__*/React.createElement("div", {
+    })
+  }, "style", {
+    height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
+  }), "bodyClassName", classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode))), /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, createHeader, /*#__PURE__*/React.createElement("div", {
-    className: "booking-info-client-line"
-  }, modules.client ? globalState !== null && globalState !== void 0 && globalState.isBookingTicket2 ? /*#__PURE__*/React.createElement("div", {
-    style: {
-      flex: 1,
-      overflow: 'hidden'
-    }
-  }, /*#__PURE__*/React.createElement(CartClientCard, null)) : /*#__PURE__*/React.createElement(Client, null) : null, globalState !== null && globalState !== void 0 && globalState.isBookingTicket2 ? /*#__PURE__*/React.createElement("div", {
-    className: "booking-info-client-line-code",
-    onClick: function onClick() {
-      var _globalState$onQrCode;
-      globalState === null || globalState === void 0 || (_globalState$onQrCode = globalState.onQrCodeClick) === null || _globalState$onQrCode === void 0 || _globalState$onQrCode.call(globalState);
-    }
-  }, /*#__PURE__*/React.createElement(Iconfont, {
-    type: "pisell2-a-qr-code-02",
-    style: {
-      color: '#fff',
-      fontSize: 42
-    }
-  })) : null), modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: string;
+    locale: any;
     slice: any;
     selectProps: {
         size: string;

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

@@ -555,8 +555,7 @@ var AddTimeModal = function AddTimeModal() {
           case 22:
             // 回调关闭弹窗
             state === null || state === void 0 || state.action('init');
-            state === null || state === void 0 || state.callback({}, "save");
-          case 24:
+          case 23:
           case "end":
             return _context5.stop();
         }

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

@@ -30,7 +30,7 @@ import { renderBundles } from "../../../components/collapsibleList/utils";
 import { useUpdateEffect, useMemoizedFn, useDebounceFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
 import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProduct } from "../../../utils";
-import { getErrorList, getIsNoSpecAndPackage } from "../../utilsByBooking";
+import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
@@ -581,7 +581,7 @@ var Info = function Info(_, ref) {
     return false;
   }, [state.renderType, isNormalProduct]);
   var SelectTime = (_window$BaseMaterials = window.BaseMaterials) === null || _window$BaseMaterials === void 0 ? void 0 : _window$BaseMaterials.SelectTime;
-  var isNoSpecAndPackage = getIsNoSpecAndPackage(state.service.cacheItem);
+  console.log(isShowTimeAndResource, 'isShowTimeAndResource');
   var productName = useMemo(function () {
     var _state$service7;
     return /*#__PURE__*/React.createElement(Col, {
@@ -754,7 +754,7 @@ var Info = function Info(_, ref) {
         form.submit();
       }
     }, locales.getText('pisell2.text.apply')));
-  }, [(_state$service$resour2 = state.service.resourcesOrigin) === null || _state$service$resour2 === void 0 ? void 0 : _state$service$resour2.length]);
+  }, [(_state$service$resour2 = state.service.resourcesOrigin) === null || _state$service$resour2 === void 0 ? void 0 : _state$service$resour2.length, isNormalProduct]);
   console.log('render edit');
   console.log(state.service.editModal && !((_state$service$cacheI13 = state.service.cacheItem) !== null && _state$service$cacheI13 !== void 0 && _state$service$cacheI13.autoClose), performance.now() - window.pp1, '打开商品1');
   var _useState = useState(false),
@@ -777,7 +777,7 @@ var Info = function Info(_, ref) {
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
     mask: state.drawerMask,
-    open: !isNoSpecAndPackage && state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose),
+    open: state.service.editModal && !((_state$service$cacheI14 = state.service.cacheItem) !== null && _state$service$cacheI14 !== void 0 && _state$service$cacheI14.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {
       dispatch({

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

@@ -6,7 +6,7 @@ import "../../info/service/index.less";
 import AddTimeModal from "./addTimeModal";
 import useInfoHolder from "../../info/hooks/useInfoHolder";
 import Lists from "../../info/service/Lists";
-import EditNormalService from "./editNormalService";
+import useClearCart from "../../hooks/useClearCart";
 import useQuotation from "../../hooks/useQuotation";
 var Service = function Service() {
   var _useContext = useContext(Context),
@@ -17,21 +17,18 @@ var Service = function Service() {
     handleEdit = _useInfoHolder.handleEdit,
     handleAction = _useInfoHolder.handleAction,
     dispatchService = _useInfoHolder.dispatchService,
-    showAddTimeModal = _useInfoHolder.showAddTimeModal,
-    editNormalServiceRef = _useInfoHolder.editNormalServiceRef;
+    showAddTimeModal = _useInfoHolder.showAddTimeModal;
   useEffect(function () {
     document.body.id = 'body';
   }, []);
-
-  // const clearCart = useClearCart(state, dispatch);
-
+  var clearCart = useClearCart(state, dispatch);
   var _useQuotation = useQuotation(state, dispatch),
     dom = _useQuotation.dom;
   var renderMemo = useMemo(function () {
     console.log('render info22222');
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-service-wrap"
-    }, /*#__PURE__*/React.createElement(Lists, {
+    }, clearCart, /*#__PURE__*/React.createElement(Lists, {
       isParallelResource: true,
       onEdit: handleEdit,
       onAction: handleAction,
@@ -42,10 +39,8 @@ var Service = function Service() {
       onEdit: handleEdit
     }) : null), /*#__PURE__*/React.createElement(EditService, {
       ref: detailRef
-    }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), /*#__PURE__*/React.createElement(EditNormalService, {
-      ref: editNormalServiceRef
-    }), dom);
-  }, [dom, showAddTimeModal]);
+    }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null), dom);
+  }, [clearCart, dom, showAddTimeModal, clearCart]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, renderMemo);
 };
 export default /*#__PURE__*/React.memo(Service);

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

@@ -139,7 +139,7 @@ var ServiceItem = function ServiceItem(_ref) {
     icon: /*#__PURE__*/React.createElement(Iconfont, {
       type: "pisell2-trash-01"
     })
-  })), d.id || d.isCustomItem ? /*#__PURE__*/React.createElement("div", {
+  })), d.id ? /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-title"
   }, d.title) : null, d._extend && state.renderType !== 'eventBooking' ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-date"
@@ -149,7 +149,7 @@ var ServiceItem = function ServiceItem(_ref) {
     renderItem: function renderItem(item) {
       return renderBundles(item, state.amountSymbol);
     }
-  }) : null, d.id || d.isCustomItem ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+  }) : null, d.id ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-item-price-wrap"
   }, /*#__PURE__*/React.createElement("span", {
     className: "pisell-lowcode__booking-service-item-price"

package/es/components/booking/info2/utilsByBooking.d.ts

@@ -33,4 +33,3 @@ export declare const getAppointmentTimingPreference: (state: any) => any;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServiceStartTimeAndEndTime: (state: any, cacheItem: any, timeObj: any) => any;
-export declare const getIsNoSpecAndPackage: (product: any) => boolean;

package/es/components/booking/info2/utilsByBooking.js

@@ -10,8 +10,6 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import dayjs from 'dayjs';
 import { locales } from "@pisell/utils";
 import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
-import { isNormalProductByDurationSchedule } from "../info/service2/utils";
-import { isOption } from "../../ticketBooking/components/addServiceVariant/utils";
 
 // 获取当前剩余量
 var getUseableEventCount = function getUseableEventCount(eventList, current) {
@@ -321,19 +319,11 @@ export var getAppointmentTimingPreference = function getAppointmentTimingPrefere
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _state$service$value, _cacheItem$duration, _cacheItem$_extend2;
-  // 自定义商品不需要时间相关处理，直接返回基础扩展参数
-  if (cacheItem !== null && cacheItem !== void 0 && cacheItem.isCustomItem) {
-    return {
-      duration: null // 自定义商品没有时长概念
-    };
-  }
+  var _cacheItem$duration, _cacheItem$_extend2;
   var appointmentTimingPreference = getAppointmentTimingPreference(state);
 
-  // 获取上一个服务商品（过滤掉自定义商品）
-  var lastServer = getLastServer((_state$service$value = state.service.value) === null || _state$service$value === void 0 ? void 0 : _state$service$value.filter(function (item) {
-    return !item.isCustomItem;
-  }));
+  // 获取上一个服务商品
+  var lastServer = getLastServer(state.service.value);
 
   // 下一个商品的扩展参数
   var _extend = {
@@ -409,18 +399,4 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     }, 'minutes');
   }
   return _extend;
-};
-
-// 是否是无规格无套餐商品的非预约商品
-export var getIsNoSpecAndPackage = function getIsNoSpecAndPackage(product) {
-  var _product$variant;
-  if (!isNormalProductByDurationSchedule(product)) {
-    return false;
-  }
-  // 编辑状态参数判断
-  if (product !== null && product !== void 0 && product.isEditBooking) {
-    var _product$product_bund, _product$product_sku;
-    return (product === null || product === void 0 || (_product$product_bund = product.product_bundle) === null || _product$product_bund === void 0 ? void 0 : _product$product_bund.length) === 0 && (product === null || product === void 0 ? void 0 : product.product_variant_id) === 0 && ((product === null || product === void 0 || (_product$product_sku = product.product_sku) === null || _product$product_sku === void 0 || (_product$product_sku = _product$product_sku.option) === null || _product$product_sku === void 0 ? void 0 : _product$product_sku.length) || 0) === 0;
-  }
-  return (product === null || product === void 0 ? void 0 : product.is_bundle) === 0 && ((product === null || product === void 0 || (_product$variant = product.variant) === null || _product$variant === void 0 ? void 0 : _product$variant.length) || 0) === 0 && !isOption(product);
 };

package/es/components/booking/locales.d.ts

@@ -223,7 +223,6 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
-        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
@@ -241,30 +240,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.action-buttons.clear': string;
-        'pisell2.action-buttons.manuel-order': string;
-        'pisell2.action-buttons.customise-item': string;
-        'pisell2.action-buttons.no-items-to-adjust': string;
-        'pisell2.action-buttons.adjust-order-price': string;
-        'pisell2.action-buttons.price-adjusted-success': string;
-        'pisell2.action-buttons.clear-success': string;
-        'pisell2.text.manual-price-adjustment': string;
-        'pisell2.customise-item.modal-title': string;
-        'pisell2.customise-item.product-name': string;
-        'pisell2.customise-item.default-product-name': string;
-        'pisell2.customise-item.vouchers-applicable': string;
-        'pisell2.customise-item.sell-price': string;
-        'pisell2.customise-item.manual-deduction-price': string;
-        'pisell2.customise-item.amount-placeholder': string;
-        'pisell2.customise-item.save': string;
-        'pisell2.customise-item.save-success': string;
-        'pisell2.customise-item.price-required-error': (priceType: string) => string;
-        'pisell2.subtotal.total': string;
-        'pisell2.clear-cart-modal.title': string;
-        'pisell2.clear-cart-modal.clear-items-only': string;
-        'pisell2.clear-cart-modal.clear-all-reset': string;
-        'pisell2.clear-cart-modal.empty-cart-tip': string;
-        'pisell2.voucher-modal.title': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -298,7 +273,6 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
-        'pisell2.booking.notes.placeholder': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -524,7 +498,6 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
-        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
@@ -542,30 +515,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.action-buttons.clear': string;
-        'pisell2.action-buttons.manuel-order': string;
-        'pisell2.action-buttons.customise-item': string;
-        'pisell2.action-buttons.no-items-to-adjust': string;
-        'pisell2.action-buttons.adjust-order-price': string;
-        'pisell2.action-buttons.price-adjusted-success': string;
-        'pisell2.action-buttons.clear-success': string;
-        'pisell2.text.manual-price-adjustment': string;
-        'pisell2.customise-item.modal-title': string;
-        'pisell2.customise-item.product-name': string;
-        'pisell2.customise-item.default-product-name': string;
-        'pisell2.customise-item.vouchers-applicable': string;
-        'pisell2.customise-item.sell-price': string;
-        'pisell2.customise-item.manual-deduction-price': string;
-        'pisell2.customise-item.amount-placeholder': string;
-        'pisell2.customise-item.save': string;
-        'pisell2.customise-item.save-success': string;
-        'pisell2.customise-item.price-required-error': (priceType: string) => string;
-        'pisell2.subtotal.total': string;
-        'pisell2.clear-cart-modal.title': string;
-        'pisell2.clear-cart-modal.clear-items-only': string;
-        'pisell2.clear-cart-modal.clear-all-reset': string;
-        'pisell2.clear-cart-modal.empty-cart-tip': string;
-        'pisell2.voucher-modal.title': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -599,7 +548,6 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
-        'pisell2.booking.notes.placeholder': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -825,7 +773,6 @@ declare const _default: {
         'pisell2.booking.dashboard.departed-visitors': string;
         'pisell2.booking.dashboard.departed-visitors-tip': string;
         'pisell2.booking.dashboard.default': string;
-        'pisell2.booking.info.text.clear': string;
         'pisell2.booking.info.text.clear-cart': string;
         'pisell2.booking.info.text.clear-all': string;
         'pisell2.booking.info.text.create-new': string;
@@ -843,30 +790,6 @@ declare const _default: {
         'pisell2.text.missing.reservation.content': string;
         'pisell2.text.confirm': string;
         'pisell2.text.cancel': string;
-        'pisell2.action-buttons.clear': string;
-        'pisell2.action-buttons.manuel-order': string;
-        'pisell2.action-buttons.customise-item': string;
-        'pisell2.action-buttons.no-items-to-adjust': string;
-        'pisell2.action-buttons.adjust-order-price': string;
-        'pisell2.action-buttons.price-adjusted-success': string;
-        'pisell2.action-buttons.clear-success': string;
-        'pisell2.text.manual-price-adjustment': string;
-        'pisell2.customise-item.modal-title': string;
-        'pisell2.customise-item.product-name': string;
-        'pisell2.customise-item.default-product-name': string;
-        'pisell2.customise-item.vouchers-applicable': string;
-        'pisell2.customise-item.sell-price': string;
-        'pisell2.customise-item.manual-deduction-price': string;
-        'pisell2.customise-item.amount-placeholder': string;
-        'pisell2.customise-item.save': string;
-        'pisell2.customise-item.save-success': string;
-        'pisell2.customise-item.price-required-error': (priceType: string) => string;
-        'pisell2.subtotal.total': string;
-        'pisell2.clear-cart-modal.title': string;
-        'pisell2.clear-cart-modal.clear-items-only': string;
-        'pisell2.clear-cart-modal.clear-all-reset': string;
-        'pisell2.clear-cart-modal.empty-cart-tip': string;
-        'pisell2.voucher-modal.title': string;
         'pisell2.text.change.pet.title': string;
         'pisell2.text.change.pet.content': string;
         'pisell2.text.change.pet.content1': string;
@@ -900,7 +823,6 @@ declare const _default: {
         'pisell2.text.validity.valid_through': (str: string) => string;
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': string;
-        'pisell2.booking.notes.placeholder': string;
     };
 };
 export default _default;