@pisell/private-materials 3.0.201 → 3.0.203

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

@@ -22,6 +22,16 @@ export declare const isInterval: (time1: number, time2: number, interval?: numbe
  */
 export declare const formatServiceListByTime: (list: any[]) => any[];
 export declare const isBooking4Shop: (shopId: number, renderType?: string) => boolean;
+declare type DataEntry = {
+    total: number;
+    origin_total: number;
+    num: number;
+    quotation_id: number;
+    start_date: string;
+    end_date: string;
+};
+declare type ResultStructure = Record<string, Record<string, any>>;
+export declare const getMultiDayPrices: (data: DataEntry[]) => ResultStructure;
 /**
  * @title: 是否是跨日预约
  * @description:
@@ -31,3 +41,4 @@ export declare const isBooking4Shop: (shopId: number, renderType?: string) => bo
  * @Date: 2024-11-29 11:19
  */
 export declare const isDayBooking: (shopId: number) => boolean;
+export {};

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

@@ -4,6 +4,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
+import dayjs from "dayjs";
 // 商品是套餐或单规格多规格
 export var getIsBundleOrCombination = function getIsBundleOrCombination(productDetail) {
   var _productDetail$bundle;
@@ -48,6 +49,10 @@ export var moveItemToFront = function moveItemToFront(arr, targetId) {
  */
 export var isInterval = function isInterval(time1, time2) {
   var interval = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000;
+  // 相同的为复制的, 不影响
+  if (time2 === time1) {
+    return false;
+  }
   return Math.abs(time2 - time1) < interval;
 };
 
@@ -91,6 +96,25 @@ export var isBooking4Shop = function isBooking4Shop(shopId, renderType) {
   var booking4Shops = [1350, 1401, 3013, 7154, 7572, 7007, 8119, 7320, 7362, 6497, 6087, 6303, 6726, 8191];
   return booking4Shops.includes(shopId);
 };
+function generateDateRange(start, end) {
+  var dateRange = [];
+  var currentDate = dayjs(start);
+  while (currentDate.isBefore(dayjs(end).add(1, "day"))) {
+    dateRange.push(currentDate.format("YYYY-MM-DD"));
+    currentDate = currentDate.add(1, "day");
+  }
+  return dateRange;
+}
+export var getMultiDayPrices = function getMultiDayPrices(data) {
+  var result = {};
+  data.forEach(function (entry) {
+    var dateRange = generateDateRange(entry.start_date, entry.end_date);
+    dateRange.forEach(function (date) {
+      result[date] = entry;
+    });
+  });
+  return result;
+};
 
 /**
  * @title: 是否是跨日预约

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

@@ -238,6 +238,8 @@ declare const _default: {
         'pisell2.text.change.pet.content1': string;
         'pisell2.text.change.pet.confirm': string;
         'pisell2.text.change.pet.cancel': string;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -478,6 +480,8 @@ declare const _default: {
         'pisell2.text.change.pet.content1': string;
         'pisell2.text.change.pet.confirm': string;
         'pisell2.text.change.pet.cancel': string;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -718,6 +722,8 @@ declare const _default: {
         'pisell2.text.change.pet.content1': string;
         'pisell2.text.change.pet.confirm': string;
         'pisell2.text.change.pet.cancel': string;
+        'pisell2.text.booking-list': string;
+        'pisell2.text.edit-booking': string;
     };
 };
 export default _default;

package/es/components/booking/locales.js

@@ -274,7 +274,9 @@ export default {
     'pisell2.text.change.pet.content': 'Selecting “Keep” will move the items to Open Items. Selecting “Discard” will clear all items under the holder’s name.',
     'pisell2.text.change.pet.content1': 'Reservation-type items cannot be added to the Open Items cart and will be removed.',
     'pisell2.text.change.pet.confirm': 'Keep (Add to open items)',
-    'pisell2.text.change.pet.cancel': 'Discard (Clear items)'
+    'pisell2.text.change.pet.cancel': 'Discard (Clear items)',
+    'pisell2.text.booking-list': "List",
+    'pisell2.text.edit-booking': "Edit"
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -555,7 +557,9 @@ export default {
     'pisell2.text.change.pet.content': '选择“保留”将商品添加到未分配商品（公共购物车）中；选择“不保留”将清空该持有人名下的所有商品。',
     'pisell2.text.change.pet.content1': '预约类商品无法添加到公共购物车，将会被删除。',
     'pisell2.text.change.pet.confirm': '保留（添加到未分配中）',
-    'pisell2.text.change.pet.cancel': '不保留（清空商品）'
+    'pisell2.text.change.pet.cancel': '不保留（清空商品）',
+    'pisell2.text.booking-list': "列表",
+    'pisell2.text.edit-booking': "编辑"
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -836,6 +840,8 @@ export default {
     'pisell2.text.change.pet.content': '選擇“保留”將商品添加到未分配商品（公共購物車）中；選擇“不保留”將清空該持有人名下的所有商品。',
     'pisell2.text.change.pet.content1': '預約類商品無法添加到公共購物車，將會被刪除。',
     'pisell2.text.change.pet.confirm': '保留（添加到未分配中）',
-    'pisell2.text.change.pet.cancel': '不保留（清空商品）'
+    'pisell2.text.change.pet.cancel': '不保留（清空商品）',
+    'pisell2.text.booking-list': "列表",
+    'pisell2.text.edit-booking': "編輯"
   }
 };

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

@@ -99,6 +99,7 @@ export interface FormState {
     loading: boolean;
     isTerminalDayBookingPage?: boolean;
     activeCartId?: any[];
+    isDayBooking: boolean;
 }
 export declare const walkInData: {
     id: number;

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

@@ -4,5 +4,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Notes: (props: any) => any;
+declare const Notes: any;
 export default Notes;

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

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

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

@@ -5,5 +5,5 @@ export interface InfoProps {
     globalState: any;
     setGlobalState: any;
 }
-declare const Payments: (props: any) => any;
+declare const Payments: any;
 export default Payments;

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

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

package/es/components/booking/utils.js

@@ -695,12 +695,15 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
 
   // 跨日预约
   if (isDay) {
+    _extend.end_date = dayjs(_extend.start_date).add(_extend.duration, 'day');
     var _formatDayDate2 = formatDayDate(_extend),
       start_date = _formatDayDate2.start_date,
       end_date = _formatDayDate2.end_date;
     _extend = _objectSpread(_objectSpread({}, _extend), {}, {
       start_date: start_date,
-      end_date: end_date
+      startDate: start_date,
+      end_date: end_date,
+      endDate: end_date
     });
   }
   return _extend;
@@ -709,8 +712,7 @@ export var getServerItemExtend = function getServerItemExtend(state, cacheItem,
 // 商品价格:   (商品价格 + (套餐价格 + 单规格价格 * 单规格数量) * 套餐数量 + 单规格价格 * 单规格数量)  * 商品数量
 export var getProductTotalPrice = function getProductTotalPrice(item) {
   var _item$_extend;
-  var price = 0;
-  price += Number(item._extend.price);
+  var price = Number(item._extend.price);
   var other = (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.other;
 
   // 多规格
@@ -730,7 +732,6 @@ export var getProductTotalPrice = function getProductTotalPrice(item) {
       return accumulator + Number(currentValue.price) * Number(currentValue.num);
     }, price);
   }
-  price = price;
   return price;
 };
 /**

package/es/components/eftpos/hooks.d.ts

@@ -6,8 +6,8 @@ import { Eftpos } from './const';
  * @Date: 2024-08-20 13:23
  */
 export declare const usePairTerminalo: (type: Eftpos, params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => ({ mid, tid, apiKey, posProductData, }: {
     mid: string;
     tid: string;
@@ -29,6 +29,6 @@ export declare const usePairTerminalo: (type: Eftpos, params: {
  * @Date: 2024-08-19 18:36
  */
 export declare const useTyro: (params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => readonly [import("react").MutableRefObject<any>, boolean];

package/es/components/eftposPay/amount.d.ts

@@ -9,7 +9,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "page" | "success" | "fail", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/es/components/eftposPay/component/step/index.d.ts

@@ -2,11 +2,11 @@ import React from 'react';
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;
-    warn?: string | undefined;
-    text?: string | undefined;
-    tip?: string | undefined;
-    loading?: string | undefined;
-    success?: string | undefined;
-    fail?: string | undefined;
+    warn?: string;
+    text?: string;
+    tip?: string;
+    loading?: string;
+    success?: string;
+    fail?: string;
 }) => React.JSX.Element;
 export default _default;

package/es/components/eftposPay/component/step/step.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
 declare const _default: (props: {
     status: string;
-    pedding?: string | undefined;
-    resolve?: string | undefined;
-    reject?: string | undefined;
-    className?: string | undefined;
+    pedding?: string;
+    resolve?: string;
+    reject?: string;
+    className?: string;
 }) => React.JSX.Element;
 export default _default;

package/es/components/eftposPay/hooks.d.ts

@@ -30,5 +30,5 @@ export declare const useStoreRef: <T extends {
  * @Date: 2024-08-12 11:54
  */
 export declare const useFail: (index: number) => (res: {
-    code?: "200" | "4004" | "701000" | "701001" | "701003" | "701004" | "701005" | "701006" | "701007" | "701008" | "701009" | "701010" | undefined;
+    code?: `${PayStatus}`;
 }, isMark?: boolean) => void;

package/es/components/eftposPay/store/index.d.ts

@@ -297,7 +297,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | undefined;
+        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
         action?: "amount" | "deviceList" | "pay" | undefined;
         key?: number | undefined;
         step?: number | undefined;

package/es/components/eftposPay/tyro/hooks.d.ts

@@ -9,6 +9,6 @@
  * @Date: 2024-08-19 18:36
  */
 export declare const useTyro: (params: {
-    url?: string | undefined;
-    version?: string | undefined;
+    url?: string;
+    version?: string;
 }) => readonly [import("react").MutableRefObject<any>, boolean];

package/es/components/eftposPay/windcave/helper.d.ts

@@ -9,7 +9,7 @@ import XhrTimer from './timer';
  * @Date: 2024-08-12 10:29
  */
 export declare const useFail: () => (res: {
-    code?: "200" | "4004" | "701000" | "701001" | "701003" | "701004" | "701005" | "701006" | "701007" | "701008" | "701009" | "701010" | undefined;
+    code?: `${PayStatus}`;
 }, isMark?: boolean) => void;
 /**
  * @title: 轮询 check 接口

package/es/components/schedules/index.d.ts

@@ -1,3 +1,3 @@
 import "./index.less";
-declare const Schedules: (props: any) => any;
+declare const Schedules: any;
 export default Schedules;

package/es/components/schedules/model.d.ts

@@ -69,7 +69,7 @@ export interface FormState {
     };
     setGlobalState: Function | null;
 }
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/shoppingCart/components/Cart/Product.js

@@ -1,20 +1,8 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-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; }
 import React, { useMemo } from 'react';
 import { ProductCard } from '@pisell/materials';
+// import ProductCard from '../../../../../../materials/src/components/productCard';
 import useClearCart from "../../hooks/useClearCart";
-import { updateProduct } from "../../utils";
 import { useContext } from "../../hooks/useContext";
 import useAddService from "../../hooks/useAddService";
 var Product = function Product(props) {
@@ -22,10 +10,8 @@ var Product = function Product(props) {
     lists = props.lists;
   var _useContext = useContext(),
     state = _useContext.state,
-    updateState = _useContext.updateState,
     _onAction = _useContext.onAction,
-    onChange = _useContext.onChange,
-    _onCard = _useContext.onCard;
+    onChange = _useContext.onChange;
   var disabledEdit = state.disabledEdit,
     isShowPackageNote = state.isShowPackageNote,
     isShowNote = state.isShowNote,
@@ -40,27 +26,9 @@ var Product = function Product(props) {
    * @Author: WangHan
    * @Date: 2024-11-28 22:02
    */
-  var handleChange = function handleChange(item, type) {
+  var handleChange = function handleChange(item, type, other) {
     if (disabledEdit) return;
-    var products = _toConsumableArray(state.products);
-
-    // 删除商品
-    if (type === 'delete') {
-      products = products.filter(function (product) {
-        return product._id !== item._id;
-      });
-    } else {
-      products = products.map(function (product) {
-        if (product._id === item._id) {
-          return _objectSpread(_objectSpread({}, product), item);
-        }
-        return product;
-      });
-    }
-
-    // 更新state
-    updateState(updateProduct(state, products));
-    onChange === null || onChange === void 0 ? void 0 : onChange(products);
+    onChange(item, type, other);
   };
   var productParams = useMemo(function () {
     return {
@@ -82,13 +50,17 @@ var Product = function Product(props) {
         return handleChange(e, 'delete');
       },
       onNote: function onNote(e) {
-        return handleChange(e);
+        return handleChange(e, 'note', {
+          note: e.note
+        });
       },
       onLike: function onLike(e) {
-        return handleChange(e);
+        return handleChange(e, 'like', {
+          like_status: e.like_status
+        });
       },
       onCard: function onCard(e) {
-        return _onCard === null || _onCard === void 0 ? void 0 : _onCard(e);
+        return handleChange === null || handleChange === void 0 ? void 0 : handleChange(e, 'view');
       }
     }, productParams));
   }), !hideAddBtn ? useAddService(id, 'more') : null);

package/es/components/shoppingCart/components/Render/index.js

@@ -15,7 +15,7 @@ import "./index.less";
 var Content = function Content() {
   var _useContext = useContext(),
     state = _useContext.state,
-    _onChange = _useContext.onChange;
+    onChange = _useContext.onChange;
   var selectPetRef = useRef();
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -43,9 +43,12 @@ var Content = function Content() {
     // 不是编辑页面，有选择的holder，没有记录的holder，并且有商品数据
     if (_holders !== null && _holders !== void 0 && _holders.length && !(pet !== null && pet !== void 0 && pet.length) && products !== null && products !== void 0 && products.length && !isEdit) {
       if (_holders.length === 1) {
-        var _holders$;
-        var _products = formatService(products, (_holders$ = _holders[0]) === null || _holders$ === void 0 ? void 0 : _holders$.key);
-        _onChange(_products);
+        var _holders$, _holders$2;
+        // const ids = products?.map((item: any) => item?._id);
+        onChange(products, 'update_holders', (_holders$ = _holders[0]) === null || _holders$ === void 0 ? void 0 : _holders$.key);
+        return;
+        var _products = formatService(products, (_holders$2 = _holders[0]) === null || _holders$2 === void 0 ? void 0 : _holders$2.key);
+        onChange(_products);
       } else {
         var _selectPetRef$current, _selectPetRef$current2;
         (_selectPetRef$current = selectPetRef.current) === null || _selectPetRef$current === void 0 ? void 0 : (_selectPetRef$current2 = _selectPetRef$current.open) === null || _selectPetRef$current2 === void 0 ? void 0 : _selectPetRef$current2.call(_selectPetRef$current, {
@@ -60,9 +63,7 @@ var Content = function Content() {
     className: classNames('pisell-lowcode__shopping-cart-wrap', className)
   }, isEmpty ? /*#__PURE__*/React.createElement(Empty, null) : /*#__PURE__*/React.createElement(Cart, null)), /*#__PURE__*/React.createElement(SelectHolderModal, {
     ref: selectPetRef,
-    onChange: function onChange(e) {
-      return _onChange(e);
-    }
+    onChange: onChange
   }));
 };
 export default Content;

package/es/components/shoppingCart/components/SelectHolderModal/index.js

@@ -51,7 +51,7 @@ var SelectPetModal = function SelectPetModal(_ref, ref) {
   });
   var handleChange = function handleChange(e, index) {
     var _lists = _toConsumableArray(params === null || params === void 0 ? void 0 : params.service);
-    _lists[index]._extend.holder_id = e;
+    _lists[index].holder_id = e;
     console.log(e, index, _lists, 'wh79876');
     setParams(_objectSpread(_objectSpread({}, params), {}, {
       service: _lists
@@ -82,12 +82,13 @@ var SelectPetModal = function SelectPetModal(_ref, ref) {
       return /*#__PURE__*/React.createElement("div", {
         className: "pisell-lowcode__booking-select-pet-item",
         key: item._id
-      }, /*#__PURE__*/React.createElement("span", null, " ", item.title), /*#__PURE__*/React.createElement(Select, {
+      }, /*#__PURE__*/React.createElement("span", null, " ", item.name), /*#__PURE__*/React.createElement(Select, {
         defaultValue: (_options$ = options[0]) === null || _options$ === void 0 ? void 0 : _options$.value,
         onChange: function onChange(e) {
           return handleChange(e, index);
         },
-        options: options
+        options: options,
+        popupMatchSelectWidth: false
       }));
     }));
   }, [params === null || params === void 0 ? void 0 : params.service, params === null || params === void 0 ? void 0 : params.pets]);
@@ -103,7 +104,14 @@ var SelectPetModal = function SelectPetModal(_ref, ref) {
    * @Date: 2024-12-03 17:05
    */
   var handleOk = function handleOk() {
-    onChange(params === null || params === void 0 ? void 0 : params.service);
+    var service = params.service;
+    var holders = service === null || service === void 0 ? void 0 : service.map(function (item) {
+      return {
+        _id: item._id,
+        holder_id: item.holder_id
+      };
+    });
+    onChange(service, 'update_holders', holders);
     handleCancel();
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PisellModal, {

package/es/components/shoppingCart/hooks/useClearCart.js

@@ -9,7 +9,6 @@ import classNames from 'classnames';
 import { Iconfont } from '@pisell/materials';
 import { useContext } from "./useContext";
 import { locales } from '@pisell/utils';
-import { updateProduct } from "../utils";
 var useClearCart = function useClearCart(key) {
   var _useContext = useContext(),
     state = _useContext.state,
@@ -32,16 +31,22 @@ var useClearCart = function useClearCart(key) {
     if (typeof key === 'undefined') {
       products = [];
     } else {
+      var _products;
+      var ids = (_products = products) === null || _products === void 0 ? void 0 : _products.map(function (item) {
+        return item === null || item === void 0 ? void 0 : item._id;
+      });
+      onChange(ids, 'delete_holders', key);
+      return;
       products = products.filter(function (item) {
-        var _item$_extend;
-        return (item === null || item === void 0 ? void 0 : (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.holder_id) !== key;
+        return (item === null || item === void 0 ? void 0 : item.holder_id) !== key;
       });
     }
 
     // 更新state
-    updateState(updateProduct(state, products));
-    onChange(products);
+    // updateState(updateProduct(state, products));
+    // onChange(products);
   };
+
   return !disabledEdit ? /*#__PURE__*/React.createElement("span", {
     className: classNames('pisell-lowcode__shopping-cart-clear-btn', {
       'pisell-lowcode__shopping-cart-clear-btn-empty': isProductList

package/es/components/shoppingCart/type.d.ts

@@ -17,7 +17,7 @@ export interface shoppingCartProps {
     defaultActiveKey?: string[] | number[];
     className?: string;
     onCard?: (e: any) => void;
-    onChange?: (e: any) => void;
+    onChange?: (items: any, type?: string, other?: any) => void;
     onAddProduct?: (e?: any) => void;
     onActiveKey?: (e: any) => void;
     isShowImage?: boolean;

package/es/components/shoppingCart/utils.js

@@ -18,8 +18,7 @@ export var formatCartList = function formatCartList(state) {
   return holders === null || holders === void 0 ? void 0 : holders.map(function (holder) {
     return _objectSpread(_objectSpread({}, holder), {}, {
       products: products === null || products === void 0 ? void 0 : products.filter(function (product) {
-        var _product$_extend;
-        return (product === null || product === void 0 ? void 0 : (_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.holder_id) === (holder === null || holder === void 0 ? void 0 : holder.key);
+        return (product === null || product === void 0 ? void 0 : product.holder_id) === (holder === null || holder === void 0 ? void 0 : holder.key);
       })
     });
   });
@@ -111,9 +110,7 @@ export var updateProduct = function updateProduct(state, newProducts) {
 export var formatService = function formatService(service, id) {
   return service.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
-      _extend: _objectSpread(_objectSpread({}, item._extend || {}), {}, {
-        holder_id: id
-      })
+      holder_id: id
     });
   });
 };

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

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

package/lib/components/booking/components/footer/amount.js

@@ -44,8 +44,9 @@ var getProductAmount = (state, isEdit) => {
     if ((state == null ? void 0 : state.service) || (state == null ? void 0 : state.addons)) {
       for (let item of state == null ? void 0 : state.service.value) {
         if (isDay) {
-          price += Number(item._extend.total) * Number(item._extend.quantity);
-          const _duration = (0, import_utils3.isAppointment)(item, state) ? item._extend.duration : 0;
+          const quantity = item._extend.quantity || 1;
+          price += Number(item._extend.total) * Number(quantity);
+          const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? item._extend.duration : 0;
           duration += _duration;
         } else {
           price += Number(item._extend.total);
@@ -66,7 +67,7 @@ var getProductAmount = (state, isEdit) => {
       var _a2;
       let current = 0;
       if (isDay) {
-        const _duration = (0, import_utils3.isAppointment)(cur, state) ? cur._extend.duration : 0;
+        const _duration = (0, import_utils3.isDayBookingProduct)(cur, state) ? cur._extend.duration : 0;
         current = _duration || 0;
       } else {
         current = import_utils.flexibleObj.getValue(((_a2 = cur._extend) == null ? void 0 : _a2.duration) || 0);