@pisell/private-materials 6.4.65 → 6.4.67

package/es/components/appointmentBooking/components/Cart/Item/Total.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Total: ({ className, isFooter }: any) => JSX.Element;
 export default Total;

package/es/components/appointmentBooking/components/ConfirmInformation/index.js

@@ -344,7 +344,7 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
   var handleSubmit = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
       var _utils$businessUtils, _utils$businessUtils$;
-      var _utils$businessUtils2, _utils$businessUtils3, contacts_info, _contacts_info, _contacts_info2, _contacts_info3, newPhone;
+      var _utils$businessUtils2, _utils$businessUtils3, contacts_info, _contacts_info, _contacts_info2, _contacts_info3, _contacts_info4, _contacts_info5, newPhone, _contacts_info6, _contacts_info7;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -363,7 +363,7 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
             contacts_info = null;
             _context6.prev = 5;
             if (!showContactInfo) {
-              _context6.next = 13;
+              _context6.next = 14;
               break;
             }
             _context6.next = 9;
@@ -376,24 +376,30 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
               country_code: ((_contacts_info3 = contacts_info) === null || _contacts_info3 === void 0 || (_contacts_info3 = _contacts_info3.phone) === null || _contacts_info3 === void 0 ? void 0 : _contacts_info3.countryCode) || ''
             };
             contacts_info.phone = newPhone;
+            // 处理dispaly_name
+            if ((_contacts_info4 = contacts_info) !== null && _contacts_info4 !== void 0 && _contacts_info4.first_name || (_contacts_info5 = contacts_info) !== null && _contacts_info5 !== void 0 && _contacts_info5.last_name) {
+              contacts_info.display_name = "".concat(((_contacts_info6 = contacts_info) === null || _contacts_info6 === void 0 ? void 0 : _contacts_info6.first_name) || '', " ").concat(((_contacts_info7 = contacts_info) === null || _contacts_info7 === void 0 ? void 0 : _contacts_info7.last_name) || '');
+            } else {
+              contacts_info.display_name = '';
+            }
             console.log('contacts_info', contacts_info);
-          case 13:
-            _context6.next = 19;
+          case 14:
+            _context6.next = 20;
             break;
-          case 15:
-            _context6.prev = 15;
+          case 16:
+            _context6.prev = 16;
             _context6.t0 = _context6["catch"](5);
             console.log('error', _context6.t0);
             return _context6.abrupt("return");
-          case 19:
+          case 20:
             handleNext({
               contacts_info: contacts_info
             });
-          case 20:
+          case 21:
           case "end":
             return _context6.stop();
         }
-      }, _callee6, null, [[5, 15]]);
+      }, _callee6, null, [[5, 16]]);
     }));
     return function handleSubmit() {
       return _ref9.apply(this, arguments);

package/es/components/appointmentBooking/components/Deposit/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const DepositContent: (props: {
     isAgreeDepositPolicy: boolean;

package/es/components/appointmentBooking/components/Guest/components/InformationOptionsModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const GuestOptionsModal: (props: any) => JSX.Element;
 export default GuestOptionsModal;

package/es/components/appointmentBooking/deposit/components/PolicyModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const DepositModal: (props: any) => JSX.Element;
 export default DepositModal;

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface TabProductProps {
     list: any[];

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const SelectProductItem: ({ item, onClick, onChangeQuantity, amountSymbol, style, className, disabled, }: any) => JSX.Element;
 export default SelectProductItem;

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

@@ -1,2 +1 @@
-/// <reference types="react" />
 export declare const renderBundles: (item: any, amountSymbol: string) => JSX.Element;

package/es/components/booking/components/customSelect/index.js

@@ -424,7 +424,7 @@ var CustomSelect = function CustomSelect(props, ref) {
         marginTop: 16,
         height: 44
       },
-      placeholder: locales.getText('pisell2.text.search'),
+      placeholder: locales.getText('pisell2.booking.text.search-placeholder'),
       value: search,
       allowClear: true,
       onChange: function onChange(e) {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 /**
  * @title: 空状态
  * @description:

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const FooterMenus: ({ state, menuChange, items }: any) => JSX.Element | null;
 export default FooterMenus;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface IProps {
     modal: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface FooterProps {
     state: any;
     reload: () => void;

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

@@ -9,7 +9,7 @@ import useSendModal from "./sendModal/useSendModal";
 import SendModal from "./sendModal";
 import { locales } from '@pisell/utils';
 var Footer = function Footer(_ref) {
-  var _state$client6, _state$form, _state$client7;
+  var _state$client2, _state$contacts_info2, _state$form, _state$client3;
   var state = _ref.state,
     reload = _ref.reload;
   var _useSendModal = useSendModal(state === null || state === void 0 ? void 0 : state.bookingId),
@@ -38,17 +38,31 @@ var Footer = function Footer(_ref) {
     };
   }();
   var defaultValues = useMemo(function () {
-    var _state$client, _state$client2, _state$client3, _state$client4, _state$client5;
+    var _state$contacts_info, _state$client;
+    // 优先取contacts_info中的phone和email，如果不存在则取客户信息中的phone和email
+    var _ref3 = ((_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.value) || {},
+      contactsEmail = _ref3.email,
+      contactsPhone = _ref3.phone;
+    var _ref4 = ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {},
+      clientEmail = _ref4.email,
+      clientPhone = _ref4.phone,
+      clientCode = _ref4.country_calling_code;
+    var email = contactsEmail || clientEmail;
+    var phone = (contactsPhone === null || contactsPhone === void 0 ? void 0 : contactsPhone.phone) || clientPhone;
+    var code = (contactsPhone === null || contactsPhone === void 0 ? void 0 : contactsPhone.country_calling_code) || clientCode || '+61';
+    if (!code.startsWith('+')) {
+      code = "+".concat(code);
+    }
     return {
-      sendSms: !!((_state$client = state.client) !== null && _state$client !== void 0 && (_state$client = _state$client.value) !== null && _state$client !== void 0 && _state$client.phone),
-      sendEmail: !!((_state$client2 = state.client) !== null && _state$client2 !== void 0 && (_state$client2 = _state$client2.value) !== null && _state$client2 !== void 0 && _state$client2.email),
-      email: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.email,
+      sendSms: !!phone,
+      sendEmail: !!email,
+      email: email,
       phone: {
-        code: (_state$client4 = state.client) === null || _state$client4 === void 0 || (_state$client4 = _state$client4.value) === null || _state$client4 === void 0 ? void 0 : _state$client4.country_calling_code,
-        phone: (_state$client5 = state.client) === null || _state$client5 === void 0 || (_state$client5 = _state$client5.value) === null || _state$client5 === void 0 ? void 0 : _state$client5.phone
+        code: code,
+        phone: phone
       }
     };
-  }, [(_state$client6 = state.client) === null || _state$client6 === void 0 ? void 0 : _state$client6.value]);
+  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 ? void 0 : _state$client2.value, (_state$contacts_info2 = state.contacts_info) === null || _state$contacts_info2 === void 0 ? void 0 : _state$contacts_info2.value]);
   if (!state.bookingId || !(state !== null && state !== void 0 && (_state$form = state.form) !== null && _state$form !== void 0 && _state$form.forms.length)) {
     return null;
   }
@@ -65,8 +79,8 @@ var Footer = function Footer(_ref) {
     block: true,
     type: "primary",
     onClick: handleOpen
-  }, locales.getText('pisell2.text.send-form-reminder')), /*#__PURE__*/React.createElement(SendModal, {
-    refreshKey: (_state$client7 = state.client) === null || _state$client7 === void 0 || (_state$client7 = _state$client7.value) === null || _state$client7 === void 0 ? void 0 : _state$client7.id,
+  }, locales.getText('pisell2.text.send-form-reminder')), open && /*#__PURE__*/React.createElement(SendModal, {
+    refreshKey: (_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id,
     open: open,
     onCancel: function onCancel() {
       return setOpen(false);

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

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

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SendModalValues } from './index';
 declare const useSendModal: (bookingId?: number) => {
     open: boolean;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 表单选择器

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Table: ({ value, onChange, field, mode, onAdd }: any) => JSX.Element;
 export default Table;

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useClearCart: (state: any, dispatch: any) => false | JSX.Element;
 export default useClearCart;

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

@@ -1,15 +1,15 @@
 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); }
 var _excluded = ["customer_id"];
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _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 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; }
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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); } }
@@ -84,7 +84,7 @@ var Client = function Client() {
   }, [state.disabledEdit]);
   var getClients = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-      var customer_id, resetParams, _setLoading, _state$client, api, data, list, _payload, customerItem, totalList;
+      var customer_id, resetParams, _setLoading, _state$client, api, withKey, data, list, _payload, customerItem, totalList;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -101,14 +101,20 @@ var Client = function Client() {
             }
             // let _setLoading = resetParams.skip === 1 ? setLoading : setLoadLoading;
             _setLoading(true);
-            api = state.isFranchisee ? getFranchiseeCustomerList : state.apis.getClientsEs;
-            _context.next = 6;
-            return api(_objectSpread(_objectSpread({}, resetParams), !state.isFranchisee ? {
+            api = state.isFranchisee ? getFranchiseeCustomerList : state.apis.getClientsEs; // 默认返回用户的联系信息
+            withKey = _toConsumableArray((resetParams === null || resetParams === void 0 ? void 0 : resetParams.with) || []);
+            if (!withKey.includes('contactsInfo')) {
+              withKey.push('contactsInfo');
+            }
+            _context.next = 8;
+            return api(_objectSpread(_objectSpread({}, resetParams), {}, {
+              with: withKey
+            }, !state.isFranchisee ? {
               _config: {
                 abort: true
               }
             } : {}));
-          case 6:
+          case 8:
             data = _context.sent;
             list = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
@@ -145,7 +151,7 @@ var Client = function Client() {
             setLoadLoading(false);
             isLoadClient = true;
             return _context.abrupt("return", {});
-          case 19:
+          case 21:
           case "end":
             return _context.stop();
         }
@@ -420,6 +426,15 @@ var Client = function Client() {
         // searchChange('');
       },
       optionRender: function optionRender(item) {
+        console.log('render_optionRender', item);
+        // 显示优先级：如果客户中存在email或phone，则优先显示，否则显示联系信息中的email和phone
+        var displayEmail = item === null || item === void 0 ? void 0 : item.email;
+        var displayPhone = item === null || item === void 0 ? void 0 : item.phone;
+        if (!displayEmail && !displayPhone) {
+          var _item$contacts_info, _item$contacts_info2;
+          displayEmail = item === null || item === void 0 || (_item$contacts_info = item.contacts_info) === null || _item$contacts_info === void 0 || (_item$contacts_info = _item$contacts_info.value) === null || _item$contacts_info === void 0 ? void 0 : _item$contacts_info.email;
+          displayPhone = item === null || item === void 0 || (_item$contacts_info2 = item.contacts_info) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.value) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.phone) === null || _item$contacts_info2 === void 0 ? void 0 : _item$contacts_info2.phone;
+        }
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Avatar, {
           className: "pisell-lowcode__booking-client-list-item-avatar",
           src: image.ali(item.cover, 100) || undefined,
@@ -432,11 +447,11 @@ var Client = function Client() {
           className: "pisell-lowcode__booking-client-list-item-info-name"
         }, getNickname(item)), /*#__PURE__*/React.createElement("div", {
           className: "pisell-lowcode__booking-client-list-item-info-desc"
-        }, item.email ? /*#__PURE__*/React.createElement("div", {
+        }, displayEmail ? /*#__PURE__*/React.createElement("div", {
           className: ""
-        }, item.email) : null, item.phone ? /*#__PURE__*/React.createElement("div", {
+        }, displayEmail) : null, displayPhone ? /*#__PURE__*/React.createElement("div", {
           className: ""
-        }, item.phone) : null), /*#__PURE__*/React.createElement("div", {
+        }, displayPhone) : null), /*#__PURE__*/React.createElement("div", {
           className: 'pisell-lowcode__booking-client-list-item-info-waiver',
           title: getWaiverTitle(item.waiver_form)
         }, (item.waiver_form || []).map(function (item) {

package/es/components/booking/info/clientVariant/hooks/useClientFn.js

@@ -76,7 +76,7 @@ var useClientFn = function useClientFn(_params) {
   }, [(_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id]);
   var getClients = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref, returnResult) {
-      var customer_id, customer_ids, resetParams, _setLoading, _state$client, api, data, list, _payload, customerItem, totalList;
+      var customer_id, customer_ids, resetParams, _setLoading, _state$client, api, withKey, data, list, _payload, customerItem, totalList;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -93,8 +93,12 @@ var useClientFn = function useClientFn(_params) {
             }
             _setLoading(true);
             api = state.isFranchisee ? getFranchiseeCustomerList : state.apis.getClients;
-            _context.next = 6;
-            return api(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, resetParams), resetParams.search ? {
+            withKey = _toConsumableArray((resetParams === null || resetParams === void 0 ? void 0 : resetParams.with) || []);
+            if (!withKey.includes('contactsInfo')) {
+              withKey.push('contactsInfo');
+            }
+            _context.next = 8;
+            return api(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, resetParams), resetParams.search ? {
               num: 10
             } : {}), state.isFranchisee ? {
               franchisee_customer_ids: customer_ids
@@ -104,8 +108,10 @@ var useClientFn = function useClientFn(_params) {
               _config: {
                 abort: true
               }
-            } : {}));
-          case 6:
+            } : {}), {}, {
+              with: withKey
+            }));
+          case 8:
             data = _context.sent;
             list = ((data === null || data === void 0 ? void 0 : data.list) || []).map(function (d) {
               var _d$form_record;
@@ -120,11 +126,11 @@ var useClientFn = function useClientFn(_params) {
               });
             });
             if (!returnResult) {
-              _context.next = 10;
+              _context.next = 12;
               break;
             }
             return _context.abrupt("return", list);
-          case 10:
+          case 12:
             _payload = {
               clients: list
             }; // 有传递, 则表示新增客户之后刷新列表的,  应该默认选中
@@ -163,7 +169,7 @@ var useClientFn = function useClientFn(_params) {
             setLoading(false);
             setLoadLoading(false);
             return _context.abrupt("return", {});
-          case 21:
+          case 23:
           case "end":
             return _context.stop();
         }

package/es/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/es/components/booking/info/clientVariant/vertical/SelectDrawer.js

@@ -323,6 +323,7 @@ var SelectDrawer = function SelectDrawer(props, ref) {
       return _ref4.apply(this, arguments);
     };
   }();
+  console.log('options7777', options);
   return /*#__PURE__*/React.createElement(Drawer, {
     showGoBack: showHeader,
     title: showHeader && locales.getText('pisell2.text.select-customer'),
@@ -335,7 +336,7 @@ var SelectDrawer = function SelectDrawer(props, ref) {
         margin: '16px 0',
         height: 44
       },
-      placeholder: locales.getText('pisell2.text.search'),
+      placeholder: locales.getText('pisell2.booking.text.search-placeholder'),
       value: search,
       allowClear: true,
       onChange: function onChange(e) {
@@ -376,6 +377,13 @@ var SelectDrawer = function SelectDrawer(props, ref) {
     delay: 500
   }, !!options.length ? options.map(function (item) {
     var _holder$form2;
+    var displayEmail = item === null || item === void 0 ? void 0 : item.email;
+    var displayPhone = item === null || item === void 0 ? void 0 : item.phone;
+    if (!displayEmail && !displayPhone) {
+      var _item$contacts_info, _item$contacts_info2;
+      displayEmail = item === null || item === void 0 || (_item$contacts_info = item.contacts_info) === null || _item$contacts_info === void 0 || (_item$contacts_info = _item$contacts_info.value) === null || _item$contacts_info === void 0 ? void 0 : _item$contacts_info.email;
+      displayPhone = item === null || item === void 0 || (_item$contacts_info2 = item.contacts_info) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.value) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.phone) === null || _item$contacts_info2 === void 0 ? void 0 : _item$contacts_info2.phone;
+    }
     return /*#__PURE__*/React.createElement("div", {
       className: "vertical-client-select-drawer-content-item",
       key: item.id
@@ -385,7 +393,7 @@ var SelectDrawer = function SelectDrawer(props, ref) {
       },
       cover: item.cover,
       title: getNickname(item),
-      desc: [item.email, item.phone],
+      desc: [displayEmail, displayPhone],
       checked: item.id === client.id,
       style: showPet ? {
         marginBottom: 6

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export declare const updateServiceDate: (services: any[], date: any, isTime: boolean) => any[];
 declare const DateCom: () => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export declare const disabledDate: (current: any, position: any, currentDate: any) => any;
 declare const DateRange: ({ state, dispatch, key }: any) => JSX.Element;

package/es/components/booking/info/hooks/useInfoHolder.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { EditServiceRef } from "../service/editService";
 declare const useInfoHolder: (state: any, dispatch: any) => {
     detailRef: import("react").MutableRefObject<EditServiceRef | undefined>;

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

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

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Notes: () => JSX.Element | null;
 export default Notes;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -6,7 +6,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const BookingList: ({ items }: {
     items: any[];
 }) => JSX.Element;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, resourceItem, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const Lists: ({ onEdit, onChange }: any) => JSX.Element;
 export default Lists;

package/es/components/booking/info2/service/actions/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/actions/index.less';
 declare const Actions: ({ currentService }: {
     currentService: any;

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

@@ -7,7 +7,7 @@ export declare const getDurationProps: ({ cacheItem, useStartTime, currentResour
         type: string;
         value: number;
     };
-    locale: any;
+    locale: string;
     slice: any;
     selectProps: {
         size: string;

package/es/components/booking/info2/service/serviceItem/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
 export default ServiceItem;

package/es/components/booking/info2/service/serviceList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;

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

@@ -303,6 +303,7 @@ declare const _default: {
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
     'zh-CN': {
         'pisell2.text.refunded-amount': string;
@@ -608,6 +609,7 @@ declare const _default: {
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
     'zh-HK': {
         'pisell2.text.refunded-amount': string;
@@ -913,6 +915,7 @@ declare const _default: {
         'pisell2.booking.notes.placeholder': string;
         'pisell2.text.form.link.to.another.record.more': string;
         'pisell2.booking.text.contact-info.title': string;
+        'pisell2.booking.text.search-placeholder': string;
     };
 };
 export default _default;