@pisell/private-materials 3.2.25 → 3.2.26

package/es/components/booking/forms/sendModal/useSendModal.js

@@ -0,0 +1,79 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+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(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { useState } from 'react';
+import { message } from '@pisell/materials';
+import { locales } from '@pisell/utils';
+import { sendFormReminder } from "../serve";
+var useSendModal = function useSendModal(bookingId) {
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var handleOpen = function handleOpen() {
+    setOpen(true);
+  };
+  var handleValuesChange = function handleValuesChange(val) {
+    console.log(val, 'val');
+  };
+  var handleOk = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
+      var value;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (!(!values.sendSms && !values.sendEmail)) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return", message.error(locales.getText('pisell2.text.send-form-reminder-error-message')));
+          case 2:
+            if (!(values.sendSms && !values.phone.phone)) {
+              _context.next = 4;
+              break;
+            }
+            return _context.abrupt("return", message.error(locales.getText('pisell2.text.phone-required-error-message')));
+          case 4:
+            if (!(values.sendEmail && !values.email)) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return", message.error(locales.getText('pisell2.text.email-required-error-message')));
+          case 6:
+            _context.next = 8;
+            return sendFormReminder({
+              phone: values.sendSms ? values.phone.phone : undefined,
+              email: values.sendEmail ? values.email : undefined,
+              order_id: bookingId,
+              country_calling_code: values.sendSms ? values.phone.code.replace('+', '') : undefined
+            });
+          case 8:
+            value = _context.sent;
+            message.success(locales.getText('pisell2.text.send-form-toast'));
+            setOpen(false);
+          case 11:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleOk(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  return {
+    open: open,
+    setOpen: setOpen,
+    handleOpen: handleOpen,
+    handleValuesChange: handleValuesChange,
+    handleOk: handleOk
+  };
+};
+export default useSendModal;

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

@@ -7,3 +7,12 @@ export declare const getFormData: (params: {
     num: number;
     skip: number;
 }) => Promise<any>;
+/**
+ * 发送表单填写提醒
+ */
+export declare const sendFormReminder: (params: {
+    email?: string;
+    phone?: string;
+    order_id: number;
+    country_calling_code?: string;
+}) => Promise<any>;

package/es/components/booking/forms/serve.js

@@ -22,4 +22,24 @@ export var getFormData = /*#__PURE__*/function () {
   return function getFormData(_x) {
     return _ref.apply(this, arguments);
   };
+}();
+
+/**
+ * 发送表单填写提醒
+ */
+export var sendFormReminder = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          return _context2.abrupt("return", request.getRequest().post("/shop/form/form-reminder", params));
+        case 1:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function sendFormReminder(_x2) {
+    return _ref2.apply(this, arguments);
+  };
 }();

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

@@ -1,14 +1,5 @@
-/// <reference types="react" />
-import { FormState } from '../model';
 export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -335,14 +335,14 @@ var Info = function Info(props) {
         customer_id: customerId
       },
       callback: function () {
-        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e) {
+        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(e, extension_type, detail) {
           var data;
           return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
                 return createBookingData({
-                  product: _objectSpread(_objectSpread({}, item), {}, {
+                  product: _objectSpread(_objectSpread({}, detail || item), {}, {
                     _params: e
                   })
                 });
@@ -358,7 +358,7 @@ var Info = function Info(props) {
             }
           }, _callee3);
         }));
-        function callback(_x3) {
+        function callback(_x3, _x4, _x5) {
           return _callback.apply(this, arguments);
         }
         return callback;

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

@@ -23,7 +23,7 @@ import '@pisell/materials';
 import { formatAmount, locales } from '@pisell/utils';
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 import { Alert, Button, Col, DatePicker, Form, Input, InputNumber, Row, Select } from 'antd';
-import React, { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useState } from 'react';
+import React, { forwardRef, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import CollapsibleList from "../../../components/collapsibleList";
 import { renderBundles } from "../../../components/collapsibleList/utils";
 import Drawer from "../../../components/drawer";
@@ -72,6 +72,7 @@ var Info = function Info(_, ref) {
     setSelectOpen = _useState4[1];
   var _useSelectPet = useSelectPet(state),
     holderLists = _useSelectPet.holderLists;
+  var isChangeTotal = useRef(false);
   var _useService = useService({
       state: state,
       dispatch: dispatch
@@ -399,11 +400,15 @@ var Info = function Info(_, ref) {
             });
           case 6:
             data = _context2.sent;
-            _context2.next = 9;
+            // 手动改价时移除优惠券使用
+            if (isChangeTotal.current) {
+              delete data.discount_list;
+            }
+            _context2.next = 10;
             return editBooking({
               booking: data
             });
-          case 9:
+          case 10:
           case "end":
             return _context2.stop();
         }
@@ -416,6 +421,7 @@ var Info = function Info(_, ref) {
   var setEditData = useMemoizedFn(function (_cacheItem, open) {
     var _values;
     setCurrentTab('batch_edit');
+    isChangeTotal.current = false;
     var cacheItem = _cacheItem || state.service.cacheItem;
     var values = cacheItem._extend;
 
@@ -677,49 +683,59 @@ var Info = function Info(_, ref) {
         value: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), dayValue),
         customer_id: isDayBookingMode ? ((_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id) || 1 : undefined
       },
-      callback: function callback(e) {
-        var _cacheItem$_extend;
-        // 重新生成商品
-        var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
-          product_id: item.id,
-          _id: item === null || item === void 0 ? void 0 : item._id,
-          _key: e.key,
-          _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
-            // 覆盖选择的规格和套餐
-            other: JSON.parse(JSON.stringify(e))
-          }),
-          new: 0
-        });
+      callback: function () {
+        var _callback = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(e, extension_type, detail) {
+          var _cacheItem$_extend;
+          var _detail, cacheItem, _total, _cacheItem$_extend2;
+          return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+            while (1) switch (_context4.prev = _context4.next) {
+              case 0:
+                _detail = detail || item; // 重新生成商品
+                cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
+                  product_id: item.id,
+                  _id: item === null || item === void 0 ? void 0 : item._id,
+                  _key: e.key,
+                  _extend: _objectSpread(_objectSpread(_objectSpread({}, item._extend), values), {}, {
+                    // 覆盖选择的规格和套餐
+                    other: JSON.parse(JSON.stringify(e))
+                  }),
+                  new: 0
+                }); // 获取商品总价
+                _total = getProductTotalPrice(cacheItem); // 如果有多规格，则更新商品的单价
+                if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend = _cacheItem$_extend.other) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.product_variant_id) {
+                  cacheItem._extend.price = Number((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.price);
+                }
 
-        // 获取商品总价
-        var _total = getProductTotalPrice(cacheItem);
-
-        // 如果有多规格，则更新商品的单价
-        if (cacheItem !== null && cacheItem !== void 0 && (_cacheItem$_extend = cacheItem._extend) !== null && _cacheItem$_extend !== void 0 && (_cacheItem$_extend = _cacheItem$_extend.other) !== null && _cacheItem$_extend !== void 0 && _cacheItem$_extend.product_variant_id) {
-          var _cacheItem$_extend2;
-          cacheItem._extend.price = Number((_cacheItem$_extend2 = cacheItem._extend) === null || _cacheItem$_extend2 === void 0 || (_cacheItem$_extend2 = _cacheItem$_extend2.other) === null || _cacheItem$_extend2 === void 0 ? void 0 : _cacheItem$_extend2.price);
-        }
+                // 用于折扣 可修改
+                cacheItem._extend.total = _total;
 
-        // 用于折扣 可修改
-        cacheItem._extend.total = _total;
+                // 用于储存原价
+                cacheItem._extend.origin_total = _total;
 
-        // 用于储存原价
-        cacheItem._extend.origin_total = _total;
-
-        // 覆盖商品
-        dispatch({
-          type: 'setService',
-          payload: {
-            cacheItem: cacheItem
-          }
-        });
-        setTimeout(function () {
-          updateMultiDay({
-            start_date: values.start_date,
-            end_date: values.end_date
-          });
-        }, 100);
-      }
+                // 覆盖商品
+                dispatch({
+                  type: 'setService',
+                  payload: {
+                    cacheItem: cacheItem
+                  }
+                });
+                setTimeout(function () {
+                  updateMultiDay({
+                    start_date: values.start_date,
+                    end_date: values.end_date
+                  });
+                }, 100);
+              case 8:
+              case "end":
+                return _context4.stop();
+            }
+          }, _callee4);
+        }));
+        function callback(_x4, _x5, _x6) {
+          return _callback.apply(this, arguments);
+        }
+        return callback;
+      }()
     });
   });
 
@@ -782,13 +798,13 @@ var Info = function Info(_, ref) {
    * @Date: 2024-12-29 23:17
    */
   var updateMultiDay = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref6) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref6) {
       var start_date, end_date, duration, cacheItem, fieldsValues;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             start_date = _ref6.start_date, end_date = _ref6.end_date, duration = _ref6.duration;
-            _context4.next = 3;
+            _context5.next = 3;
             return getMultiDay({
               start_date: start_date,
               end_date: end_date,
@@ -796,7 +812,7 @@ var Info = function Info(_, ref) {
               cacheItem: getCurrentCacheItem()
             });
           case 3:
-            cacheItem = _context4.sent;
+            cacheItem = _context5.sent;
             // 兼容时长为空的情况
             if (duration !== undefined) {
               cacheItem._extend.duration = duration;
@@ -816,11 +832,11 @@ var Info = function Info(_, ref) {
             form.setFieldsValue(fieldsValues);
           case 10:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
-    return function updateMultiDay(_x4) {
+    return function updateMultiDay(_x7) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -908,6 +924,9 @@ var Info = function Info(_, ref) {
   var isEditGroup = useMemo(function () {
     return items.length;
   }, [items]);
+  var handleTotalChange = function handleTotalChange(number) {
+    isChangeTotal.current = true;
+  };
   return useMemo(function () {
     var _state$service$cacheI8, _state$service9, _state$service$cacheI9, _state$service$cacheI10, _state$service$cacheI11, _state$service$cacheI12, _state$bookingConfig3;
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Drawer
@@ -995,6 +1014,7 @@ var Info = function Info(_, ref) {
       },
       min: 0,
       precision: 2,
+      onChange: handleTotalChange,
       prefix: state.amountSymbol,
       disabled: state.channelDisabledEdit,
       originValue: ((_state$service$cacheI11 = state.service.cacheItem) === null || _state$service$cacheI11 === void 0 || (_state$service$cacheI11 = _state$service$cacheI11._extend) === null || _state$service$cacheI11 === void 0 ? void 0 : _state$service$cacheI11.origin_total) || 0,

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

@@ -255,14 +255,15 @@ var Info = function Info(props) {
         setTimeout(function () {
           lock = false;
         }, 2000);
-        var cacheItem = _objectSpread(_objectSpread({}, detail || item), {}, {
+        var _detail = detail || item;
+        var cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
           product_id: item.id,
           _id: getUniqueId(),
           _key: e.key,
           _extend: {
             start_date: state.date.value,
             quantity: 1,
-            price: item.price,
+            price: _detail.price,
             product_name: item.title,
             other: JSON.parse(JSON.stringify(e))
           },

package/es/components/booking/info2/service/addService/utils.js

@@ -1,4 +1,8 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -17,6 +21,7 @@ import { getServiceStartTimeAndEndTime, formatResource, getErrorList } from "../
 import dayjs from 'dayjs';
 import { locales } from '@pisell/utils';
 import AlertTriangle from '@pisell/icon/es/AlertTriangle';
+import { getAutoAllocationStorage } from "../editService/utils";
 import { getNoResource2 } from "../../../mock";
 export var getUsableTime = function getUsableTime(cacheItem) {
   try {
@@ -211,6 +216,38 @@ export var formatResources = function formatResources(_ref5) {
     maps: []
   };
 };
+
+// 取可用资源空闲时长最大的
+var getResourceMaxFreeTime = function getResourceMaxFreeTime(resource) {
+  var renderList = resource.renderList,
+    form_id = resource.form_id;
+  if (!getAutoAllocationStorage(form_id)) {
+    return [];
+  }
+  // 可用列表
+  var usableList = renderList.filter(function (d) {
+    return d.usable && d.id !== 0;
+  });
+  var defaultResource = [];
+  var maxFreeTime = 0;
+  usableList.forEach(function (d) {
+    var times = d.times;
+    var currentMaxFreeTime = times.reduce(function (pre, cur) {
+      var _cur$event_list, _cur$event_list2;
+      // 开始时间使用预约的最后时间或者资源开始时间
+      var start = ((_cur$event_list = cur.event_list) === null || _cur$event_list === void 0 || (_cur$event_list = _cur$event_list[((_cur$event_list2 = cur.event_list) === null || _cur$event_list2 === void 0 ? void 0 : _cur$event_list2.length) - 1]) === null || _cur$event_list === void 0 ? void 0 : _cur$event_list.end_at) || cur.start_at;
+      // 结束时间使用资源结束时间
+      var end = cur.end_at;
+      var diff = dayjs(end).diff(dayjs(start), 'minute');
+      return diff > pre ? diff : pre;
+    }, 0);
+    if (currentMaxFreeTime > maxFreeTime) {
+      maxFreeTime = currentMaxFreeTime;
+      defaultResource = [d];
+    }
+  });
+  return defaultResource;
+};
 export var setDefaultResource = function setDefaultResource(_ref6) {
   var cacheItem = _ref6.cacheItem,
     resources = _ref6.resources;
@@ -237,9 +274,16 @@ export var setDefaultResource = function setDefaultResource(_ref6) {
   try {
     var _loop3 = function _loop3() {
       var item = _step2.value;
-      var defaultResource = item.renderList.filter(function (d) {
+      var renderList = item.renderList.filter(function (d) {
         return d.is_default == 1 || d.id === resourceId;
-      }).map(function (d) {
+      });
+      var defaultOriginalResource = [];
+      if (renderList.length === 0) {
+        defaultOriginalResource = getResourceMaxFreeTime(item);
+      } else {
+        defaultOriginalResource = renderList;
+      }
+      var defaultResource = defaultOriginalResource.map(function (d) {
         return _objectSpread(_objectSpread({}, d), {}, {
           relation_type: d.relation_type,
           form_id: item.form_id,
@@ -400,6 +444,12 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
       }
     }
   }
+  return Object.entries(cacheItem._extend.resource).every(function (_ref8) {
+    var _ref9 = _slicedToArray(_ref8, 2),
+      key = _ref9[0],
+      value = _ref9[1];
+    return getAutoAllocationStorage(key) && (value === null || value === void 0 ? void 0 : value.length);
+  });
 };
 
 /**
@@ -410,9 +460,9 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export var getProductExtend = function getProductExtend(_ref8) {
-  var cacheItem = _ref8.cacheItem,
-    state = _ref8.state;
+export var getProductExtend = function getProductExtend(_ref10) {
+  var cacheItem = _ref10.cacheItem,
+    state = _ref10.state;
   // 有endDate 说明是在编辑已经保存过的商品, 没有则是编辑还没保存过的商品
   var isNew = cacheItem.new || !cacheItem._extend.endDate;
   var _cacheItem = _objectSpread({}, cacheItem);
@@ -486,6 +536,8 @@ export var getProductExtend = function getProductExtend(_ref8) {
     }
 
     // 如果只有一种类型的资源 & 单选，还按照之前的逻辑处理：自动选中，不会打开Edit service抽屉。
+    // 或
+    // 如果开启自动分派 并且 资源列表中每个资源都有默认值，自动关闭。
     _cacheItem.autoClose = getIsAutoClose(_cacheItem);
     if (_cacheItem._extend.bundle_edit !== undefined) {
       _cacheItem._extend.bundle_edit = 1;

package/es/components/booking/info2/service/editService/Resources/index.js

@@ -13,13 +13,16 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useMemo, forwardRef, useCallback, useImperativeHandle } from 'react';
-import { Col, Form, Select, Button, Alert } from 'antd';
+import { Col, Form, Select, Button, Alert, Checkbox, Tooltip } from 'antd';
 import MaxLengthSelect from "./MaxLengthSelect";
 import Like from "../../../../info/service/like";
 import "./index.less";
 import { locales } from '@pisell/utils';
 import { getErrorList } from "../../../utilsByBooking";
 import { isArray } from 'lodash';
+import { getAutoAllocationStorage, setAutoAllocationStorage } from "../utils";
+import { useUpdate } from 'ahooks';
+import { QuestionCircleOutlined } from "@ant-design/icons";
 var Resources = function Resources(_ref, ref) {
   var _cacheItem$_data2, _cacheItem$_data4;
   var state = _ref.state,
@@ -31,6 +34,7 @@ var Resources = function Resources(_ref, ref) {
     _useState2 = _slicedToArray(_useState, 2),
     showError = _useState2[0],
     setShowError = _useState2[1];
+  var update = useUpdate();
 
   // 需要渲染的列表, 资源二级结构数据
   var data = useMemo(function () {
@@ -56,6 +60,10 @@ var Resources = function Resources(_ref, ref) {
   var _value = useMemo(function () {
     return value || defaultValue;
   }, [value, defaultValue]);
+  var handleCheckAutoAllocation = function handleCheckAutoAllocation(id, checked) {
+    setAutoAllocationStorage(_defineProperty({}, id, checked));
+    update();
+  };
 
   /**
    * @title: 当选择资源时
@@ -169,6 +177,9 @@ var Resources = function Resources(_ref, ref) {
       check: check
     };
   });
+  var getIsAutoAllocation = function getIsAutoAllocation(id) {
+    return getAutoAllocationStorage(id);
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, data.map(function (item) {
     var _cur$2;
     var cur = _value[item.form_id];
@@ -217,7 +228,14 @@ var Resources = function Resources(_ref, ref) {
       filterOption: function filterOption(str, option) {
         return ((option === null || option === void 0 ? void 0 : option.labelText) || '').toLowerCase().includes((str || '').toLowerCase());
       }
-    }, renderOptions(item.renderList, 'id', 'label', 'resource')))), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
+    }, renderOptions(item.renderList, 'id', 'label', 'resource')), /*#__PURE__*/React.createElement(Checkbox, {
+      checked: getIsAutoAllocation(item.form_id),
+      onChange: function onChange(e) {
+        handleCheckAutoAllocation(item.form_id, e.target.checked);
+      }
+    }), /*#__PURE__*/React.createElement(Tooltip, {
+      title: locales.getText('page.booking.text.resource.check-auto-allocation-tip')
+    }, /*#__PURE__*/React.createElement(QuestionCircleOutlined, null)))), state.renderType !== 'eventBooking' && (errors || []).map(function (d) {
       return /*#__PURE__*/React.createElement(Alert, {
         key: d.type,
         message: d.label,

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

@@ -32,7 +32,7 @@ import { useUpdateEffect, useMemoizedFn } from 'ahooks';
 import { getServiceTimes, deleteCacheParams, getProductTotalPrice } from "../../../utils";
 import { getErrorList } from "../../utilsByBooking";
 import { formatResources, getDurationProps, getFlexibleOption, getTimeObj } from "../addService/utils";
-import { PisellAdjustPriceInputNumber } from "@pisell/materials";
+import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$bookingConfig2, _state$service$cacheI4, _state$service$cacheI5, _state$service3, _state$service5, _window$BaseMaterials, _state$service$cacheI6, _state$service6, _state$service$cacheI7, _state$service$cacheI8, _state$service$cacheI9, _state$service$cacheI10, _state$bookingConfig3, _state$service$resour;
@@ -269,6 +269,7 @@ var Info = function Info(_, ref) {
   };
   var setEditData = useMemoizedFn(function (_cacheItem) {
     form.resetFields();
+    isChangeTotal.current = false;
     var cacheItem = _cacheItem || state.service.cacheItem;
     var values = cacheItem._extend;
     form.setFieldsValue(values);
@@ -404,9 +405,10 @@ var Info = function Info(_, ref) {
         },
         value: item._extend.other
       },
-      callback: function callback(e) {
+      callback: function callback(e, extension_type, detail) {
+        var _detail = detail || item;
         // 重新生成商品
-        var cacheItem = _objectSpread(_objectSpread({}, item), {}, {
+        var cacheItem = _objectSpread(_objectSpread({}, _detail), {}, {
           product_id: item.id,
           _id: item === null || item === void 0 ? void 0 : item._id,
           _key: e.key,

package/es/components/booking/info2/service/editService/utils.d.ts

@@ -7,5 +7,7 @@
 
 判断是否需要进入编辑服务页
  */
-declare const isNewService: (service: any) => any;
-declare const init: ({ cacheItem, state }: any) => any;
+export declare const getAutoAllocationStorage: (id: string | number) => any;
+export declare const setAutoAllocationStorage: (data: {
+    [key: string]: boolean;
+}) => void;

package/es/components/booking/info2/service/editService/utils.js

@@ -14,6 +14,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 判断是否需要进入编辑服务页
  */
 
+import { isBoolean } from "@pisell/utils";
 var isNewService = function isNewService(service) {
   return !service.new && service._extend.endDate;
 };
@@ -34,4 +35,21 @@ var init = function init(_ref) {
   var _isNewService = isNewService(cacheItem);
   if (!_isNewService) {}
   return _objectSpread({}, cacheItem);
+};
+export var getAutoAllocationStorage = function getAutoAllocationStorage(id) {
+  var value = localStorage.getItem('resource-auto-allocation');
+  if (value) {
+    var valueObj = JSON.parse(value);
+    return isBoolean(valueObj[id]) ? valueObj[id] : true;
+  }
+  return true;
+};
+export var setAutoAllocationStorage = function setAutoAllocationStorage(data) {
+  var value = localStorage.getItem('resource-auto-allocation');
+  if (value) {
+    var valueObj = JSON.parse(value);
+    localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread(_objectSpread({}, valueObj), data)));
+  } else {
+    localStorage.setItem('resource-auto-allocation', JSON.stringify(_objectSpread({}, data)));
+  }
 };