@pisell/private-materials 6.1.1 → 6.1.3

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/businessModel/SalesModel/index.d.ts

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

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/booking/components/TabProduct/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

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

@@ -74,6 +74,7 @@ var CustomSelect = function CustomSelect(props, ref) {
     showDropDown = _props$showDropDown === void 0 ? true : _props$showDropDown,
     propsHandleOpenModal = props.handleOpenModal,
     handleDayChange = props.handleDayChange;
+  console.log('custom select');
   var searchRef = useRef();
 
   // 当前选择的值

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) {
@@ -227,9 +227,20 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend6, _item$_extend7;
+  var _item$_extend6, _item$_extend7, _item$variant;
   var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
   var price = Number((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
+
+  // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
+  if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant = item.variant) === null || _item$variant === void 0 ? void 0 : _item$variant.length) > 0) {
+    var variant = item.variant.find(function (d) {
+      return d.id === (other === null || other === void 0 ? void 0 : other.product_variant_id);
+    });
+    if (variant) {
+      price = Number(variant === null || variant === void 0 ? void 0 : variant.price) || 0;
+    }
+  }
+
   // 单规格， 单价 + 单规格价格
   if (other !== null && other !== void 0 && other.option) {
     var _other$option;
@@ -273,6 +284,24 @@ var formatMetaData = function formatMetaData(item) {
 //   })
 // }
 
+// 获取商品价格 包含组合规格
+var getSourceProductPrice = function getSourceProductPrice(item) {
+  var _item$_extend13, _item$_extend14, _item$variant2;
+  var other = (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.other;
+  var price = Number((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price);
+
+  // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
+  if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant2 = item.variant) === null || _item$variant2 === void 0 ? void 0 : _item$variant2.length) > 0) {
+    var variant = item.variant.find(function (d) {
+      return d.id === (other === null || other === void 0 ? void 0 : other.product_variant_id);
+    });
+    if (variant) {
+      price = Number(variant === null || variant === void 0 ? void 0 : variant.price) || 0;
+    }
+  }
+  return price;
+};
+
 /**
  * @title: 格式化商品数据
  * @description: 
@@ -282,7 +311,7 @@ var formatMetaData = function formatMetaData(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16;
+  var _item$_extend15, _item$_extend16, _item$_extend17;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -298,7 +327,7 @@ var formatProducts = function formatProducts(item, quantity) {
   return {
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
-    "source_product_price": (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.price,
+    "source_product_price": getSourceProductPrice(item),
     "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
@@ -308,10 +337,10 @@ var formatProducts = function formatProducts(item, quantity) {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 || (_item$_extend14 = _item$_extend14.other) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.bundle),
+    "product_bundle": formatProductBundle((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.option),
-    "product_variant_id": ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.option),
+    "product_variant_id": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -331,8 +360,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend17;
-    var holderId = (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.holder_id;
+    var _item$_extend18;
+    var holderId = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -358,15 +387,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend18;
-      return ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend19;
+      return ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend19;
-      var key = (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id; // 分组键
+      var _item$_extend20;
+      var key = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -439,9 +468,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend20, _item$_extend21, _item$_extend22, _item$_extend23;
-      var startDate = ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.startDate) || ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.start_date);
-      var endDate = ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.endDate) || ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.end_date);
+      var _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24;
+      var startDate = ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.startDate) || ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.start_date);
+      var endDate = ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.endDate) || ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -644,7 +673,7 @@ export var formatValues = function formatValues(state) {
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend24;
+    var _item$_extend25;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
@@ -652,7 +681,7 @@ export var checkHolderIsError = function checkHolderIsError(state) {
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 || (_item$_extend24 = _item$_extend24.holder_id) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.length) !== item._extend.quantity) {
+    if (item._extend.quantity > 1 && ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 || (_item$_extend25 = _item$_extend25.holder_id) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.length) !== item._extend.quantity) {
       return true;
     }
     return false;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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;