@pisell/private-materials 3.0.203 → 3.0.204

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

@@ -24,22 +24,18 @@ import Drawer from "../../../components/drawer";
 import TabProduct from "../../../components/TabProduct";
 import { Context } from "../../model";
 import AddButton from "../../../components/addButton";
-import { Input, Skeleton, Row, Col } from 'antd';
+import { Input, Skeleton } from 'antd';
 import "./index.less";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../serve";
 import { getIsBundleOrCombination } from "../../utils";
-import DateRange from "../../dateRange";
-import { formatProductListByCategory, request } from "../../../utils";
-import { isDayBooking, getDayProducts, holderId } from "../../service2/utils";
-import { inputDateCol, appointmentTypes } from "../../service2/status";
+import { getProductExtend } from "./utils";
+import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
-import debounce from 'lodash/debounce';
-import { useService } from "../serviceManager";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(props) {
-  var _state$client2, _state$client2$value, _state$service2, _state2, _state$service5, _state$service7, _state$service7$cache, _state3;
+  var _state$service3, _state$service6, _state$service8, _state$service8$cache;
   var onEdit = props.onEdit,
     drawerProps = props.drawerProps,
     renderMode = props.renderMode;
@@ -55,80 +51,10 @@ var Info = function Info(props) {
     loading = _useState4[0],
     setLoading = _useState4[1];
   var searchRef = useRef();
-  // 头部高度
-  var headerRef = useRef(null);
-  var _useState5 = useState(0),
-    _useState6 = _slicedToArray(_useState5, 2),
-    headerHeight = _useState6[0],
-    setHeaderHeight = _useState6[1];
   var context = useEngineContext();
   state = state || (props === null || props === void 0 ? void 0 : props.state);
   dispatch = dispatch || (props === null || props === void 0 ? void 0 : props.dispatch);
   request.setRequest(context.appHelper.utils.request);
-  var _useService = useService({
-      renderMode: renderMode,
-      onEdit: onEdit,
-      state: state,
-      dispatch: dispatch
-    }),
-    createBookingData = _useService.createBookingData,
-    createBooking = _useService.createBooking;
-  /**
-   * @title: 是否是跨日预约
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2024-12-09 15:46
-   */
-  var isDay = useMemo(function () {
-    return isDayBooking(state);
-  }, [state.renderType]);
-
-  /**
-   * @title: 监听元素高度变化的函数
-   * @description:
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2024-12-10 17:13
-   */
-  var handleResize = function handleResize() {
-    if (headerRef !== null && headerRef !== void 0 && headerRef.current) {
-      var _headerRef$current;
-      setHeaderHeight((_headerRef$current = headerRef.current) === null || _headerRef$current === void 0 ? void 0 : _headerRef$current.offsetHeight);
-    }
-  };
-
-  // 使用防抖的监听函数
-  var debouncedHandleResize = debounce(handleResize, 100);
-  useEffect(function () {
-    if (isDay && state.isTerminalDayBookingPage) {
-      // 初始化时设置一次高度
-      handleResize();
-
-      // 添加窗口大小变化的监听器
-      window.addEventListener('resize', debouncedHandleResize);
-    }
-
-    // 清理函数
-    return function () {
-      window.removeEventListener('resize', debouncedHandleResize);
-    };
-  }, [debouncedHandleResize]);
-
-  /**
-   * @title: 客户id
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2024-12-24 10:33
-   */
-  var customerId = useMemo(function () {
-    var _state$client, _state$client$value;
-    if (!isDay) return undefined;
-    return ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : (_state$client$value = _state$client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id) || 1;
-  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : (_state$client2$value = _state$client2.value) === null || _state$client2$value === void 0 ? void 0 : _state$client2$value.id, isDay]);
 
   /**
    * @title: 如果商品只有一个, 则自动设置默认商品
@@ -173,8 +99,7 @@ var Info = function Info(props) {
             product = list[0];
             _context.next = 13;
             return getProductDetail(product.id, {
-              schedule_date: state.date.value.format('YYYY-MM-DD'),
-              customer_id: customerId
+              schedule_date: state.date.value.format('YYYY-MM-DD')
             });
           case 13:
             detail = _context.sent;
@@ -195,7 +120,7 @@ var Info = function Info(props) {
               _extend: {
                 start_date: state.date.value,
                 startDate: state.date.value,
-                endDate: isDay ? state.date.end_date : state.date.value,
+                endDate: state.date.value,
                 start_time: '00:00:00',
                 duration: 10,
                 quantity: 1,
@@ -226,7 +151,7 @@ var Info = function Info(props) {
   var getServices = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
       var _state$eventOtherPara, _state$eventOtherPara2, _state$eventOtherPara3;
-      var dayParams, data, lists, _state, id;
+      var data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -245,13 +170,8 @@ var Info = function Info(props) {
             setLoading(false);
             return _context2.abrupt("return");
           case 5:
-            dayParams = {}; // 跨日预约
-            if (isDay) {
-              dayParams.extension_type = ['normal', 'product_appointment'];
-              dayParams.customer_id = customerId;
-            }
-            _context2.next = 9;
-            return state.apis.getServices(_objectSpread(_objectSpread({
+            _context2.next = 7;
+            return state.apis.getServices(_objectSpread({
               skip: 1,
               num: 500,
               extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket'],
@@ -268,27 +188,22 @@ var Info = function Info(props) {
               _config: {
                 useCache: true
               }
-            }), dayParams));
-          case 9:
+            }));
+          case 7:
             data = _context2.sent;
             setLoading(false);
-            lists = (data === null || data === void 0 ? void 0 : data.list) || []; // 跨日预约过滤商品列表
-            if (isDay) {
-              id = holderId(state);
-              lists = getDayProducts(id, lists, (_state = state) === null || _state === void 0 ? void 0 : _state.isTerminalDayBookingPage);
-            }
 
             // 只有自动获取列表的时候才设置商品, 手动点击添加按钮的时候不设置
             if (!state.service.addModal) {
-              setDefaultService(lists);
+              setDefaultService(data === null || data === void 0 ? void 0 : data.list);
             }
             dispatch({
               type: 'setService',
               payload: {
-                services: lists
+                services: (data === null || data === void 0 ? void 0 : data.list) || []
               }
             });
-          case 15:
+          case 11:
           case "end":
             return _context2.stop();
         }
@@ -315,94 +230,112 @@ var Info = function Info(props) {
   var handleSelectProduct = useMemoizedFn(function (item, type) {
     // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
     var isEject = type === 'detail' || item.bundle_group_count > 0;
-
-    // 跨日预约开启单规格 组合规格 套餐
-    if (isDay) {
-      isEject = type === 'detail' || item.bundle_group_count > 0 || item.option_group_count > 0 || item.is_variant > 0;
-    }
+    var lock = false;
     state.action({
       type: 'pisell1.handleOpenProductModal',
       data: {
         id: item.id,
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
-          option: isDay ? true : false,
+          option: false,
           session: false,
-          variant: isDay ? true : false,
+          variant: false,
           package: true
         },
-        is_eject: isEject ? 1 : 0,
-        customer_id: customerId
+        is_eject: isEject ? 1 : 0
       },
-      callback: function () {
-        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e) {
-          var data;
-          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-            while (1) switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return createBookingData({
-                  product: _objectSpread(_objectSpread({}, item), {}, {
-                    _params: e
-                  })
-                });
-              case 2:
-                data = _context3.sent;
-                // 创建预约
-                createBooking({
-                  booking: data
-                });
-              case 4:
-              case "end":
-                return _context3.stop();
-            }
-          }, _callee3);
-        }));
-        function callback(_x4) {
-          return _callback.apply(this, arguments);
+      callback: function callback(e) {
+        // 防止选择商品弹窗多次触发callback
+        if (lock) {
+          return;
         }
-        return callback;
-      }()
-    });
-  });
-  var renderList = useMemo(function () {
-    var _state$service;
-    var _list = ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.services) || [];
+        lock = true;
 
-    // 跨日预约
-    if (isDay) {
-      // 公共购物车下过滤掉预约商品
-      if (!holderId(state)) {
-        _list = _list.filter(function (item) {
-          return !appointmentTypes.includes(item.extension_type);
+        // 2秒后解除
+        setTimeout(function () {
+          lock = false;
+        }, 2000);
+        var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
+          product_id: item.id,
+          _id: getUniqueId(),
+          _key: e.key,
+          _extend: {
+            start_date: state.date.value,
+            quantity: 1,
+            price: item.price,
+            product_name: item.title,
+            other: JSON.parse(JSON.stringify(e))
+          },
+          new: 1
+        });
+        var _total = getProductTotalPrice(cacheItem);
+        // 用于折扣 可修改
+        cacheItem._extend.total = _total;
+        // 用于储存原价
+        cacheItem._extend.origin_total = _total;
+        var _isEdit = !!state.service.cacheItem;
+        if (_isEdit) {
+          var _state$service$cacheI;
+          cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
+          cacheItem.new = 0;
+        }
+        // 渲染到当前位置模式时，默认无资源 时间默认取顶部设置的时间
+        if (renderMode === 'current') {
+          // cacheItem._extend.resource = 0;
+          cacheItem.currentDefaultTime = state.date.value.format('HH:mm');
+        }
+        cacheItem._extend = getProductExtend({
+          cacheItem: cacheItem,
+          state: state
+        });
+        if (state.renderType === 'eventBooking') {
+          cacheItem.autoClose = false;
+        } else {
+          var _state$service;
+          cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || []).length === 1);
+        }
+        dispatch({
+          type: 'setService',
+          payload: {
+            editModal: true,
+            cacheItem: cacheItem,
+            addModal: !cacheItem.autoClose,
+            changeService: false
+          }
         });
+        onEdit === null || onEdit === void 0 ? void 0 : onEdit(cacheItem);
       }
-    }
+    });
+  });
+  var renderList = useMemo(function () {
+    var _state$service2;
+    var _list = ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services) || [];
     var isIncludes = function isIncludes(str) {
       return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
     };
     return formatProductListByCategory(_list, search ? function (item) {
       return isIncludes(item.title);
     } : undefined);
-  }, [search, (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services, (_state2 = state) === null || _state2 === void 0 ? void 0 : _state2.activeCartId]);
+  }, [search, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.services]);
+  console.log('state.service.renderList', renderList);
   var isService = useMemo(function () {
-    var _state$service3, _state$service3$value;
-    return ((_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : (_state$service3$value = _state$service3.value) === null || _state$service3$value === void 0 ? void 0 : _state$service3$value.length) > 0;
+    var _state$service4, _state$service4$value;
+    return ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$value = _state$service4.value) === null || _state$service4$value === void 0 ? void 0 : _state$service4$value.length) > 0;
   }, [state.service.value]);
   useEffect(function () {
-    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service4, _state$service4$value;
+    var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _state$service5, _state$service5$value;
     // Salonip 不要这个
     if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.global) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.globalConfig) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.id) || state.closeAutoOpenService) {
       return;
     }
 
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$value = _state$service4.value) === null || _state$service4$value === void 0 ? void 0 : _state$service4$value.length) === 0) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : (_state$service5$value = _state$service5.value) === null || _state$service5$value === void 0 ? void 0 : _state$service5$value.length) === 0) {
       setTimeout(function () {
         handleSelectService();
       }, 10);
     }
-  }, [state.modalOpen, state.bookingId, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
+  }, [state.modalOpen, state.bookingId, (_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : _state$service6.value]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -429,10 +362,6 @@ var Info = function Info(props) {
     }
   }, [state.renderType, state.modalOpen]);
   var addButton = useMemo(function () {
-    // 跨日预约不显示添加服务按钮
-    if (isDay) {
-      return;
-    }
     if (state.isBookingCreatePage) {
       return /*#__PURE__*/React.createElement("div", {
         style: {
@@ -467,31 +396,11 @@ var Info = function Info(props) {
   var isRenderCurrent = useMemo(function () {
     return renderMode === 'current';
   }, [renderMode]);
-
-  /**
-   * @title: 日期宽度
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2024-12-09 15:46
-   */
-  var colSpan = useMemo(function () {
-    var isTerminal = state.isTerminalDayBookingPage;
-    var showDate = !!(isDay && holderId(state));
-    return inputDateCol(showDate, isTerminal);
-  }, [state.isTerminalDayBookingPage, isDay, holderId(state)]);
   return useMemo(function () {
-    var _state$service6, _state$service6$cache;
+    var _state$service7, _state$service7$cache;
     var header = /*#__PURE__*/React.createElement("div", {
-      className: 'pisell-lowcode__booking-service-header',
-      ref: headerRef
-    }, /*#__PURE__*/React.createElement(Row, {
-      gutter: [16, 16]
-    }, isDay && holderId(state) ? /*#__PURE__*/React.createElement(Col, colSpan.date, /*#__PURE__*/React.createElement(DateRange, {
-      state: state,
-      dispatch: dispatch
-    })) : null, /*#__PURE__*/React.createElement(Col, colSpan.input, /*#__PURE__*/React.createElement(Input, {
+      className: 'pisell-lowcode__booking-service-header'
+    }, /*#__PURE__*/React.createElement(Input, {
       ref: searchRef,
       prefix: /*#__PURE__*/React.createElement(SearchLg, null),
       style: {
@@ -504,9 +413,9 @@ var Info = function Info(props) {
       onChange: function onChange(e) {
         setSearch(e.target.value);
       }
-    }))));
+    }));
     var content = /*#__PURE__*/React.createElement("div", {
-      className: isDay && headerHeight > 76 ? 'pisell-lowcode__booking-service-date-body' : 'pisell-lowcode__booking-service-body'
+      className: 'pisell-lowcode__booking-service-body'
     }, /*#__PURE__*/React.createElement(TabProduct, {
       list: renderList,
       amountSymbol: state.amountSymbol,
@@ -523,14 +432,14 @@ var Info = function Info(props) {
         }
       }, header, content);
     }
-    return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : _state$service6$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : _state$service7$cache.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
       loading: true,
       active: true,
       round: true
     }), addButton, /*#__PURE__*/React.createElement(Drawer, _extends({
       titleNoWrap: true,
-      open: state.service.addModal && !state.isBookingCreatePage && !state.isTerminalDayBookingPage,
-      title: isDay ? locales.getText('pisell2.text.select.items') : locales.getText('pisell2.text.select-service'),
+      open: state.service.addModal && !state.isBookingCreatePage,
+      title: locales.getText('pisell2.text.select-service'),
       rootClassName: "booking-server-wrap",
       onClose: function onClose() {
         dispatch({
@@ -543,6 +452,6 @@ var Info = function Info(props) {
       },
       header: header
     }, drawerProps || {}), content));
-  }, [(_state$service7 = state.service) === null || _state$service7 === void 0 ? void 0 : (_state$service7$cache = _state$service7.cacheItem) === null || _state$service7$cache === void 0 ? void 0 : _state$service7$cache.autoClose, addButton, state.service.addModal, locales, search, renderList, state.amountSymbol, state.renderType, (_state3 = state) === null || _state3 === void 0 ? void 0 : _state3.activeCartId, headerHeight, holderId(state)]);
+  }, [(_state$service8 = state.service) === null || _state$service8 === void 0 ? void 0 : (_state$service8$cache = _state$service8.cacheItem) === null || _state$service8$cache === void 0 ? void 0 : _state$service8$cache.autoClose, addButton, state.service.addModal, locales, search, renderList, state.amountSymbol]);
 };
 export default Info;

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

@@ -3,9 +3,8 @@
   // border-bottom: 1px solid var(--gray-300, #D0D5DD);
 }
 
-.pisell-lowcode__booking-service-body,
-.pisell-lowcode__booking-service-date-body {
-  background: var(--gray-50, #f9fafb);
+.pisell-lowcode__booking-service-body {
+  background: var(--gray-50, #F9FAFB);
 }
 
 .pisell-lowcode__booking-vertical-add-service-wrap {
@@ -26,7 +25,6 @@
   .booking-category-list {
     padding: 0 16px !important;
   }
-
   .pisell-lowcode__booking-service-body {
     .booking-tab-product {
       .booking-tabs-wrap {
@@ -34,12 +32,4 @@
       }
     }
   }
-
-  .pisell-lowcode__booking-service-date-body {
-    .booking-tab-product {
-      .booking-tabs-wrap {
-        top: 136px !important;
-      }
-    }
-  }
-}
+}

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

@@ -1,4 +1,4 @@
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 export declare const getDurationProps: ({ cacheItem, useStartTime, currentResource, slice, }: any) => {
     startDate: dayjs.Dayjs;
     usableTime: any;
@@ -48,7 +48,7 @@ export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, st
  * @Author: zhiwei.Wang
  * @Date: 2024-01-09 13:38
  */
-export declare const formatResources: ({ cacheItem, resourcesOrigin, isDay }: any) => any[];
+export declare const formatResources: ({ cacheItem, resourcesOrigin }: any) => any[];
 export declare const checkCacheItemResource: ({ cacheItem, resources }: any) => any;
 /**
  * @title: 预生成服务的 extend
@@ -59,13 +59,3 @@ export declare const checkCacheItemResource: ({ cacheItem, resources }: any) =>
  * @Date: 2024-06-01 13:25
  */
 export declare const getProductExtend: ({ cacheItem, state }: any) => any;
-/**
- * @title: 获取资源标题
- * @description:
- * @param {any} param1
- * @return {*}
- * @Author: WangHan
- * @Date: 2024-12-09 15:53
- */
-export declare const getResourceTitle: ({ state, id }: any) => any;
-export declare const getMultiDay: ({ start_date, end_date, state, cacheItem, }: any) => Promise<any>;