@pisell/private-materials 3.3.85 → 3.3.86

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

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

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

@@ -6,7 +6,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { createContext } from 'react';
 import { useSales } from "../../../businessModel/SalesModel";
-import { getResourceListApi } from "./serve";
+import { getSpecialResourceListApi } from "./serve";
 import { useRequest } from 'ahooks';
 import { useCart } from "../Cart";
 import { getIamgeFromMedia } from "../utils";
@@ -73,7 +73,7 @@ export var ResourceProvider = function ResourceProvider(_ref) {
     });
     return renderData;
   };
-  var getResourceList = useRequest(getResourceListApi, {
+  var getResourceList = useRequest(getSpecialResourceListApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
       var formatData = formatResourceList(res);

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

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

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

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

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

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(100vh - 100px);
+  height: calc(var(--vh, 1vh) * 100 - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  >div {
+  > div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

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

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(100vh - 16px) !important;
+      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
     }
   }
 }

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

@@ -0,0 +1,3 @@
+import './index.less';
+declare const Header: () => JSX.Element;
+export default Header;

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

@@ -85,9 +85,7 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
             return checkProductType(item === null || item === void 0 ? void 0 : item.id);
           case 4:
             type = _context2.sent;
-            if (type === 'session') {
-              appointmentBooking.openProductDetail(item.id);
-            }
+            appointmentBooking.openProductDetail(item.id);
           case 6:
             utils === null || utils === void 0 || utils.action({
               type: 'pisell1.productDetail',
@@ -105,6 +103,13 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                   return _regeneratorRuntime().wrap(function _callee$(_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
+                        if (!data.isCancel) {
+                          _context.next = 3;
+                          break;
+                        }
+                        appointmentBooking.closeProductDetail();
+                        return _context.abrupt("return");
+                      case 3:
                         product = _objectSpread(_objectSpread({}, data), {}, {
                           options: (data === null || data === void 0 ? void 0 : data.option) || []
                         });
@@ -112,31 +117,21 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
 
                         // 零售模版，直接加入购物车
                         if (!isRetailTemplate) {
-                          _context.next = 7;
+                          _context.next = 10;
                           break;
                         }
                         if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 5;
+                          _context.next = 8;
                           break;
                         }
                         return _context.abrupt("return");
-                      case 5:
+                      case 8:
                         appointmentBooking.storeProduct(product);
                         return _context.abrupt("return");
-                      case 7:
-                        if (!(data !== null && data !== void 0 && data.isCancel)) {
-                          _context.next = 10;
-                          break;
-                        }
-                        if (type === 'session') {
-                          appointmentBooking.closeProductDetail();
-                          appointmentBooking.getAvailableDate();
-                        }
-                        return _context.abrupt("return");
                       case 10:
                         session = data === null || data === void 0 ? void 0 : data.session;
                         if (!session) {
-                          _context.next = 20;
+                          _context.next = 19;
                           break;
                         }
                         startDate = dayjs(session === null || session === void 0 ? void 0 : session.start_at).format('YYYY-MM-DD');
@@ -148,35 +143,36 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                             endTime: "".concat(endDate, " ").concat(session === null || session === void 0 ? void 0 : session.end_time)
                           }
                         });
-                        appointmentBooking.closeProductDetail();
-                        _context.next = 18;
+                        _context.next = 17;
                         return appointmentBooking.getAvailableDate({
                           startDate: startDate,
                           endDate: endDate
                         });
-                      case 18:
-                        _context.next = 28;
+                      case 17:
+                        _context.next = 27;
                         break;
-                      case 20:
+                      case 19:
                         resources = (data === null || data === void 0 || (_data$origin = data.origin) === null || _data$origin === void 0 || (_data$origin = _data$origin.product_resource) === null || _data$origin === void 0 ? void 0 : _data$origin.resources) || [];
                         activeStatus = resources.find(function (item) {
                           return item.status === 1;
                         });
                         if (!(!activeStatus && !appointmentBooking.isTargetNormalProduct(data === null || data === void 0 ? void 0 : data.origin))) {
-                          _context.next = 24;
+                          _context.next = 23;
                           break;
                         }
                         return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.no.available.service')));
-                      case 24:
+                      case 23:
                         appointmentBooking.storeProduct(product);
                         // duration 类型的商品，要获取一下资源，在先选日期的 duration 步骤里目前只能通过这个动作拉取
                         if (!(type === 'duration')) {
-                          _context.next = 28;
+                          _context.next = 27;
                           break;
                         }
-                        _context.next = 28;
+                        _context.next = 27;
                         return appointmentBooking.getAvailableDate();
-                      case 28:
+                      case 27:
+                        appointmentBooking.closeProductDetail();
+
                         // 先选择日期流程
                         if (isDateSelectedFirst) {
                           index = (currentStep === null || currentStep === void 0 ? void 0 : currentStep.index) + 2; //先选择日期流程：如果商品类型是duration的商品，则需要增加选择时间步骤

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

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

package/es/components/appointmentBooking/index.js

@@ -27,6 +27,20 @@ var AppointmentBooking = function AppointmentBooking() {
       }
     });
   }, []);
+  useEffect(function () {
+    var setRealVH = function setRealVH() {
+      // window.innerHeight 会返回视口真实的高度（不包括工具栏）
+      var vh = window.innerHeight * 0.01;
+      document.documentElement.style.setProperty('--vh', "".concat(vh, "px"));
+    };
+
+    // 页面加载和窗口大小变化时都重新计算
+    setRealVH();
+    window.addEventListener('resize', setRealVH);
+    return function () {
+      window.removeEventListener('resize', setRealVH);
+    };
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "parallel-booking-wrap ".concat(isMobile() ? 'parallel-booking-mobile-wrap' : '')
   }, /*#__PURE__*/React.createElement(AppointmentBookingProvider, null, /*#__PURE__*/React.createElement(Content, null)));

package/es/components/appointmentBooking/index.less

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   background: #ffffff;
-  height: 100vh;
+  height: calc(var(--vh, 1vh) * 100);
   overflow-y: auto;
 
   .pisell-section-headers {

package/es/components/appointmentBooking/locales.d.ts

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

package/es/components/appointmentBooking/locales.js

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

package/es/components/booking/addons/model.d.ts

@@ -1 +1,10 @@
-export declare const Provider: any, Context: any;
+/// <reference types="react" />
+import { FormState } from "../model";
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
+    state: FormState;
+} & {
+    dispatch: (params: {
+        type: string;
+        payload: any;
+    }) => void;
+}>;

package/es/components/booking/components/TabProduct/tabs/index.js

@@ -2,7 +2,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useMemo, useState, useEffect, forwardRef, useImperativeHandle } from "react";
 import classNames from "classnames";
@@ -13,10 +13,6 @@ import "./index.less";
 
 // tabs 子组件定义
 
-// 定义主键类型
-
-// Tabs 可传递的参数
-
 var Tabs = function Tabs(_ref, ref) {
   var renderTab = _ref.renderTab,
     rowKey = _ref.rowKey,

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

@@ -29,7 +29,7 @@ var BrowserSelect = function BrowserSelect(props) {
     onChange: function onChange(e) {
       var _resetProps$onChange;
       e.persist();
-      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 || _resetProps$onChange.call(resetProps, e);
+      (_resetProps$onChange = resetProps.onChange) === null || _resetProps$onChange === void 0 ? void 0 : _resetProps$onChange.call(resetProps, e);
     }
   }), _options);
 };

package/es/components/booking/components/footer/utils.d.ts

@@ -27,6 +27,7 @@ export interface ResourceItem {
  * @Author: jinglin.tan
  */
 export declare const checkSubResourcesCapacity: (resource: ResourceItem) => void;
+export declare const checkResourcesFormat: (resources: any[], service: any, isChild?: boolean) => any[];
 /**
  * @title: 格式化商品单价
  * @description:

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

@@ -152,7 +152,7 @@ export var checkSubResourcesCapacity = function checkSubResourcesCapacity(resour
     });
   }
 };
-var checkResourcesFormat = function checkResourcesFormat(resources, service, isChild) {
+export var checkResourcesFormat = function checkResourcesFormat(resources, service, isChild) {
   return resources.map(function (resource) {
     var _resource$children;
     if (!isChild) {

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

@@ -26,8 +26,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { getServiceAddons } from "./utils";
 import { useMemoizedFn, useDebounceFn, useDebounceEffect } from 'ahooks';
+import { getServiceAddons } from "./utils";
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -275,8 +275,8 @@ var VoucherCard = function VoucherCard(props) {
     style: {
       width: '100%'
     },
-    mixedSort: mixedSort,
     dataSource: (_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length ? availableData : [],
+    mixedSort: mixedSort,
     onChange: function onChange(val) {
       var shopDiscount = pisellos.getModule('shopDiscount');
       var detail = shopDiscount.setDiscountSelected({

package/es/components/booking/editBookingModal/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import { EditBookingModalProps } from './type';
+import './index.less';
+declare const _default: React.ForwardRefExoticComponent<EditBookingModalProps & React.RefAttributes<unknown>>;
+export default _default;