@pisell/private-materials 6.6.48 → 6.6.49

package/lib/components/appointmentBooking/components/Voucher/index.js

@@ -43,8 +43,6 @@ var import_materials = require("@pisell/materials");
 var import_hooks = require("../../hooks");
 var import_voucher = require("../../../booking/components/voucher/index.less");
 var import_index = require("./index.less");
-var import_context = require("../../context");
-var import_ahooks = require("ahooks");
 var ShopDiscountHooks = {
   onInited: "shopDiscount:onInited",
   onDestroy: "shopDiscount:onDestroy",
@@ -68,17 +66,11 @@ var VoucherCard = (props) => {
   const productRef = (0, import_react.useRef)(products);
   const { openLoginModal } = (0, import_hooks.useAppointmentBookingLogin)();
   const { accountLists } = (0, import_hooks.useAppointmentBookingAccount)();
-  const { summary } = (0, import_context.useAppointmentBookingContext)();
-  const { originTotal, total } = summary;
   const cart = (_b = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _b.cart;
   const isUserLoggedIn = (0, import_react.useMemo)(() => {
     var _a2, _b2;
     return !!((_b2 = (_a2 = utils == null ? void 0 : utils.token) == null ? void 0 : _a2.get) == null ? void 0 : _b2.call(_a2)) || false;
   }, [store]);
-  (0, import_react.useEffect)(() => {
-    const shopDiscount2 = pisellos.getModule("shopDiscount");
-    shopDiscount2.setOriginTotalAmount(originTotal);
-  }, [originTotal]);
   const availableData = (0, import_react.useMemo)(() => {
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
@@ -114,7 +106,7 @@ var VoucherCard = (props) => {
     });
     (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.batchUpdateCart) == null ? void 0 : _a2.call(appointmentBooking, items);
   };
-  const { run: onCartChange } = (0, import_ahooks.useDebounceFn)(() => {
+  const onCartChange = () => {
     var _a2, _b2, _c;
     const products2 = cart == null ? void 0 : cart.getItems();
     (_c = shopDiscount == null ? void 0 : shopDiscount.setBookingSubject) == null ? void 0 : _c.call(
@@ -123,7 +115,7 @@ var VoucherCard = (props) => {
     );
     const val = shopDiscount.calcDiscount(products2);
     batchUpdateCart(val.productList);
-  }, { wait: 200 });
+  };
   const stringifiedHolders = (0, import_react.useMemo)(() => {
     let _ret;
     try {

package/lib/components/booking/addons/index.js

@@ -68,15 +68,14 @@ var formatProducts = (values) => {
       discountway: "num",
       discount_type: "discount",
       bundle_edit: (_c = item._extend) == null ? void 0 : _c.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle, item.is_price_include_tax),
+      product_bundle: (0, import_utils.formatProductBundle)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
       "product_option_item": (0, import_utils.formatProductOption)((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
       "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
       "source_product_price": (0, import_utils.getSourceProductPrice)(item),
       "main_product_selling_price": (0, import_utils.getMainProductSellingPrice)(item) ?? (0, import_utils.formatProductPrice)(item),
       "calculated_original_price": (0, import_utils.formatOriginalPrice)(item),
       "calculated_selling_price": (0, import_utils.formatSellingPrice)(item),
-      "tax_fee": item._extend.tax_fee,
-      is_price_include_tax: item.is_price_include_tax
+      "tax_fee": item._extend.tax_fee
     };
   });
   return arr;

package/lib/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/lib/components/booking/components/footer/amount.js

@@ -498,7 +498,7 @@ var getMainProductTotal = (item) => {
     if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
       const discountAmount = getDiscountAmount(bundleItem.discount_list);
       const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
-      const bundleItemTotal = bundleItemPrice;
+      const bundleItemTotal = bundleItemPrice.minus(discountAmount);
       total = total.add(bundleItemTotal);
     }
   }

package/lib/components/booking/components/footer/index.js

@@ -269,15 +269,6 @@ var Footer = (props) => {
       ...getDataFromHost()
     });
   }, [state, isEdit]);
-  (0, import_react.useEffect)(() => {
-    window.dispatchEvent(
-      new CustomEvent("onOriginExpectAmountWithoutDiscountChange", {
-        detail: {
-          originExpectAmountWithoutDiscount: total == null ? void 0 : total.originExpectAmountWithoutDiscount
-        }
-      })
-    );
-  }, [total == null ? void 0 : total.originExpectAmountWithoutDiscount]);
   (0, import_ahooks.useDebounceEffect)(() => {
     var _a2;
     if ((_a2 = state == null ? void 0 : state.service) == null ? void 0 : _a2.addTimeModal) {

package/lib/components/booking/components/footer/utils.d.ts

@@ -15,7 +15,7 @@ export declare const formatProductOption: (option: any) => any;
  * @Author: zhiwei.Wang
  * @Date: 2024-02-19 09:26
  */
-export declare const formatProductBundle: (bundle: any, is_price_include_tax: number) => any;
+export declare const formatProductBundle: (bundle: any) => any;
 /**
  * 获取子商品折扣信息
  * @param item

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

@@ -96,7 +96,7 @@ var log = (data) => {
     ]
   });
 };
-var formatProductBundle = (bundle, is_price_include_tax) => {
+var formatProductBundle = (bundle) => {
   if (!bundle) {
     return;
   }
@@ -136,7 +136,6 @@ var formatProductBundle = (bundle, is_price_include_tax) => {
       "option": option,
       "bundle_selling_price": Math.abs(d == null ? void 0 : d.price),
       // "bundle_sum_price": d?.original_price || d?.original_total,
-      is_price_include_tax,
       "metadata": {
         custom_product_bundle_map_id: d._id,
         // 子商品单数量附加费
@@ -403,7 +402,7 @@ var formatProducts = (item, quantity) => {
     "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((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle, item.is_price_include_tax),
+    "product_bundle": formatProductBundle((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.bundle),
     "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
     "product_option_item": formatProductOption((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.option),
     "product_variant_id": ((_i = (_h = item._extend) == null ? void 0 : _h.other) == null ? void 0 : _i.product_variant_id) || 0,
@@ -413,8 +412,7 @@ var formatProducts = (item, quantity) => {
     "calculated_original_price": formatOriginalPrice(item),
     "calculated_selling_price": formatSellingPrice(item),
     "tax_fee": item._extend.tax_fee,
-    "custom_deposit_data": item.custom_deposit_data,
-    is_price_include_tax: item.is_price_include_tax
+    "custom_deposit_data": item.custom_deposit_data
   };
 };
 var formatAppointmentProductLists = (data) => {

package/lib/components/booking/components/voucher/index.js

@@ -135,17 +135,11 @@ var VoucherCard = (props) => {
     }
     onScanCode(e.detail.code);
   });
-  const onOriginExpectAmountWithoutDiscountChange = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2;
-    (_a2 = shopDiscount == null ? void 0 : shopDiscount.setOriginTotalAmount) == null ? void 0 : _a2.call(shopDiscount, e.detail.originExpectAmountWithoutDiscount);
-  });
   (0, import_react.useEffect)(() => {
     const wrappedOnScanWallPassCode = executeIfActive(onScanWallPassCode);
     window.addEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
-    window.addEventListener("onOriginExpectAmountWithoutDiscountChange", onOriginExpectAmountWithoutDiscountChange);
     return () => {
       window.removeEventListener("onScanWallPassCode", wrappedOnScanWallPassCode);
-      window.removeEventListener("onOriginExpectAmountWithoutDiscountChange", onOriginExpectAmountWithoutDiscountChange);
     };
   }, []);
   const addonsMemo = (0, import_react.useMemo)(() => {

package/lib/components/booking/components/voucher/index.less

@@ -1,8 +1,5 @@
 .pisell-lowcode__booking-footer-voucher-container {
   margin-bottom: 8px;
-  width: 100%;
-  display: flex;
-  flex-direction: column;
   .voucher-title {
     display: flex;
     align-items: center;
@@ -50,9 +47,9 @@
     width: 100%;
     transition: 0.2s;
     max-height: 0;
+    overflow: hidden;
     display: flex;
     flex-direction: column;
-    overflow: auto;
 
     &.show {
       max-height: unset;

package/lib/components/booking/components/voucherModal/index.less

@@ -6,7 +6,6 @@
   .pisell-voucher-modal-content {
     max-height: 70vh;
     overflow-y: auto;
-    display: flex;
   }
 
   // 隐藏状态下的样式优化

package/lib/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/lib/components/booking/forms/sendModal/useSendModal.d.ts

@@ -4,6 +4,6 @@ declare const useSendModal: (bookingId?: number) => {
     setOpen: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     handleOpen: () => void;
     handleValuesChange: (val: any) => void;
-    handleOk: (values: SendModalValues) => Promise<boolean | undefined>;
+    handleOk: (values: SendModalValues) => Promise<any>;
 };
 export default useSendModal;

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

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const useClearCart: (state: any, dispatch: any) => false | React.JSX.Element;
+declare const useClearCart: (state: any, dispatch: any) => React.JSX.Element;
 export default useClearCart;

package/lib/components/booking/hooks/useClearCart.js

@@ -38,28 +38,50 @@ var import_materials = require("@pisell/materials");
 var import_utils = require("@pisell/utils");
 var useClearCart = (state, dispatch) => {
   var _a, _b;
-  const handleClear = () => {
+  const [open, setOpen] = (0, import_react.useState)(false);
+  const handleOpenModal = (0, import_react.useCallback)(() => {
+    setOpen(true);
+  }, []);
+  const handleConfirm = (0, import_react.useCallback)(() => {
     dispatch({
       type: "setService",
       payload: {
         value: []
       }
     });
-  };
+    setOpen(false);
+  }, []);
+  const handleCancel = (0, import_react.useCallback)(() => {
+    setOpen(false);
+  }, []);
   return (0, import_react.useMemo)(() => {
     var _a2, _b2, _c, _d;
-    return !!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) && !state.channelDisabledEdit && /* @__PURE__ */ import_react.default.createElement(
+    const showClearBtn = !!((_b2 = (_a2 = state.service) == null ? void 0 : _a2.value) == null ? void 0 : _b2.length) && !state.channelDisabledEdit;
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showClearBtn && /* @__PURE__ */ import_react.default.createElement(
       "span",
       {
         className: (0, import_classnames.default)("pisell-lowcode__booking-service-clear-btn", {
           ["pisell-lowcode__booking-service-clear-btn-disabled"]: !((_d = (_c = state.service) == null ? void 0 : _c.value) == null ? void 0 : _d.length)
         }),
-        onClick: handleClear
+        onClick: handleOpenModal
       },
       /* @__PURE__ */ import_react.default.createElement(import_materials.Iconfont, { type: "pisell2-trash-01" }),
       " ",
       /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart"))
-    );
-  }, [(_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length, state.channelDisabledEdit]);
+    ), /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellModal,
+      {
+        open,
+        platform: "pc",
+        title: import_utils.locales.getText("pisell2.booking.info.text.clear-cart-modal.title"),
+        onOk: handleConfirm,
+        onCancel: handleCancel,
+        okText: import_utils.locales.getText("pisell2.booking.info.text.clear-cart-modal.confirm"),
+        cancelText: import_utils.locales.getText("pisell2.booking.info.text.clear-cart-modal.cancel"),
+        destroyOnClose: true
+      },
+      /* @__PURE__ */ import_react.default.createElement("div", { style: { margin: "24px 0" } }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.booking.info.text.clear-cart-modal.content")))
+    ));
+  }, [(_b = (_a = state.service) == null ? void 0 : _a.value) == null ? void 0 : _b.length, state.channelDisabledEdit, open]);
 };
 var useClearCart_default = useClearCart;

package/lib/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/lib/components/booking/info/service/index.less

@@ -8,8 +8,10 @@
     line-height: 24px; /* 150% */
     display: flex;
     align-items: center;
-    margin-bottom: 4px;
-    padding: 12px 0;
+    margin-bottom: 16px !important;
+    // padding: 12px 0;
+    padding: 0 !important;
+    width: max-content;
     .anticon {
       font-size: 18px;
       margin-right: 6px;

package/lib/components/booking/info2/cartClientCard/index.js

@@ -50,6 +50,7 @@ var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContex
 var import_model = require("../../info/model");
 var import_index = require("./index.less");
 var import_IsActiveContext = require("../../../ticketBooking/context/IsActiveContext");
+var import_serve = require("../serve");
 var CartClientCard = (0, import_react.forwardRef)(({
   clientCardProps = {},
   beforeSwitchModalOpen,
@@ -67,6 +68,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
   const [keyword, setKeyword] = (0, import_react.useState)("");
   const keywordRef = (0, import_react.useRef)("");
   const isActive = (0, import_IsActiveContext.useIsActive)();
+  const [resultLoading, setResultLoading] = (0, import_react.useState)(false);
   keywordRef.current = keyword;
   const Toast = (0, import_materials.useToast)();
   const { openScan, closeScan } = (0, import_useScanCustomer.default)();
@@ -289,6 +291,47 @@ var CartClientCard = (0, import_react.forwardRef)(({
   (0, import_react.useImperativeHandle)(ref, () => ({
     handleSetClient
   }));
+  const handleRowClick = (0, import_ahooks.useMemoizedFn)(
+    async (record, options) => {
+      var _a2;
+      try {
+        if ((state == null ? void 0 : state.isFranchisee) && (record == null ? void 0 : record.is_franchisor_customer) == 1) {
+          setResultLoading(true);
+          let franchiseeCustomerId = record == null ? void 0 : record.franchisee_customer_id;
+          if (!franchiseeCustomerId) {
+            const res = await (0, import_serve.getFranchiseeCustomer)({
+              franchisor_customer_id: record.id
+            });
+            franchiseeCustomerId = res == null ? void 0 : res.franchisee_customer_id;
+          }
+          if (franchiseeCustomerId) {
+            const listRes = await (0, import_serve.getCustomerList)({
+              sort_by: "id",
+              with: [
+                "latestWalletDetail.wallet",
+                "contactsInfo",
+                "formRecord"
+              ],
+              search_wallet_flag: 1,
+              search_wallet_pass_flag: 1,
+              skip: 1,
+              num: 20,
+              customer_ids: [franchiseeCustomerId]
+            });
+            if ((_a2 = listRes == null ? void 0 : listRes.list) == null ? void 0 : _a2.length) {
+              await handleSetClient(listRes == null ? void 0 : listRes.list[0], options);
+            }
+          }
+          return;
+        }
+        await handleSetClient(record, options);
+      } catch (error) {
+        console.error("handleRowClick error:", error);
+      } finally {
+        setResultLoading(false);
+      }
+    }
+  );
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     import_clientCard.default,
     {
@@ -329,7 +372,7 @@ var CartClientCard = (0, import_react.forwardRef)(({
       onKeywordChange: (_keyword) => {
         setKeyword(_keyword);
       },
-      onRowClick: handleSetClient,
+      onRowClick: handleRowClick,
       containerProps: {
         open: searchModalVisible,
         onCancel: handleModalCancel,
@@ -342,7 +385,8 @@ var CartClientCard = (0, import_react.forwardRef)(({
       onAddClient: handleAddClientSuccess,
       onLoadMore: loadMore,
       hasMore,
-      state
+      state,
+      resultLoading
     }
   ), /* @__PURE__ */ import_react.default.createElement(
     import_materials.PisellModal,

package/lib/components/booking/info2/serve.d.ts

@@ -4,3 +4,11 @@ export declare const getResourceList: (params: any, bookingId?: number[]) => Pro
 }>;
 export declare const createBookings: (params: any) => Promise<any>;
 export declare const editBookings: (params: any, id?: number) => Promise<any>;
+/**
+ * 获取加盟店的影子账户id（不存在则创建）
+ */
+export declare const getFranchiseeCustomer: (params: any) => Promise<any>;
+/**
+ * 获取客户列表（当前店铺）
+ */
+export declare const getCustomerList: (params: any) => Promise<any>;

package/lib/components/booking/info2/serve.js

@@ -21,6 +21,8 @@ var serve_exports = {};
 __export(serve_exports, {
   createBookings: () => createBookings,
   editBookings: () => editBookings,
+  getCustomerList: () => getCustomerList,
+  getFranchiseeCustomer: () => getFranchiseeCustomer,
   getResourceList: () => getResourceList
 });
 module.exports = __toCommonJS(serve_exports);
@@ -38,9 +40,19 @@ var editBookings = async (params, id) => {
   let { data } = await import_utils.request.getRequest().put(`/shop/v1.1/order/appointment/${id}`, params);
   return data;
 };
+var getFranchiseeCustomer = async (params) => {
+  let { data } = await import_utils.request.getRequest().get(`/shop/franchisee/customer/id`, params);
+  return data;
+};
+var getCustomerList = async (params) => {
+  let { data } = await import_utils.request.getRequest().get(`/shop/customer/select-list`, params);
+  return data;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createBookings,
   editBookings,
+  getCustomerList,
+  getFranchiseeCustomer,
   getResourceList
 });

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

@@ -61,13 +61,12 @@ var import_EditTabs = __toESM(require("../../../info/service/editService/EditTab
 var import_BookingList = __toESM(require("../../../info/service/editService/BookingList"));
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils9 = require("../../../info/service2/Group/utils");
-var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var import_useShopDiscountModule = require("../../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var import_DiscountChangeModal = __toESM(require("./DiscountChangeModal"));
 var import_decimal = __toESM(require("decimal.js"));
 var submitLock = false;
 var Info = (_, ref) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K;
   const [form] = import_antd.Form.useForm();
   const useTotal = import_antd.Form.useWatch("total", form);
   const useResource = import_antd.Form.useWatch("resource", form);
@@ -86,10 +85,6 @@ var Info = (_, ref) => {
   const [noteModalOpen, setNoteModalOpen] = (0, import_react.useState)(false);
   const [open, setOpen] = (0, import_react.useState)(false);
   const [currentTab, setCurrentTab] = (0, import_react.useState)("batch_edit");
-  const context = (0, import_useEngineContext.default)();
-  const {
-    getData
-  } = (_a = context.appHelper) == null ? void 0 : _a.utils;
   const valuesRef = (0, import_react.useRef)({});
   const noInOriginalDiscountIdsRef = (0, import_react.useRef)([]);
   const isEditedRef = (0, import_react.useRef)(false);
@@ -107,7 +102,7 @@ var Info = (_, ref) => {
       return true;
     }
     return ((_b2 = state == null ? void 0 : state.service) == null ? void 0 : _b2.cacheItem) && (0, import_utils4.isNormalProductByDurationSchedule)((_c2 = state == null ? void 0 : state.service) == null ? void 0 : _c2.cacheItem);
-  }, [(_b = state == null ? void 0 : state.service) == null ? void 0 : _b.cacheItem]);
+  }, [(_a = state == null ? void 0 : state.service) == null ? void 0 : _a.cacheItem]);
   const getCurrentCacheItem = (0, import_ahooks.useMemoizedFn)((_cacheItem) => {
     let values = form.getFieldsValue();
     let _item = _cacheItem || state.service.cacheItem;
@@ -137,7 +132,7 @@ var Info = (_, ref) => {
     state.service.cacheItem,
     useStartTime,
     useResource,
-    (_e = (_d = (_c = state.bookingConfig) == null ? void 0 : _c.config) == null ? void 0 : _d.basic) == null ? void 0 : _e.service_time
+    (_d = (_c = (_b = state.bookingConfig) == null ? void 0 : _b.config) == null ? void 0 : _c.basic) == null ? void 0 : _d.service_time
   ]);
   const flexibleOption = (0, import_react.useMemo)(() => {
     const op = (0, import_utils7.getFlexibleOption)({
@@ -159,7 +154,7 @@ var Info = (_, ref) => {
     durationProps,
     useStartTime,
     currentResource,
-    (_h = (_g = (_f = state.bookingConfig) == null ? void 0 : _f.config) == null ? void 0 : _g.basic) == null ? void 0 : _h.service_time,
+    (_g = (_f = (_e = state.bookingConfig) == null ? void 0 : _e.config) == null ? void 0 : _f.basic) == null ? void 0 : _g.service_time,
     useDuration
   ]);
   (0, import_react.useEffect)(() => {
@@ -256,7 +251,6 @@ var Info = (_, ref) => {
     }, 1500);
     let _list = [...state.service.value];
     let _item = {
-      is_price_include_tax: getData("is_price_include_tax"),
       ...cacheItem ?? state.service.cacheItem,
       autoClose: false
     };
@@ -294,7 +288,7 @@ var Info = (_, ref) => {
       const mainProductQuantity = ((_d2 = _extend.other) == null ? void 0 : _d2.quantity) || _extend.quantity || 1;
       _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
     }
-    if (_extend.bundle_edit !== void 0) {
+    if ((_extend.bundle_edit !== void 0 || (cacheItem == null ? void 0 : cacheItem.edit)) && (cacheItem == null ? void 0 : cacheItem.is_bundle)) {
       _extend.bundle_edit = 1;
     }
     _item._extend = _extend;
@@ -436,7 +430,7 @@ var Info = (_, ref) => {
     let oPrice = Number(((_a2 = state.service.cacheItem) == null ? void 0 : _a2._extend.origin_total) || 0);
     let cPrice = Number(useTotal || 0);
     return cPrice !== oPrice;
-  }, [useTotal, (_j = (_i = state.service.cacheItem) == null ? void 0 : _i._extend) == null ? void 0 : _j.origin_total]);
+  }, [useTotal, (_i = (_h = state.service.cacheItem) == null ? void 0 : _h._extend) == null ? void 0 : _i.origin_total]);
   const getResources = () => {
     var _a2, _b2;
     let res = (0, import_utils7.formatResources)({
@@ -500,11 +494,11 @@ var Info = (_, ref) => {
   }, [state.service.editModal, state.isBookingCreatePage]);
   (0, import_react.useEffect)(() => {
     getDiscount();
-  }, [useTotal, (_l = (_k = state.service.cacheItem) == null ? void 0 : _k._extend) == null ? void 0 : _l.origin_total]);
+  }, [useTotal, (_k = (_j = state.service.cacheItem) == null ? void 0 : _j._extend) == null ? void 0 : _k.origin_total]);
   const bundles = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2;
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
-  }, [(_p = (_o = (_n = (_m = state.service) == null ? void 0 : _m.cacheItem) == null ? void 0 : _n._extend) == null ? void 0 : _o.other) == null ? void 0 : _p.bundle]);
+  }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
     var _a2, _b2, _c2, _d2, _e2;
     const item = state.service.cacheItem;
@@ -635,7 +629,7 @@ var Info = (_, ref) => {
     }
     return false;
   }, [state.renderType, isNormalProduct]);
-  const SelectTime = (_q = window.BaseMaterials) == null ? void 0 : _q.SelectTime;
+  const SelectTime = (_p = window.BaseMaterials) == null ? void 0 : _p.SelectTime;
   const isNoSpecAndPackage = (0, import_utilsByBooking.getIsNoSpecAndPackage)(state.service.cacheItem);
   const items = (0, import_react.useMemo)(() => {
     var _a2, _b2;
@@ -672,7 +666,7 @@ var Info = (_, ref) => {
       }
     ))));
   }, [
-    (_t = (_s = (_r = state.service) == null ? void 0 : _r.cacheItem) == null ? void 0 : _s._extend) == null ? void 0 : _t.product_name,
+    (_s = (_r = (_q = state.service) == null ? void 0 : _q.cacheItem) == null ? void 0 : _r._extend) == null ? void 0 : _s.product_name,
     bundles,
     state.amountSymbol,
     state.isBookingCreatePage
@@ -717,7 +711,7 @@ var Info = (_, ref) => {
     ));
   }, [
     useTotal,
-    (_v = (_u = state.service.cacheItem) == null ? void 0 : _u._extend) == null ? void 0 : _v.origin_total,
+    (_u = (_t = state.service.cacheItem) == null ? void 0 : _t._extend) == null ? void 0 : _u.origin_total,
     state.amountSymbol,
     state.channelDisabledEdit
   ]);
@@ -765,7 +759,7 @@ var Info = (_, ref) => {
         }
       ) : null
     ));
-  }, [SelectTime, (_z = (_y = (_x = (_w = state.bookingConfig) == null ? void 0 : _w.config) == null ? void 0 : _x.basic) == null ? void 0 : _y.service_time) == null ? void 0 : _z.value, isEditGroup]);
+  }, [SelectTime, (_y = (_x = (_w = (_v = state.bookingConfig) == null ? void 0 : _v.config) == null ? void 0 : _w.basic) == null ? void 0 : _x.service_time) == null ? void 0 : _y.value, isEditGroup]);
   const endTime = (0, import_react.useMemo)(() => {
     if (!isEditGroup) {
       return null;
@@ -804,8 +798,8 @@ var Info = (_, ref) => {
     ));
   }, [
     state.renderType,
-    (_B = (_A = state.service.cacheItem) == null ? void 0 : _A._data) == null ? void 0 : _B.resources,
-    (_D = (_C = state.service.cacheItem) == null ? void 0 : _C._data) == null ? void 0 : _D.resourceMaps
+    (_A = (_z = state.service.cacheItem) == null ? void 0 : _z._data) == null ? void 0 : _A.resources,
+    (_C = (_B = state.service.cacheItem) == null ? void 0 : _B._data) == null ? void 0 : _C.resourceMaps
   ]);
   const holder = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
@@ -843,7 +837,7 @@ var Info = (_, ref) => {
   }, [
     state.locale,
     state.isTerminal,
-    (_G = (_F = (_E = state.service) == null ? void 0 : _E.cacheItem) == null ? void 0 : _F._data) == null ? void 0 : _G.capacitys
+    (_F = (_E = (_D = state.service) == null ? void 0 : _D.cacheItem) == null ? void 0 : _E._data) == null ? void 0 : _F.capacitys
   ]);
   const hiddenQuantity = (0, import_react.useMemo)(() => {
     return /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { hidden: true, name: "quantity" }, /* @__PURE__ */ import_react.default.createElement(import_antd.InputNumber, null));
@@ -923,10 +917,10 @@ var Info = (_, ref) => {
         import_utils.locales.getText("pisell2.text.apply")
       )
     );
-  }, [(_H = state.service.resourcesOrigin) == null ? void 0 : _H.length, isNormalProduct]);
+  }, [(_G = state.service.resourcesOrigin) == null ? void 0 : _G.length, isNormalProduct]);
   console.log("render edit");
   console.log(
-    state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
+    state.service.editModal && !((_H = state.service.cacheItem) == null ? void 0 : _H.autoClose),
     performance.now() - window.pp1,
     "打开商品1"
   );
@@ -1061,7 +1055,7 @@ var Info = (_, ref) => {
       zIndex: state.service.changeService ? 999 : 1e3,
       forceRender: true,
       mask: state.drawerMask,
-      open: !isNoSpecAndPackage && state.service.editModal && !((_J = state.service.cacheItem) == null ? void 0 : _J.autoClose),
+      open: !isNoSpecAndPackage && state.service.editModal && !((_I = state.service.cacheItem) == null ? void 0 : _I.autoClose),
       title: import_utils.locales.getText("pisell2.text.edit-service"),
       onClose: () => {
         var _a2;
@@ -1087,7 +1081,7 @@ var Info = (_, ref) => {
           display: currentTab === "batch_edit" ? "block" : "none"
         }
       },
-      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_L = (_K = state.client) == null ? void 0 : _K.value) == null ? void 0 : _L.id) && holder),
+      /* @__PURE__ */ import_react.default.createElement(import_antd.Row, { style: { width: "100%" }, gutter: [16, 0] }, productName, price, reason, val && isShowTimeAndResource && /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, startTime, endTime, duration, resource, capacity, hiddenQuantity), isNormalProduct && quantity, !(0, import_utils4.isNormalProductByDurationSchedule)(state.service.cacheItem) && !(0, import_utils6.isWalkIn)((_K = (_J = state.client) == null ? void 0 : _J.value) == null ? void 0 : _K.id) && holder),
       /* @__PURE__ */ import_react.default.createElement(import_antd.Form.Item, { noStyle: true, name: "note" }, noteModalOpen && /* @__PURE__ */ import_react.default.createElement(
         import_noteModal.default,
         {

package/lib/components/booking/info2/service/index.js

@@ -41,6 +41,7 @@ var import_addTimeModal = __toESM(require("./addTimeModal"));
 var import_useInfoHolder = __toESM(require("../../info/hooks/useInfoHolder"));
 var import_Lists = __toESM(require("../../info/service/Lists"));
 var import_useQuotation = __toESM(require("../../hooks/useQuotation"));
+var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var import_editNormalService = __toESM(require("./editNormalService"));
 var Service = () => {
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
@@ -55,10 +56,11 @@ var Service = () => {
   (0, import_react.useEffect)(() => {
     document.body.id = "body";
   }, []);
+  const clearCart = (0, import_useClearCart.default)(state, dispatch);
   const { dom } = (0, import_useQuotation.default)(state, dispatch);
   const renderMemo = (0, import_react.useMemo)(() => {
     console.log("render info22222");
-    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, /* @__PURE__ */ import_react.default.createElement(
+    return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-service-wrap" }, (state == null ? void 0 : state.isBookingTicket2) ? null : clearCart, /* @__PURE__ */ import_react.default.createElement(
       import_Lists.default,
       {
         isParallelResource: true,
@@ -67,7 +69,7 @@ var Service = () => {
         onChange: (e, type) => dispatchService(type || "setService", e)
       }
     ), !state.isBookingCreatePage ? /* @__PURE__ */ import_react.default.createElement(import_addService.default, { onEdit: handleEdit }) : null), /* @__PURE__ */ import_react.default.createElement(import_editService.default, { ref: detailRef }), showAddTimeModal && /* @__PURE__ */ import_react.default.createElement(import_addTimeModal.default, null), /* @__PURE__ */ import_react.default.createElement(import_editNormalService.default, { ref: editNormalServiceRef }), dom);
-  }, [dom, showAddTimeModal]);
+  }, [dom, showAddTimeModal, clearCart, state == null ? void 0 : state.isBookingTicket2]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, renderMemo);
 };
 var service_default = import_react.default.memo(Service);