@pisell/private-materials 3.3.26 → 3.3.27

package/es/components/Sales/Customer/index.js

@@ -21,7 +21,9 @@ export var CustomerProvider = function CustomerProvider(_ref) {
       callback = _ref2.callback;
     utils.action({
       type: 'pisell1.login',
-      data: {},
+      data: {
+        type: 'plugin'
+      },
       callback: callback
     });
   };

package/es/components/Sales/Event/Detail.js

@@ -19,6 +19,7 @@ import { getEventDetailBookingOptionsApi, getEventDetailIntroductionApi, getEven
 import { useRequest } from 'ahooks';
 import { useEvent } from "./index";
 import { getIamgeFromMedia } from "../utils";
+import useLoginUser from "../../../hooks/useLoginUser";
 
 // 定义步骤数据接口
 
@@ -44,6 +45,7 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     setCurrentBookingOption = _useState6[1];
   var _useEvent = useEvent(),
     selectEvent = _useEvent.selectEvent;
+  var customer = useLoginUser();
   var _setDetail = function _setDetail(detailData) {
     detailRef.current = _objectSpread(_objectSpread({}, detailRef.current || {}), detailData || {});
     console.log(detailRef.current, '55555555');
@@ -70,7 +72,9 @@ export var EventDetailProvider = function EventDetailProvider(_ref) {
     getEventDetailBookingOptions.run({
       ids: ((_eventItem$_originDat = eventItem._originData) === null || _eventItem$_originDat === void 0 ? void 0 : _eventItem$_originDat.relation_product_ids) || [],
       num: 100,
-      skip: 1
+      skip: 1,
+      customer_id: customer === null || customer === void 0 ? void 0 : customer.id,
+      open_quotation: 1
     });
     getEventDetailSelectDate.run(eventItem.id, {
       days: 366

package/es/components/Sales/Event/serve.d.ts

@@ -10,6 +10,7 @@ export declare const getEventListApi: (params: {
     title?: string;
     skip?: number;
     num?: number;
+    open_quotation: number;
 }) => Promise<any>;
 export declare const getEventDetailIntroductionApi: (eventItemId: number | string) => Promise<any>;
 export declare const getEventDetailTeacherApi: (params: {
@@ -19,6 +20,8 @@ export declare const getEventDetailBookingOptionsApi: (params: {
     ids: number | string;
     num: number;
     skip: number;
+    customer_id?: number;
+    open_quotation?: number;
 }) => Promise<any>;
 export declare const getEventDetailSelectDateApi: (id: number | string, params: {
     days: number;

package/es/components/Sales/Init/index.d.ts

@@ -4,6 +4,7 @@ interface InitData {
     form_id?: number;
     shop_id?: number;
     shop?: any;
+    scheduleDisplayType?: 'calendarView' | 'textList';
 }
 interface InitContextType {
     getBoardSetting: any;

package/es/components/Sales/Init/index.js

@@ -84,12 +84,13 @@ export var InitProvider = function InitProvider(_ref) {
   var getBoardSetting = useRequest(getBoardSettingApi, {
     manual: true,
     onSuccess: function onSuccess(res) {
-      var _res$data, _res$data2, _appUtils$getStore;
+      var _res$data, _res$data2, _appUtils$getStore, _res$data3;
       setInitData({
         boardSetting: res === null || res === void 0 ? void 0 : res.data,
         form_id: res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 || (_res$data = _res$data.config) === null || _res$data === void 0 || (_res$data = _res$data.resource) === null || _res$data === void 0 || (_res$data = _res$data.booking_event_v2_resource) === null || _res$data === void 0 ? void 0 : _res$data.form_id,
         shop_id: res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shop_id,
-        shop: (_appUtils$getStore = appUtils.getStore()) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.getState()) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.core) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.core) === null || _appUtils$getStore === void 0 ? void 0 : _appUtils$getStore.shop
+        shop: (_appUtils$getStore = appUtils.getStore()) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.getState()) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.core) === null || _appUtils$getStore === void 0 || (_appUtils$getStore = _appUtils$getStore.core) === null || _appUtils$getStore === void 0 ? void 0 : _appUtils$getStore.shop,
+        scheduleDisplayType: res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 || (_res$data3 = _res$data3.config) === null || _res$data3 === void 0 || (_res$data3 = _res$data3.product_display_setting) === null || _res$data3 === void 0 || (_res$data3 = _res$data3.booking_event_v2_schedule_display_format) === null || _res$data3 === void 0 ? void 0 : _res$data3.value
       });
     }
   });

package/es/components/Sales/Step/index.d.ts

@@ -7,6 +7,7 @@ interface Step {
 declare type StepKey = 'select-category' | 'select-event' | 'confirm-information';
 interface StepData {
     currentStep: StepKey;
+    isAutoOperate?: boolean;
 }
 interface StepContextType {
     setStepData: (data: Partial<StepData>) => void;
@@ -18,6 +19,7 @@ interface StepContextType {
     isLastStep: boolean;
     isFirstStep: boolean;
     isTwoStep: boolean;
+    changeAutoOperate: (newAutoOperate: boolean) => void;
 }
 interface StepProviderProps {
     children: React.ReactNode;

package/es/components/Sales/Step/index.js

@@ -40,7 +40,8 @@ var stepMaps = steps.reduce(function (acc, step) {
 
 // 默认步骤状态
 var defaultState = {
-  currentStep: steps[0].key
+  currentStep: steps[0].key,
+  isAutoOperate: true
 };
 
 // 创建步骤上下文
@@ -97,7 +98,8 @@ export var StepProvider = function StepProvider(_ref) {
     var nextStep = getNextStep();
     if (nextStep) {
       setStepData({
-        currentStep: nextStep
+        currentStep: nextStep,
+        isAutoOperate: true
       });
     }
   };
@@ -107,7 +109,8 @@ export var StepProvider = function StepProvider(_ref) {
     var prevStep = getPrevStep();
     if (prevStep) {
       setStepData({
-        currentStep: prevStep
+        currentStep: prevStep,
+        isAutoOperate: false
       });
     } else {
       closePage();
@@ -162,6 +165,11 @@ export var StepProvider = function StepProvider(_ref) {
   var isTwoStep = useMemo(function () {
     return (currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key) === steps[1].key;
   }, [currentStepData === null || currentStepData === void 0 ? void 0 : currentStepData.key]);
+  var changeAutoOperate = function changeAutoOperate(newAutoOperate) {
+    setStepData({
+      isAutoOperate: newAutoOperate
+    });
+  };
   var contextValue = {
     setStepData: setStepData,
     currentStepData: currentStepData,
@@ -171,7 +179,8 @@ export var StepProvider = function StepProvider(_ref) {
     toFirstStep: toFirstStep,
     isFirstStep: isFirstStep,
     isLastStep: isLastStep,
-    isTwoStep: isTwoStep
+    isTwoStep: isTwoStep,
+    changeAutoOperate: changeAutoOperate
   };
   return /*#__PURE__*/React.createElement(StepContext.Provider, {
     value: contextValue

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

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

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

@@ -65,18 +65,18 @@ var ConfirmInformation = /*#__PURE__*/forwardRef(function (props, ref) {
    */
   var handleNext = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _summary$deposit;
+      var _deposit$protocols;
       var deposit, _yield$appointmentBoo, data, _ref2, is_deposit, deposit_amount, total_amount, order_id, _total, freeResult;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!(summary !== null && summary !== void 0 && (_summary$deposit = summary.deposit) !== null && _summary$deposit !== void 0 && _summary$deposit.hasDeposit && !isAgreeDepositPolicy)) {
-              _context.next = 2;
+            deposit = summary.deposit; // 如果未同意定金政策，则提示
+            if (!(deposit !== null && deposit !== void 0 && deposit.hasDeposit && (deposit === null || deposit === void 0 || (_deposit$protocols = deposit.protocols) === null || _deposit$protocols === void 0 ? void 0 : _deposit$protocols.length) > 0 && !isAgreeDepositPolicy)) {
+              _context.next = 3;
               break;
             }
             return _context.abrupt("return", Toast(locales.getText('pisell2.appointment.deposit.agree.policy')));
-          case 2:
-            deposit = summary.deposit;
+          case 3:
             setLoading(true);
             _context.prev = 4;
             _context.next = 7;

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

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

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

@@ -153,6 +153,8 @@ var Services = /*#__PURE__*/forwardRef(function (props, ref) {
                               key: 'select-time',
                               description: description
                             }, 'select-resource');
+                          } else {
+                            removeStep('select-time');
                           }
                         } else {
                           // 先选择商品，如果商品是session类型，则不需要选择日期和时间步骤

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

@@ -67,7 +67,7 @@ var Deposit = function Deposit(props) {
     value: total,
     showCurrencySymbol: true,
     className: "amount"
-  }), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.appointment.deposit.amount.tip2')))), /*#__PURE__*/React.createElement("div", {
+  }), /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.appointment.deposit.amount.tip2')))), (protocols === null || protocols === void 0 ? void 0 : protocols.length) > 0 ? /*#__PURE__*/React.createElement("div", {
     className: "checkbox-wrap",
     onClick: function onClick() {
       return handleAgreed();
@@ -90,7 +90,7 @@ var Deposit = function Deposit(props) {
     }, item === null || item === void 0 ? void 0 : item.title, /*#__PURE__*/React.createElement("span", {
       className: "symbol"
     }, _policyText(item, index)));
-  }))))), /*#__PURE__*/React.createElement(PolicyModal, {
+  })))) : null), /*#__PURE__*/React.createElement(PolicyModal, {
     open: visible,
     onCancel: function onCancel() {
       return setVisible(false);

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

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

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

@@ -277,7 +277,7 @@ var formatMetaData = function formatMetaData(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item) {
-  var _item$_extend10, _item$_extend11, _item$_extend12;
+  var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend13;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -293,6 +293,7 @@ var formatProducts = function formatProducts(item) {
   return {
     "num": item._extend.quantity,
     "price": formatProductPrice(item),
+    "source_product_price": (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.price,
     "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
     "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
     "product_discount_reason": item._extend.discount_reason || '',
@@ -302,10 +303,10 @@ var formatProducts = function formatProducts(item) {
     "discount_per": item._extend.discount_per,
     "discount_type": item._extend.discount_type || discount_type,
     "order_detail_id": item._extend.order_detail_id || 0,
-    "product_bundle": formatProductBundle((_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 || (_item$_extend10 = _item$_extend10.other) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.bundle),
+    "product_bundle": formatProductBundle((_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.option),
-    "product_variant_id": ((_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.option),
+    "product_variant_id": ((_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 || (_item$_extend13 = _item$_extend13.other) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.product_variant_id) || 0,
     "discount_list": notManualDiscount,
     metadata: formatMetaData(item)
   };
@@ -325,8 +326,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend13;
-    var holderId = (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.holder_id;
+    var _item$_extend14;
+    var holderId = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -352,15 +353,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend14;
-      return ((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.holder_id) && appointmentTypes.includes(item.extension_type);
+      var _item$_extend15;
+      return ((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.holder_id) && appointmentTypes.includes(item.extension_type);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend15;
-      var key = (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.holder_id; // 分组键
+      var _item$_extend16;
+      var key = (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -422,9 +423,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19;
-      var startDate = ((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.startDate) || ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.start_date);
-      var endDate = ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.endDate) || ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.end_date);
+      var _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20;
+      var startDate = ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.startDate) || ((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.start_date);
+      var endDate = ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.endDate) || ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -485,8 +486,8 @@ var formatRelationProducts = function formatRelationProducts(data) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend20;
-    return !((_item$_extend20 = item._extend) !== null && _item$_extend20 !== void 0 && _item$_extend20.holder_id);
+    var _item$_extend21;
+    return !((_item$_extend21 = item._extend) !== null && _item$_extend21 !== void 0 && _item$_extend21.holder_id);
   });
   var relationProducts = [];
   relationProducts = list.map(function (item) {

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

@@ -0,0 +1,4 @@
+declare const useQuotation: (state: any, dispatch: any) => {
+    dom: JSX.Element;
+};
+export default useQuotation;

package/es/components/booking/hooks/useQuotation.js

@@ -0,0 +1,256 @@
+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; }
+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, { useEffect, useMemo, useRef, useState } from 'react';
+import { getProductTotalPrice } from "../utils";
+import useEngineContext from "../../../../es/hooks/useEngineContext";
+import { locales } from "@pisell/utils";
+import { PisellModal } from "@pisell/materials";
+var formatBundleItemMap = function formatBundleItemMap(product) {
+  return product.bundle_group.reduce(function (pre, cur) {
+    var curObj = {};
+    cur.bundle_item.forEach(function (item) {
+      curObj[item.id] = item;
+    });
+    return _objectSpread(_objectSpread({}, pre), curObj);
+  }, {});
+};
+var setNewCartValue = function setNewCartValue(cartValue, newProducts) {
+  if (!newProducts.length) {
+    return {
+      isChange: false,
+      value: cartValue
+    };
+  }
+
+  // 是否有报价单价格有改动
+  var isChange = false;
+
+  // 是否是套餐内子商品变更
+  var isBundleChange = false;
+
+  // 是否套餐子商品被删除
+  var isNotFoundBundle = false;
+  var notFoundProducts = [];
+  var value = cartValue.map(function (item) {
+    var _item$_extend, _item$_extend2;
+    var newProduct = newProducts.find(function (newItem) {
+      return newItem.id === item.product_id;
+    });
+    if (!newProduct) {
+      return item;
+    }
+    // 是否报价单变更价格更新
+    var isChangePrice = newProduct.price != item.price;
+    var bundleItemMap = formatBundleItemMap(newProduct);
+    var newBundle = (((_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).map(function (bundle) {
+      if (!bundleItemMap[bundle.id]) {
+        isNotFoundBundle = true;
+        if (!notFoundProducts.some(function (p) {
+          return p._id === bundle._id;
+        })) {
+          notFoundProducts.push(item);
+        }
+        return bundle;
+      }
+      if (bundle.price != bundleItemMap[bundle.id].price) {
+        isChangePrice = true;
+        isBundleChange = true;
+      }
+      return _objectSpread(_objectSpread({}, bundle), {}, {
+        base_price: bundleItemMap[bundle.id].base_price,
+        price: bundleItemMap[bundle.id].price
+        // product_price: bundleItemMap[item.id].product_price,
+      });
+    });
+
+    // 价格都没有变动时返回原始信息
+    if (!isChangePrice) {
+      return item;
+    } else {
+      isChange = true;
+    }
+    var newItem = _objectSpread(_objectSpread({}, item), {}, {
+      original_price: newProduct.original_price,
+      price: newProduct.price,
+      base_price: newProduct.base_price,
+      _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
+        price: newProduct.price,
+        // total: newProduct.total,
+        bundle_edit: isBundleChange ? 1 : item._extend.bundle_edit,
+        other: _objectSpread(_objectSpread({}, item._extend.other), {}, {
+          option: (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 || (_item$_extend2 = _item$_extend2.other) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.option,
+          bundle: newBundle
+        })
+      })
+    });
+    var total = getProductTotalPrice(newItem);
+    newItem._extend.total = total;
+    newItem._extend.origin_total = total;
+    return newItem;
+  });
+  return {
+    isChange: isChange,
+    value: value,
+    isNotFoundBundle: isNotFoundBundle,
+    notFoundProducts: notFoundProducts
+  };
+};
+var useQuotation = function useQuotation(state, dispatch) {
+  var _state$client3;
+  var context = useEngineContext();
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    products = _useState4[0],
+    setProducts = _useState4[1];
+  var cartValueRef = useRef(state.service.value || []);
+  cartValueRef.current = state.service.value;
+  var getCartQuotation = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+      var data;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (cartValueRef.current.length) {
+              _context.next = 2;
+              break;
+            }
+            return _context.abrupt("return");
+          case 2:
+            _context.next = 4;
+            return state.apis.getServices({
+              skip: 1,
+              num: 500,
+              extension_type: state.renderType === 'eventBooking' ? undefined : ['product_appointment', 'appointment_ticket', 'service_product', 'session_product', 'session_ticket'],
+              with: ['category', 'resourceRelation'],
+              ids: cartValueRef.current.map(function (item) {
+                return item.product_id;
+              }),
+              open_quotation: 1,
+              with_schedule: 1,
+              with_count: ['bundleGroup', 'optionGroup'],
+              order_by_string: 'sort:desc',
+              status: 'published',
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
+              customer_id: params === null || params === void 0 ? void 0 : params.customer_id,
+              open_bundle: 1
+            });
+          case 4:
+            data = _context.sent;
+            return _context.abrupt("return", data);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getCartQuotation(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  var currentDate = useMemo(function () {
+    return state.date.value.format('YYYY-MM-DD');
+  }, [state.date.value]);
+  var updateCartQuotation = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+      var data, _setNewCartValue, isChange, newCartValue, isNotFoundBundle, notFoundProducts;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return getCartQuotation(params);
+          case 2:
+            data = _context2.sent;
+            if (data) {
+              _context2.next = 5;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 5:
+            _setNewCartValue = setNewCartValue(cartValueRef.current, data.list), isChange = _setNewCartValue.isChange, newCartValue = _setNewCartValue.value, isNotFoundBundle = _setNewCartValue.isNotFoundBundle, notFoundProducts = _setNewCartValue.notFoundProducts;
+            if (!isNotFoundBundle) {
+              _context2.next = 10;
+              break;
+            }
+            setProducts(notFoundProducts);
+            setOpen(true);
+            return _context2.abrupt("return");
+          case 10:
+            if (isChange) {
+              _context2.next = 12;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 12:
+            dispatch({
+              type: "setService",
+              payload: {
+                value: newCartValue,
+                edit: true
+              }
+            });
+          case 13:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function updateCartQuotation(_x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var isEditClientOrDate = useMemo(function () {
+    var _state$client, _state$date;
+    return (state === null || state === void 0 || (_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.edit) || (state === null || state === void 0 || (_state$date = state.date) === null || _state$date === void 0 ? void 0 : _state$date.edit);
+  }, [state]);
+  useEffect(function () {
+    var _context$appHelper, _context$appHelper$ge, _state$client2;
+    var isQuotation = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getAppByModal) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'quotation');
+
+    // 没有报价单不走该流程 没有更新客户信息或者日期不更新不走该流程
+    if (!isQuotation || !isEditClientOrDate) return;
+    updateCartQuotation({
+      customer_id: (_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id,
+      schedule_date: currentDate
+    });
+  }, [(_state$client3 = state.client) === null || _state$client3 === void 0 || (_state$client3 = _state$client3.value) === null || _state$client3 === void 0 ? void 0 : _state$client3.id, currentDate, isEditClientOrDate]);
+  var dom = useMemo(function () {
+    return /*#__PURE__*/React.createElement(PisellModal.Information, {
+      open: open,
+      platform: "pc",
+      title: locales.getText('pisell2.text.quotation.product.change.title'),
+      describe: /*#__PURE__*/React.createElement("div", null, locales.getText('pisell2.text.quotation.product.change.describe'), products.map(function (item) {
+        return /*#__PURE__*/React.createElement("div", null, item === null || item === void 0 ? void 0 : item.product_title);
+      })),
+      okText: locales.getText('pisell2.text.ok'),
+      closable: true,
+      cancelVisible: false,
+      onOk: function onOk() {
+        return setOpen(false);
+      },
+      onCancel: function onCancel() {
+        return setOpen(false);
+      }
+    });
+  }, [open, products]);
+  return {
+    dom: dom
+  };
+};
+export default useQuotation;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

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

@@ -126,9 +126,8 @@ var Info = function Info(props) {
    */
   var customerId = useMemo(function () {
     var _state$client;
-    if (!isDay) return undefined;
     return ((_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;
-  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id, isDay]);
+  }, [(_state$client2 = state.client) === null || _state$client2 === void 0 || (_state$client2 = _state$client2.value) === null || _state$client2 === void 0 ? void 0 : _state$client2.id]);
 
   /**
    * @title: 如果商品只有一个, 则自动设置默认商品
@@ -248,7 +247,7 @@ var Info = function Info(props) {
             dayParams = {}; // 跨日预约
             if (isDay && !isEventBooking(state)) {
               dayParams.extension_type = ['normal', 'product_appointment'];
-              dayParams.customer_id = customerId;
+              // dayParams.customer_id = customerId;
             }
             _context2.next = 9;
             return state.apis.getServices(_objectSpread({
@@ -262,7 +261,8 @@ var Info = function Info(props) {
               with_count: ['bundleGroup', 'optionGroup'],
               order_by_string: 'sort:desc',
               status: 'published',
-              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date
+              schedule_date: params === null || params === void 0 ? void 0 : params.schedule_date,
+              customer_id: customerId
             }, dayParams));
           case 9:
             data = _context2.sent;