@pisell/private-materials 6.0.25 → 6.1.1

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

@@ -22,6 +22,7 @@ import { checkBeforeAddToCartApi } from "./serve";
 import { useCustomer } from "../Customer";
 import { useRequest } from 'ahooks';
 import { formatValues } from "../Checkout/utils";
+import { handleCartItemOrigin, handleProductInfo } from "./utils";
 var defaultState = {
   cartItems: [],
   currentCartItem: null
@@ -158,6 +159,7 @@ export var CartProvider = function CartProvider(_ref) {
    * @Date: 2025-01-20 13:00
    */
   var createCartItemFromEvent = function createCartItemFromEvent(eventItem) {
+    console.log('eventItem>>>>>>', eventItem);
     var _getCurrentData = getCurrentData(),
       resourceData = _getCurrentData.resourceData,
       holderData = _getCurrentData.holderData;
@@ -253,29 +255,37 @@ export var CartProvider = function CartProvider(_ref) {
   var createCartItemData = function createCartItemData() {
     var _cartData = getCurrentData().cartData;
     if (_cartData.currentCartItem) {
-      var _eventItem$eventDetai, _eventItem$eventDetai2, _startDateInfo$times, _eventItem$eventDetai3, _endDateInfo$times, _eventItem$eventDetai4;
+      var _eventDetail$bookingO, _eventItem$eventDetai, _startDateInfo$times, _eventItem$eventDetai2, _endDateInfo$times, _eventItem$eventDetai3;
       var _ref2 = _cartData.currentCartItem || {},
         _id = _ref2._id,
         _ref2$eventItem = _ref2.eventItem,
         _eventItem = _ref2$eventItem === void 0 ? {} : _ref2$eventItem,
         _ref2$holderItem = _ref2.holderItem,
         _holderItem = _ref2$holderItem === void 0 ? {} : _ref2$holderItem;
-      var bookingOptionData = _eventItem === null || _eventItem === void 0 || (_eventItem$eventDetai = _eventItem.eventDetail) === null || _eventItem$eventDetai === void 0 || (_eventItem$eventDetai = _eventItem$eventDetai.bookingOptionItem) === null || _eventItem$eventDetai === void 0 ? void 0 : _eventItem$eventDetai._originData;
+      var eventDetail = _eventItem === null || _eventItem === void 0 ? void 0 : _eventItem.eventDetail;
+      var bookingOptionData = eventDetail === null || eventDetail === void 0 || (_eventDetail$bookingO = eventDetail.bookingOptionItem) === null || _eventDetail$bookingO === void 0 ? void 0 : _eventDetail$bookingO._originData;
+      console.log('eventDetail>>>>>>', eventDetail);
+
       // 活动开始日期相关信息
-      var startDateInfo = _eventItem === null || _eventItem === void 0 || (_eventItem$eventDetai2 = _eventItem.eventDetail) === null || _eventItem$eventDetai2 === void 0 || (_eventItem$eventDetai2 = _eventItem$eventDetai2.selectDate) === null || _eventItem$eventDetai2 === void 0 ? void 0 : _eventItem$eventDetai2.startDateInfo;
+      var startDateInfo = _eventItem === null || _eventItem === void 0 || (_eventItem$eventDetai = _eventItem.eventDetail) === null || _eventItem$eventDetai === void 0 || (_eventItem$eventDetai = _eventItem$eventDetai.selectDate) === null || _eventItem$eventDetai === void 0 ? void 0 : _eventItem$eventDetai.startDateInfo;
       var startTime = startDateInfo === null || startDateInfo === void 0 || (_startDateInfo$times = startDateInfo.times) === null || _startDateInfo$times === void 0 || (_startDateInfo$times = _startDateInfo$times[0]) === null || _startDateInfo$times === void 0 ? void 0 : _startDateInfo$times.start_at;
-      var endDateInfo = _eventItem === null || _eventItem === void 0 || (_eventItem$eventDetai3 = _eventItem.eventDetail) === null || _eventItem$eventDetai3 === void 0 || (_eventItem$eventDetai3 = _eventItem$eventDetai3.selectDate) === null || _eventItem$eventDetai3 === void 0 ? void 0 : _eventItem$eventDetai3.endDateInfo;
+      var endDateInfo = _eventItem === null || _eventItem === void 0 || (_eventItem$eventDetai2 = _eventItem.eventDetail) === null || _eventItem$eventDetai2 === void 0 || (_eventItem$eventDetai2 = _eventItem$eventDetai2.selectDate) === null || _eventItem$eventDetai2 === void 0 ? void 0 : _eventItem$eventDetai2.endDateInfo;
       var endTime = endDateInfo === null || endDateInfo === void 0 || (_endDateInfo$times = endDateInfo.times) === null || _endDateInfo$times === void 0 || (_endDateInfo$times = _endDateInfo$times.slice(-1)) === null || _endDateInfo$times === void 0 || (_endDateInfo$times = _endDateInfo$times[0]) === null || _endDateInfo$times === void 0 ? void 0 : _endDateInfo$times.end_at;
-      var originTotal = Number((bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.original_price) || '');
+      var num = 1;
+      var _handleProductInfo = handleProductInfo(eventDetail, num),
+        totalPrice = _handleProductInfo.totalPrice,
+        originTotal = _handleProductInfo.originTotal,
+        is_charge_tax = _handleProductInfo.is_charge_tax;
       var newCartItem = {
         _id: _id,
         id: _eventItem.id,
         name: _eventItem.title,
-        price: bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.price,
-        total: bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.price,
+        price: totalPrice,
+        // eventBooking中售价和总价保持一致，因为数量为1
+        total: totalPrice,
         // 排除原始价格为0的场景
-        origin_total: isNaN(originTotal) || originTotal === 0 ? undefined : bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.original_price,
-        num: 1,
+        origin_total: isNaN(originTotal) || originTotal === 0 ? undefined : originTotal,
+        num: num,
         image: _eventItem.image,
         isShowNote: true,
         note: '',
@@ -290,12 +300,12 @@ export var CartProvider = function CartProvider(_ref) {
         // 是否显示时间
         show_time: true,
         end_time: endTime ? dayjs(endTime || '').format('HH:mm') : '',
-        custom_day_count: (_eventItem === null || _eventItem === void 0 || (_eventItem$eventDetai4 = _eventItem.eventDetail) === null || _eventItem$eventDetai4 === void 0 || (_eventItem$eventDetai4 = _eventItem$eventDetai4.selectDate) === null || _eventItem$eventDetai4 === void 0 || (_eventItem$eventDetai4 = _eventItem$eventDetai4.dates) === null || _eventItem$eventDetai4 === void 0 ? void 0 : _eventItem$eventDetai4.length) || 0,
-        is_charge_tax: bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.is_charge_tax,
+        custom_day_count: (_eventItem === null || _eventItem === void 0 || (_eventItem$eventDetai3 = _eventItem.eventDetail) === null || _eventItem$eventDetai3 === void 0 || (_eventItem$eventDetai3 = _eventItem$eventDetai3.selectDate) === null || _eventItem$eventDetai3 === void 0 || (_eventItem$eventDetai3 = _eventItem$eventDetai3.dates) === null || _eventItem$eventDetai3 === void 0 ? void 0 : _eventItem$eventDetai3.length) || 0,
+        is_charge_tax: is_charge_tax,
         _originData: _objectSpread(_objectSpread({}, _cartData.currentCartItem._originData), {}, {
           product: {
             num: 1,
-            product_id: bookingOptionData.id,
+            product_id: bookingOptionData === null || bookingOptionData === void 0 ? void 0 : bookingOptionData.id,
             note: '',
             // eventdetail 获取
             product_bundle: [],
@@ -311,8 +321,11 @@ export var CartProvider = function CartProvider(_ref) {
             end_time_text: endTime ? dayjs(endTime || '').format('HH:mm') : null
           },
           event_unique_identifier: _id // 传递给接口用于商品可用性检测的比对
-        })
+        }),
+        _productDetail: eventDetail.productDetail
       };
+      var originData = handleCartItemOrigin(newCartItem, eventDetail);
+      newCartItem._originData = originData;
       if (_holderItem !== null && _holderItem !== void 0 && _holderItem._originData) {
         var _getUserInfo, _holderItem$_originDa, _holderItem$_originDa2, _holderItem$_originDa3;
         newCartItem._originData.holder = {

package/es/components/Sales/Cart/types.d.ts

@@ -17,3 +17,15 @@ export interface IUnavailableResult {
  * 更新失效的购物车商品
  */
 export declare type TUpdateDisabledCartItem = (list: Array<IUnavailableResult>) => void;
+export interface ICalculatePriceParams {
+    /** 商品 */
+    product: any;
+    /** 规格 */
+    variant?: any;
+    /** 套餐 */
+    bundle?: any[];
+    /** 规格 */
+    options?: any[];
+    /** 数量 */
+    num?: number;
+}

package/es/components/Sales/Cart/utils.d.ts

@@ -0,0 +1,23 @@
+import { ICalculatePriceParams } from './types';
+export declare const handleProductInfo: (eventDetail: any, num: number) => {
+    totalPrice: number;
+    originTotal: any;
+    is_charge_tax: any;
+};
+/**
+ * 获取商品总价
+ * @description 当前总价计算基于商品数量为1
+ * @param item 商品
+ * @returns 商品总价
+ */
+export declare const getTotalPrice: (params: ICalculatePriceParams) => number;
+/**
+ * 获取商品原始总价
+ * @description 当前总价计算基于商品数量为1
+ * @param item 商品
+ * @returns 商品原始总价
+ */
+export declare const getOriginTotalPrice: (params: ICalculatePriceParams) => number | undefined;
+export declare const handleCartItemOrigin: (cartItem: any, eventDetail: any) => any;
+export declare const formatBundleToOrigin: (bundle: any) => any;
+export declare const formatOptionsToOrigin: (options: any) => any;

package/es/components/Sales/Cart/utils.js

@@ -0,0 +1,161 @@
+export var handleProductInfo = function handleProductInfo(eventDetail, num) {
+  var productDetail = eventDetail.productDetail,
+    bookingOptionItem = eventDetail.bookingOptionItem;
+  var normalProduct = bookingOptionItem === null || bookingOptionItem === void 0 ? void 0 : bookingOptionItem._originData;
+  var totalPrice = Number((normalProduct === null || normalProduct === void 0 ? void 0 : normalProduct.price) || '');
+  var originTotal = Number((normalProduct === null || normalProduct === void 0 ? void 0 : normalProduct.original_price) || '');
+  var is_charge_tax = normalProduct === null || normalProduct === void 0 ? void 0 : normalProduct.is_charge_tax;
+  if (productDetail) {
+    var origin = productDetail.origin,
+      bundle = productDetail.bundle,
+      options = productDetail.options,
+      product_variant_id = productDetail.product_variant_id;
+    var variant = null;
+
+    // 如果是组合规格，需要单独处理
+    if (product_variant_id) {
+      var _origin$variant, _variant;
+      variant = origin === null || origin === void 0 || (_origin$variant = origin.variant) === null || _origin$variant === void 0 ? void 0 : _origin$variant.find(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.id) === product_variant_id;
+      });
+      is_charge_tax = (_variant = variant) === null || _variant === void 0 ? void 0 : _variant.is_charge_tax;
+    }
+    var params = {
+      product: origin,
+      variant: variant,
+      bundle: bundle,
+      options: options,
+      num: num
+    };
+    totalPrice = getTotalPrice(params);
+    originTotal = getOriginTotalPrice(params);
+  }
+  return {
+    totalPrice: totalPrice,
+    originTotal: originTotal,
+    is_charge_tax: is_charge_tax
+  };
+};
+
+/**
+ * 获取商品总价
+ * @description 当前总价计算基于商品数量为1
+ * @param item 商品
+ * @returns 商品总价
+ */
+export var getTotalPrice = function getTotalPrice(params) {
+  var product = params.product,
+    bundle = params.bundle,
+    options = params.options,
+    variant = params.variant;
+  var num = params.num || 1;
+  var price = Number(product.price);
+
+  // 组合规格
+  if (variant) {
+    price = Number(variant === null || variant === void 0 ? void 0 : variant.price);
+  }
+
+  // 套餐
+  if (bundle !== null && bundle !== void 0 && bundle.length) {
+    price = bundle.reduce(function (accumulator, currentValue) {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+
+  // 单规格
+  if (options !== null && options !== void 0 && options.length) {
+    price = options.reduce(function (accumulator, currentValue) {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+  return price * num;
+};
+
+/**
+ * 获取商品原始总价
+ * @description 当前总价计算基于商品数量为1
+ * @param item 商品
+ * @returns 商品原始总价
+ */
+export var getOriginTotalPrice = function getOriginTotalPrice(params) {
+  var product = params.product,
+    bundle = params.bundle,
+    options = params.options,
+    variant = params.variant;
+  var num = (params === null || params === void 0 ? void 0 : params.num) || 1;
+  var price = Number(product.original_price);
+
+  // 组合规格
+  if (variant) {
+    price = Number(variant === null || variant === void 0 ? void 0 : variant.original_price);
+  }
+  if (isNaN(price) || price === 0) {
+    return undefined;
+  }
+
+  // 套餐
+  if (bundle !== null && bundle !== void 0 && bundle.length) {
+    price = bundle.reduce(function (accumulator, currentValue) {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+
+  // 单规格
+  if (options !== null && options !== void 0 && options.length) {
+    price = options.reduce(function (accumulator, currentValue) {
+      return accumulator + Number(currentValue.price) * Number(currentValue.num);
+    }, price);
+  }
+  return price * num;
+};
+export var handleCartItemOrigin = function handleCartItemOrigin(cartItem, eventDetail) {
+  var productDetail = eventDetail.productDetail;
+  var originData = (cartItem === null || cartItem === void 0 ? void 0 : cartItem._originData) || {};
+  if (productDetail) {
+    var bundle = productDetail.bundle,
+      options = productDetail.options,
+      product_variant_id = productDetail.product_variant_id;
+    if (!originData.product) {
+      originData.product = {};
+    }
+    if (product_variant_id) {
+      originData.product.product_variant_id = product_variant_id;
+    }
+    if (bundle !== null && bundle !== void 0 && bundle.length) {
+      originData.product.product_bundle = formatBundleToOrigin(bundle);
+    }
+    if (options !== null && options !== void 0 && options.length) {
+      originData.product.product_option_item = formatOptionsToOrigin(options);
+    }
+  }
+  console.log('originData>>>>>>', originData);
+  return originData;
+};
+export var formatBundleToOrigin = function formatBundleToOrigin(bundle) {
+  if (!(bundle !== null && bundle !== void 0 && bundle.length)) return [];
+  return bundle.map(function (d) {
+    return {
+      bundle_group_id: d.group_id,
+      bundle_id: d.id,
+      bundle_product_id: (d === null || d === void 0 ? void 0 : d._bundle_product_id) || (d === null || d === void 0 ? void 0 : d.product_id),
+      bundle_variant_id: d.bundle_variant_id,
+      num: d.num,
+      extension_id: d.extension_id,
+      extension_type: d.extension_type,
+      option: formatOptionsToOrigin(d.option)
+    };
+  });
+};
+export var formatOptionsToOrigin = function formatOptionsToOrigin(options) {
+  if (!(options !== null && options !== void 0 && options.length)) {
+    return [];
+  }
+  return options.map(function (d) {
+    return {
+      num: d.num,
+      option_group_item_id: d.product_option_item_id,
+      option_group_id: d.option_group_id
+    };
+  });
+};

package/es/components/Sales/Checkout/utils.d.ts

@@ -24,4 +24,12 @@ export declare const formatProductBundle: (bundle: any) => any;
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export declare const formatValues: (state: any, excludeDisabled?: boolean) => any;
+export declare const formatValues: (state: any, excludeDisabled?: boolean, otherValue?: Record<string, any>) => any;
+/**
+ * @title: 获取拉开表单弹窗参数
+ * @param state
+ */
+export declare const getFormParams: (state: any) => {
+    product_id: any;
+    appointment_type: string;
+};

package/es/components/Sales/Checkout/utils.js

@@ -1,3 +1,9 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+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); }
 /**
  * @title: 套餐单规格信息
  * @description:
@@ -78,8 +84,8 @@ var formatBookings = function formatBookings(list) {
  * @Author: xiangfeng.xue
  * @Date: 2025-01-21 17:57
  */
-export var formatValues = function formatValues(state, excludeDisabled) {
-  var values = {
+export var formatValues = function formatValues(state, excludeDisabled, otherValue) {
+  var values = _objectSpread({
     type: 'event_booking_v2',
     platform: 'H5',
     sales_channel: 'my_pisel',
@@ -87,7 +93,7 @@ export var formatValues = function formatValues(state, excludeDisabled) {
     bookings: [],
     shop_note: '',
     schedule_date: ''
-  };
+  }, otherValue || {});
   var data = [];
   if (excludeDisabled) {
     var _state$cartData$cartI, _state$cartData$cartI2;
@@ -101,4 +107,20 @@ export var formatValues = function formatValues(state, excludeDisabled) {
   // 服务
   values.bookings = formatBookings(data);
   return values;
+};
+
+/**
+ * @title: 获取拉开表单弹窗参数
+ * @param state
+ */
+export var getFormParams = function getFormParams(state) {
+  var _state$cartData;
+  var product_id = ((state === null || state === void 0 || (_state$cartData = state.cartData) === null || _state$cartData === void 0 ? void 0 : _state$cartData.cartItems) || []).map(function (item) {
+    var _item$_originData;
+    return (_item$_originData = item._originData) === null || _item$_originData === void 0 || (_item$_originData = _item$_originData.product) === null || _item$_originData === void 0 ? void 0 : _item$_originData.product_id;
+  });
+  return {
+    product_id: product_id,
+    appointment_type: "event_booking_v2"
+  };
 };

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

@@ -21,7 +21,9 @@ export var CustomerProvider = function CustomerProvider(_ref) {
       callback = _ref2.callback;
     utils.action({
       type: 'pisell1.login',
-      data: {},
+      data: {
+        type: 'plugin'
+      },
       callback: callback
     });
   };

package/es/components/Sales/Event/Detail.d.ts

@@ -12,6 +12,8 @@ interface EventDetailContextType {
         data?: any;
     };
     currentBookingOption: any;
+    selectEventDetailProductDetail: (productDetail: any) => void;
+    checkBeforeSelectEventDetail: () => boolean;
 }
 interface EventDetailProviderProps {
     children: React.ReactNode;

package/es/components/Sales/Event/Detail.js

@@ -19,6 +19,7 @@ import { getEventDetailBookingOptionsApi, getEventDetailIntroductionApi, getEven
 import { useRequest } from 'ahooks';
 import { useEvent } from "./index";
 import { getIamgeFromMedia } from "../utils";
+import useLoginUser from "../../../hooks/useLoginUser";
 
 // 定义步骤数据接口
 
@@ -44,11 +45,16 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     setCurrentBookingOption = _useState6[1];
   var _useEvent = useEvent(),
     selectEvent = _useEvent.selectEvent;
+  var customer = useLoginUser();
+  var currentBookingOptionRef = useRef(null);
   var _setDetail = function _setDetail(detailData) {
     detailRef.current = _objectSpread(_objectSpread({}, detailRef.current || {}), detailData || {});
-    console.log(detailRef.current, '55555555');
     setDetail(_objectSpread({}, detailRef.current));
   };
+  var _setCurrentBookingOption = function _setCurrentBookingOption(id) {
+    currentBookingOptionRef.current = id;
+    setCurrentBookingOption(id);
+  };
   var onOpenEventDetail = function onOpenEventDetail(eventItem) {
     var _eventItem$_originDat;
     setOpen(true);
@@ -70,7 +76,10 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     getEventDetailBookingOptions.run({
       ids: ((_eventItem$_originDat = eventItem._originData) === null || _eventItem$_originDat === void 0 ? void 0 : _eventItem$_originDat.relation_product_ids) || [],
       num: 100,
-      skip: 1
+      skip: 1,
+      customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+      open_quotation: 1,
+      is_eject: 1
     });
     getEventDetailSelectDate.run(eventItem.id, {
       days: 366
@@ -80,14 +89,22 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     setOpen(false);
     _setDetail(null);
     detailRef.current = null;
+    setCurrentBookingOption(null);
+    currentBookingOptionRef.current = null;
   };
+
+  /**
+   * @title:选择活动详情
+   * @param productDetail 商品详情
+   */
   var onSelectEventDetail = function onSelectEventDetail() {
-    var _detail$bookingOption;
+    var _detail$bookingOption, _detailRef$current;
     selectEvent(_objectSpread(_objectSpread({}, eventRef.current), {}, {
-      eventDetail: _objectSpread(_objectSpread({}, detail), {}, {
+      eventDetail: _objectSpread(_objectSpread({}, detailRef.current || {}), {}, {
         bookingOptionItem: (_detail$bookingOption = detail.bookingOptions) === null || _detail$bookingOption === void 0 || (_detail$bookingOption = _detail$bookingOption.filter(function (v) {
-          return v.value === currentBookingOption;
-        })) === null || _detail$bookingOption === void 0 ? void 0 : _detail$bookingOption[0]
+          return v.value === currentBookingOptionRef.current;
+        })) === null || _detail$bookingOption === void 0 ? void 0 : _detail$bookingOption[0],
+        productDetail: (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 ? void 0 : _detailRef$current.productDetail
       })
     }));
     onCloseEventDetail();
@@ -118,11 +135,11 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
   var getEventDetailSelectDate = useRequest(getEventDetailSelectDateApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
-      var _detailRef$current, _detailRef$current2;
+      var _detailRef$current2, _detailRef$current3;
       var data = res.data;
       var dates = _toConsumableArray(data.dates || []);
-      var startDateInfo = (_detailRef$current = detailRef.current) === null || _detailRef$current === void 0 || (_detailRef$current = _detailRef$current.selectDate) === null || _detailRef$current === void 0 ? void 0 : _detailRef$current.startDateInfo;
-      var endDateInfo = (_detailRef$current2 = detailRef.current) === null || _detailRef$current2 === void 0 || (_detailRef$current2 = _detailRef$current2.selectDate) === null || _detailRef$current2 === void 0 ? void 0 : _detailRef$current2.endDateInfo;
+      var startDateInfo = (_detailRef$current2 = detailRef.current) === null || _detailRef$current2 === void 0 || (_detailRef$current2 = _detailRef$current2.selectDate) === null || _detailRef$current2 === void 0 ? void 0 : _detailRef$current2.startDateInfo;
+      var endDateInfo = (_detailRef$current3 = detailRef.current) === null || _detailRef$current3 === void 0 || (_detailRef$current3 = _detailRef$current3.selectDate) === null || _detailRef$current3 === void 0 ? void 0 : _detailRef$current3.endDateInfo;
       var selectDate = {
         dates: dates,
         _originData: {
@@ -184,13 +201,14 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
       var list = ((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list) || [];
       var current = null;
       var bookingOptions = list.map(function (v) {
+        var _current;
         var option = {
           value: v.id,
           label: v.title,
           price: v.price,
           _originData: v
         };
-        if (!current || current.price > v.price) {
+        if (!current || Number(((_current = current) === null || _current === void 0 ? void 0 : _current.price) || 0) > Number(v.price || 0)) {
           current = _objectSpread({}, option);
         }
         return option;
@@ -213,9 +231,36 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
       introduction: _objectSpread(_objectSpread({}, introduction), {}, {
         price: option.price,
         origin_price: option.original_price
-      })
+      }),
+      selectedProduct: option // 选中的活动关联的商品
     });
-    setCurrentBookingOption(id);
+    _setCurrentBookingOption(id);
+  };
+
+  /**
+   * @title: 选择商品详情
+   * @param {any} productDetail 商品详情
+   */
+  var selectEventDetailProductDetail = function selectEventDetailProductDetail(productDetail) {
+    _setDetail({
+      productDetail: productDetail
+    });
+  };
+
+  /**
+   * @title: 校验is_eject为1的商品是否有拉起商品详情弹窗选中过
+   * @returns boolean
+   */
+  var checkBeforeSelectEventDetail = function checkBeforeSelectEventDetail() {
+    var _selectedProduct$_ori;
+    var _ref3 = detailRef.current || {},
+      selectedProduct = _ref3.selectedProduct,
+      productDetail = _ref3.productDetail;
+    console.log('selectedProduct', selectedProduct, productDetail);
+    if ((selectedProduct === null || selectedProduct === void 0 || (_selectedProduct$_ori = selectedProduct._originData) === null || _selectedProduct$_ori === void 0 ? void 0 : _selectedProduct$_ori.is_eject) === 1 && !productDetail) {
+      return false;
+    }
+    return true;
   };
   var contextValue = {
     detail: detail,
@@ -225,7 +270,9 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     onSelectEventDetail: onSelectEventDetail,
     selectEventDetailBookingOptions: selectEventDetailBookingOptions,
     getEventDetailSelectDate: getEventDetailSelectDate,
-    currentBookingOption: currentBookingOption
+    currentBookingOption: currentBookingOption,
+    selectEventDetailProductDetail: selectEventDetailProductDetail,
+    checkBeforeSelectEventDetail: checkBeforeSelectEventDetail
   };
   return /*#__PURE__*/React.createElement(EventDetailContext.Provider, {
     value: contextValue

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

@@ -87,13 +87,13 @@ export var EventProvider = function EventProvider(_ref) {
     setEventData({
       currentEventItem: eventItem
     });
-    if (currentCartItem) {
-      updateCurrentCartItem({
-        eventItem: eventItem
-      });
-    } else {
-      createCartItemFromEvent(eventItem);
-    }
+    // if (currentCartItem) {
+    //   updateCurrentCartItem({ eventItem: eventItem });
+    // } else {
+    //   createCartItemFromEvent(eventItem);
+    // }
+    // 每次添加商品时都需要直接创建购物车，防止第一步创建的购物车数据和缓存数据冲突
+    createCartItemFromEvent(eventItem);
   };
   var contextValue = {
     eventData: eventData,

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

@@ -10,6 +10,7 @@ export declare const getEventListApi: (params: {
     title?: string;
     skip?: number;
     num?: number;
+    open_quotation: number;
 }) => Promise<any>;
 export declare const getEventDetailIntroductionApi: (eventItemId: number | string) => Promise<any>;
 export declare const getEventDetailTeacherApi: (params: {
@@ -19,8 +20,20 @@ export declare const getEventDetailBookingOptionsApi: (params: {
     ids: number | string;
     num: number;
     skip: number;
+    customer_id?: number;
+    open_quotation?: number;
+    is_eject?: number;
 }) => Promise<any>;
 export declare const getEventDetailSelectDateApi: (id: number | string, params: {
     days: number;
     start_date?: string;
 }) => Promise<any>;
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export declare const getProductPrice: (params: {
+    ids: number[];
+    customer_id: number;
+    schedule_date?: string;
+}) => Promise<any>;

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

@@ -1,3 +1,7 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { request } from "../../../utils";
 /**
  * @title: 获取活动列表
@@ -30,4 +34,25 @@ export var getEventDetailSelectDateApi = function getEventDetailSelectDateApi(id
   return request.getRequest().get("/h5/eventbookingv2/available-count/".concat(id), params, {
     useCache: true
   });
-};
+};
+
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export var getProductPrice = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request.getRequest().post("/h5/product/query/price", params));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getProductPrice(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/es/components/Sales/Init/index.d.ts

@@ -4,6 +4,7 @@ interface InitData {
     form_id?: number;
     shop_id?: number;
     shop?: any;
+    scheduleDisplayType?: 'calendarView' | 'textList';
 }
 interface InitContextType {
     getBoardSetting: any;