@pisell/private-materials 3.3.45 → 3.3.47

package/es/businessModel/SalesModel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const SalesModel: ({ children, hooks, config }: any) => JSX.Element;
 export * from './Sales';
 export default SalesModel;

package/es/components/appointmentBooking/components/Cart/Item/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const CartItem: ({ onNext }: any) => JSX.Element;
 export default CartItem;

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

@@ -197,6 +197,9 @@ var CartItem = function CartItem(_ref) {
   };
   var products = useMemo(function () {
     if (!(carts !== null && carts !== void 0 && carts.length)) return [];
+    carts.forEach(function (item) {
+      item.isShowChangeHolder = !appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id);
+    });
     if ((currentSelectedResources === null || currentSelectedResources === void 0 ? void 0 : currentSelectedResources.length) > 0) {
       var newCarts = carts.map(function (item) {
         var currentResourceData = currentSelectedResources.find(function (resource) {

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Layout: () => JSX.Element;
 export default Layout;

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

@@ -83,8 +83,14 @@ var Layout = function Layout() {
   }, [currentStepParams]);
   useEffect(function () {
     try {
+      var _appointmentBooking$o;
       if (!(appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.otherParams) || isRetailTemplate) return;
-      if (isFormSubject) {
+
+      // 显示预约添加人
+      var showAddGuest = appointmentBooking === null || appointmentBooking === void 0 || (_appointmentBooking$o = appointmentBooking.otherParams) === null || _appointmentBooking$o === void 0 || (_appointmentBooking$o = _appointmentBooking$o.productModuleParams) === null || _appointmentBooking$o === void 0 ? void 0 : _appointmentBooking$o.showAddGuest;
+
+      // 如果是表单主体或者是预约添加人不显示，则删除添加人步骤
+      if (isFormSubject || !showAddGuest) {
         removeStep('select-guest');
       } else {
         appointmentBooking.addStep({

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Header: () => JSX.Element;
 export default Header;

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

@@ -145,8 +145,8 @@ var Header = function Header() {
               });
             }
 
-            // 如果当前步骤是选择资源，则清空表单步骤，不然表单步骤会累加
-            if ((currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) === 'select-resource') {
+            // 如果前一步是选择资源，则清空表单步骤，不然表单步骤会累加
+            if ((prevStepData === null || prevStepData === void 0 ? void 0 : prevStepData.key) === 'select-resource') {
               stepList.forEach(function (item) {
                 if (item.key.startsWith('fill-form_')) {
                   removeStep(item.key);

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

@@ -125,8 +125,11 @@ var Resource = /*#__PURE__*/forwardRef(function (props, ref) {
     return currentAppointmentBoard(currentStepParams.key, resources, appointmentBooking);
   }, [currentStepParams.key, resources]);
   var renderLists = useMemo(function () {
-    // 如果购物车有多个，则不显示左侧内容
-    if (carts.length > 1 || !(carts !== null && carts !== void 0 && carts.length)) {
+    // 如果购物车有多个预约类商品，则不显示左侧内容
+    var appointmentCarts = carts.filter(function (n) {
+      return !(appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.isTargetCartIdNormalProduct(n._id));
+    });
+    if (appointmentCarts.length > 1 || !(appointmentCarts !== null && appointmentCarts !== void 0 && appointmentCarts.length)) {
       return [];
     }
     return currentRenderLists(resources, appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.form_code);
@@ -142,7 +145,7 @@ var Resource = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     var autoSelectResources = /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var res, cartItem;
+        var res, carts, cartItem;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -160,11 +163,17 @@ var Resource = /*#__PURE__*/forwardRef(function (props, ref) {
 
               // 自动分派之后获取重新获取资源列表数据;
               getResourceList();
-              cartItem = carts === null || carts === void 0 ? void 0 : carts[0];
-              appointmentBooking.updateCart(_objectSpread({
-                _id: cartItem === null || cartItem === void 0 ? void 0 : cartItem._id
-              }, cartItem));
+              _context3.next = 9;
+              return appointmentBooking.getCart();
             case 9:
+              carts = _context3.sent;
+              cartItem = carts === null || carts === void 0 ? void 0 : carts[0];
+              if (cartItem !== null && cartItem !== void 0 && cartItem._id) {
+                appointmentBooking.updateCart(_objectSpread({
+                  _id: cartItem === null || cartItem === void 0 ? void 0 : cartItem._id
+                }, cartItem));
+              }
+            case 12:
             case "end":
               return _context3.stop();
           }
@@ -184,16 +193,25 @@ var Resource = /*#__PURE__*/forwardRef(function (props, ref) {
   var _onClick = function onClick(e) {
     setSelectedResource(e.id);
     if (e.id) {
-      var _carts$;
+      var _carts$index;
+      // 能够被点击的情况
+      // 1. 购物车里只有一个预约类商品
+      // 2. 购物车里有多个商品，但只有一个预约类商品
+      var index = carts.findIndex(function (n) {
+        return !(appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.isTargetCartIdNormalProduct(n._id));
+      });
       return appointmentBooking.updateCart({
-        _id: carts === null || carts === void 0 || (_carts$ = carts[0]) === null || _carts$ === void 0 ? void 0 : _carts$._id,
-        resources: updateCartResources(carts === null || carts === void 0 ? void 0 : carts[0], e)
+        _id: carts === null || carts === void 0 || (_carts$index = carts[index]) === null || _carts$index === void 0 ? void 0 : _carts$index._id,
+        resources: updateCartResources(carts === null || carts === void 0 ? void 0 : carts[index], e)
       });
     }
   };
   useEffect(function () {
-    var _carts$2;
-    var selectedResource = carts === null || carts === void 0 || (_carts$2 = carts[0]) === null || _carts$2 === void 0 || (_carts$2 = _carts$2._origin) === null || _carts$2 === void 0 || (_carts$2 = _carts$2.resources) === null || _carts$2 === void 0 ? void 0 : _carts$2.find(function (item) {
+    var _carts$index2;
+    var index = carts.findIndex(function (n) {
+      return !(appointmentBooking !== null && appointmentBooking !== void 0 && appointmentBooking.isTargetCartIdNormalProduct(n._id));
+    });
+    var selectedResource = carts === null || carts === void 0 || (_carts$index2 = carts[index]) === null || _carts$index2 === void 0 || (_carts$index2 = _carts$index2._origin) === null || _carts$index2 === void 0 || (_carts$index2 = _carts$index2.resources) === null || _carts$index2 === void 0 ? void 0 : _carts$index2.find(function (item) {
       return (item === null || item === void 0 ? void 0 : item.form_id) === (appointmentBoard === null || appointmentBoard === void 0 ? void 0 : appointmentBoard.form_id);
     });
     setSelectedResource((selectedResource === null || selectedResource === void 0 ? void 0 : selectedResource.id) || 0);

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

@@ -94,7 +94,10 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
               data: {
                 detail: _objectSpread(_objectSpread({}, item), {}, {
                   open_deposit: 1
-                })
+                }),
+                setting: {
+                  can_input: true
+                }
               },
               callback: function () {
                 var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
@@ -159,7 +162,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
-                        if (activeStatus) {
+                        if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
                           _context.next = 24;
                           break;
                         }

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

@@ -68,11 +68,14 @@ var TimeSlicing = /*#__PURE__*/forwardRef(function (props, ref) {
     };
   }();
   useEffect(function () {
-    if ((times === null || times === void 0 ? void 0 : times.length) > 0 && (carts === null || carts === void 0 ? void 0 : carts.length) > 0) {
-      var _carts$, _times$, _carts$2;
-      var startTime = (carts === null || carts === void 0 || (_carts$ = carts[0]) === null || _carts$ === void 0 ? void 0 : _carts$.start_time) || (times === null || times === void 0 || (_times$ = times[0]) === null || _times$ === void 0 ? void 0 : _times$.start_time);
+    var appoimentBookingProductCart = carts.filter(function (item) {
+      return !appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id);
+    });
+    if ((times === null || times === void 0 ? void 0 : times.length) > 0 && (appoimentBookingProductCart === null || appoimentBookingProductCart === void 0 ? void 0 : appoimentBookingProductCart.length) > 0) {
+      var _appoimentBookingProd, _times$, _appoimentBookingProd2;
+      var startTime = (appoimentBookingProductCart === null || appoimentBookingProductCart === void 0 || (_appoimentBookingProd = appoimentBookingProductCart[0]) === null || _appoimentBookingProd === void 0 ? void 0 : _appoimentBookingProd.start_time) || (times === null || times === void 0 || (_times$ = times[0]) === null || _times$ === void 0 ? void 0 : _times$.start_time);
       setSelectedResource(startTime);
-      if (carts !== null && carts !== void 0 && (_carts$2 = carts[0]) !== null && _carts$2 !== void 0 && _carts$2.start_time) return;
+      if (appoimentBookingProductCart !== null && appoimentBookingProductCart !== void 0 && (_appoimentBookingProd2 = appoimentBookingProductCart[0]) !== null && _appoimentBookingProd2 !== void 0 && _appoimentBookingProd2.start_time) return;
 
       // 如果没有选择时间，则默认选中第一个时间
       getAutoSelect(times === null || times === void 0 ? void 0 : times[0]);

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

@@ -97,6 +97,7 @@ var VoucherCard = function VoucherCard(props) {
       var _item$_origin;
       return {
         _id: item._id,
+        quantity: item.num,
         bundle: item._bundleOrigin,
         options: item._optionsOrigin,
         product: _objectSpread({}, item._productOrigin),

package/es/components/appointmentBooking/context.js

@@ -166,11 +166,15 @@ export var AppointmentBookingProvider = function AppointmentBookingProvider(_ref
       if (!(carts !== null && carts !== void 0 && carts.length) || !(resources !== null && resources !== void 0 && resources.length)) {
         return setCurrentSelectedResources(null);
       }
-      var _currentSelectedResources = carts.map(function (item) {
-        return {
+      var _currentSelectedResources = [];
+      carts.forEach(function (item) {
+        if (appointmentBooking.isTargetCartIdNormalProduct(item === null || item === void 0 ? void 0 : item._id)) {
+          return;
+        }
+        _currentSelectedResources.push({
           _id: item === null || item === void 0 ? void 0 : item._id,
           currentSelectedResource: getCartCurrentResourceData(item, currentStepParams === null || currentStepParams === void 0 ? void 0 : currentStepParams.key, resources)
-        };
+        });
       });
       setCurrentSelectedResources(_currentSelectedResources);