@pisell/private-materials 3.0.16 → 3.0.17

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

@@ -1 +1,19 @@
+/**
+ * @title: 套餐单规格信息
+ * @description:
+ * @param {any} option
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export declare const formatProductOption: (option: any) => any;
+/**
+ * @title: 套餐信息
+ * @description:
+ * @param {any} bundle
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export declare const formatProductBundle: (bundle: any) => any;
 export declare const formatValues: (state: any) => any;

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

@@ -24,28 +24,90 @@ var formatCustomer = function formatCustomer(data) {
     country_calling_code: (_data$client6 = data.client) === null || _data$client6 === void 0 ? void 0 : (_data$client6$value = _data$client6.value) === null || _data$client6$value === void 0 ? void 0 : _data$client6$value.country_calling_code
   };
 };
+
+/**
+ * @title: 套餐单规格信息
+ * @description: 
+ * @param {any} option
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export var formatProductOption = function formatProductOption(option) {
+  if (!option) {
+    return [];
+  }
+  return option.map(function (d) {
+    return {
+      "num": d.num,
+      "option_group_item_id": d.product_option_item_id,
+      "option_group_id": d.option_group_id
+    };
+  });
+};
+
+/**
+ * @title: 套餐信息
+ * @description: 
+ * @param {any} bundle
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
+export var formatProductBundle = function formatProductBundle(bundle) {
+  if (!bundle) {
+    return;
+  }
+  return bundle.map(function (d) {
+    return {
+      "bundle_group_id": d.group_id,
+      "bundle_id": d.id,
+      "bundle_product_id": d._bundle_product_id,
+      "bundle_variant_id": d.bundle_variant_id,
+      "num": d.num,
+      "extension_id": d.extension_id,
+      "extension_type": d.extension_type,
+      "option": formatProductOption(d.option)
+    };
+  });
+};
+
+/**
+ * @title: 预约商品信息
+ * @description: 
+ * @param {any} data
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
 var formatBookings = function formatBookings(data) {
   var list = data.service.value;
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   bookings = list.map(function (item) {
+    var _item$_extend, _item$_extend$other;
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
-    var start_time = item._extend.startDate.format("HH:mm");
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format("HH:mm");
+    var start_time = item._extend.startDate.format("HH:mm");
+    var total = Number(item._extend.total);
+    var origin_total = Number(item._extend.origin_total);
+    var discount_amount = origin_total - total;
     return _objectSpread({
       "product": {
         "num": item._extend.quantity,
-        "price": item.price,
+        "price": item._extend.price,
         "product_id": item.id,
-        "discount_amount": Number(item.price) - Number(item._extend.price),
+        "discount_amount": discount_amount,
         "product_discount_reason": item._extend.discount_reason || '',
         "is_charge_tax": item.is_charge_tax,
         "note": "",
         "discountway": item._extend.discountway || "num",
         "discount_per": item._extend.discount_per,
         "discount_type": item._extend.discount_type || "discount",
-        "order_detail_id": item._extend.order_detail_id || 0
+        "order_detail_id": item._extend.order_detail_id || 0,
+        "product_bundle": formatProductBundle((_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : (_item$_extend$other = _item$_extend.other) === null || _item$_extend$other === void 0 ? void 0 : _item$_extend$other.bundle),
+        "bundle_edit": item._extend.bundle_edit
       },
       'id': item.booking_id || 0,
       "relation_id": item._extend.relation_id,
@@ -65,6 +127,16 @@ var formatBookings = function formatBookings(data) {
   });
   return bookings;
 };
+
+/**
+ * @title: 预约主体信息
+ * @description: 
+ * @param {any} data
+ * @param {any} values
+ * @return {*}
+ * @Author: zhiwei.Wang
+ * @Date: 2024-02-19 09:26
+ */
 var formatHolder = function formatHolder(data, values) {
   var _data$bookingConfig, _data$bookingConfig$c, _data$bookingConfig$c2, _data$bookingConfig$c3, _data$pet$value, _data$pet, _data$pet$originValue, _data$pet$originValue2;
   var form_id = (data === null || data === void 0 ? void 0 : (_data$bookingConfig = data.bookingConfig) === null || _data$bookingConfig === void 0 ? void 0 : (_data$bookingConfig$c = _data$bookingConfig.config) === null || _data$bookingConfig$c === void 0 ? void 0 : (_data$bookingConfig$c2 = _data$bookingConfig$c.basic) === null || _data$bookingConfig$c2 === void 0 ? void 0 : (_data$bookingConfig$c3 = _data$bookingConfig$c2.appointment_subject) === null || _data$bookingConfig$c3 === void 0 ? void 0 : _data$bookingConfig$c3.form_id) || 0;

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

@@ -21,5 +21,5 @@ export interface InfoProps {
  * @Author: zhiwei.Wang
  * @Date: 2024-01-30 17:10
  */
-declare const Forms: (props: any) => any;
+declare const Forms: (props: any) => JSX.Element;
 export default Forms;

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

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

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

@@ -1,6 +1,5 @@
-/// <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) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/forms/single/index.js

@@ -5,19 +5,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useCallback, useState, useMemo } from "react";
+import React, { useCallback, useMemo } from "react";
 import FileDownload02 from "@pisell/icon/es/FileDownload02";
 import { image, locales } from "@pisell/utils";
 import { Avatar } from "antd";
 import CustomSelect from "../../components/customSelect";
+import CollapsibleList from "../../components/collapsibleList";
 import "./index.less";
-var MAX_LIMIT = 3;
 
 /**
  * @title: 表单选择器
@@ -39,10 +33,6 @@ var Single = function Single(_ref) {
     addButtonProps = _ref.addButtonProps,
     modalOpen = _ref.modalOpen,
     watch = _ref.watch;
-  var _useState = useState({}),
-    _useState2 = _slicedToArray(_useState, 2),
-    maxLimit = _useState2[0],
-    setMaxLimit = _useState2[1];
   // const primaryField = useMemo(() => {
   // 	return field.field[0]?.key || "";
   // }, [field]);
@@ -125,69 +115,20 @@ var Single = function Single(_ref) {
    */
   var renderItem = useCallback(function (fieldData) {
     var _fields = form.field || [];
-
-    // 默认展示3条, 点击更多时展示全部
-    var _maxLimit = maxLimit[fieldData.form_record_id] || MAX_LIMIT;
-    if (_fields.length > _maxLimit) {
-      _fields = _fields.slice(0, _maxLimit);
-    }
-    return _fields.map(function (field) {
-      return /*#__PURE__*/React.createElement("div", {
-        className: "pet-form-item",
-        key: field.key
-      }, /*#__PURE__*/React.createElement("div", {
-        className: "pet-form-item-label"
-      }, field.field_column.title), /*#__PURE__*/React.createElement("div", {
-        className: "pet-form-item-value"
-      }, renderFieldValue(fieldData, field)));
+    return /*#__PURE__*/React.createElement(CollapsibleList, {
+      list: _fields,
+      renderItem: function renderItem(field) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "pet-form-item",
+          key: field.key
+        }, /*#__PURE__*/React.createElement("div", {
+          className: "pet-form-item-label"
+        }, field.field_column.title), /*#__PURE__*/React.createElement("div", {
+          className: "pet-form-item-value"
+        }, renderFieldValue(fieldData, field)));
+      }
     });
-  }, [form, maxLimit]);
-
-  /**
-   * @title: 展开和收起
-   * @description:
-   * @param {any} d
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-01-30 17:08
-   */
-  var handlePreviewAll = function handlePreviewAll(d) {
-    var _maxLimit = maxLimit[d.form_record_id] || MAX_LIMIT;
-    if (_maxLimit === MAX_LIMIT) {
-      _maxLimit = 99;
-    } else {
-      _maxLimit = MAX_LIMIT;
-    }
-    setMaxLimit(_objectSpread(_objectSpread({}, maxLimit), {}, _defineProperty({}, d.form_record_id, _maxLimit)));
-  };
-
-  /**
-   * @title: 是否展开全部
-   * @description:
-   * @param {*} useMemo
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-01-30 17:08
-   */
-  var showAll = useMemo(function () {
-    var _field = form.field || [];
-    return _field.length > MAX_LIMIT;
-  }, [maxLimit, form]);
-
-  /**
-   * @title: 展开文案
-   * @description:
-   * @return {*}
-   * @Author: zhiwei.Wang
-   * @Date: 2024-01-30 17:08
-   */
-  var viewAllText = useCallback(function (d) {
-    var _maxLimit = maxLimit[d.form_record_id] || MAX_LIMIT;
-    if (_maxLimit === MAX_LIMIT) {
-      return locales.getText("pisell2.text.view-all");
-    }
-    return locales.getText("pisell2.text.view-less");
-  }, [maxLimit]);
+  }, [form]);
 
   /**
    * @title: 渲染字段
@@ -259,14 +200,7 @@ var Single = function Single(_ref) {
     mode: _mode,
     previewItemClassName: "pisell-lowcode__booking-pet-card",
     previewItemRender: function previewItemRender(d) {
-      return /*#__PURE__*/React.createElement(React.Fragment, null, renderItem(d), showAll ? /*#__PURE__*/React.createElement("div", {
-        className: "pet-form-view-all",
-        onClick: function onClick(e) {
-          e.preventDefault();
-          e.stopPropagation();
-          handlePreviewAll(d);
-        }
-      }, viewAllText(d)) : null);
+      return renderItem(d);
     },
     name: ((_form$form3 = form.form) === null || _form$form3 === void 0 ? void 0 : _form$form3.title) || "-",
     addButtonProps: _addButtonProps,

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

@@ -1,2 +1,2 @@
-declare const Booking: (props: any) => any;
+declare const Booking: (props: any) => JSX.Element;
 export default Booking;

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

@@ -8,5 +8,5 @@ export interface InfoProps {
     slot: any;
     setState: any;
 }
-declare const Info: (props: any) => any;
+declare const Info: (props: any) => JSX.Element;
 export default Info;

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

@@ -1,10 +1,9 @@
-/// <reference types="react" />
 import { FormState } from "../model";
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => (props: any) => any, Context: import("react").Context<{
+export declare const Provider: (ComponentUi: any) => (props: any) => JSX.Element, Context: import("react").Context<{
     state: FormState;
 } & {
     dispatch: (params: {

package/es/components/booking/info/service/addService/index.js

@@ -25,11 +25,11 @@ import { Context } from "../../model";
 import AddButton from "../../../components/addButton";
 import { Input } from "antd";
 import "./index.less";
-import { formatProductListByCategory, request } from "../../../utils";
-import { locales, getUniqueId } from "@pisell/utils";
 import useEngineContext from "../../../../../hooks/useEngineContext";
 import { getProductDetail } from "../serve";
 import { getIsBundleOrCombination } from "../../utils";
+import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
+import { locales, getUniqueId } from "@pisell/utils";
 var Info = function Info() {
   var _state$service2;
   var _useState = useState(""),
@@ -140,7 +140,7 @@ var Info = function Info() {
               // include_variant: "no",
               ids: state.renderType === "eventBooking" ? (_state$eventOtherPara = state.eventOtherParams) === null || _state$eventOtherPara === void 0 ? void 0 : _state$eventOtherPara.productIds : undefined,
               open_quotation: 1,
-              with_schedule: 0
+              with_schedule: 1
             });
           case 2:
             data = _context2.sent;
@@ -171,28 +171,51 @@ var Info = function Info() {
     });
   };
   var handleSelectProduct = function handleSelectProduct(item) {
-    var _isEdit = !!state.service.cacheItem;
-    var _item = _objectSpread(_objectSpread({}, item), {}, {
-      product_id: item.id,
-      _id: getUniqueId(),
-      _extend: {
-        start_date: state.date.value,
-        quantity: 1,
-        price: item.price,
-        product_name: item.title
+    state.action({
+      type: "pisell1.handleOpenProductModal",
+      data: {
+        id: item.id,
+        date: state.date.value.format("YYYY-MM-DD"),
+        showConfig: {
+          option: false,
+          session: false,
+          variant: false,
+          package: true
+        }
       },
-      new: 1
-    });
-    if (_isEdit) {
-      var _state$service$cacheI;
-      _item._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
-      _item.new = 0;
-    }
-    dispatch({
-      type: "setService",
-      payload: {
-        editModal: true,
-        cacheItem: _item
+      callback: function callback(e) {
+        var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
+          product_id: item.id,
+          _id: getUniqueId(),
+          _key: e.key,
+          _extend: {
+            start_date: state.date.value,
+            quantity: 1,
+            price: item.price,
+            product_name: item.title,
+            other: e
+          },
+          new: 1
+        });
+        var _total = getProductTotalPrice(cacheItem);
+        console.log("_total", e);
+        // 用于折扣 可修改
+        cacheItem._extend.total = _total;
+        // 用于储存原价
+        cacheItem._extend.origin_total = _total;
+        var _isEdit = !!state.service.cacheItem;
+        if (_isEdit) {
+          var _state$service$cacheI;
+          cacheItem._id = (_state$service$cacheI = state.service.cacheItem) === null || _state$service$cacheI === void 0 ? void 0 : _state$service$cacheI._id;
+          cacheItem.new = 0;
+        }
+        dispatch({
+          type: "setService",
+          payload: {
+            editModal: true,
+            cacheItem: cacheItem
+          }
+        });
       }
     });
   };

package/es/components/booking/info/service/editService/index.js

@@ -27,17 +27,19 @@ import { formatAmount, locales } from "@pisell/utils";
 import Duration from "../../../materiels/duration";
 import { Input, Button, Select, Row, Col, Form, Alert, InputNumber } from "antd";
 import "./index.less";
+import CollapsibleList from "../../../components/collapsibleList";
+import { renderBundles } from "../../../components/collapsibleList/utils";
 import dayjs from "dayjs";
 import { useUpdateEffect, useMemoizedFn } from "ahooks";
 import { sliceDayIntoFiveMinutes, formatResource, getErrorList, getServiceTimes, getServerItemExtend, deleteCacheParams, getEndDate, flexibleObj, getDuration, getDiscountTime } from "../../../utils";
 import Like from "../like";
 import { getNoResource } from "../../../mock";
 var Info = function Info() {
-  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service$cacheI5, _state$service$cacheI6;
+  var _state$bookingConfig2, _state$bookingConfig3, _state$bookingConfig4, _state$service3, _state$service3$cache, _state$service5, _state$service6, _state$service6$cache, _state$service6$cache2, _state$service$cacheI5, _state$service$cacheI6, _state$service$cacheI7, _state$service$cacheI8;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var usePrice = Form.useWatch("price", form);
+  var useTotal = Form.useWatch("total", form);
   var useLikeStatus = Form.useWatch("like_status", form);
   var useResource = Form.useWatch("resource", form);
   var useStartTime = Form.useWatch("start_time", form);
@@ -182,8 +184,9 @@ var Info = function Info() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            _context.prev = 0;
             setResourceLoading(true);
-            _context.next = 3;
+            _context.next = 4;
             return state.apis.getResources({
               skip: 1,
               num: 1000,
@@ -193,17 +196,17 @@ var Info = function Info() {
                 abort: true
               }
             });
-          case 3:
+          case 4:
             data = _context.sent;
             // 合并无资源
             _list = [getNoResource()].concat((data === null || data === void 0 ? void 0 : data.list) || []);
             _cacheItem = cacheItem || getCurrentCacheItem();
             if (_cacheItem._extend) {
-              _context.next = 8;
+              _context.next = 9;
               break;
             }
             return _context.abrupt("return");
-          case 8:
+          case 9:
             // 格式化, 添加自定义参数
             _list = _list.map(function (d) {
               return formatResource(d, _cacheItem, function (item) {
@@ -235,12 +238,18 @@ var Info = function Info() {
                 resources: _list
               }
             });
+            _context.next = 17;
+            break;
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](0);
+          case 17:
             setResourceLoading(false);
-          case 13:
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee);
+      }, _callee, null, [[0, 15]]);
     }));
     return function getResources(_x2) {
       return _ref.apply(this, arguments);
@@ -342,8 +351,8 @@ var Info = function Info() {
    */
   var getDiscount = function getDiscount() {
     var _state$service$cacheI2;
-    var oPrice = Number(((_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2.price) || 0);
-    var cPrice = Number(usePrice || 0);
+    var oPrice = Number(((_state$service$cacheI2 = state.service.cacheItem) === null || _state$service$cacheI2 === void 0 ? void 0 : _state$service$cacheI2._extend.origin_total) || 0);
+    var cPrice = Number(useTotal || 0);
     var discount = "";
     // 原价 = 现价 为无折扣
     if (cPrice === oPrice) {
@@ -391,6 +400,9 @@ var Info = function Info() {
     _extend.relation_type = relation_type || "form";
     _extend.relation_id = item_id || (currentResource === null || currentResource === void 0 ? void 0 : currentResource.form_record_id) || 0;
     _extend.schedule_id = schedule_id || 0;
+    if (_extend.bundle_edit !== undefined) {
+      _extend.bundle_edit = 1;
+    }
     _item._extend = _extend;
 
     // 判断是新增还是编辑
@@ -439,11 +451,11 @@ var Info = function Info() {
    */
   var isReason = useMemo(function () {
     var _state$service$cacheI4;
-    var oPrice = Number(((_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : _state$service$cacheI4.price) || 0);
-    var cPrice = Number(usePrice || 0);
+    var oPrice = Number(((_state$service$cacheI4 = state.service.cacheItem) === null || _state$service$cacheI4 === void 0 ? void 0 : _state$service$cacheI4._extend.origin_total) || 0);
+    var cPrice = Number(useTotal || 0);
     // 原价 !== 现价
     return cPrice !== oPrice;
-  }, [usePrice, state.service.cacheItem]);
+  }, [useTotal, state.service.cacheItem]);
 
   /**
    * @title: 错误信息列表
@@ -501,7 +513,7 @@ var Info = function Info() {
    */
   useEffect(function () {
     getDiscount();
-  }, [usePrice, state.service.cacheItem]);
+  }, [useTotal, state.service.cacheItem]);
 
   // useEffect(() => {
   // 	handleLikeResource("common");
@@ -511,13 +523,17 @@ var Info = function Info() {
     if (!((_state$service = state.service) !== null && _state$service !== void 0 && _state$service.cacheItem)) {
       return false;
     }
-    return usePrice != ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : (_state$service2$cache = _state$service2.cacheItem) === null || _state$service2$cache === void 0 ? void 0 : _state$service2$cache.price);
-  }, [usePrice, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : (_state$service3$cache = _state$service3.cacheItem) === null || _state$service3$cache === void 0 ? void 0 : _state$service3$cache.price]);
+    return useTotal != ((_state$service2 = state.service) === null || _state$service2 === void 0 ? void 0 : (_state$service2$cache = _state$service2.cacheItem) === null || _state$service2$cache === void 0 ? void 0 : _state$service2$cache._extend.origin_total);
+  }, [useTotal, (_state$service3 = state.service) === null || _state$service3 === void 0 ? void 0 : (_state$service3$cache = _state$service3.cacheItem) === null || _state$service3$cache === void 0 ? void 0 : _state$service3$cache._extend.origin_total]);
   useEffect(function () {
     if (useResource === 0) {
       handleLikeResource("common");
     }
   }, [useResource]);
+  var bundles = useMemo(function () {
+    var _state$service4, _state$service4$cache, _state$service4$cache2, _state$service4$cache3;
+    return ((_state$service4 = state.service) === null || _state$service4 === void 0 ? void 0 : (_state$service4$cache = _state$service4.cacheItem) === null || _state$service4$cache === void 0 ? void 0 : (_state$service4$cache2 = _state$service4$cache._extend) === null || _state$service4$cache2 === void 0 ? void 0 : (_state$service4$cache3 = _state$service4$cache2.other) === null || _state$service4$cache3 === void 0 ? void 0 : _state$service4$cache3.bundle) || [];
+  }, [(_state$service5 = state.service) === null || _state$service5 === void 0 ? void 0 : _state$service5.cacheItem]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer, {
     zIndex: 1000,
     open: state.service.editModal,
@@ -546,9 +562,8 @@ var Info = function Info() {
     span: 24
   }, /*#__PURE__*/React.createElement(Form.Item, {
     name: "product_name"
-  }, /*#__PURE__*/React.createElement(Select, {
-    size: "large",
-    open: false,
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "current-service-info",
     onClick: function onClick() {
       if (state.channelDisabledEdit) {
         return;
@@ -561,11 +576,21 @@ var Info = function Info() {
         }
       });
     }
-  }))), /*#__PURE__*/React.createElement(Col, {
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "current-service-info-name"
+  }, ((_state$service6 = state.service) === null || _state$service6 === void 0 ? void 0 : (_state$service6$cache = _state$service6.cacheItem) === null || _state$service6$cache === void 0 ? void 0 : (_state$service6$cache2 = _state$service6$cache._extend) === null || _state$service6$cache2 === void 0 ? void 0 : _state$service6$cache2.product_name) || "-"), /*#__PURE__*/React.createElement(CollapsibleList, {
+    style: {
+      marginTop: bundles.length ? "8px" : 0
+    },
+    list: bundles,
+    renderItem: function renderItem(item) {
+      return renderBundles(item, state.amountSymbol);
+    }
+  })))), /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {
     label: locales.getText("pisell2.text.price"),
-    name: "price",
+    name: "total",
     rules: [{
       required: true
     }]
@@ -578,8 +603,8 @@ var Info = function Info() {
       width: "100%"
     },
     min: 0,
-    max: ((_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 ? void 0 : _state$service$cacheI5.price) || 0,
-    placeholder: ((_state$service$cacheI6 = state.service.cacheItem) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.price) || "0"
+    max: ((_state$service$cacheI5 = state.service.cacheItem) === null || _state$service$cacheI5 === void 0 ? void 0 : (_state$service$cacheI6 = _state$service$cacheI5._extend) === null || _state$service$cacheI6 === void 0 ? void 0 : _state$service$cacheI6.origin_total) || 0,
+    placeholder: ((_state$service$cacheI7 = state.service.cacheItem) === null || _state$service$cacheI7 === void 0 ? void 0 : (_state$service$cacheI8 = _state$service$cacheI7._extend) === null || _state$service$cacheI8 === void 0 ? void 0 : _state$service$cacheI8.origin_total) || "0"
   }))), /*#__PURE__*/React.createElement(Col, {
     span: 12
   }, /*#__PURE__*/React.createElement(Form.Item, {
@@ -592,7 +617,7 @@ var Info = function Info() {
     allowClear: isDiscount,
     onChange: function onChange(e) {
       form.setFieldsValue({
-        price: state.service.cacheItem.price
+        total: state.service.cacheItem._extend.origin_total
       });
     }
   }))), isReason ? /*#__PURE__*/React.createElement(Col, {

package/es/components/booking/info/service/editService/index.less

@@ -84,4 +84,25 @@
     .like-resource {}
   }
 
+}
+
+.current-service-info {
+  min-height: 40px;
+  cursor: pointer;
+  background-color: #ffffff;
+  border: 1px solid #D0D5DD;
+  border-radius: 10px;
+  transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+  overflow: hidden;
+  padding: 11px;
+
+  .current-service-info-name {
+    font-size: 16px;
+    color: #101828;
+    font-weight: 650;
+  }
+
+  &:hover {
+    border-color: #7f56d9;
+  }
 }

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

@@ -1,4 +1,4 @@
 import React from "react";
 import "./index.less";
-declare const Info: () => React.JSX.Element;
-export default Info;
+declare const Service: () => React.JSX.Element;
+export default Service;