@pisell/private-materials 6.2.24 → 6.2.26

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

@@ -15,7 +15,6 @@ 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';
@@ -34,6 +33,8 @@ import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
 import { useDebounceEffect } from 'ahooks';
+import CartClientCard from "./cartClientCard";
+import { Iconfont } from '@pisell/materials';
 var defaultModules = {
   client: 1,
   date: 1,
@@ -43,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,
@@ -81,6 +82,7 @@ var Info = Provider(function (props) {
   }, []);
   useMemo(function () {
     var _context$appHelper, _context$appHelper$ge, _context$appHelper2, _context$appHelper2$i, _context$appHelper3;
+    // TODO: 优化 内部每次设置state会触发两次渲染
     var isFranchisee = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getAppByModal) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'franchisee');
     modal.dispatch({
       type: 'setState',
@@ -117,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: 获取资源列表数据
@@ -265,19 +265,42 @@ var Info = Provider(function (props) {
         })
       });
     }
-  }), !!modal.state.setGlobalState ? /*#__PURE__*/React.createElement(TabPane, _defineProperty(_defineProperty({
-    style: style,
+  }), !!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/utils.js

@@ -128,7 +128,8 @@ export var getTimeObj = function getTimeObj(_ref4) {
     cacheItem: cacheItem,
     useStartTime: useStartTime,
     currentResource: currentResource,
-    state: state,
+    // 没有使用该参数
+    // state,
     durationProps: durationProps
   });
   var obj = sliceDayIntoFiveMinutes((_state$bookingConfig2 = state.bookingConfig) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.config) === null || _state$bookingConfig2 === void 0 || (_state$bookingConfig2 = _state$bookingConfig2.basic) === null || _state$bookingConfig2 === void 0 ? void 0 : _state$bookingConfig2.service_time, locales.locale);
@@ -286,7 +287,9 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
         defaultOriginalResource = renderList;
       }
       var defaultResource = defaultOriginalResource.map(function (d) {
-        return _objectSpread(_objectSpread({}, d), {}, {
+        return {
+          // ...d,
+          children: d.children,
           relation_type: d.relation_type,
           form_id: item.form_id,
           relation_id: d.id,
@@ -297,7 +300,7 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
             form_name: item.title,
             resource_name: d.main_field
           }
-        });
+        };
       });
       obj[item.form_id] = defaultResource;
     };

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

@@ -70,6 +70,7 @@ var AddTimeModal = function AddTimeModal() {
     _useState10 = _slicedToArray(_useState9, 2),
     renderList = _useState10[0],
     setRenderList = _useState10[1];
+  console.log(renderList, 'renderListrenderList');
   var context = useEngineContext();
   var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
     interaction = _context$appHelper$ut.interaction;
@@ -148,6 +149,7 @@ var AddTimeModal = function AddTimeModal() {
     }
     return arr.filter(Boolean);
   }, [(_state$service = state.service) === null || _state$service === void 0 || (_state$service = _state$service.cacheItem) === null || _state$service === void 0 || (_state$service = _state$service._extend) === null || _state$service === void 0 ? void 0 : _state$service.resource]);
+  console.log(currentResource, 'currentResource');
   var getTimeUsableStatus = function getTimeUsableStatus(time) {
     var _state$service$cacheI3;
     if (!((_state$service$cacheI3 = state.service.cacheItem) !== null && _state$service$cacheI3 !== void 0 && _state$service$cacheI3._extend) || !currentResource.length) {
@@ -270,6 +272,7 @@ var AddTimeModal = function AddTimeModal() {
           case 3:
             newList = _context2.sent;
             list = newList.map(function (d) {
+              debugger;
               // 是否可用
               var isUsable = isUsableProduct(d.add_time, state.service.cacheItem);
               return _objectSpread(_objectSpread({}, d), {}, {
@@ -552,7 +555,8 @@ var AddTimeModal = function AddTimeModal() {
           case 22:
             // 回调关闭弹窗
             state === null || state === void 0 || state.action('init');
-          case 23:
+            state === null || state === void 0 || state.callback({}, "save");
+          case 24:
           case "end":
             return _context5.stop();
         }

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

@@ -0,0 +1,67 @@
+import React, { forwardRef, useContext, useImperativeHandle, useRef } from 'react';
+import { useMemoizedFn } from 'ahooks';
+import SkuDetailModal from "../../../../../pro/skuDetailModal";
+import { Context } from "../../../info/model";
+var EditNormalService = /*#__PURE__*/forwardRef(function (props, ref) {
+  var _useContext = useContext(Context),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  var modalRef = useRef(null);
+  useImperativeHandle(ref, function () {
+    return {
+      init: function init(cacheItem) {
+        modalRef.current.open(cacheItem);
+      }
+    };
+  });
+  var handleRemove = useMemoizedFn(function (productData) {
+    var _ref, _state$service;
+    var newProducts = (_ref = (state === null || state === void 0 || (_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []) === null || _ref === void 0 ? void 0 : _ref.filter(function (item) {
+      return item._id !== productData._id;
+    });
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: false,
+        value: newProducts,
+        edit: true,
+        cacheItem: null
+      }
+    });
+  });
+  var handleConfirm = useMemoizedFn(function (data) {
+    var _ref2, _state$service2;
+    var newProducts = (_ref2 = (state === null || state === void 0 || (_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : _state$service2.value) || []) === null || _ref2 === void 0 ? void 0 : _ref2.map(function (item) {
+      if (item._id == data._id) {
+        return data;
+      }
+      return item;
+    });
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: false,
+        value: newProducts,
+        edit: true,
+        cacheItem: null
+      }
+    });
+  });
+  var handleClose = useMemoizedFn(function () {
+    dispatch({
+      type: 'setService',
+      payload: {
+        editModal: false,
+        cacheItem: null,
+        changeService: false
+      }
+    });
+  });
+  return /*#__PURE__*/React.createElement(SkuDetailModal, {
+    onClose: handleClose,
+    onConfirm: handleConfirm,
+    onRemove: handleRemove,
+    ref: modalRef
+  });
+});
+export default EditNormalService;

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

@@ -189,9 +189,14 @@ var Resources = function Resources(_ref, ref) {
   var getIsAutoAllocation = function getIsAutoAllocation(id) {
     return getAutoAllocationStorage(id);
   };
+  console.log('resourcesss');
+
+  /* todo: 此处value变化渲染三次 */
+
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.map(function (item) {
     var _cur$2;
     var cur = _value[item.form_id];
+    console.log(cur, 'curcur');
     var errors = (cur || []).reduce(function (pre, d) {
       return pre.concat((d === null || d === void 0 ? void 0 : d.errors) || []);
     }, []);