@pisell/private-materials 6.1.1 → 6.2.1

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

@@ -3,14 +3,13 @@ import Info2 from "../info2";
 import Info1 from "./main";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { isBooking4Shop } from "./utils";
-import { Skeleton } from 'antd';
+import { Skeleton } from "antd";
 var APP = function APP(props) {
-  var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
   var context = useEngineContext();
   var globalState = props.globalState;
-  var shopId = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'shop_id')) || ((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id);
-  var isBooking4 = isBooking4Shop(shopId, globalState === null || globalState === void 0 ? void 0 : globalState.renderType);
-  if (!shopId) {
+  var isBooking4 = isBooking4Shop((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id, globalState === null || globalState === void 0 ? void 0 : globalState.renderType);
+  if (!((_context$appHelper$ut3 = context.appHelper.utils.store) !== null && _context$appHelper$ut3 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut3.getState) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.call(_context$appHelper$ut3)) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.global) !== null && _context$appHelper$ut4 !== void 0 && (_context$appHelper$ut4 = _context$appHelper$ut4.globalConfig) !== null && _context$appHelper$ut4 !== void 0 && _context$appHelper$ut4.id)) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
         padding: 16

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

@@ -67,6 +67,11 @@ var _miniRedux = miniRedux({
       },
       setActiveCartId: function setActiveCartId(state, payload) {
         state.setGlobalState(payload);
+      },
+      setAddons: function setAddons(state, payload) {
+        state.setGlobalState({
+          addons: _objectSpread(_objectSpread({}, state.addons), payload)
+        });
       }
     },
     reducers: {

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

@@ -389,9 +389,9 @@ var Info = function Info(props) {
     return ((_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length) > 0;
   }, [state.service.value]);
   useEffect(function () {
-    var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _state$service4;
+    var _context$appHelper$ut, _context$appHelper$ut2, _state$service4;
     // Salonip 不要这个
-    if (shopList.includes(((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'shop_id')) || ((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id)) || state.closeAutoOpenService) {
+    if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id) || state.closeAutoOpenService) {
       return;
     }
 

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

@@ -714,7 +714,7 @@ var Info = function Info(_, ref) {
                 other.session = e.session;
 
                 // 重新生成商品
-                cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
+                cacheItem = _objectSpread(_objectSpread(_objectSpread({}, item), _detail), {}, {
                   product_id: item.id,
                   _id: item === null || item === void 0 ? void 0 : item._id,
                   _key: e.key,

package/es/components/booking/info/service/like/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

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

@@ -166,10 +166,10 @@ export var useService = function useService(_ref) {
               _extend.endDate = endDate;
             }
             resourceItem = currentResource(changeValues.resource);
-            _ref6 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {}, relation_type = _ref6.relation_type, item_id = _ref6.item_id, schedule_id = _ref6.schedule_id;
-            _extend.relation_type = relation_type || 'form';
-            _extend.relation_id = item_id || (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) || 0;
-            _extend.schedule_id = schedule_id || 0;
+            _ref6 = (resourceItem === null || resourceItem === void 0 || (_resourceItem$_extend = resourceItem._extend) === null || _resourceItem$_extend === void 0 ? void 0 : _resourceItem$_extend.usableTime) || {}, relation_type = _ref6.relation_type, item_id = _ref6.item_id, schedule_id = _ref6.schedule_id; // 资源item中的数据  > 原数据 >  兜底
+            _extend.relation_type = relation_type || (_extend === null || _extend === void 0 ? void 0 : _extend.relation_type) || 'form';
+            _extend.relation_id = item_id || (resourceItem === null || resourceItem === void 0 ? void 0 : resourceItem.form_record_id) || (_extend === null || _extend === void 0 ? void 0 : _extend.relation_id) || 0;
+            _extend.schedule_id = schedule_id || (_extend === null || _extend === void 0 ? void 0 : _extend.schedule_id) || 0;
             if (_extend.bundle_edit !== undefined) {
               _extend.bundle_edit = 1;
             }

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

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

@@ -451,12 +451,13 @@ var formatBundle = function formatBundle(bundle) {
 var formatOptions = function formatOptions(options) {
   if (!(options !== null && options !== void 0 && options.length)) return [];
   return options.map(function (item) {
+    var price = Number((item === null || item === void 0 ? void 0 : item.price) || (item === null || item === void 0 ? void 0 : item.add_price));
     return {
       id: item === null || item === void 0 ? void 0 : item.id,
       name: item === null || item === void 0 ? void 0 : item.name,
       num: item === null || item === void 0 ? void 0 : item.num,
-      price: item === null || item === void 0 ? void 0 : item.price,
-      total: item === null || item === void 0 ? void 0 : item.price,
+      price: price,
+      total: price,
       origin_total: item === null || item === void 0 ? void 0 : item.original_price
     };
   });
@@ -495,7 +496,8 @@ var getAllErrorList = function getAllErrorList(item) {
   var _ref4 = item._data || {},
     resourceMaps = _ref4.resourceMaps;
   var _ref5 = item._extend || {},
-    resource = _ref5.resource;
+    _ref5$resource = _ref5.resource,
+    resource = _ref5$resource === void 0 ? {} : _ref5$resource;
   var errorList = [];
   Object.entries(resource).forEach(function (_ref6) {
     var _ref7 = _slicedToArray(_ref6, 2),
@@ -515,7 +517,7 @@ var mapListItems = function mapListItems(items) {
     return {
       id: item.id || item.form_record_id,
       label: item.labelText,
-      isError: !item.usable
+      isError: !item.usable || item.unbound
     };
   });
 };

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

@@ -95,7 +95,7 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   if (renderType === 'eventBooking') {
     return false;
   }
-  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824];
+  var booking4Shops = [8390, 1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191, 6812, 6813, 6814, 7651, 8586, 8581, 9, 2155, 8030, 1749, 8194, 2327, 8609, 8610, 8782, 1285, 6124, 8727, 5538, 6988, 8872, 6930, 8824, 8913];
   return booking4Shops.includes(shopId);
 };
 function generateDateRange(start, end) {

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

@@ -19,6 +19,7 @@ import AddNote from "../notes/addNote";
 import Header from "../info/header";
 import localeTexts from "../locales";
 import { locales } from '@pisell/utils';
+import ReloadResourceModal from "../components/reloadResourceModal";
 import { findNextDuration, flexibleObj, sliceDayIntoFiveMinutes, request } from "../utils";
 import { formatResource } from "./utilsByBooking";
 import { getErrorList } from "./utilsByBooking";
@@ -31,7 +32,7 @@ import { Skeleton } from 'antd';
 import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
-import { useDebounceEffect } from "ahooks";
+import { useDebounceEffect } from 'ahooks';
 var defaultModules = {
   client: 1,
   date: 1,
@@ -162,21 +163,21 @@ var Info = Provider(function (props) {
                 });
               }
             }
-            try {
+            return _context2.abrupt("return", new Promise(function (resolve, reject) {
               // 同步最新数据用, 增加延迟为了不和getProduct接口冲突
               setTimeout( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                var _stateRef$current, _stateRef$current$map;
-                var data;
+                var _stateRef$current, _stateRef$current$map, data;
                 return _regeneratorRuntime().wrap(function _callee$(_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
-                      _context.next = 2;
+                      _context.prev = 0;
+                      _context.next = 3;
                       return getResourceList({
                         date: currentDate
                       }, stateRef === null || stateRef === void 0 || (_stateRef$current = stateRef.current) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.service) === null || _stateRef$current === void 0 || (_stateRef$current = _stateRef$current.value) === null || _stateRef$current === void 0 || (_stateRef$current$map = _stateRef$current.map) === null || _stateRef$current$map === void 0 ? void 0 : _stateRef$current$map.call(_stateRef$current, function (item) {
                         return item === null || item === void 0 ? void 0 : item.booking_id;
                       }));
-                    case 2:
+                    case 3:
                       data = _context.sent;
                       data.date = currentDate;
                       localStorage.setItem('bookingResourceList', JSON.stringify(data));
@@ -184,18 +185,30 @@ var Info = Provider(function (props) {
                         type: 'setService',
                         payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
                           resourcesOrigin: data.list || [],
-                          resourcesOriginMap: data.listMap
+                          resourcesOriginMap: data.listMap,
+                          reloadResourceModal: false
                         })
                       });
-                    case 6:
+                      resolve(data);
+                      _context.next = 14;
+                      break;
+                    case 10:
+                      _context.prev = 10;
+                      _context.t0 = _context["catch"](0);
+                      modal.dispatch({
+                        type: 'setService',
+                        payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
+                          reloadResourceModal: true
+                        })
+                      });
+                      reject(_context.t0);
+                    case 14:
                     case "end":
                       return _context.stop();
                   }
-                }, _callee);
+                }, _callee, null, [[0, 10]]);
               })), timeoutNumber);
-            } catch (err) {
-              console.log(err, 'err');
-            }
+            }));
           case 4:
           case "end":
             return _context2.stop();
@@ -215,7 +228,18 @@ var Info = Provider(function (props) {
   }, [currentDate], {
     wait: 300
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ReloadResourceModal, {
+    modal: modal,
+    onReload: getResourcesData,
+    onCancel: function onCancel() {
+      modal.dispatch({
+        type: 'setService',
+        payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
+          reloadResourceModal: false
+        })
+      });
+    }
+  }), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
     style: style,
     header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {

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

@@ -33,10 +33,11 @@ import { getProductExtend } from "./utils";
 import { formatProductListByCategory, getIsEject, getIsOnlySession, getProductTotalPrice, isSessionProduct, request } from "../../../utils";
 import { locales, getUniqueId } from '@pisell/utils';
 import { useUpdateEffect } from 'ahooks';
+import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { getIsShowNumber } from "../../../../ticketBooking/utils";
 var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080, 6978, 7386, 6848, 6305];
 var Info = function Info(props) {
-  var _state$client2, _state$service2, _state$service4, _state$service5;
+  var _state$client2, _state$service3, _state$service5, _state$service6;
   var onEdit = props.onEdit,
     drawerProps = props.drawerProps,
     renderMode = props.renderMode;
@@ -240,6 +241,18 @@ var Info = function Info(props) {
   };
   var handleSelectProduct = function handleSelectProduct(item, type) {
     var _state$client3;
+    if (!isNormalProductByDurationSchedule(item)) {
+      var _state$service;
+      if (!Array.isArray((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || !state.service.resourcesOrigin.length) {
+        dispatch({
+          type: 'setService',
+          payload: _objectSpread(_objectSpread({}, state.service), {}, {
+            reloadResourceModal: true
+          })
+        });
+        return;
+      }
+    }
     var isSession = isSessionProduct(item);
     // 是否有单规格 组合规格 套餐, 或者session商品 如果没有不需要打开弹窗
     var isEject = getIsEject(item, type);
@@ -355,33 +368,33 @@ var Info = function Info(props) {
     });
   };
   var renderList = useMemo(function () {
-    var _state$service;
-    var _list = ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.services) || [];
+    var _state$service2;
+    var _list = ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services) || [];
     var isIncludes = function isIncludes(str) {
       return str.toLowerCase().indexOf(search.toLowerCase()) !== -1;
     };
     return formatProductListByCategory(_list, search ? function (item) {
       return isIncludes(item.title);
     } : undefined);
-  }, [search, (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.services]);
+  }, [search, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : _state$service3.services]);
   var isService = useMemo(function () {
     return state.service.value.length > 0;
   }, [state.service.value]);
   useEffect(function () {
-    var _context$appHelper, _context$appHelper$ge, _context$appHelper$ut, _context$appHelper$ut2, _state$service3;
+    var _context$appHelper$ut, _context$appHelper$ut2, _state$service4;
     // Salonip 不要这个
 
-    if (shopList.includes(((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getData) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'shop_id')) || ((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id)) || state.closeAutoOpenService) {
+    if (shopList.includes((_context$appHelper$ut = context.appHelper.utils.store) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut.getState) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.global) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut2 = _context$appHelper$ut2.globalConfig) === null || _context$appHelper$ut2 === void 0 ? void 0 : _context$appHelper$ut2.id) || state.closeAutoOpenService) {
       return;
     }
 
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length) === 0) {
+    if (state.modalOpen && !state.bookingId && state.renderType !== 'eventBooking' && ((_state$service4 = state.service) === null || _state$service4 === void 0 || (_state$service4 = _state$service4.value) === null || _state$service4 === void 0 ? void 0 : _state$service4.length) === 0) {
       setTimeout(function () {
         handleSelectService();
       }, 10);
     }
-  }, [state.modalOpen, state.bookingId, (_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : _state$service4.value]);
+  }, [state.modalOpen, state.bookingId, (_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.value]);
   var showAddButton = useMemo(function () {
     return !state.disabledEdit && !state.channelDisabledEdit;
   }, [state.disabledEdit, state.channelDisabledEdit]);
@@ -483,7 +496,7 @@ var Info = function Info(props) {
       }
     }, header, content);
   }
-  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service5 = state.service) === null || _state$service5 === void 0 || (_state$service5 = _state$service5.cacheItem) === null || _state$service5 === void 0 ? void 0 : _state$service5.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, ((_state$service6 = state.service) === null || _state$service6 === void 0 || (_state$service6 = _state$service6.cacheItem) === null || _state$service6 === void 0 ? void 0 : _state$service6.autoClose) && /*#__PURE__*/React.createElement(Skeleton, {
     loading: true,
     active: true,
     round: true

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

@@ -69,6 +69,16 @@ 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,14 +179,23 @@ 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"
-          }), newData.labelText, !newData.usable && /*#__PURE__*/React.createElement(AlertTriangle, {
+          }), /*#__PURE__*/React.createElement("span", {
+            className: "resource-option-label-text"
+          }, newData.labelText), (!newData.usable || unbound) && /*#__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) {
@@ -356,10 +365,12 @@ export var setDefaultCapacitys = function setDefaultCapacitys(_ref7) {
  * @Author: zhiwei.Wang
  * @Date: 2024-09-19 20:23
  */
-var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem) {
+export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem, extraParams) {
   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;
@@ -371,6 +382,14 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
       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;
@@ -380,7 +399,10 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
         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]);
+              var _resourcesOriginMap$i, _resourcesOriginMap$i2;
+              combiningResources.push(_objectSpread(_objectSpread({}, resourcesOriginMap[id]), {}, {
+                relation_id: ((_resourcesOriginMap$i = resourcesOriginMap[id]) === null || _resourcesOriginMap$i === void 0 ? void 0 : _resourcesOriginMap$i.relation_id) || ((_resourcesOriginMap$i2 = resourcesOriginMap[id]) === null || _resourcesOriginMap$i2 === void 0 ? void 0 : _resourcesOriginMap$i2.id)
+              }));
             }
           });
         }
@@ -393,7 +415,7 @@ var getResourceByIds = function getResourceByIds(resourcesOriginMap, cacheItem)
       };
 
       // 可选项
-      var optional_resource = item.optional_resource.map(function (d) {
+      var optional_resource = [].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)).map(function (d) {
         if (!resourcesOriginMap[d]) {
           return null;
         }
@@ -454,10 +476,10 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
       }
     }
   }
-  return Object.entries(cacheItem._extend.resource).every(function (_ref8) {
-    var _ref9 = _slicedToArray(_ref8, 2),
-      key = _ref9[0],
-      value = _ref9[1];
+  return Object.entries(cacheItem._extend.resource).every(function (_ref9) {
+    var _ref10 = _slicedToArray(_ref9, 2),
+      key = _ref10[0],
+      value = _ref10[1];
     return getAutoAllocationStorage(key) && (value === null || value === void 0 ? void 0 : value.length);
   });
 };
@@ -470,10 +492,10 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export var getProductExtend = function getProductExtend(_ref10) {
-  var cacheItem = _ref10.cacheItem,
-    state = _ref10.state,
-    isDisabledTime = _ref10.isDisabledTime;
+export var getProductExtend = function getProductExtend(_ref11) {
+  var cacheItem = _ref11.cacheItem,
+    state = _ref11.state,
+    isDisabledTime = _ref11.isDisabledTime;
   // 有endDate 说明是在编辑已经保存过的商品, 没有则是编辑还没保存过的商品
   var isNew = cacheItem.new || !cacheItem._extend.endDate;
   var _cacheItem = _objectSpread({}, cacheItem);
@@ -570,7 +592,19 @@ export var getProductExtend = function getProductExtend(_ref10) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
-      _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem);
+      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
+      });
     }
     if (!_cacheItem._data.resources) {
       // 资源

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

@@ -51,6 +51,7 @@ var AddTimeModal = function AddTimeModal() {
     _useState2 = _slicedToArray(_useState, 2),
     isEdit = _useState2[0],
     setIsEdit = _useState2[1];
+  var loadingRef = useRef(false);
   var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     loading = _useState4[0],
@@ -236,7 +237,11 @@ var AddTimeModal = function AddTimeModal() {
               extension_type: ['product_add_time'],
               status: 'published'
             }, {
-              useCache: true
+              useCache: true,
+              retry: {
+                count: 3,
+                delay: 500
+              }
             });
           case 2:
             data = _context.sent;
@@ -304,6 +309,7 @@ var AddTimeModal = function AddTimeModal() {
       var productId = list[0].id;
       var time = list[0].times[0].value;
       setRecordKey(addTimeRowKey.create(productId, time));
+      updateServices.run();
     } catch (err) {}
   };
 
@@ -311,6 +317,7 @@ var AddTimeModal = function AddTimeModal() {
   useUpdateEffect(function () {
     if (state.service.addTimeModal) {
       getTimeProducts();
+      loadingRef.current = false; // 打开弹窗时重置loading
       originServices.current = state.service;
     } else {
       updateServices.run();
@@ -491,7 +498,7 @@ var AddTimeModal = function AddTimeModal() {
   }();
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-      var _context$appHelper2, _context$appHelper2$g, _context$appHelper$ut2, _context$appHelper$ut3;
+      var _context$appHelper$ut2, _context$appHelper$ut3;
       var loadingType,
         api,
         _args5 = arguments;
@@ -505,16 +512,32 @@ var AddTimeModal = function AddTimeModal() {
             }
             return _context5.abrupt("return");
           case 3:
+            if (!loadingRef.current) {
+              _context5.next = 5;
+              break;
+            }
+            return _context5.abrupt("return");
+          case 5:
+            loadingRef.current = true;
             setLoading(loadingType);
-            api = isBooking4Shop(((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getData) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2, 'shop_id')) || ((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id), state.renderType) ? saveAddTimeProduct2 : saveAddTimeProduct; // save
-            _context5.next = 7;
+            api = isBooking4Shop((_context$appHelper$ut2 = context.appHelper.utils.store) === null || _context$appHelper$ut2 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut2.getState) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.call(_context$appHelper$ut2)) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.global) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.globalConfig) === null || _context$appHelper$ut3 === void 0 ? void 0 : _context$appHelper$ut3.id, state.renderType) ? saveAddTimeProduct2 : saveAddTimeProduct;
+            _context5.prev = 8;
+            _context5.next = 11;
             return api({
               orderId: state.bookingId,
               params: _objectSpread(_objectSpread({}, newService), {}, {
                 _extend: undefined
               })
             });
-          case 7:
+          case 11:
+            loadingRef.current = false;
+            _context5.next = 17;
+            break;
+          case 14:
+            _context5.prev = 14;
+            _context5.t0 = _context5["catch"](8);
+            loadingRef.current = false;
+          case 17:
             // 更新外部预约列表
             setLoading('');
             message.success(locales.getText('page.booking.text.add-time-success'));
@@ -522,18 +545,18 @@ var AddTimeModal = function AddTimeModal() {
             // close
             onCancel();
             if (!(loadingType === 'checkout')) {
-              _context5.next = 12;
+              _context5.next = 22;
               break;
             }
             return _context5.abrupt("return");
-          case 12:
+          case 22:
             // 回调关闭弹窗
             state === null || state === void 0 || state.action('init');
-          case 13:
+          case 23:
           case "end":
             return _context5.stop();
         }
-      }, _callee5);
+      }, _callee5, null, [[8, 14]]);
     }));
     return function handleSave() {
       return _ref5.apply(this, arguments);