@pisell/private-materials 3.0.201 → 3.0.202

package/es/components/booking/info/service2/Lists.js

@@ -14,7 +14,7 @@ import React, { useContext, useEffect, useMemo, useState } from 'react';
 import { CartContext } from "../../../shoppingCart/Provider";
 import ShoppingCart from "../../../shoppingCart";
 import { Context } from "../model";
-import { formatProducts, formatActiveKey } from "./utils";
+import { formatProducts, formatActiveKey, updateServices } from "./utils";
 import useSelectPet from "./hooks/useSelectPet";
 import { defaultData } from "./status";
 var Lists = function Lists(_ref) {
@@ -30,7 +30,7 @@ var Lists = function Lists(_ref) {
   var _useSelectPet = useSelectPet(state),
     holderLists = _useSelectPet.holderLists;
   useEffect(function () {
-    var keys = formatActiveKey(holderLists, params === null || params === void 0 ? void 0 : params.platform);
+    var keys = formatActiveKey(holderLists, params === null || params === void 0 ? void 0 : params.platform, !!state.bookingId);
     onChange({
       activeCartId: keys
     }, 'setActiveCartId');
@@ -39,29 +39,6 @@ var Lists = function Lists(_ref) {
     }));
   }, [holderLists, params === null || params === void 0 ? void 0 : params.platform]);
 
-  /**
-   * @title: 点击商品卡片
-   * @description:
-   * @param {any} item
-   * @return {*}
-   * @Author: WangHan
-   * @Date: 2024-12-09 16:06
-   */
-  var handleCard = function handleCard(item) {
-    if (state.disabledEdit || state.disableEventBookingEdit) {
-      return;
-    }
-    onChange({
-      editModal: true,
-      cacheItem: _objectSpread(_objectSpread({}, item), {}, {
-        new: 0
-      })
-    });
-    onEdit === null || onEdit === void 0 ? void 0 : onEdit(_objectSpread(_objectSpread({}, item), {}, {
-      new: 0
-    }));
-  };
-
   /**
    * @title: 更新商品数据
    * @description:
@@ -70,13 +47,33 @@ var Lists = function Lists(_ref) {
    * @Author: WangHan
    * @Date: 2024-11-29 16:35
    */
-  var handleChange = function handleChange(newState) {
-    if (state.disabledEdit || state.disableEventBookingEdit || state.channelDisabledEdit) {
+  var handleChange = function handleChange(currentItem, type, other) {
+    if (state.disabledEdit || state.disableEventBookingEdit) {
       return;
     }
+    var products = updateServices(state, currentItem, type, other);
+
+    // 查看
+    if (type === 'view') {
+      var product = currentItem._origin;
+      // if (isGroupBooking(currentItem._id)) {
+      //   product = currentItem._origin;
+      // } else {
+      //   product = products?.find((item: any) => item._id === currentItem._id);
+      // }
+      onChange({
+        editModal: true,
+        cacheItem: _objectSpread(_objectSpread({}, product), {}, {
+          new: 0
+        })
+      });
+      return onEdit === null || onEdit === void 0 ? void 0 : onEdit(_objectSpread(_objectSpread({}, product), {}, {
+        new: 0
+      }));
+    }
     var params = {
       editModal: false,
-      value: newState,
+      value: products,
       edit: true,
       cacheItem: null
     };
@@ -127,7 +124,7 @@ var Lists = function Lists(_ref) {
   var productParams = useMemo(function () {
     return {
       hideAddBtn: state.isTerminalDayBookingPage,
-      isShowNote: true,
+      isShowNote: false,
       isShowPackageNote: false,
       holders: holderLists,
       isEdit: !!(state !== null && state !== void 0 && state.bookingId),
@@ -139,10 +136,7 @@ var Lists = function Lists(_ref) {
       state: state
     }
   }, /*#__PURE__*/React.createElement(ShoppingCart, {
-    onCard: handleCard,
-    onChange: function onChange(e) {
-      return handleChange(e);
-    },
+    onChange: handleChange,
     onAddProduct: function onAddProduct() {
       return onChange({
         addModal: true

package/es/components/booking/info/service2/index.d.ts

@@ -1,3 +1,6 @@
 import React from 'react';
 export declare const Service2Context: React.Context<any>;
-export declare const Service2Cart: () => React.JSX.Element;
+export declare const Service2Cart: ({ hideAdd, hideEdit, }: {
+    hideAdd?: boolean | undefined;
+    hideEdit?: boolean | undefined;
+}) => React.JSX.Element;

package/es/components/booking/info/service2/index.js

@@ -10,7 +10,9 @@ import EditService from "../service/editService";
 import { Context } from "../model";
 import Lists from "./Lists";
 export var Service2Context = /*#__PURE__*/createContext({});
-export var Service2Cart = function Service2Cart() {
+export var Service2Cart = function Service2Cart(_ref) {
+  var hideAdd = _ref.hideAdd,
+    hideEdit = _ref.hideEdit;
   var detailRef = useRef();
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -18,9 +20,6 @@ export var Service2Cart = function Service2Cart() {
   useEffect(function () {
     document.body.id = 'body';
   }, []);
-  useEffect(function () {
-    console.log(state, 'wh_state33');
-  }, [state]);
 
   /**
    * @title: 更新服务
@@ -50,9 +49,9 @@ export var Service2Cart = function Service2Cart() {
     onChange: function onChange(e, type) {
       return dispatchService(type || 'setService', e);
     }
-  }), /*#__PURE__*/React.createElement(AddService, {
+  }), !hideAdd && /*#__PURE__*/React.createElement(AddService, {
     onEdit: handleEdit
-  })), /*#__PURE__*/React.createElement(EditService, {
+  })), !hideEdit && /*#__PURE__*/React.createElement(EditService, {
     ref: detailRef
   }));
 };

package/es/components/booking/info/service2/status.js

@@ -62,7 +62,7 @@ export var inputDateCol = function inputDateCol(isDayBooking, isTerminal) {
  * @Author: WangHan
  * @Date: 2024-12-06 14:59
  */
-export var appointmentTypes = ['product_appointment', 'product_add_time'];
+export var appointmentTypes = ['product_appointment'];
 
 /**
  * @title: 营业日时间

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

@@ -1,5 +1,5 @@
 import dayjs from 'dayjs';
-export declare const formatActiveKey: (lists: any[], platform: string) => any[];
+export declare const formatActiveKey: (lists: any[], platform: string, isEdit: boolean) => any[];
 /**
  * @title: 获取资源名称
  * @description:
@@ -30,6 +30,7 @@ export declare const getErrorMessage: (service: any, resourceItem: any, isDay?:
  * @Date: 2024-12-04 11:27
  */
 export declare const formatHolderLists: (lists: any) => any;
+export declare const isBookingProduct: (extension_type: any) => boolean;
 /**
  * @title: 是否是预约商品
  * @description:
@@ -37,7 +38,20 @@ export declare const formatHolderLists: (lists: any) => any;
  * @Author: WangHan
  * @Date: 2024-12-06 11:24
  */
-export declare const isAppointment: (item: any, state: any) => boolean;
+export declare const isDayBookingProduct: (item: any, state: any) => boolean;
+/**
+ * @title: 更新商品数据
+ * @description:
+ * @param {any} state
+ * @param {string} type
+ * @param {any} _id // 商品id
+ * @param {any} other
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-01-03 15:00
+ */
+export declare const updateServices: (state: any, currentItem: any, type?: string, other?: any) => any;
+export declare const formItems: (items: any[]) => any[];
 /**
  * @title: 格式化商品数据
  * @description:
@@ -46,7 +60,35 @@ export declare const isAppointment: (item: any, state: any) => boolean;
  * @Author: WangHan
  * @Date: 2024-11-29 17:36
  */
-export declare const formatProducts: (lists: any[], state: any) => any[] | undefined;
+export declare const formatProducts: (lists: any[], state: any, isRenderGroup?: boolean) => {
+    id: any;
+    _id: any;
+    name: any;
+    price: any;
+    total: any;
+    origin_total: any;
+    num: any;
+    image: any;
+    isShowNote: boolean;
+    note: any;
+    like_status: any;
+    bundle: any;
+    options: any;
+    errorMessage: string;
+    product_option_string: any;
+    discount_reason: any;
+    resource_id: any;
+    relation_form_name: any;
+    holder_title: any;
+    start_date: any;
+    end_date: any;
+    holder_id: any;
+    isNormalProduct: boolean;
+    locale: any;
+    symbol: any;
+    items: any[];
+    _origin: any;
+}[];
 /**
  * @title: 禁用日期
  * @description:
@@ -121,6 +163,24 @@ export declare const isHasDayAppointmentProduct: (state: any) => boolean;
  * @Date: 2024-12-13 16:44
  */
 export declare const getDayProducts: (holderId: number, lists: any, isTerminal?: boolean) => any;
+/**
+ * @title: 格式化表单数据
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-30 22:19
+ */
+export declare const getPets: (state: any) => any;
+/**
+ * @title: 得出预约商品
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-30 22:26
+ */
+export declare const getAppointmentService: (state: any) => any;
 /**
  * @title: 判断是否打开删除宠物弹窗
  * @description:
@@ -143,3 +203,35 @@ export declare const isOpenDeletePet: (state: any, newVal: any) => {
  * @Date: 2024-12-17 14:40
  */
 export declare const holderId: (state: any) => number;
+/**
+ * @title: 更新套餐的价格
+ * @description:
+ * @param {any} currentValue
+ * @param {any} newBundleData
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-31 15:16
+ */
+export declare function updateNormalBundlePrice(currentValue: any, newBundleData: any): any[];
+/**
+ * @title: 更新预约商品报价单
+ * @description:
+ * @param {any} state
+ * @param {any} cacheItem
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-25 16:41
+ */
+export declare const updateAppointmentServicePrice: (state: any, { start_date, end_date, product_id }: any) => Promise<{
+    multiDayPrices: any;
+    price: number;
+}>;
+/**
+ * @title: 更新普通商品报价单价格
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-12-24 11:32
+ */
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;