@pisell/private-materials 3.4.43 → 3.4.44

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

@@ -52,7 +52,7 @@ var useClientFn = function useClientFn(_params) {
       num: 5,
       total: 0,
       search: '',
-      with: ['formRecord'],
+      with: ['formRecord', 'contactsInfo'],
       relation_form_id: state === null || state === void 0 || (_state$bookingConfig = state.bookingConfig) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.config) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.basic) === null || _state$bookingConfig === void 0 || (_state$bookingConfig = _state$bookingConfig.appointment_subject) === null || _state$bookingConfig === void 0 ? void 0 : _state$bookingConfig.form_id
     }),
     _useState8 = _slicedToArray(_useState7, 2),
@@ -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();
         }
@@ -294,7 +300,7 @@ var useClientFn = function useClientFn(_params) {
     if (getIsWalkIn(item === null || item === void 0 ? void 0 : item.id)) {
       return locales.getText('pisell2.text.select-a-customer');
     }
-    var firstLastName = item.first_name || item.last_name ? "".concat(item.first_name, " ").concat(item.last_name) : "";
+    var firstLastName = item.first_name || item.last_name ? "".concat(item.first_name, " ").concat(item.last_name) : '';
     return item.name || (item.display_name || '').trim() || (item.nickname || '').trim() || firstLastName.trim() || '';
   }, [locales.localeMap]);
   useEffect(function () {

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/clientVariant/vertical/index.js

@@ -262,7 +262,7 @@ var VerticalClient = /*#__PURE__*/forwardRef(function (props, ref) {
               case 7:
                 _context.next = 9;
                 return getClients({
-                  with: ['formRecord'],
+                  with: ['formRecord', 'contactsInfo'],
                   relation_form_id: boardConfig === null || boardConfig === void 0 ? void 0 : boardConfig.form_id,
                   skip: 1,
                   num: 20,

package/es/components/booking/info/main.js

@@ -27,6 +27,7 @@ import "./index.less";
 import Notes from "./notes";
 import { Service2Cart } from "./service2";
 import { isDayBooking, isEventBooking, isTerminalDayBooking } from "./service2/utils";
+import ContactInfoMode from "../info2/service/contactInfoMode";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -37,7 +38,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state5, _context$appHelper4, _modal$state6;
+  var _modal$state2, _modal$state5, _context$appHelper4, _modal$state6, _modal$state7;
   var style = props.style,
     globalState = props.globalState,
     _props$modules = props.modules,
@@ -143,7 +144,7 @@ var Info = Provider(function (props) {
     bodyClassName: classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode && !isTerminalDayBooking(modal.state)))
   }, /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state6 = modal.state) !== null && _modal$state6 !== void 0 && _modal$state6.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, (modal === null || modal === void 0 || (_modal$state6 = modal.state) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.bookingConfig) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.config) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.cart_settings_tab) === null || _modal$state6 === void 0 || (_modal$state6 = _modal$state6.display_contact_info) === null || _modal$state6 === void 0 ? void 0 : _modal$state6.show_contact_info) === true ? /*#__PURE__*/React.createElement(ContactInfoMode, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

package/es/components/booking/info/model.js

@@ -21,6 +21,11 @@ var _miniRedux = miniRedux({
         });
         // return { ...state, client: { ...state.client, ...payload } };
       },
+      setContactsInfo: function setContactsInfo(state, payload) {
+        state.setGlobalState({
+          contacts_info: _objectSpread(_objectSpread({}, state.contacts_info), payload)
+        });
+      },
       setService: function setService(state, payload) {
         var obj = {};
         // 拦截,  如果服务列表里 有两个相近时间的服务, 删除最后一个

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

@@ -32,6 +32,7 @@ import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
 import { useDebounceEffect } from 'ahooks';
+import ContactInfoMode from "./service/contactInfoMode";
 var defaultModules = {
   client: 1,
   date: 1,
@@ -41,7 +42,7 @@ var defaultModules = {
 };
 locales.init(localeTexts, getLocale());
 var Info = Provider(function (props) {
-  var _modal$state2, _modal$state4, _modal$state6, _context$appHelper4, _modal$state7;
+  var _modal$state2, _modal$state4, _modal$state6, _context$appHelper4, _modal$state7, _modal$state8;
   // return <Payments {...props} />;
   var style = props.style,
     globalState = props.globalState,
@@ -230,7 +231,7 @@ var Info = Provider(function (props) {
     height: context !== null && context !== void 0 && (_context$appHelper4 = context.appHelper) !== null && _context$appHelper4 !== void 0 && (_context$appHelper4 = _context$appHelper4.utils) !== null && _context$appHelper4 !== void 0 && _context$appHelper4.isMobile ? '100%' : '100vh'
   }), "bodyClassName", classNames('booking-info-warp', _defineProperty(_defineProperty({}, 'create-booking-page-info-wrap', isBookingCreatePage), 'create-booking-page-info-wrap-create', isBookingCreatePageCreateMode))), /*#__PURE__*/React.createElement("div", {
     className: "booking-info"
-  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, modules.holder && !((_modal$state7 = modal.state) !== null && _modal$state7 !== void 0 && _modal$state7.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
+  }, createHeader, modules.client ? /*#__PURE__*/React.createElement(Client, null) : null, (modal === null || modal === void 0 || (_modal$state7 = modal.state) === null || _modal$state7 === void 0 || (_modal$state7 = _modal$state7.bookingConfig) === null || _modal$state7 === void 0 || (_modal$state7 = _modal$state7.config) === null || _modal$state7 === void 0 || (_modal$state7 = _modal$state7.cart_settings_tab) === null || _modal$state7 === void 0 || (_modal$state7 = _modal$state7.display_contact_info) === null || _modal$state7 === void 0 ? void 0 : _modal$state7.show_contact_info) === true ? /*#__PURE__*/React.createElement(ContactInfoMode, null) : null, modules.holder && !((_modal$state8 = modal.state) !== null && _modal$state8 !== void 0 && _modal$state8.disabledEdit) ? /*#__PURE__*/React.createElement(React.Fragment, null, params.type === 'form' ? /*#__PURE__*/React.createElement(Pet, null) : null) : null, modules.date ? /*#__PURE__*/React.createElement(DateCom, null) : null, /*#__PURE__*/React.createElement(Skeleton, {
     loading: globalState.loading,
     round: true,
     active: true,

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

@@ -0,0 +1,2 @@
+declare const ContactInfoMode: () => JSX.Element;
+export default ContactInfoMode;

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

@@ -0,0 +1,94 @@
+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 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); }
+import React, { useContext, useEffect } from 'react';
+import { locales } from '@pisell/utils';
+import ContactInfo from "../../../../../plus/contactInfo";
+import { Context } from "../../../info/model";
+var ContactInfoMode = function ContactInfoMode() {
+  var _state$client$value6, _state$contacts_info3, _state$contacts_info4;
+  var _useContext = useContext(Context),
+    state = _useContext.state,
+    dispatch = _useContext.dispatch;
+  console.log('state>>>>>>>>>', state);
+  useEffect(function () {
+    var _state$contacts_info, _state$client$value, _state$client$value2, _state$contacts_info2;
+    // 如果客户id发生变化，则获取客户信息中的ContactInfo，如果不存在，则使用客户信息填充ContactInfo
+    console.log('state>>>>>>>>>111', state === null || state === void 0 || (_state$contacts_info = state.contacts_info) === null || _state$contacts_info === void 0 ? void 0 : _state$contacts_info.client_id);
+    console.log('state>>>>>>>>>222', (_state$client$value = state.client.value) === null || _state$client$value === void 0 ? void 0 : _state$client$value.id);
+    if (((_state$client$value2 = state.client.value) === null || _state$client$value2 === void 0 ? void 0 : _state$client$value2.id) != (state === null || state === void 0 || (_state$contacts_info2 = state.contacts_info) === null || _state$contacts_info2 === void 0 ? void 0 : _state$contacts_info2.client_id)) {
+      var _state$client$value3;
+      var contactInfo = (_state$client$value3 = state.client.value) === null || _state$client$value3 === void 0 || (_state$client$value3 = _state$client$value3.contacts_info) === null || _state$client$value3 === void 0 ? void 0 : _state$client$value3.value;
+      if (!contactInfo) {
+        var _state$client, _state$client$value4;
+        var _ref = ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {},
+          first_name = _ref.first_name,
+          last_name = _ref.last_name,
+          phone = _ref.phone,
+          country_calling_code = _ref.country_calling_code,
+          country_code = _ref.country_code,
+          email = _ref.email;
+        dispatch({
+          type: 'setContactsInfo',
+          payload: {
+            value: {
+              first_name: first_name || '',
+              last_name: last_name || '',
+              phone: {
+                phone: phone || '',
+                country_calling_code: country_calling_code || '',
+                country_code: country_code || ''
+              },
+              email: email || ''
+            },
+            client_id: (_state$client$value4 = state.client.value) === null || _state$client$value4 === void 0 ? void 0 : _state$client$value4.id
+          }
+        });
+      } else {
+        var _state$client$value5;
+        dispatch({
+          type: 'setContactsInfo',
+          payload: {
+            value: _objectSpread({}, contactInfo || {}),
+            client_id: (_state$client$value5 = state.client.value) === null || _state$client$value5 === void 0 ? void 0 : _state$client$value5.id
+          }
+        });
+      }
+    }
+  }, [(_state$client$value6 = state.client.value) === null || _state$client$value6 === void 0 ? void 0 : _state$client$value6.id, state === null || state === void 0 || (_state$contacts_info3 = state.contacts_info) === null || _state$contacts_info3 === void 0 ? void 0 : _state$contacts_info3.client_id]);
+  var handleSave = function handleSave(value) {
+    dispatch({
+      type: 'setContactsInfo',
+      payload: {
+        value: value,
+        edit: true
+      }
+    });
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: '24px'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-contact-info-title",
+    style: {
+      fontSize: '16px',
+      fontWeight: 500,
+      marginBottom: '8px'
+    }
+  }, locales.getText('pisell2.booking.text.contact-info.title')), /*#__PURE__*/React.createElement(ContactInfo, {
+    dataSource: ((_state$contacts_info4 = state.contacts_info) === null || _state$contacts_info4 === void 0 ? void 0 : _state$contacts_info4.value) || null,
+    isShowDelete: false,
+    isShowAvatar: false,
+    isShowPhone: true,
+    isShowEmail: true,
+    style: {
+      padding: '14px 0 14px 14px'
+    },
+    onSave: handleSave
+  }));
+};
+export default ContactInfoMode;

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

@@ -273,6 +273,8 @@ declare const _default: {
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': 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;
@@ -548,6 +550,8 @@ declare const _default: {
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': 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;
@@ -823,6 +827,8 @@ declare const _default: {
         'pisell2.text.quotation.product.change.title': string;
         'pisell2.text.quotation.product.change.describe': 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;

package/es/components/booking/locales.js

@@ -317,7 +317,10 @@ export default {
     },
     'pisell2.text.quotation.product.change.title': "Notification",
     'pisell2.text.quotation.product.change.describe': "Product updates available: Please refresh the following items to load the latest data.",
-    'pisell2.text.form.link.to.another.record.more': 'View More'
+    'pisell2.text.form.link.to.another.record.more': 'View More',
+    // 联系信息
+    'pisell2.booking.text.contact-info.title': 'Contact info',
+    'pisell2.booking.text.search-placeholder': 'Search Customers / Contacts'
   },
   'zh-CN': {
     'pisell2.text.refunded-amount': '已退金额',
@@ -641,7 +644,10 @@ export default {
     },
     'pisell2.text.quotation.product.change.title': "提示",
     'pisell2.text.quotation.product.change.describe': "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
-    'pisell2.text.form.link.to.another.record.more': '查看更多'
+    'pisell2.text.form.link.to.another.record.more': '查看更多',
+    // 联系信息
+    'pisell2.booking.text.contact-info.title': '联系信息',
+    'pisell2.booking.text.search-placeholder': '搜索客户/联系信息'
   },
   'zh-HK': {
     'pisell2.text.refunded-amount': '已退金額',
@@ -965,6 +971,9 @@ export default {
     },
     'pisell2.text.quotation.product.change.title': "提示",
     'pisell2.text.quotation.product.change.describe': "以下商品信息已更新，请重新编辑相关商品以同步最新数据。",
-    'pisell2.text.form.link.to.another.record.more': '查看更多'
+    'pisell2.text.form.link.to.another.record.more': '查看更多',
+    // 联系信息
+    'pisell2.booking.text.contact-info.title': '聯繫信息',
+    'pisell2.booking.text.search-placeholder': '搜索客戶/聯系信息'
   }
 };

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

@@ -27,6 +27,10 @@ export interface FormState {
         };
         edit: boolean;
     };
+    contacts_info: {
+        edit: boolean;
+        value: any;
+    };
     date: {
         value: any;
         end_date: any;

package/es/components/booking/model.js

@@ -27,6 +27,9 @@ var apis = {
   },
   getFormData: function getFormData() {
     return [];
+  },
+  getContactsInfo: function getContactsInfo() {
+    return null;
   }
 };
 export var walkInData = {

package/es/components/ticketBooking/components/ticketBooking/index.less

@@ -8,7 +8,8 @@
       .booking-info-create-new,
       .pisell-lowcode__booking-field-title,
       .pisell-lowcode__shopping-cart-empty,
-      .pisell-lowcode__booking-service-clear-btn {
+      .pisell-lowcode__booking-service-clear-btn,
+      .pisell-lowcode__booking-contact-info-title {
         color: #ffffff;
       }
     }

package/es/index.d.ts

@@ -52,3 +52,5 @@ export { default as PinModal } from './components/pinModal';
 export { default as PinVerifyModal } from './components/pinVerifyModal';
 export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './components/authentication/admin';
 export type { SaaSAdminAuthProps, OrgAdminAuthProps, DeviceAuthProps, POSOperatorAuthProps, CustomerOAuthConfigProps } from './components/authentication/admin';
+export { default as ContactInfo } from './plus/contactInfo';
+export { default as ContactInfoModal } from './plus/contactInfoModal';

package/es/index.js

@@ -54,4 +54,6 @@ export { default as SaasRegister } from "./plus/saasRegister";
 export { default as SaasCreateOrganization } from "./plus/saasCreateOrganization";
 export { default as PinModal } from "./components/pinModal";
 export { default as PinVerifyModal } from "./components/pinVerifyModal";
-export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./components/authentication/admin";
+export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from "./components/authentication/admin";
+export { default as ContactInfo } from "./plus/contactInfo";
+export { default as ContactInfoModal } from "./plus/contactInfoModal";

package/es/plus/clientName/index.d.ts

@@ -0,0 +1,4 @@
+import './index.less';
+import { IClientNameProps } from './type';
+declare const ClientName: ({ className, dataSource, style }: IClientNameProps) => JSX.Element | null;
+export default ClientName;

package/es/plus/clientName/index.js

@@ -0,0 +1,18 @@
+import React, { useMemo } from 'react';
+import classNames from 'classnames';
+import "./index.less";
+import { getClientName } from "./utils";
+var ClientName = function ClientName(_ref) {
+  var className = _ref.className,
+    dataSource = _ref.dataSource,
+    style = _ref.style;
+  var name = useMemo(function () {
+    return getClientName(dataSource);
+  }, [dataSource]);
+  if (!dataSource) return null;
+  return /*#__PURE__*/React.createElement("div", {
+    className: classNames('pisell-client-name', className),
+    style: style || {}
+  }, name);
+};
+export default ClientName;

package/es/plus/clientName/index.less

@@ -0,0 +1,10 @@
+.pisell-client-name {
+  color: var(--Base-Black, #000);
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 600;
+  line-height: 20px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}

package/es/plus/clientName/type.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+export declare type ClientData = {
+    display_name?: string;
+    nickname?: string;
+    first_name?: string;
+    last_name?: string;
+    [key: string]: any;
+};
+export interface IClientNameProps {
+    dataSource?: string | ClientData | null;
+    className?: string;
+    style?: React.CSSProperties;
+}

package/es/plus/clientName/type.js

@@ -0,0 +1 @@
+export {};

package/es/plus/clientName/utils.d.ts

@@ -0,0 +1,2 @@
+import { ClientData } from './type';
+export declare const getClientName: (dataSource: string | ClientData | null) => string | null;

package/es/plus/clientName/utils.js

@@ -0,0 +1,18 @@
+export var getClientName = function getClientName(dataSource) {
+  if (!dataSource || typeof dataSource === 'string') {
+    return dataSource;
+  }
+  var first_name = dataSource.first_name,
+    last_name = dataSource.last_name,
+    display_name = dataSource.display_name,
+    nickname = dataSource.nickname;
+  var finalName = '';
+  if (display_name) {
+    finalName = display_name;
+  } else if (nickname) {
+    finalName = nickname;
+  } else if (first_name || last_name) {
+    finalName = "".concat(first_name, " ").concat(last_name).trim();
+  }
+  return finalName;
+};

package/es/plus/contactInfo/components/Avatar/index.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+import { AvatarConfig } from '../../types';
+import '../../index.less';
+interface AvatarProps {
+    config?: AvatarConfig;
+    name: string;
+    cover?: string;
+}
+declare const Avatar: React.FC<AvatarProps>;
+export default Avatar;