@pisell/private-materials 3.3.89 → 3.3.91

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

@@ -10,11 +10,6 @@ interface PriceDetail {
     taxTitle?: string;
     totalTaxFee?: string;
     isPriceIncludeTax?: 0 | 1;
-    deposit?: {
-        total: string;
-        protocols: any[];
-        hasDeposit: boolean;
-    };
 }
 /**
  * 计算商品小计（不含其他费用）
@@ -30,7 +25,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组
@@ -38,14 +33,4 @@ export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.0
  * @returns 价格明细对象
  */
 export declare const calculatePriceDetails: (shopInfo: any, items: CartItem[]) => PriceDetail;
-/**
- * @title: 计算定金
- * @param items - 购物车商品数组
- * @returns 定金字符串，保留2位小数
- */
-export declare const calculateDeposit: (items: CartItem[]) => {
-    total: string;
-    protocols: any[];
-    hasDeposit: never;
-} | undefined;
 export {};

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

@@ -54,53 +54,11 @@ export var calculatePriceDetails = function calculatePriceDetails(shopInfo, item
 
   // 计算总价
   var total = shopInfo !== null && shopInfo !== void 0 && shopInfo.is_price_include_tax ? subtotal : subtotal.plus(totalTaxFee);
-
-  // 计算定金
-  var deposit = calculateDeposit(items);
   return {
     subtotal: subtotal.toFixed(2),
     total: total.toFixed(2),
     taxTitle: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.tax_title,
     totalTaxFee: totalTaxFee.toFixed(2),
-    isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax,
-    deposit: deposit
+    isPriceIncludeTax: shopInfo === null || shopInfo === void 0 ? void 0 : shopInfo.is_price_include_tax
   };
-};
-
-/**
- * @title: 计算定金
- * @param items - 购物车商品数组
- * @returns 定金字符串，保留2位小数
- */
-export var calculateDeposit = function calculateDeposit(items) {
-  if (!(items !== null && items !== void 0 && items.length)) {
-    return undefined;
-  }
-  var protocols = [];
-  var hasDeposit = false;
-  var total = items.reduce(function (sum, item) {
-    if (item !== null && item !== void 0 && item.deposit) {
-      var _item$deposit, _item$deposit2;
-      hasDeposit = true;
-      var cartItemTotalPrice = new Decimal((item === null || item === void 0 || (_item$deposit = item.deposit) === null || _item$deposit === void 0 ? void 0 : _item$deposit.total) || 0);
-      // 将协议数据去重合并
-      item === null || item === void 0 || (_item$deposit2 = item.deposit) === null || _item$deposit2 === void 0 || (_item$deposit2 = _item$deposit2.protocols) === null || _item$deposit2 === void 0 || _item$deposit2.forEach(function (protocol) {
-        if (protocols.findIndex(function (p) {
-          return p.id === protocol.id;
-        }) === -1) {
-          protocols.push(protocol);
-        }
-      });
-      return sum.plus(cartItemTotalPrice);
-    }
-    return sum;
-  }, new Decimal(0));
-  if (hasDeposit) {
-    return {
-      total: total.toFixed(2),
-      protocols: protocols,
-      hasDeposit: hasDeposit
-    };
-  }
-  return undefined;
 };

package/es/components/appointmentBooking/components/Cart/Item/index.less

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(var(--vh, 1vh) * 100 - 100px);
+  height: calc(100vh - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  > div {
+  >div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

package/es/components/appointmentBooking/components/Content/index.less

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
+      height: calc(100vh - 16px) !important;
     }
   }
 }

package/es/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,9 +1,3 @@
 import './index.less';
-export declare const DepositContent: (props: {
-    isAgreeDepositPolicy: boolean;
-    setIsAgreeDepositPolicy: (value: boolean) => void;
-    deposit: any;
-    depositProtocolRequest?: any;
-}) => JSX.Element;
 declare const Deposit: () => JSX.Element;
 export default Deposit;

package/es/components/appointmentBooking/components/Deposit/index.js

@@ -4,11 +4,12 @@ import AppointmentDeposit from "../../deposit";
 import { useAppointmentBookingContext } from "../../context";
 import { locales } from '@pisell/utils';
 import "./index.less";
-export var DepositContent = function DepositContent(props) {
-  var isAgreeDepositPolicy = props.isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy = props.setIsAgreeDepositPolicy,
-    deposit = props.deposit,
-    depositProtocolRequest = props.depositProtocolRequest;
+var Deposit = function Deposit() {
+  var _useAppointmentBookin = useAppointmentBookingContext(),
+    setIsAgreeDepositPolicy = _useAppointmentBookin.setIsAgreeDepositPolicy,
+    isAgreeDepositPolicy = _useAppointmentBookin.isAgreeDepositPolicy,
+    summary = _useAppointmentBookin.summary;
+  var deposit = summary.deposit;
   return /*#__PURE__*/React.createElement("div", {
     className: "appointment-deposit-wrap"
   }, /*#__PURE__*/React.createElement("div", {
@@ -23,28 +24,7 @@ export var DepositContent = function DepositContent(props) {
     isAgreePolicy: isAgreeDepositPolicy,
     onChange: function onChange(value) {
       return setIsAgreeDepositPolicy(value);
-    },
-    depositProtocolRequest: depositProtocolRequest
+    }
   }));
 };
-var Deposit = function Deposit() {
-  var _ref = useAppointmentBookingContext(),
-    setIsAgreeDepositPolicy = _ref.setIsAgreeDepositPolicy,
-    isAgreeDepositPolicy = _ref.isAgreeDepositPolicy,
-    summary = _ref.summary,
-    appointmentBooking = _ref.appointmentBooking;
-  var deposit = summary.deposit;
-
-  // 获取协议方法需要在组件中定义才能传递给子组件，子组件无法获取到context中的方法
-  var depositProtocolRequest = function depositProtocolRequest(id) {
-    var _appointmentBooking$g;
-    return appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$g = appointmentBooking.getProtocol) === null || _appointmentBooking$g === void 0 ? void 0 : _appointmentBooking$g.call(appointmentBooking, id);
-  };
-  return /*#__PURE__*/React.createElement(DepositContent, {
-    isAgreeDepositPolicy: !!isAgreeDepositPolicy,
-    setIsAgreeDepositPolicy: setIsAgreeDepositPolicy,
-    deposit: deposit,
-    depositProtocolRequest: depositProtocolRequest
-  });
-};
 export default Deposit;

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

@@ -85,7 +85,9 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
             return checkProductType(item === null || item === void 0 ? void 0 : item.id);
           case 4:
             type = _context2.sent;
-            appointmentBooking.openProductDetail(item.id);
+            if (type === 'session') {
+              appointmentBooking.openProductDetail(item.id);
+            }
           case 6:
             utils === null || utils === void 0 || utils.action({
               type: 'pisell1.productDetail',
@@ -103,13 +105,6 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
-                        if (!data.isCancel) {
-                          _context.next = 3;
-                          break;
-                        }
-                        appointmentBooking.closeProductDetail();
-                        return _context.abrupt("return");
-                      case 3:
                         product = _objectSpread(_objectSpread({}, data), {}, {
                           options: (data === null || data === void 0 ? void 0 : data.option) || []
                         });
@@ -117,21 +112,31 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 10;
+                          _context.next = 7;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 8;
+                          _context.next = 5;
                           break;
                         }
                         return _context.abrupt("return");
-                      case 8:
+                      case 5:
                         appointmentBooking.storeProduct(product);
                         return _context.abrupt("return");
+                      case 7:
+                        if (!(data !== null && data !== void 0 && data.isCancel)) {
+                          _context.next = 10;
+                          break;
+                        }
+                        if (type === 'session') {
+                          appointmentBooking.closeProductDetail();
+                          appointmentBooking.getAvailableDate();
+                        }
+                        return _context.abrupt("return");
                       case 10:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 19;
+                          _context.next = 20;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
@@ -143,36 +148,35 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             endTime: "".concat(endDate, " ").concat(session === null || session === void 0 ? void 0 : session.end_time)
                           }
                         });
-                        _context.next = 17;
+                        appointmentBooking.closeProductDetail();
+                        _context.next = 18;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 17:
-                        _context.next = 27;
+                      case 18:
+                        _context.next = 28;
                         break;
-                      case 19:
+                      case 20:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
-                          _context.next = 23;
+                          _context.next = 24;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 23:
+                      case 24:
                         appointmentBooking.storeProduct(product);
                         // duration 类型的商品，要获取一下资源，在先选日期的 duration 步骤里目前只能通过这个动作拉取
                         if (!(type === 'duration')) {
-                          _context.next = 27;
+                          _context.next = 28;
                           break;
                         }
-                        _context.next = 27;
+                        _context.next = 28;
                         return appointmentBooking.getAvailableDate();
-                      case 27:
-                        appointmentBooking.closeProductDetail();
-
+                      case 28:
                         // 先选择日期流程
                         if (isDateSelectedFirst) {
                           index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2; //先选择日期流程：如果商品类型是duration的商品，则需要增加选择时间步骤

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -12,6 +12,7 @@ import React, { useState, useEffect } from 'react';
 import { Spin } from 'antd';
 import { PisellModal, PisellEmpty, Button, Checkbox } from '@pisell/materials';
 import { locales, isMobile } from '@pisell/utils';
+import { useAppointmentBookingContext } from "../../../context";
 import "./index.less";
 var DepositModal = function DepositModal(props) {
   var open = props.open,
@@ -20,8 +21,9 @@ var DepositModal = function DepositModal(props) {
     onChange = props.onChange,
     onConfirm = props.onConfirm,
     _props$isHideCheckout = props.isHideCheckout,
-    isHideCheckout = _props$isHideCheckout === void 0 ? true : _props$isHideCheckout,
-    depositProtocolRequest = props.depositProtocolRequest;
+    isHideCheckout = _props$isHideCheckout === void 0 ? true : _props$isHideCheckout;
+  var _useAppointmentBookin = useAppointmentBookingContext(),
+    appointmentBooking = _useAppointmentBookin.appointmentBooking;
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     policy = _useState2[0],
@@ -48,42 +50,35 @@ var DepositModal = function DepositModal(props) {
    */
   var getPolicy = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
-      var _yield$depositProtoco, data;
+      var _yield$appointmentBoo, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (depositProtocolRequest) {
-              _context.next = 3;
-              break;
-            }
-            console.error('depositProtocolRequest is not defined');
-            return _context.abrupt("return");
-          case 3:
             setLoading(true);
-            _context.prev = 4;
-            _context.next = 7;
-            return depositProtocolRequest === null || depositProtocolRequest === void 0 ? void 0 : depositProtocolRequest(id);
-          case 7:
-            _yield$depositProtoco = _context.sent;
-            data = _yield$depositProtoco.data;
+            _context.prev = 1;
+            _context.next = 4;
+            return appointmentBooking.getProtocol(id);
+          case 4:
+            _yield$appointmentBoo = _context.sent;
+            data = _yield$appointmentBoo.data;
             setPolicy(data);
             onChange && onChange(data);
-            _context.next = 17;
+            _context.next = 14;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](4);
+          case 10:
+            _context.prev = 10;
+            _context.t0 = _context["catch"](1);
             console.log(_context.t0);
             onChange && onChange(_context.t0);
-          case 17:
-            _context.prev = 17;
+          case 14:
+            _context.prev = 14;
             setLoading(false);
-            return _context.finish(17);
-          case 20:
+            return _context.finish(14);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 13, 17, 20]]);
+      }, _callee, null, [[1, 10, 14, 17]]);
     }));
     return function getPolicy(_x) {
       return _ref.apply(this, arguments);

package/es/components/appointmentBooking/deposit/index.js

@@ -21,8 +21,7 @@ var Deposit = function Deposit(props) {
     isAgreePolicy = _props$isAgreePolicy === void 0 ? true : _props$isAgreePolicy,
     _props$isShowTitle = props.isShowTitle,
     isShowTitle = _props$isShowTitle === void 0 ? true : _props$isShowTitle,
-    onChange = props.onChange,
-    depositProtocolRequest = props.depositProtocolRequest;
+    onChange = props.onChange;
   var context = useEngineContext();
   // 打开协议弹窗
   var _useState = useState(false),
@@ -96,8 +95,7 @@ var Deposit = function Deposit(props) {
     onCancel: function onCancel() {
       return setVisible(false);
     },
-    item: policyItem,
-    depositProtocolRequest: depositProtocolRequest
+    item: policyItem
   }));
 };
 export default Deposit;

package/es/components/appointmentBooking/index.js

@@ -27,20 +27,6 @@ var AppointmentBooking = function AppointmentBooking() {
       }
     });
   }, []);
-  useEffect(function () {
-    var setRealVH = function setRealVH() {
-      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
-      var vh = window.innerHeight * 0.01;
-      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
-    };
-
-    // 页面加载和窗口大小变化时都重新计算
-    setRealVH();
-    window.addEventListener('resize', setRealVH);
-    return function () {
-      window.removeEventListener('resize', setRealVH);
-    };
-  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "parallel-booking-wrap ".concat(isMobile() ? 'parallel-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(AppointmentBookingProvider, null, /*#__PURE__*/React.createElement(Content, null)));

package/es/components/appointmentBooking/index.less

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   background: #ffffff;
-  height: calc(var(--vh, 1vh) * 100);
+  height: 100vh;
   overflow-y: auto;
 
   .pisell-section-headers {

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

@@ -27,7 +27,6 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
-export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
 /**
  * @title: 格式化商品单价
  * @description:

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

@@ -152,7 +152,7 @@ export var checkSubResourcesCapacity = function checkSubResourcesCapacity(resour
     });
   }
 };
-export var checkResourcesFormat = function checkResourcesFormat(resources, service, isChild) {
+var checkResourcesFormat = function checkResourcesFormat(resources, service, isChild) {
   return resources.map(function (resource) {
     var _resource$children;
     if (!isChild) {

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

@@ -26,8 +26,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
 import { getServiceAddons } from "./utils";
+import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -275,8 +275,8 @@ var VoucherCard = function VoucherCard(props) {
     style: {
       width: '100%'
     },
-    dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
     mixedSort: mixedSort,
+    dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
     onChange: function onChange(val) {
       var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({

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

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

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

@@ -495,8 +495,7 @@ var getAllErrorList = function getAllErrorList(item) {
   var _ref4 = item._data || {},
     resourceMaps = _ref4.resourceMaps;
   var _ref5 = item._extend || {},
-    _ref5$resource = _ref5.resource,
-    resource = _ref5$resource === void 0 ? {} : _ref5$resource;
+    resource = _ref5.resource;
   var errorList = [];
   Object.entries(resource).forEach(function (_ref6) {
     var _ref7 = _slicedToArray(_ref6, 2),
@@ -516,7 +515,7 @@ var mapListItems = function mapListItems(items) {
     return {
       id: item.id || item.form_record_id,
       label: item.labelText,
-      isError: !item.usable || item.unbound
+      isError: !item.usable
     };
   });
 };

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

@@ -69,16 +69,6 @@ export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
  * @Date: 2024-09-19 20:26
  */
 export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any;
-/**
- * @title: 将商品内关联的资源id还原成数据
- * @description:
- * @param {any} resourcesOriginMap
- * @param {any} cacheItem
- * @return {*}
- * @Author: zhiwei.Wang
- * @Date: 2024-09-19 20:23
- */
-export declare const getResourceByIds: (resourcesOriginMap: any, cacheItem: any, extraParams?: any) => any[];
 /**
  * @title: 预生成服务的 extend
  * @description:

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

@@ -179,23 +179,14 @@ export var formatResources = function formatResources(_ref5) {
       var _item = cloneDeep(item);
       _item.renderList = _item.renderList.map(function (d) {
         var res = formatResource(d, _cacheItem, function (newData) {
-          var unbound = !item.optional_resource.includes(newData.id) && !item.default_resource.includes(newData.id) && newData.id !== 0;
           return /*#__PURE__*/React.createElement("div", {
             className: "resource-option"
           }, /*#__PURE__*/React.createElement("div", {
             className: "like-wrap"
-          }), /*#__PURE__*/React.createElement("span", {
-            className: "resource-option-label-text"
-          }, newData.labelText), (!newData.usable || unbound) && /*#__PURE__*/React.createElement(AlertTriangle, {
+          }), newData.labelText, !newData.usable && /*#__PURE__*/React.createElement(AlertTriangle, {
             className: "resource-option-alert-icon"
           }));
         });
-        // 平行资源日历拖拽需求
-        // 当拖入为绑定的资源中时，为了展示，会临时创建目标资源对应的resourceItem
-        // 但是在 item.optional_resource 中并不包含目标资源id
-        if (!item.optional_resource.includes(d.id) && !item.default_resource.includes(d.id) && d.id !== 0) {
-          res.unbound = true;
-        }
         renderListMaps[res.id] = res;
         return res;
       }).sort(function (a, b) {
@@ -365,12 +356,10 @@ export var setDefaultCapacitys = function setDefaultCapacitys(_ref7) {
  * @Author: zhiwei.Wang
  * @Date: 2024-09-19 20:23
  */
-export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem, extraParams) {
+var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem) {
   var _cacheItem$product_re;
   var _resources = _toConsumableArray((cacheItem === null || cacheItem === void 0 || (_cacheItem$product_re = cacheItem.product_resource) === null || _cacheItem$product_re === void 0 ? void 0 : _cacheItem$product_re.resources) || []);
-  var _ref8 = extraParams || {},
-    _ref8$extraResources = _ref8.extraResources,
-    extraResources = _ref8$extraResources === void 0 ? [] : _ref8$extraResources;
+
   // 过滤出开启的资源
   _resources = _resources.filter(function (d) {
     return d.status == 1;
@@ -382,14 +371,6 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
       var item = _step2.value;
       var form_id = item.id;
 
-      // 将未绑定的资源，也放入 SelectOption 列表，避免出现仅展示id的情况
-      var extraResourceIds = extraResources.filter(function (_extraItem) {
-        return _extraItem.form_id === form_id && !item.optional_resource.includes(_extraItem.id) && !item.default_resource.includes(_extraItem.id);
-      }).map(function (_extraItem) {
-        return _extraItem.id;
-      });
-      extraResourceIds = Array.from(new Set(extraResourceIds));
-
       // 去重
       item.optional_resource = (item.optional_resource || []).filter(function (d) {
         return item.default_resource.indexOf(d) == -1;
@@ -412,7 +393,7 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
       };
 
       // 可选项
-      var optional_resource = [].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)).map(function (d) {
+      var optional_resource = item.optional_resource.map(function (d) {
         if (!resourcesOriginMap[d]) {
           return null;
         }
@@ -473,10 +454,10 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
       }
     }
   }
-  return Object.entries(cacheItem._extend.resource).every(function (_ref9) {
-    var _ref10 = _slicedToArray(_ref9, 2),
-      key = _ref10[0],
-      value = _ref10[1];
+  return Object.entries(cacheItem._extend.resource).every(function (_ref8) {
+    var _ref9 = _slicedToArray(_ref8, 2),
+      key = _ref9[0],
+      value = _ref9[1];
     return getAutoAllocationStorage(key) && (value === null || value === void 0 ? void 0 : value.length);
   });
 };
@@ -489,10 +470,10 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export var getProductExtend = function getProductExtend(_ref11) {
-  var cacheItem = _ref11.cacheItem,
-    state = _ref11.state,
-    isDisabledTime = _ref11.isDisabledTime;
+export var getProductExtend = function getProductExtend(_ref10) {
+  var cacheItem = _ref10.cacheItem,
+    state = _ref10.state,
+    isDisabledTime = _ref10.isDisabledTime;
   // 有endDate 说明是在编辑已经保存过的商品, 没有则是编辑还没保存过的商品
   var isNew = cacheItem.new || !cacheItem._extend.endDate;
   var _cacheItem = _objectSpread({}, cacheItem);
@@ -589,19 +570,7 @@ export var getProductExtend = function getProductExtend(_ref11) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
-      var extraResources = [];
-      // 日历中可以将预约拖入未绑定的资源中，需要兼容未绑定资源的 selectOption展示
-      if (Array.isArray(_cacheItem._extend.event_resources)) {
-        _cacheItem._extend.event_resources.forEach(function (_item) {
-          extraResources.push({
-            form_id: _item.form_id,
-            id: _item.relation_id
-          });
-        });
-      }
-      _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
-        extraResources: extraResources
-      });
+      _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem);
     }
     if (!_cacheItem._data.resources) {
       // 资源