@pisell/private-materials 6.1.7 → 6.1.8

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

@@ -15,10 +15,11 @@ import Pet from "../info/pet";
 import DateCom from "../info/date";
 import Footer from "../components/footer";
 import TabPane from "../components/tabPane";
-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 { sendWarningLog } from '@pisell/utils';
 import { findNextDuration, flexibleObj, sliceDayIntoFiveMinutes, request } from "../utils";
 import { formatResource } from "./utilsByBooking";
 import { getErrorList } from "./utilsByBooking";
@@ -31,7 +32,9 @@ 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';
+import CartClientCard from "./cartClientCard";
+import { Iconfont } from '@pisell/materials';
 var defaultModules = {
   client: 1,
   date: 1,
@@ -41,7 +44,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state4, _modal$state6, _context$appHelper4, _modal$state7;
+  var _modal$state2, _modal$state3, _modal$state5, _context$appHelper4, _modal$state6;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -116,22 +119,20 @@ var Info = Provider(function (props) {
     });
   }, [globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, modal.state, modal.dispatch, globalState === null || globalState === void 0 ? void 0 : globalState.renderType]);
   var notes = useMemo(function () {
-    var _modal$state3;
     if (!modules.note) {
       return null;
     }
-    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' ? /*#__PURE__*/React.createElement(Notes, null) : null : /*#__PURE__*/React.createElement(AddNote, {
-      value: (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote,
-      onChange: addNote
-    });
-  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state4 = modal.state) === null || _modal$state4 === void 0 || (_modal$state4 = _modal$state4.notes) === null || _modal$state4 === void 0 ? void 0 : _modal$state4.orderNote]);
+    return globalState !== null && globalState !== void 0 && globalState.bookingId ? globalState.renderType === 'eventBooking' ? /*#__PURE__*/React.createElement(Notes, null) : null :
+    // <AddNote value={modal.state?.notes?.orderNote} onChange={addNote} />
+    null;
+  }, [modules.note, globalState === null || globalState === void 0 ? void 0 : globalState.bookingId, globalState.render, (_modal$state3 = modal.state) === null || _modal$state3 === void 0 || (_modal$state3 = _modal$state3.notes) === null || _modal$state3 === void 0 ? void 0 : _modal$state3.orderNote]);
   var currentDate = useMemo(function () {
-    var _modal$state5;
-    if ((_modal$state5 = modal.state) !== null && _modal$state5 !== void 0 && (_modal$state5 = _modal$state5.date) !== null && _modal$state5 !== void 0 && _modal$state5.value) {
+    var _modal$state4;
+    if ((_modal$state4 = modal.state) !== null && _modal$state4 !== void 0 && (_modal$state4 = _modal$state4.date) !== null && _modal$state4 !== void 0 && _modal$state4.value) {
       return modal.state.date.value.format('YYYY-MM-DD');
     }
     return null;
-  }, [(_modal$state6 = modal.state) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.date) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.value) === null || _modal$state6 === void 0 ? void 0 : _modal$state6.format('YYYY-MM-DD')]);
+  }, [(_modal$state5 = modal.state) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.date) === null || _modal$state5 === void 0 || (_modal$state5 = _modal$state5.value) === null || _modal$state5 === void 0 ? void 0 : _modal$state5.format('YYYY-MM-DD')]);
 
   /**
    * @title: 获取资源列表数据
@@ -163,40 +164,77 @@ 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));
+                      try {
+                        data.date = currentDate;
+                        localStorage.setItem('bookingResourceList', JSON.stringify(data));
+                      } catch (error) {
+                        sendWarningLog({
+                          title: "\u8BBE\u7F6E\u8D44\u6E90\u5931\u8D25",
+                          content: [{
+                            key: 'error',
+                            value: JSON.stringify({
+                              message: error === null || error === void 0 ? void 0 : error.message,
+                              stack: error === null || error === void 0 ? void 0 : error.stack,
+                              name: error === null || error === void 0 ? void 0 : error.name
+                            })
+                          }]
+                        });
+                      }
                       modal.dispatch({
                         type: 'setService',
                         payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
                           resourcesOrigin: data.list || [],
-                          resourcesOriginMap: data.listMap
+                          resourcesOriginMap: data.listMap,
+                          reloadResourceModal: false
+                        })
+                      });
+                      resolve(data);
+                      _context.next = 14;
+                      break;
+                    case 9:
+                      _context.prev = 9;
+                      _context.t0 = _context["catch"](0);
+                      sendWarningLog({
+                        title: "\u83B7\u53D6\u8D44\u6E90\u5931\u8D25",
+                        content: [{
+                          key: 'error',
+                          value: JSON.stringify({
+                            message: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message,
+                            stack: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.stack,
+                            name: _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.name
+                          })
+                        }]
+                      });
+                      modal.dispatch({
+                        type: 'setService',
+                        payload: _objectSpread(_objectSpread({}, stateRef.current.service), {}, {
+                          reloadResourceModal: true
                         })
                       });
-                    case 6:
+                      reject(_context.t0);
+                    case 14:
                     case "end":
                       return _context.stop();
                   }
-                }, _callee);
+                }, _callee, null, [[0, 9]]);
               })), timeoutNumber);
-            } catch (err) {
-              console.log(err, 'err');
-            }
+            }));
           case 4:
           case "end":
             return _context2.stop();
@@ -216,19 +254,53 @@ var Info = Provider(function (props) {
   }, [currentDate], {
     wait: 300
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
-    style: style,
+  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, {
+    style: {
+      height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
+    },
     header: header,
     footer: /*#__PURE__*/React.createElement(Footer, {
       state: modal.state,
       dispatch: modal.dispatch,
       source: "info"
-    })
-  }, "style", {
-    height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
-  }), "bodyClassName", classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode))), /*#__PURE__*/React.createElement("div", {
+    }),
+    bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode)),
+    state: modal.state,
+    dispatch: modal.dispatch,
+    source: "info"
+  }, /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  }, createHeader, /*#__PURE__*/React.createElement("div", {
+    className: "booking-info-client-line"
+  }, modules.client ? globalState !== null && globalState !== void 0 && globalState.isBookingTicket2 ? /*#__PURE__*/React.createElement("div", {
+    style: {
+      flex: 1,
+      overflow: 'hidden'
+    }
+  }, /*#__PURE__*/React.createElement(CartClientCard, null)) : /*#__PURE__*/React.createElement(Client, null) : null, globalState !== null && globalState !== void 0 && globalState.isBookingTicket2 ? /*#__PURE__*/React.createElement("div", {
+    className: "booking-info-client-line-code",
+    onClick: function onClick() {
+      var _globalState$onQrCode;
+      globalState === null || globalState === void 0 || (_globalState$onQrCode = globalState.onQrCodeClick) === null || _globalState$onQrCode === void 0 || _globalState$onQrCode.call(globalState);
+    }
+  }, /*#__PURE__*/React.createElement(Iconfont, {
+    type: "pisell2-a-qr-code-02",
+    style: {
+      color: '#fff',
+      fontSize: 42
+    }
+  })) : null), modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

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);
@@ -356,20 +369,20 @@ 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, _context$appHelper$ge, _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) {
@@ -377,12 +390,12 @@ var Info = function Info(props) {
     }
 
     // 如果弹窗打开,并且是创建, 则自动打开选择服务的弹窗
-    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]);
@@ -484,7 +497,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

@@ -0,0 +1,98 @@
+import dayjs from 'dayjs';
+export declare const getUsableTime: (cacheItem: any) => any;
+export declare const getDurationProps: ({ cacheItem, useStartTime, currentResource, slice, }: any) => {
+    startDate: dayjs.Dayjs;
+    usableTime: any;
+    duration: string | number | {
+        type: string;
+        value: number;
+    };
+    locale: string;
+    slice: any;
+    selectProps: {
+        size: string;
+    };
+};
+/**
+ * @title: 灵活时长选项
+ * @description:
+ * @param {*} useMemo
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-23 10:10
+ */
+export declare const getFlexibleOption: ({ cacheItem, useStartTime, currentResource, slice, durationProps, }: any) => {
+    label: any;
+    value: any;
+} | null;
+export declare const getTimeSlices: ({ state }: any) => {
+    timeSlices: {
+        label: string;
+        value: string;
+    }[];
+};
+/**
+ * @title: 时间切片
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-09 13:37
+ */
+export declare const getTimeObj: ({ cacheItem, useStartTime, currentResource, state, useDuration, durationProps, }: any) => {
+    timeSlices: {
+        label: string;
+        value: string;
+    }[];
+    durationSlicesBasedOnTime: {
+        label: string;
+        value: number;
+    }[];
+};
+/**
+ * @title: 获取资源列表
+ * @description:
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-01-09 13:38
+ */
+export declare const formatResources: ({ cacheItem, resourcesOrigin, id }: any) => {
+    list: any;
+    maps: any;
+};
+export declare const setDefaultResource: ({ cacheItem, resources }: any) => any;
+/**
+ * @title: 设置默认容量
+ * @description:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @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:
+ * @param {any} param1
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-06-01 13:25
+ */
+export declare const getProductExtend: ({ cacheItem, state, isDisabledTime }: any) => any;
+/**
+ * @title: 格式化服务列表
+ * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据
+ * 使用with resourceRelation后 返回的resource_relation是实时数据
+ * 这里做一次转换
+ * @param list
+ */
+export declare const transServiceList: (list: any[]) => any[];

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

@@ -373,7 +373,11 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
   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;
+    extraResources = _ref8$extraResources === void 0 ? [] : _ref8$extraResources,
+    _ref8$resourcesOrigin = _ref8.resourcesOrigin,
+    resourcesOrigin = _ref8$resourcesOrigin === void 0 ? [] : _ref8$resourcesOrigin,
+    _ref8$resourceTab = _ref8.resourceTab,
+    resourceTab = _ref8$resourceTab === void 0 ? {} : _ref8$resourceTab;
   // 过滤出开启的资源
   _resources = _resources.filter(function (d) {
     return d.status == 1;
@@ -382,15 +386,29 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
     _step2;
   try {
     var _loop3 = function _loop3() {
+      var _resourceTab$item$cod;
       var item = _step2.value;
       var form_id = item.id;
+      // resource_tab -> 每个资源类型 -> resource_display_scope  { only_linked: '仅显示已关联资源' ｜ all: '全部' } 默认值 ‘only_linked’
+      var isAllResource = (resourceTab === null || resourceTab === void 0 || (_resourceTab$item$cod = resourceTab[item.code]) === null || _resourceTab$item$cod === void 0 ? void 0 : _resourceTab$item$cod.resource_display_scope) === 'all';
 
       // 将未绑定的资源，也放入 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;
-      });
+      var extraResourceIds = [];
+
+      // 如果设置了全部资源 需要把未关联的资源进行补全
+      if (isAllResource) {
+        extraResourceIds = (resourcesOrigin || []).filter(function (d) {
+          return d.form_code === item.code;
+        }).map(function (d) {
+          return d.id;
+        });
+      } else {
+        extraResourceIds = extraResources.filter(function (_extraItem) {
+          return _extraItem.form_id === form_id && !!_extraItem.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));
 
       // 去重
@@ -418,7 +436,7 @@ export var getResourceByIds = function getResourceByIds(resourcesOriginMap, cach
       };
 
       // 可选项
-      var optional_resource = [].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)).map(function (d) {
+      var optional_resource = Array.from(new Set([].concat(_toConsumableArray(item.optional_resource), _toConsumableArray(extraResourceIds)))).map(function (d) {
         if (!resourcesOriginMap[d]) {
           return null;
         }
@@ -505,10 +523,13 @@ export var getProductExtend = function getProductExtend(_ref11) {
 
   // 资源总列表
   var resourcesOriginMap = state.service.resourcesOriginMap || {};
+  // const resourcesOrigin = state.s;
+
   _cacheItem._data = {};
 
   // 新商品
   if (isNew) {
+    var _state$bookingConfig3;
     // 时间切片
     _cacheItem._data.timeObj = getTimeObj({
       cacheItem: cacheItem,
@@ -523,7 +544,11 @@ export var getProductExtend = function getProductExtend(_ref11) {
     _cacheItem._data.capacitys = cacheItem.capacity;
 
     // 将商品关联的资源id还原资源列表
-    _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem);
+    _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
+      //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+      resourceTab: state === null || state === void 0 || (_state$bookingConfig3 = state.bookingConfig) === null || _state$bookingConfig3 === void 0 || (_state$bookingConfig3 = _state$bookingConfig3.config) === null || _state$bookingConfig3 === void 0 ? void 0 : _state$bookingConfig3.resource_tab,
+      resourcesOrigin: state.service.resourcesOrigin
+    });
 
     // 默认容量
     _cacheItem._extend.capacity = setDefaultCapacitys({
@@ -595,6 +620,7 @@ export var getProductExtend = function getProductExtend(_ref11) {
       _cacheItem._data.capacitys = cacheItem.capacity;
     }
     if (!_cacheItem._data.resourcesOrigin) {
+      var _state$bookingConfig4;
       var extraResources = [];
       // 日历中可以将预约拖入未绑定的资源中，需要兼容未绑定资源的 selectOption展示
       if (Array.isArray(_cacheItem._extend.event_resources)) {
@@ -606,7 +632,10 @@ export var getProductExtend = function getProductExtend(_ref11) {
         });
       }
       _cacheItem._data.resourcesOrigin = getResourceByIds(resourcesOriginMap, cacheItem, {
-        extraResources: extraResources
+        extraResources: extraResources,
+        //  此数据用来控制 该商品所展示的资源是自身关联的,  还是全部的
+        resourceTab: state === null || state === void 0 || (_state$bookingConfig4 = state.bookingConfig) === null || _state$bookingConfig4 === void 0 || (_state$bookingConfig4 = _state$bookingConfig4.config) === null || _state$bookingConfig4 === void 0 ? void 0 : _state$bookingConfig4.resource_tab,
+        resourcesOrigin: state.service.resourcesOrigin
       });
     }
     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],
@@ -238,7 +239,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;
@@ -307,6 +312,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) {}
   };
 
@@ -314,6 +320,7 @@ var AddTimeModal = function AddTimeModal() {
   useUpdateEffect(function () {
     if (state.service.addTimeModal) {
       getTimeProducts();
+      loadingRef.current = false; // 打开弹窗时重置loading
       originServices.current = state.service;
     } else {
       updateServices.run();
@@ -494,7 +501,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$appHelper2, _context$appHelper2$g, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4;
       var loadingType,
         api,
         _args5 = arguments;
@@ -508,16 +515,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$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, (_context$appHelper$ut4 = context.appHelper.utils) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.businessUtils) ? 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'));
@@ -525,18 +548,19 @@ 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:
+            state === null || state === void 0 || state.callback({}, 'save');
+          case 24:
           case "end":
             return _context5.stop();
         }
-      }, _callee5);
+      }, _callee5, null, [[8, 14]]);
     }));
     return function handleSave() {
       return _ref5.apply(this, arguments);

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const EditNormalService: React.ForwardRefExoticComponent<React.RefAttributes<unknown>>;
+export default EditNormalService;