@pisell/private-materials 3.0.15 → 3.0.17

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

@@ -1,7 +1,5 @@
 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 _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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
-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); }); }; }
 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; }
@@ -11,6 +9,8 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 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 _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 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); }); }; }
 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); }
@@ -25,7 +25,10 @@ import { Context } from "../../model";
 import AddButton from "../../../components/addButton";
 import { Input } from "antd";
 import "./index.less";
-import { formatProductListByCategory } from "../../../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;
@@ -36,52 +39,96 @@ var Info = function Info() {
   var _useContext = useContext(Context),
     state = _useContext.state,
     dispatch = _useContext.dispatch;
-  var setDefaultService = function setDefaultService(list) {
-    if (state.renderType !== "eventBooking") {
-      return;
-    }
-    if (state.bookingId) {
-      return;
-    }
-    if (list.length !== 1) {
-      return;
-    }
-    var _list = _toConsumableArray(state.service.value);
-    if (_list.length !== 0) {
-      return;
-    }
-    var product = list[0];
-    var _item = _objectSpread(_objectSpread({}, product), {}, {
-      product_id: product.id,
-      _id: getUniqueId(),
-      _extend: {
-        start_date: state.date.value,
-        startDate: state.date.value,
-        endDate: state.date.value,
-        start_time: "00:00:00",
-        duration: 10,
-        quantity: 1,
-        price: product.price,
-        product_name: product.title
-      }
-    });
-    _list.push(_item);
-    dispatch({
-      type: "setService",
-      payload: {
-        value: _list,
-        edit: true
-      }
-    });
-  };
+  var context = useEngineContext();
+  request.setRequest(context.appHelper.utils.request);
+  var setDefaultService = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(list) {
+      var _list, product, detail, isBundleOrCombination, _item;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(state.renderType !== "eventBooking")) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            if (!state.bookingId) {
+              _context.next = 4;
+              break;
+            }
+            return _context.abrupt("return");
+          case 4:
+            if (!(list.length !== 1)) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return");
+          case 6:
+            _list = _toConsumableArray(state.service.value);
+            if (!(_list.length !== 0)) {
+              _context.next = 9;
+              break;
+            }
+            return _context.abrupt("return");
+          case 9:
+            product = list[0];
+            _context.next = 12;
+            return getProductDetail(product.id, {
+              schedule_date: state.date.value.format("YYYY-MM-DD")
+            });
+          case 12:
+            detail = _context.sent;
+            // 商品是套餐或单规格多规格
+            isBundleOrCombination = getIsBundleOrCombination(detail.data); // 套餐商品单规格多规格不设置默认
+            if (!isBundleOrCombination) {
+              _context.next = 16;
+              break;
+            }
+            return _context.abrupt("return");
+          case 16:
+            _item = _objectSpread(_objectSpread({}, product), {}, {
+              product_id: product.id,
+              _id: getUniqueId(),
+              _extend: {
+                start_date: state.date.value,
+                startDate: state.date.value,
+                endDate: state.date.value,
+                start_time: "00:00:00",
+                duration: 10,
+                quantity: 1,
+                price: product.price,
+                total: product.price,
+                origin_total: product.price,
+                product_name: product.title
+              }
+            });
+            _list.push(_item);
+            dispatch({
+              type: "setService",
+              payload: {
+                value: _list,
+                edit: true
+              }
+            });
+          case 19:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function setDefaultService(_x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   var getServices = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _state$eventOtherPara;
       var data;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context.next = 2;
+            _context2.next = 2;
             return state.apis.getServices({
               skip: 1,
               num: 500,
@@ -93,10 +140,10 @@ 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 = _context.sent;
+            data = _context2.sent;
             setDefaultService(data === null || data === void 0 ? void 0 : data.list);
             dispatch({
               type: "setService",
@@ -106,12 +153,12 @@ var Info = function Info() {
             });
           case 5:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function getServices() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var handleSelectService = function handleSelectService() {
@@ -124,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;