@pisell/private-materials 3.3.84 → 3.3.85

package/es/businessModel/SalesModel/Sales/index.js

@@ -11,7 +11,6 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { createContext, useRef, useState } from 'react';
-import useEngineContext from "../../../hooks/useEngineContext";
 var defaultData = {};
 var SALES_MODEL_SESSION_STORAGE_KEY = 'shop_h5_sales_model_data';
 export var SalesContext = /*#__PURE__*/createContext({});
@@ -27,55 +26,23 @@ export var SalesProvider = function SalesProvider(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     hooks = _useState4[0],
     setHooks = _useState4[1];
-  var context = useEngineContext();
-  var utils = context.appHelper.utils || {};
   var _setData = function _setData(newData) {
     dataRef.current = _objectSpread(_objectSpread({}, dataRef.current), newData);
     console.log('sales_model_newData', dataRef.current);
     if (config !== null && config !== void 0 && config.useSessionStorage) {
-      setSessionStorage();
+      sessionStorage.setItem(SALES_MODEL_SESSION_STORAGE_KEY, JSON.stringify(dataRef.current || {}));
     }
     setData(_objectSpread({}, dataRef.current));
   };
   var getCurrentData = function getCurrentData() {
     return dataRef.current;
   };
-
-  /**
-   * @title 设置sessionStorage
-   * @description 获取路由参数中的cacheId，并设置到sessionStorage中
-   */
   var setSessionStorage = function setSessionStorage() {
-    var _utils$getHistory, _history$location;
-    var history = (utils === null || utils === void 0 || (_utils$getHistory = utils.getHistory) === null || _utils$getHistory === void 0 ? void 0 : _utils$getHistory.call(utils)) || {};
-    var cacheId = (history === null || history === void 0 || (_history$location = history.location) === null || _history$location === void 0 || (_history$location = _history$location.query) === null || _history$location === void 0 ? void 0 : _history$location.cacheId) || '';
-    var sessionData = _objectSpread(_objectSpread({}, dataRef.current || {}), {}, {
-      cacheId: cacheId
-    });
-    sessionStorage.setItem("".concat(SALES_MODEL_SESSION_STORAGE_KEY), JSON.stringify(sessionData || {}));
+    sessionStorage.setItem(SALES_MODEL_SESSION_STORAGE_KEY, JSON.stringify(dataRef.current || {}));
   };
-
-  /**
-   * @title 获取sessionStorage
-   * @description 获取路由参数中的cacheId并与sessionStorage中的cacheId进行匹配，如果匹配成功，则返回sessionStorage中的数据
-   */
   var getSessionStorage = function getSessionStorage() {
-    var _utils$getHistory2, _history$location2;
-    var history = (utils === null || utils === void 0 || (_utils$getHistory2 = utils.getHistory) === null || _utils$getHistory2 === void 0 ? void 0 : _utils$getHistory2.call(utils)) || {};
-    var strResult = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
-    var result = strResult ? JSON.parse(strResult || '{}') : {};
-    var cacheId = (history === null || history === void 0 || (_history$location2 = history.location) === null || _history$location2 === void 0 || (_history$location2 = _history$location2.query) === null || _history$location2 === void 0 ? void 0 : _history$location2.cacheId) || '';
-
-    // cacheId 为空，且sessionStorage中cacheId也为空，则返回sessionStorage中的数据
-    if (!cacheId && !(result !== null && result !== void 0 && result.cacheId)) {
-      return result;
-    }
-
-    // cacheId 不为空，需要比对sessionStorage中的cacheId与路由参数中的cacheId是否一致
-    if (cacheId && (result === null || result === void 0 ? void 0 : result.cacheId) === cacheId) {
-      return result;
-    }
-    return {};
+    var result = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
+    return JSON.parse(result || '{}');
   };
   var removeSessionStorage = function removeSessionStorage() {
     sessionStorage.removeItem(SALES_MODEL_SESSION_STORAGE_KEY);

package/es/components/Sales/Resource/index.js

@@ -6,7 +6,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 React, { createContext } from 'react';
 import { useSales } from "../../../businessModel/SalesModel";
-import { getSpecialResourceListApi } from "./serve";
+import { getResourceListApi } from "./serve";
 import { useRequest } from 'ahooks';
 import { useCart } from "../Cart";
 import { getIamgeFromMedia } from "../utils";
@@ -73,7 +73,7 @@ export var ResourceProvider = function ResourceProvider(_ref) {
     });
     return renderData;
   };
-  var getResourceList = useRequest(getSpecialResourceListApi, {
+  var getResourceList = useRequest(getResourceListApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
       var formatData = formatResourceList(res);

package/es/components/Sales/Resource/serve.d.ts

@@ -3,10 +3,3 @@ export declare const getResourceListApi: (params: {
     shop_id: string;
     form_data_status: string;
 }) => Promise<any>;
-/**
- * @title: 获取特殊资源列表
- * @Author: xiangfeng.xue
- */
-export declare const getSpecialResourceListApi: (params: {
-    event_item_ids?: string | number[];
-}) => Promise<any>;

package/es/components/Sales/Resource/serve.js

@@ -5,14 +5,4 @@ export var getResourceListApi = function getResourceListApi(params) {
   return request.getRequest().get('/h5/form/data/v1', params, {
     useCache: true
   });
-};
-
-/**
- * @title: 获取特殊资源列表
- * @Author: xiangfeng.xue
- */
-export var getSpecialResourceListApi = function getSpecialResourceListApi(params) {
-  return request.getRequest().get('/h5/eventbookingv2/item/specify-resources', params, {
-    useCache: true
-  });
 };

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/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/components/Voucher/index.js

@@ -150,7 +150,7 @@ var VoucherCard = function VoucherCard(props) {
               setCode('');
             } else {
               PisellToast({
-                content: locales.getText('pisell2.text.goodpass.code-invalid')
+                content: val.type === 'server' ? locales.getText('pisell2.text.goodpass.code-invalid') : locales.getText('pisell2.text.goodpass.code-invalid-cart')
               });
             }
           case 4:

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/appointmentBooking/locales.d.ts

@@ -114,6 +114,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };
@@ -232,6 +233,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };
@@ -350,6 +352,7 @@ declare const _default: {
         'pisell2.text.goodpass.code': string;
         'pisell2.text.goodpass.enter-code': string;
         'pisell2.text.goodpass.code-invalid': string;
+        'pisell2.text.goodpass.code-invalid-cart': string;
         'pisell2.text.goodpass.login': string;
         'pisell2.text.goodpass.login-tip': string;
     };

package/es/components/appointmentBooking/locales.js

@@ -132,6 +132,7 @@ export default {
     'pisell2.text.goodpass.code': 'Code',
     'pisell2.text.goodpass.enter-code': 'Enter Code',
     'pisell2.text.goodpass.code-invalid': 'Current code is invalid',
+    'pisell2.text.goodpass.code-invalid-cart': "No eligible items in the cart",
     'pisell2.text.goodpass.login': 'Login',
     'pisell2.text.goodpass.login-tip': ' for member benefit Or use account credit'
   },
@@ -268,6 +269,7 @@ export default {
     'pisell2.text.goodpass.code': '券码',
     'pisell2.text.goodpass.enter-code': '请输入券码',
     'pisell2.text.goodpass.code-invalid': '当前券码不可用',
+    'pisell2.text.goodpass.code-invalid-cart': "当前购物车中无可用商品",
     'pisell2.text.goodpass.login': '登录',
     'pisell2.text.goodpass.login-tip': '以获取会员福利或使用账户积分'
   },
@@ -404,6 +406,7 @@ export default {
     'pisell2.text.goodpass.code': '券碼',
     'pisell2.text.goodpass.enter-code': '請輸入券碼',
     'pisell2.text.goodpass.code-invalid': '當前券碼不可用',
+    'pisell2.text.goodpass.code-invalid-cart': "當前購物車中無可用商品",
     'pisell2.text.goodpass.login': '登錄',
     'pisell2.text.goodpass.login-tip': '以獲取會員福利或使用賬戶積分'
   }

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.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) {
       // 资源

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

@@ -22,22 +22,14 @@ import { getErrorList } from "../../../utilsByBooking";
 import { isArray } from 'lodash';
 import { getAutoAllocationStorage, setAutoAllocationStorage } from "../utils";
 import { useUpdate } from 'ahooks';
-import { QuestionCircleOutlined } from '@ant-design/icons';
+import { QuestionCircleOutlined } from "@ant-design/icons";
 var Resources = function Resources(_ref, ref) {
   var _cacheItem$_data2, _cacheItem$_data4;
   var state = _ref.state,
     cacheItem = _ref.cacheItem,
     getCurrentCacheItem = _ref.getCurrentCacheItem,
     onChange = _ref.onChange,
-    value = _ref.value,
-    _ref$config = _ref.config,
-    config = _ref$config === void 0 ? {
-      // 是否显示自动分配
-      autoAllocation: true,
-      // 是否显示资源错误图标
-      resourceErrorIcon: true,
-      disabled: false
-    } : _ref$config;
+    value = _ref.value;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     showError = _useState2[0],
@@ -152,7 +144,7 @@ var Resources = function Resources(_ref, ref) {
         relation_type: d.relation_type
       }), d[label]);
     });
-  }, [config === null || config === void 0 ? void 0 : config.resourceErrorIcon]);
+  }, []);
 
   /**
    * @title: 检查当前资源最小选择数量
@@ -201,7 +193,6 @@ var Resources = function Resources(_ref, ref) {
     }, /*#__PURE__*/React.createElement(Form.Item, {
       label: item.title,
       required: true,
-      labelCol: config === null || config === void 0 ? void 0 : config.labelCol,
       extra: showError && item.select_type.min > (cur === null || cur === void 0 ? void 0 : cur.length) ? /*#__PURE__*/React.createElement("span", {
         style: {
           color: '#ff4d4f'
@@ -210,17 +201,13 @@ var Resources = function Resources(_ref, ref) {
     }, /*#__PURE__*/React.createElement("div", {
       className: "resource-col"
     }, item.select_type.type === 'multiple' ? null : /*#__PURE__*/React.createElement(Button, {
-      className: "resource-col-like-wrap ".concat(config !== null && config !== void 0 && config.disabled ? 'resource-col-like-wrap-disabled' : ''),
+      className: "resource-col-like-wrap",
       onClick: function onClick() {
         var _cur$;
-        if (config !== null && config !== void 0 && config.disabled) {
-          return;
-        }
         setLikeStatus((cur === null || cur === void 0 || (_cur$ = cur[0]) === null || _cur$ === void 0 ? void 0 : _cur$.like_status) === 'like' ? 'common' : 'like', item.form_id, 'like_status');
       }
     }, /*#__PURE__*/React.createElement(Like, {
-      status: cur === null || cur === void 0 || (_cur$2 = cur[0]) === null || _cur$2 === void 0 ? void 0 : _cur$2.like_status,
-      className: "".concat(config !== null && config !== void 0 && config.disabled ? 'like-icon-disabled' : '')
+      status: cur === null || cur === void 0 || (_cur$2 = cur[0]) === null || _cur$2 === void 0 ? void 0 : _cur$2.like_status
     })), /*#__PURE__*/React.createElement(MaxLengthSelect, {
       className: "resource-col-select",
       size: "large",
@@ -241,16 +228,15 @@ var Resources = function Resources(_ref, ref) {
       showSearch: true,
       filterOption: function filterOption(str, option) {
         return ((option === null || option === void 0 ? void 0 : option.labelText) || '').toLowerCase().includes((str || '').toLowerCase());
-      },
-      disabled: config === null || config === void 0 ? void 0 : config.disabled
-    }, renderOptions(item.renderList, 'id', config !== null && config !== void 0 && config.resourceErrorIcon ? 'label' : 'labelText', 'resource')), config !== null && config !== void 0 && config.autoAllocation ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, {
+      }
+    }, renderOptions(item.renderList, 'id', 'label', 'resource')), /*#__PURE__*/React.createElement(Checkbox, {
       checked: getIsAutoAllocation(item.form_id),
       onChange: function onChange(e) {
         handleCheckAutoAllocation(item.form_id, e.target.checked);
       }
     }), /*#__PURE__*/React.createElement(Tooltip, {
       title: locales.getText('page.booking.text.resource.check-auto-allocation-tip')
-    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null))) : null)), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
+    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null)))), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
       return /*#__PURE__*/React.createElement(Alert, {
         key: d.type,
         message: d.label,

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

@@ -15,12 +15,6 @@
     .like-resource {}
   }
 
-  .resource-col-like-wrap-disabled,
-  .like-icon-disabled {
-    opacity: 0.5;
-    cursor: not-allowed;
-  }
-
   .resource-col-select {
     flex: 1;
   }

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

@@ -260,15 +260,6 @@ export var getErrorList = function getErrorList(resource, cacheItem) {
       }
     }
   }
-
-  // 平行资源日历拖动优化需求
-  // 拖入到未绑定的资源中
-  if (resource.unbound) {
-    list.push({
-      label: locales.getText('pisell1.text.resource-error-message-unbound'),
-      type: "time"
-    });
-  }
   return list;
 };