@pisell/private-materials 3.2.38 → 3.3.0

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

@@ -41,4 +41,6 @@ export declare const getMultiDayPrices: (data: DataEntry[]) => ResultStructure;
  * @Date: 2024-11-29 11:19
  */
 export declare const isDayBooking: (shopId: number) => boolean;
+export declare const isOpenAddTime: (state: any) => boolean;
+export declare const isShowAddTime: (state: any, currentService: any) => boolean;
 export {};

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

@@ -5,6 +5,8 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import dayjs from "dayjs";
+import { getIsEdit } from "../utils";
+import { isUsableProduct } from "../info2/service/addTimeModal/utils";
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
   var _productDetail$bundle;
@@ -93,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581];
+  var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {
@@ -127,4 +129,46 @@ export var getMultiDayPrices = function getMultiDayPrices(data) {
 export var isDayBooking = function isDayBooking(shopId) {
   var dayBookingShops = [9];
   return dayBookingShops.includes(shopId);
+};
+var getAddTimeProducts = function getAddTimeProducts(state, currentService) {
+  return (state.addTimeProducts || []).some(function (item) {
+    return isUsableProduct(item.add_time, currentService);
+  });
+};
+export var isOpenAddTime = function isOpenAddTime(state) {
+  var _state$bookingConfig;
+  var appointment_card = (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.information_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_card) || {
+    quick_time: 1
+  };
+  // event预约不需要
+  if ((state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking') {
+    return false;
+  }
+
+  // 禁止编辑
+  if (state !== null && state !== void 0 && state.disabledEdit) {
+    return false;
+  }
+
+  // 未开启加时
+  if (appointment_card.quick_time !== 1) {
+    return false;
+  }
+  return true;
+};
+
+// 是否展示加时按钮
+export var isShowAddTime = function isShowAddTime(state, currentService) {
+  if (!isOpenAddTime(state)) {
+    return false;
+  }
+
+  // 如果在编辑态, 不展示加时
+  if (getIsEdit(state)) {
+    return false;
+  }
+  if (!getAddTimeProducts(state, currentService)) {
+    return false;
+  }
+  return true;
 };

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

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import React, { useContext, useEffect, useMemo } from 'react';
+import React, { useContext, useEffect, useMemo, useRef } from 'react';
 import { Provider, Context } from "../info/model";
 import Client from "../info/client";
 import Service from "./service";
@@ -54,6 +54,8 @@ var Info = Provider(function (props) {
     var _modal$state;
     return ((_modal$state = modal.state) === null || _modal$state === void 0 || (_modal$state = _modal$state.bookingConfig) === null || _modal$state === void 0 || (_modal$state = _modal$state.config) === null || _modal$state === void 0 || (_modal$state = _modal$state.basic) === null || _modal$state === void 0 ? void 0 : _modal$state.appointment_subject) || {};
   }, [(_modal$state2 = modal.state) === null || _modal$state2 === void 0 || (_modal$state2 = _modal$state2.bookingConfig) === null || _modal$state2 === void 0 || (_modal$state2 = _modal$state2.config) === null || _modal$state2 === void 0 || (_modal$state2 = _modal$state2.basic) === null || _modal$state2 === void 0 ? void 0 : _modal$state2.appointment_subject]);
+  var stateRef = useRef(globalState);
+  stateRef.current = globalState;
   var _useCreateBookingPage = useCreateBookingPageHeader(globalState),
     createHeader = _useCreateBookingPage.createHeader,
     isBookingCreatePage = _useCreateBookingPage.isBookingCreatePage,
@@ -152,16 +154,17 @@ var Info = Provider(function (props) {
                 timeoutNumber = 200;
                 modal.dispatch({
                   type: 'setService',
-                  payload: {
+                  payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
                     resourcesOrigin: bookingResourceList.list || [],
                     resourcesOriginMap: bookingResourceList.listMap
-                  }
+                  })
                 });
               }
             }
             try {
               // 同步最新数据用, 增加延迟为了不和getProduct接口冲突
               setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                var _stateRef$current;
                 var data;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
@@ -169,17 +172,17 @@ var Info = Provider(function (props) {
                       _context.next = 2;
                       return getResourceList({
                         date: currentDate
-                      });
+                      }, stateRef === null || stateRef === void 0 || (_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 ? void 0 : _stateRef$current.bookingId);
                     case 2:
                       data = _context.sent;
                       data.date = currentDate;
                       localStorage.setItem('bookingResourceList', JSON.stringify(data));
                       modal.dispatch({
                         type: 'setService',
-                        payload: {
+                        payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
                           resourcesOrigin: data.list || [],
                           resourcesOriginMap: data.listMap
-                        }
+                        })
                       });
                     case 6:
                     case "end":

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

@@ -1,5 +1,5 @@
-export declare const getResourceList: (params: any) => Promise<{
-    list: any;
+export declare const getResourceList: (params: any, bookingId?: number) => Promise<{
+    list: any[];
     listMap: any;
 }>;
 export declare const createBookings: (params: any) => Promise<any>;

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

@@ -3,10 +3,10 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { request } from "../utils";
-import { getNoResource2 } from "../mock";
+import { getFormatResourceListAndMap } from "./utils";
 export var getResourceList = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-    var _yield$request$getReq, data, resourceList;
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, bookingId) {
+    var _yield$request$getReq, data;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -15,21 +15,14 @@ export var getResourceList = /*#__PURE__*/function () {
         case 2:
           _yield$request$getReq = _context.sent;
           data = _yield$request$getReq.data;
-          resourceList = (data || {}).concat([getNoResource2({})]);
-          return _context.abrupt("return", {
-            list: resourceList,
-            listMap: resourceList.reduce(function (prev, item) {
-              prev[item.id] = item;
-              return prev;
-            }, {})
-          });
-        case 6:
+          return _context.abrupt("return", getFormatResourceListAndMap(data, bookingId));
+        case 5:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function getResourceList(_x) {
+  return function getResourceList(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -51,7 +44,7 @@ export var createBookings = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function createBookings(_x2) {
+  return function createBookings(_x3) {
     return _ref2.apply(this, arguments);
   };
 }();
@@ -73,7 +66,7 @@ export var editBookings = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function editBookings(_x3, _x4) {
+  return function editBookings(_x4, _x5) {
     return _ref3.apply(this, arguments);
   };
 }();

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import '../../../info/service/addService/index.less';
 interface AddServiceProps {

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

@@ -30,7 +30,7 @@ import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../../../info/service/serve";
 import { getIsBundleOrCombination } from "../../../info/utils";
 import { getProductExtend } from "./utils";
-import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
+import { formatProductListByCategory, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
@@ -174,8 +174,8 @@ var Info = function Info(props) {
             return state.apis.getServices(_objectSpread({
               skip: 1,
               num: 500,
-              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'service_product'],
-              with: ['category'],
+              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'service_product', 'session_product', 'session_ticket'],
+              with: ['category', 'resourceRelation'],
               ids: state.renderType === 'eventBooking' ? (_state$eventOtherPara2 = state.eventOtherParams) === null || _state$eventOtherPara2 === void 0 ? void 0 : _state$eventOtherPara2.productIds : undefined,
               open_quotation: 1,
               with_schedule: 1,
@@ -228,8 +228,9 @@ var Info = function Info(props) {
     }
   };
   var handleSelectProduct = function handleSelectProduct(item, type) {
-    // 是否有单规格 组合规格 套餐, 如果没有不需要打开弹窗
-    var isEject = type === 'detail' || item.bundle_group_count > 0;
+    var isSession = isSessionProduct(item);
+    // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
+    var isEject = type === 'detail' || item.bundle_group_count > 0 || isSession;
     var lock = false;
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -238,11 +239,12 @@ var Info = function Info(props) {
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: false,
-          session: false,
+          session: isSession,
           variant: false,
           package: true
         },
-        is_eject: isEject ? 1 : 0
+        is_eject: isEject ? 1 : 0,
+        isOS: isSession
       },
       callback: function callback(e, extension_type, detail) {
         // 防止选择商品弹窗多次触发callback
@@ -256,6 +258,8 @@ var Info = function Info(props) {
           lock = false;
         }, 2000);
         var _detail = detail || item;
+        var other = JSON.parse(JSON.stringify(e));
+        other.session = e.session;
         var cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
           product_id: item.id,
           _id: getUniqueId(),
@@ -265,7 +269,7 @@ var Info = function Info(props) {
             quantity: 1,
             price: _detail.price,
             product_name: item.title,
-            other: JSON.parse(JSON.stringify(e))
+            other: other
           },
           new: 1
         });
@@ -379,6 +383,7 @@ var Info = function Info(props) {
         }
       });
     }
+    return null;
     if (state.renderType === 'eventBooking') {
       return isService ? /*#__PURE__*/React.createElement("div", {
         style: {

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

@@ -78,3 +78,11 @@ export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any
  * @Date: 2024-06-01 13:25
  */
 export declare const getProductExtend: ({ cacheItem, state }: any) => any;
+/**
+ * @title: 格式化服务列表
+ * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据
+ * 使用with resourceRelation后 返回的resource_relation是实时数据
+ * 这里做一次转换
+ * @param list
+ */
+export declare const transServiceList: (list: any[]) => any[];

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

@@ -382,16 +382,32 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
       item.optional_resource = (item.optional_resource || []).filter(function (d) {
         return item.default_resource.indexOf(d) == -1;
       });
+      var getChildrenMetadata = function getChildrenMetadata(d) {
+        var combiningResources = [];
+        if (resourcesOriginMap[d].combined_resource && resourcesOriginMap[d].combined_resource.status === 1) {
+          resourcesOriginMap[d].combined_resource.resource_ids.forEach(function (id) {
+            if (resourcesOriginMap[id]) {
+              combiningResources.push(resourcesOriginMap[id]);
+            }
+          });
+        }
+        return {
+          children: combiningResources,
+          metadata: _objectSpread(_objectSpread({}, resourcesOriginMap[d].metadata), {}, {
+            combined_resource: resourcesOriginMap[d].combined_resource
+          })
+        };
+      };
 
       // 可选项
       var optional_resource = item.optional_resource.map(function (d) {
-        return (
-          // 合并数据, 将资源配置项添加到每一条内
-          resourcesOriginMap[d] ? Object.assign({}, resourcesOriginMap[d], {
-            form_id: form_id,
-            resourceType: item.type
-          }) : null
-        );
+        if (!resourcesOriginMap[d]) {
+          return null;
+        }
+        return Object.assign({}, resourcesOriginMap[d], _objectSpread({
+          form_id: form_id,
+          resourceType: item.type
+        }, getChildrenMetadata(d)));
       }).filter(function (d) {
         return d;
       }).concat(getNoResource2({
@@ -403,10 +419,10 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
         var item = resourcesOriginMap[d];
         if (item) {
           item.is_default = 1;
-          return Object.assign({}, item, {
+          return Object.assign({}, item, _objectSpread({
             form_id: form_id,
             resourceType: item.type
-          });
+          }, getChildrenMetadata(d)));
         } else {
           return null;
         }
@@ -432,11 +448,12 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
   return _resources;
 };
 var getIsAutoClose = function getIsAutoClose(cacheItem) {
-  if (cacheItem._data.capacitys.type !== 'custom') {
-    var _cacheItem$_data;
-    if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_data = cacheItem._data) === null || _cacheItem$_data === void 0 ? void 0 : _cacheItem$_data.resources.length) === 1) {
-      var _cacheItem$_data2, _first$select_type;
-      var first = cacheItem === null || cacheItem === void 0 || (_cacheItem$_data2 = cacheItem._data) === null || _cacheItem$_data2 === void 0 ? void 0 : _cacheItem$_data2.resources[0];
+  var _cacheItem$_data;
+  if (((_cacheItem$_data = cacheItem._data) === null || _cacheItem$_data === void 0 || (_cacheItem$_data = _cacheItem$_data.capacitys) === null || _cacheItem$_data === void 0 ? void 0 : _cacheItem$_data.type) !== 'custom') {
+    var _cacheItem$_data2;
+    if ((cacheItem === null || cacheItem === void 0 || (_cacheItem$_data2 = cacheItem._data) === null || _cacheItem$_data2 === void 0 ? void 0 : _cacheItem$_data2.resources.length) === 1) {
+      var _cacheItem$_data3, _first$select_type;
+      var first = cacheItem === null || cacheItem === void 0 || (_cacheItem$_data3 = cacheItem._data) === null || _cacheItem$_data3 === void 0 ? void 0 : _cacheItem$_data3.resources[0];
       if (((_first$select_type = first.select_type) === null || _first$select_type === void 0 ? void 0 : _first$select_type.type) === 'single') {
         if (first.default_resource.length > 0) {
           return true;
@@ -582,4 +599,22 @@ export var getProductExtend = function getProductExtend(_ref10) {
   }
   console.log('_cacheItem_cacheItem', _cacheItem);
   return _cacheItem;
+};
+
+/**
+ * @title: 格式化服务列表
+ * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据
+ * 使用with resourceRelation后 返回的resource_relation是实时数据
+ * 这里做一次转换
+ * @param list
+ */
+export var transServiceList = function transServiceList(list) {
+  return list.map(function (item) {
+    var _item$product_resourc;
+    return _objectSpread(_objectSpread({}, item), {}, {
+      product_resource: _objectSpread(_objectSpread({}, item.product_resource), {}, {
+        resources: (item === null || item === void 0 ? void 0 : item.resource_relation) || (item === null || item === void 0 || (_item$product_resourc = item.product_resource) === null || _item$product_resourc === void 0 ? void 0 : _item$product_resourc.resources)
+      })
+    });
+  });
 };

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

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

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

@@ -139,7 +139,7 @@ var AddTimeModal = function AddTimeModal() {
     var _loop = function _loop(form_id) {
       arr = [].concat(_toConsumableArray(arr), _toConsumableArray(resource[form_id].map(function (d) {
         var _state$service$cacheI2;
-        return (_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2._data.resourceMaps) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2[form_id]) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2.renderListMaps) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2[d.relation_id];
+        return (_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2._data) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2.resourceMaps) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2[form_id]) === null || _state$service$cacheI2 === void 0 || (_state$service$cacheI2 = _state$service$cacheI2.renderListMaps) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2[d.relation_id];
       })));
     };
     for (var form_id in resource) {

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

@@ -84,7 +84,7 @@ var Resources = function Resources(_ref, ref) {
     }, {}) : {};
     // 重新赋值, 因为select返回的是数字列表, 需要补充额外的数据
     _val[form_id] = val.map(function (d) {
-      var _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3;
+      var _currentForm$renderLi, _currentForm$renderLi2, _currentForm$renderLi3, _currentForm$renderLi4, _currentForm$renderLi5;
       var _d = maps[d];
       if (_d) {
         if (key === 'like_status') {
@@ -99,12 +99,13 @@ var Resources = function Resources(_ref, ref) {
           form_id: form_id,
           relation_id: d,
           like_status: 'common',
+          children: (_currentForm$renderLi2 = currentForm.renderListMaps) === null || _currentForm$renderLi2 === void 0 || (_currentForm$renderLi2 = _currentForm$renderLi2[d]) === null || _currentForm$renderLi2 === void 0 ? void 0 : _currentForm$renderLi2.children,
           // 新添加的数据补充错误信息
-          errors: getErrorList((_currentForm$renderLi2 = currentForm.renderListMaps) === null || _currentForm$renderLi2 === void 0 ? void 0 : _currentForm$renderLi2[d], getCurrentCacheItem()),
-          metadata: {
+          errors: getErrorList((_currentForm$renderLi3 = currentForm.renderListMaps) === null || _currentForm$renderLi3 === void 0 ? void 0 : _currentForm$renderLi3[d], getCurrentCacheItem()),
+          metadata: _objectSpread(_objectSpread({}, (_currentForm$renderLi4 = currentForm.renderListMaps) === null || _currentForm$renderLi4 === void 0 || (_currentForm$renderLi4 = _currentForm$renderLi4[d]) === null || _currentForm$renderLi4 === void 0 ? void 0 : _currentForm$renderLi4.metadata), {}, {
             form_name: currentForm.title,
-            resource_name: (_currentForm$renderLi3 = currentForm.renderListMaps[d]) === null || _currentForm$renderLi3 === void 0 ? void 0 : _currentForm$renderLi3.main_field
-          }
+            resource_name: (_currentForm$renderLi5 = currentForm.renderListMaps[d]) === null || _currentForm$renderLi5 === void 0 ? void 0 : _currentForm$renderLi5.main_field
+          })
         }
       );
     });

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

@@ -29,7 +29,7 @@ import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
 import { useUpdateEffect, useMemoizedFn } from 'ahooks';
 // import SelectTime from "../../../../../../../materials/src/components/select-time";
-import { getServiceTimes, deleteCacheParams, getProductTotalPrice } from "../../../utils";
+import { getServiceTimes, deleteCacheParams, getProductTotalPrice, isSessionProduct } from "../../../utils";
 import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj, setDefaultCapacitys } from "../addService/utils";
 import { PisellAdjustPriceInputNumber } from '@pisell/materials';
@@ -390,7 +390,7 @@ var Info = function Info(_, ref) {
 
     // 表单数据
     var values = form.getFieldsValue();
-
+    var isSession = isSessionProduct(item);
     // 打开商品详情弹窗
     state.action({
       type: 'pisell1.handleOpenProductModal',
@@ -399,10 +399,11 @@ var Info = function Info(_, ref) {
         date: state.date.value.format('YYYY-MM-DD'),
         showConfig: {
           option: false,
-          session: false,
+          session: isSession,
           variant: false,
           package: true
         },
+        isOS: isSession,
         value: item._extend.other
       },
       callback: function callback(e, extension_type, detail) {

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

@@ -1,57 +1,38 @@
-import React, { useEffect, useContext, useMemo, useRef } from 'react';
+import React, { useEffect, useContext } from 'react';
 import AddService from "./addService";
 import { Context } from "../../info/model";
 import EditService from "./editService";
 import "../../info/service/index.less";
-import ServiceList from "./serviceList";
 import AddTimeModal from "./addTimeModal";
+import useInfoHolder from "../../info/hooks/useInfoHolder";
+import Lists from "../../info/service/Lists";
 import useClearCart from "../../hooks/useClearCart";
 var Service = function Service() {
-  var _state$bookingConfig2;
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
-  var detailRef = useRef();
+  var _useInfoHolder = useInfoHolder(state, dispatch),
+    detailRef = _useInfoHolder.detailRef,
+    handleEdit = _useInfoHolder.handleEdit,
+    handleAction = _useInfoHolder.handleAction,
+    dispatchService = _useInfoHolder.dispatchService,
+    showAddTimeModal = _useInfoHolder.showAddTimeModal;
   useEffect(function () {
     document.body.id = 'body';
   }, []);
-  var appointment_card = useMemo(function () {
-    var _state$bookingConfig;
-    return (state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.information_tab) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.appointment_card) || {
-      quick_time: 1
-    };
-  }, [state === null || state === void 0 || (_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.information_tab]);
-  var showAddTimeModal = useMemo(function () {
-    // event预约不需要
-    if ((state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking') {
-      return false;
-    }
-
-    // 禁止编辑
-    if (state !== null && state !== void 0 && state.disabledEdit) {
-      return false;
-    }
-
-    // 未开启加时
-    if (appointment_card.quick_time !== 1) {
-      return false;
-    }
-    return true;
-  }, [state, appointment_card.quick_time]);
-  var handleEdit = function handleEdit(cacheItem) {
-    setTimeout(function () {
-      var _detailRef$current, _detailRef$current$in;
-      (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current$in = _detailRef$current.init) === null || _detailRef$current$in === void 0 || _detailRef$current$in.call(_detailRef$current, cacheItem);
-    }, 100);
-  };
   var clearCart = useClearCart(state, dispatch);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-lowcode__booking-service-wrap"
-  }, clearCart, /*#__PURE__*/React.createElement(ServiceList, {
-    onEdit: handleEdit
-  }), /*#__PURE__*/React.createElement(AddService, {
+  }, clearCart, /*#__PURE__*/React.createElement(Lists, {
+    isParallelResource: true,
+    onEdit: handleEdit,
+    onAction: handleAction,
+    onChange: function onChange(e, type) {
+      return dispatchService(type || 'setService', e);
+    }
+  }), !state.isBookingCreatePage ? /*#__PURE__*/React.createElement(AddService, {
     onEdit: handleEdit
-  })), /*#__PURE__*/React.createElement(EditService, {
+  }) : null), /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
   }), showAddTimeModal && /*#__PURE__*/React.createElement(AddTimeModal, null));
 };

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

@@ -0,0 +1,4 @@
+export declare const getFormatResourceListAndMap: (data: any[], bookingId?: number) => {
+    list: any[];
+    listMap: any;
+};

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

@@ -0,0 +1,43 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import { getNoResource2 } from "../mock";
+export var getFormatResourceListAndMap = function getFormatResourceListAndMap(data, bookingId) {
+  var resourceList = (data || {}).concat([getNoResource2({})]);
+  var map = resourceList.reduce(function (prev, item) {
+    prev[item.id] = item;
+    return prev;
+  }, {});
+  var getCapacity = function getCapacity(item) {
+    var _item$combined_resour, _item$combined_resour2;
+    if (((_item$combined_resour = item.combined_resource) === null || _item$combined_resour === void 0 ? void 0 : _item$combined_resour.status) === 1 && (_item$combined_resour2 = item.combined_resource) !== null && _item$combined_resour2 !== void 0 && (_item$combined_resour2 = _item$combined_resour2.resource_ids) !== null && _item$combined_resour2 !== void 0 && _item$combined_resour2.length) {
+      var _item$combined_resour3;
+      return (_item$combined_resour3 = item.combined_resource) === null || _item$combined_resour3 === void 0 ? void 0 : _item$combined_resour3.resource_ids.reduce(function (pre, cur) {
+        var pax = 0;
+        map[cur].times.forEach(function (time) {
+          time.event_list.forEach(function (event) {
+            if (event.id !== bookingId) {
+              pax += (event === null || event === void 0 ? void 0 : event.pax) || 0;
+            }
+          });
+        });
+        return pre - pax;
+      }, item.capacity);
+    }
+    return item.capacity;
+  };
+  resourceList = resourceList.map(function (item) {
+    var newItem = _objectSpread(_objectSpread({}, item), {}, {
+      capacity: getCapacity(item)
+    });
+    map[item.id] = newItem;
+    return newItem;
+  });
+  return {
+    list: resourceList,
+    listMap: map
+  };
+};

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

@@ -9,7 +9,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import dayjs from 'dayjs';
 import { locales } from "@pisell/utils";
-import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration } from "../utils";
+import { getCacheParams, getServeStartTime, getLastServer, flexibleObj, getServiceTimes, findNextDuration, getDays, isSessionProduct } from "../utils";
 
 // 获取当前剩余量
 var getUseableEventCount = function getUseableEventCount(eventList, current) {
@@ -69,7 +69,9 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
   });
 
   // 已预约的列表
-  var eventList = time.event_list || [];
+  var eventList = (time.event_list || []).filter(function (event) {
+    return event.id !== (cacheItem === null || cacheItem === void 0 ? void 0 : cacheItem.booking_id);
+  });
   var endDate = null;
   // 是否去计算数量
   var isCalcCount = true;
@@ -113,7 +115,7 @@ export var getResourceTimeIsUsable = function getResourceTimeIsUsable(item, cach
     */
 
     // 取出已预约列表和当前预约重叠的时间段
-    var conflict = (time.event_list || []).filter(function (d) {
+    var conflict = (eventList || []).filter(function (d) {
       return isConflict({
         start_at: d.start_at,
         end_at: d.end_at
@@ -293,7 +295,7 @@ export var formatResource = function formatResource(resourceItem, cacheItem, for
  * @Date: 2024-01-26 14:09
  */
 export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTime(state, cacheItem, timeObj) {
-  var _cacheItem$duration;
+  var _cacheItem$duration, _cacheItem$_extend;
   // 获取上一个服务商品
   var lastServer = getLastServer(state.service.value);
 
@@ -353,5 +355,16 @@ export var getServiceStartTimeAndEndTime = function getServiceStartTimeAndEndTim
     endDate = _getServiceTimes2.endDate;
   _extend.startDate = startDate;
   _extend.endDate = endDate;
+  var session = cacheItem === null || cacheItem === void 0 || (_cacheItem$_extend = cacheItem._extend) === null || _cacheItem$_extend === void 0 || (_cacheItem$_extend = _cacheItem$_extend.other) === null || _cacheItem$_extend === void 0 ? void 0 : _cacheItem$_extend.session;
+  if (isSessionProduct(cacheItem) && session) {
+    _extend.start_date = session.start_at;
+    _extend.startDate = session.start_at;
+    _extend.start_time = session.start_time;
+    _extend.end_date = session.end_at;
+    _extend.endDate = session.end_at;
+    _extend.duration = getDays({
+      _extend: _extend
+    }, 'minutes');
+  }
   return _extend;
 };