@pisell/private-materials 3.3.33 → 3.3.35

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

@@ -22,8 +22,18 @@ export declare const getEventDetailBookingOptionsApi: (params: {
     skip: number;
     customer_id?: number;
     open_quotation?: number;
+    is_eject?: number;
 }) => Promise<any>;
 export declare const getEventDetailSelectDateApi: (id: number | string, params: {
     days: number;
     start_date?: string;
 }) => Promise<any>;
+/**
+ * 批量查询指定商品的最新价格
+ * @param params
+ */
+export declare const getProductPrice: (params: {
+    ids: number[];
+    customer_id: number;
+    schedule_date?: string;
+}) => Promise<any>;

package/lib/components/Sales/Event/serve.js

@@ -23,7 +23,8 @@ __export(serve_exports, {
   getEventDetailIntroductionApi: () => getEventDetailIntroductionApi,
   getEventDetailSelectDateApi: () => getEventDetailSelectDateApi,
   getEventDetailTeacherApi: () => getEventDetailTeacherApi,
-  getEventListApi: () => getEventListApi
+  getEventListApi: () => getEventListApi,
+  getProductPrice: () => getProductPrice
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
@@ -44,11 +45,13 @@ var getEventDetailSelectDateApi = (id, params) => {
     useCache: true
   });
 };
+var getProductPrice = async (params) => import_utils.request.getRequest().post(`/h5/product/query/price`, params);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getEventDetailBookingOptionsApi,
   getEventDetailIntroductionApi,
   getEventDetailSelectDateApi,
   getEventDetailTeacherApi,
-  getEventListApi
+  getEventListApi,
+  getProductPrice
 });

package/lib/components/Sales/Summary/utils.js

@@ -51,6 +51,7 @@ var calculateTaxFee = (shopInfo, items) => {
     return "0.00";
   }
   const { is_price_include_tax, tax_rate } = shopInfo || {};
+  console.log("shopInfo>>>", is_price_include_tax, tax_rate);
   const totalTaxFee = items.reduce((sum, item) => {
     const price = new import_decimal.default(item.price || 0);
     const taxRate = new import_decimal.default(tax_rate || 0).div(100);

package/lib/components/appointmentBooking/components/Cart/ContinueButton/index.js

@@ -46,7 +46,6 @@ var ContinueButton = ({ onNext }) => {
   const utils = context.appHelper.utils || {};
   const { isLogin, openLoginModal } = (0, import_hooks.useAppointmentBookingLogin)();
   const { accountLists, getHolders, checkAccount } = (0, import_hooks.useAppointmentBookingAccount)();
-  const shopDiscount = (0, import_hooks.useShopDiscount)();
   const {
     currentStep,
     carts,
@@ -56,12 +55,13 @@ var ContinueButton = ({ onNext }) => {
     setIsErrorHolder,
     isLastStep
   } = (0, import_context.useAppointmentBookingContext)();
-  const { isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isFormSubject, isDateSelectedFirst } = (0, import_hooks.useAppointmentBookingSetting)();
   const stepList = (0, import_react.useMemo)(() => {
     var _a2, _b2, _c2;
     return (_c2 = (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a2.step) == null ? void 0 : _b2.store) == null ? void 0 : _c2.stepList;
   }, [(_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList]);
   const handleCheckAccount = () => {
+    if (isDateSelectedFirst) return false;
     const result = (0, import_utils2.checkHolder)({
       isFormSubject,
       checkAccount,
@@ -86,6 +86,11 @@ var ContinueButton = ({ onNext }) => {
   };
   const handleContinue = async () => {
     try {
+      if ((currentStep == null ? void 0 : currentStep.index) + 2 >= (stepList == null ? void 0 : stepList.length)) {
+        const loginOk = await handleLoginCheck();
+        if (!loginOk) return;
+        if (handleCheckAccount()) return;
+      }
       return onNext && onNext();
     } catch (error) {
       console.log(error, "handleContinue_error");

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

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

package/lib/components/appointmentBooking/components/Cart/Item/index.js

@@ -46,21 +46,20 @@ var import_Deposit = __toESM(require("../../Deposit"));
 var import_utils3 = require("../utils");
 var import_index = require("./index.less");
 var CartItem = ({ onNext }) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
     carts,
     currentStep,
+    resources,
     setResourceOtherParams,
     resourceOtherParams,
     summary,
-    isLastStep,
-    currentSelectedResourcesRef,
-    currentStepParams
+    isLastStep
   } = (0, import_context.useAppointmentBookingContext)();
-  const { accountLists, getHolders, addAccount } = (0, import_hooks2.useAppointmentBookingAccount)();
+  const { accountLists, getHolders, form_id, addAccount } = (0, import_hooks2.useAppointmentBookingAccount)();
   const { getResourceList } = (0, import_hooks2.useAppointmentBookingResource)();
-  const { isFormSubject, bookingSubject } = (0, import_hooks2.useAppointmentBookingSetting)();
+  const { isFormSubject, bookingSubject, isRetailTemplate } = (0, import_hooks2.useAppointmentBookingSetting)();
   const { isLogin } = (0, import_hooks2.useAppointmentBookingLogin)();
   const utils = (0, import_hooks2.contextUtils)();
   const { businessUtils } = utils;
@@ -101,7 +100,7 @@ var CartItem = ({ onNext }) => {
       } else {
         appointmentBooking.updateCart({
           _id: e == null ? void 0 : e._id,
-          resources: val ? (0, import_utils2.updateCartResources)(e, val) : []
+          resources: val ? [val] : []
         });
       }
       getResourceList();
@@ -151,31 +150,8 @@ var CartItem = ({ onNext }) => {
     }
   };
   const products = (0, import_react.useMemo)(() => {
-    var _a2;
-    console.log(currentSelectedResourcesRef.current, carts, "wh867865");
-    if (!(carts == null ? void 0 : carts.length)) return [];
-    if (((_a2 = currentSelectedResourcesRef == null ? void 0 : currentSelectedResourcesRef.current) == null ? void 0 : _a2.length) > 0) {
-      const newCarts = carts.map((item) => {
-        var _a3;
-        const currentResourceData = currentSelectedResourcesRef.current.find(
-          (resource) => (resource == null ? void 0 : resource._id) === (item == null ? void 0 : item._id)
-        );
-        const multiResources = (0, import_utils2.getMultiResources)(
-          item,
-          (_a3 = currentResourceData == null ? void 0 : currentResourceData.currentSelectedResource) == null ? void 0 : _a3.resourceItem,
-          currentStepParams == null ? void 0 : currentStepParams.key
-        );
-        return {
-          ...item,
-          isMultipleResource: true,
-          multiResources
-        };
-      });
-      return newCarts;
-    } else {
-      return carts;
-    }
-  }, [carts, currentSelectedResourcesRef.current, currentStepParams == null ? void 0 : currentStepParams.key]);
+    return (0, import_utils2.formatCarts)(carts, resources, utils, accountLists);
+  }, [carts, resources, accountLists]);
   return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
@@ -189,8 +165,8 @@ var CartItem = ({ onNext }) => {
           hideAddBtn: false,
           holders,
           disabledEdit: isLastStep,
-          isShowChangeResource: (_c = (_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) == null ? void 0 : _c.startsWith("select-resource"),
-          isShowDelete: ((_d = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _d.key) === "select-service",
+          isShowChangeResource: ((_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key) === "select-resource",
+          isShowDelete: ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key) === "select-service",
           isShowPackageNote: false,
           isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
           isShowHolder: isFormSubject,

package/lib/components/appointmentBooking/components/Cart/index.d.ts

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

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

@@ -39,6 +39,7 @@ var import_context = require("../../context");
 var import_hooks = require("../../hooks");
 var import_Item = __toESM(require("../Cart/Item"));
 var import_utils2 = require("../../utils");
+var import_utils3 = require("./utils");
 var import_index = require("./index.less");
 var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   var _a, _b;
@@ -46,12 +47,7 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
   const config = ((_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.constants) == null ? void 0 : _b.config) || {};
   const utils = (0, import_hooks.contextUtils)();
   const { appointmentBooking, summary, isAgreeDepositPolicy, setLoading } = (0, import_context.useAppointmentBookingContext)();
-  const shopDiscount = (0, import_hooks.useShopDiscount)();
-  const clearData = () => {
-    var _a2;
-    appointmentBooking.destroy();
-    (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
-  };
+  const { isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
   const goPaymentFinish = (order_id, amount) => {
     var _a2;
     const url = `/payment-finish/success?order_id=${order_id}&amount=${Number(
@@ -60,14 +56,55 @@ var ConfirmInformation = (0, import_react.forwardRef)((props, ref) => {
     (_a2 = utils == null ? void 0 : utils.history) == null ? void 0 : _a2.replace(url);
     setLoading(false);
   };
+  (0, import_react.useEffect)(() => {
+    if (isRetailTemplate) {
+      handleForm();
+    }
+  }, [isRetailTemplate]);
+  const handleForm = async (isSubmit) => {
+    var _a2;
+    const carts = await appointmentBooking.getCart();
+    const key = "isRetailFormSubmit";
+    const isRetailFormSubmit = appointmentBooking.getOtherData(key);
+    const callback = () => {
+      if (isSubmit) {
+        onCheckout();
+      }
+    };
+    if (isRetailFormSubmit) {
+      return callback();
+    }
+    const params = (0, import_utils3.getFormParams)(carts);
+    (_a2 = utils == null ? void 0 : utils.action) == null ? void 0 : _a2.call(utils, {
+      type: "pisell1.goProductForm",
+      data: params,
+      callback: async (e) => {
+        var _a3;
+        await appointmentBooking.updateCart({
+          _id: (_a3 = carts == null ? void 0 : carts[0]) == null ? void 0 : _a3._id,
+          relationForms: e
+        });
+        appointmentBooking.setOtherData(key, true);
+        callback();
+      }
+    });
+  };
   const handleNext = async () => {
     var _a2;
     const { deposit } = summary;
     if ((deposit == null ? void 0 : deposit.hasDeposit) && ((_a2 = deposit == null ? void 0 : deposit.protocols) == null ? void 0 : _a2.length) > 0 && !isAgreeDepositPolicy) {
       return (0, import_utils2.Toast)(import_utils.locales.getText("pisell2.appointment.deposit.agree.policy"));
     }
+    if (isRetailTemplate) {
+      handleForm(true);
+      return;
+    }
+    onCheckout();
+  };
+  const onCheckout = async () => {
     setLoading(true);
     try {
+      const { deposit } = summary;
       const { data } = await appointmentBooking.submitOrder();
       const { is_deposit, deposit_amount, total_amount, order_id } = data || {};
       const _total = is_deposit ? deposit_amount : total_amount;

package/lib/components/appointmentBooking/components/ConfirmInformation/utils.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @title: 获取拉开表单弹窗参数
+ * @description:
+ * @param {any} state
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-05-28 15:40
+ */
+export declare const getFormParams: (carts: any[]) => {
+    product_id: any[];
+    appointment_type: string;
+};

package/lib/components/appointmentBooking/components/ConfirmInformation/utils.js

@@ -0,0 +1,37 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/appointmentBooking/components/ConfirmInformation/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  getFormParams: () => getFormParams
+});
+module.exports = __toCommonJS(utils_exports);
+var getFormParams = (carts) => {
+  const product_id = (carts || []).map((item) => {
+    return item.id;
+  });
+  return {
+    product_id,
+    appointment_type: "virtual"
+  };
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getFormParams
+});

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

@@ -51,6 +51,7 @@ var import_index = require("./index.less");
 var Layout = () => {
   var _a, _b, _c, _d, _e;
   const stepRef = (0, import_react.useRef)();
+  const formRef = (0, import_react.useRef)();
   const {
     currentStep,
     setResourceOtherParams,
@@ -59,19 +60,17 @@ var Layout = () => {
     appointmentBooking,
     setLoading,
     policyParams,
-    closePolicy,
-    currentStepParams
+    closePolicy
   } = (0, import_context.useAppointmentBookingContext)();
-  const { isDateSelectedFirst, isFormSubject } = (0, import_hooks.useAppointmentBookingSetting)();
+  const { isDateSelectedFirst, isFormSubject, isRetailTemplate } = (0, import_hooks.useAppointmentBookingSetting)();
   const { isLogin } = (0, import_hooks.useAppointmentBookingLogin)();
   const { getHolders } = (0, import_hooks.useAppointmentBookingAccount)();
-  const { removeStep } = (0, import_hooks.useAppointmentBookingStep)();
+  const { removeStep, stepList } = (0, import_hooks.useAppointmentBookingStep)();
   const { shopDiscount } = (0, import_hooks.useShopDiscount)();
   (0, import_hooks.useAppointmentBookingCart)();
   (0, import_hooks.useAppointmentBookingStep)();
   const [params, setParams] = (0, import_react.useState)({});
   (0, import_react.useEffect)(() => {
-    appointmentBooking.removeStep("fill-form");
     return () => {
       var _a2;
       setIsAgreeDepositPolicy(false);
@@ -79,24 +78,14 @@ var Layout = () => {
       (_a2 = shopDiscount == null ? void 0 : shopDiscount.destroy) == null ? void 0 : _a2.call(shopDiscount);
     };
   }, []);
-  (0, import_react.useEffect)(() => {
-    var _a2;
-    if ((currentStepParams == null ? void 0 : currentStepParams.index) < 0) return;
-    const resourceStepIndex = (_a2 = currentStepParams == null ? void 0 : currentStepParams.stepLists) == null ? void 0 : _a2.findIndex(
-      (item) => item.key === "select-resource"
-    );
-    if ((currentStepParams == null ? void 0 : currentStepParams.index) < resourceStepIndex) {
-      appointmentBooking.setOtherData("current_selected_resources", null);
-    }
-  }, [currentStepParams]);
   (0, import_react.useEffect)(() => {
     try {
+      if (!(appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || isRetailTemplate) return;
       if (isFormSubject) {
         removeStep("select-guest");
       } else {
         appointmentBooking.addStep(
           {
-            index: (currentStep == null ? void 0 : currentStep.index) + 1,
             key: "select-guest",
             description: import_utils.locales.getText("pisell2.appointment.add-guests")
           },
@@ -105,12 +94,12 @@ var Layout = () => {
       }
     } catch (error) {
     }
-  }, [isFormSubject]);
+  }, [isFormSubject, isRetailTemplate]);
   (0, import_react.useEffect)(() => {
-    if (isFormSubject && isLogin) {
+    if (isFormSubject && isLogin && !isRetailTemplate) {
       getHolders();
     }
-  }, [isFormSubject, isLogin]);
+  }, [isFormSubject, isLogin, isRetailTemplate]);
   (0, import_react.useEffect)(() => {
     if (!(currentStep == null ? void 0 : currentStep.step)) return;
     setLoading(false);
@@ -123,32 +112,29 @@ var Layout = () => {
       behavior: "smooth"
     });
   }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key]);
-  const components = {
-    // 选择服务
-    "select-service": import_Services.default,
-    // 添加客户
-    "select-guest": import_Guest.default,
-    // 选择时间
-    "select-date": import_Date.default,
-    // 时间切片
-    "select-time": import_TimeSlicing.default,
-    // 确认信息
-    "confirm-information": import_ConfirmInformation.default
-  };
   const Com = (0, import_react.useMemo)(() => {
     var _a2;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     if (!key) return null;
-    let Com2;
-    if (key.startsWith("select-resource")) {
-      Com2 = import_Resource.default;
-    } else if (key.startsWith("fill-form")) {
-      Com2 = import_Form.default;
-    } else {
-      Com2 = components[key];
-    }
+    const components = {
+      // 选择服务
+      "select-service": import_Services.default,
+      // 添加客户
+      "select-guest": import_Guest.default,
+      // 选择时间
+      "select-date": import_Date.default,
+      // 选择资源
+      "select-resource": import_Resource.default,
+      // 时间切片
+      "select-time": import_TimeSlicing.default,
+      // 填写表单
+      "fill-form": import_Form.default,
+      // 确认信息
+      "confirm-information": import_ConfirmInformation.default
+    };
+    let Com2 = components[key];
     return /* @__PURE__ */ import_react.default.createElement(Com2, { onChange: setParams, params, ref: stepRef });
-  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key]);
+  }, [(_b = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _b.key, stepRef]);
   (0, import_react.useEffect)(() => {
     var _a2, _b2;
     if ((0, import_utils.isMobile)()) {
@@ -186,10 +172,10 @@ var Layout = () => {
     if (isDateSelectedFirst && key === "select-date") return false;
     return key !== "confirm-information";
   }, [isDateSelectedFirst, (_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key]);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_Header.default, null), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, !isRetailTemplate ? /* @__PURE__ */ import_react.default.createElement(import_Header.default, null) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
-      className: `parallel-content-wrap ${(0, import_utils.isMobile)() ? "parallel-content-mobile-wrap" : ""}`
+      className: `parallel-content-wrap ${(0, import_utils.isMobile)() ? "parallel-content-mobile-wrap" : ""} ${isRetailTemplate ? "parallel-content-retail-wrap" : ""}`
     },
     /* @__PURE__ */ import_react.default.createElement("div", { className: "parallel-content-left" }, Com),
     isShowCartCom

package/lib/components/appointmentBooking/components/Content/index.less

@@ -1,5 +1,6 @@
 .parallel-content-wrap {
   width: 1000px;
+  max-width: 100%;
   display: flex;
   gap: 6px;
   // align-items: center;
@@ -13,7 +14,9 @@
 
   .parallel-content-left {
     flex: 1;
-    width: 634px;
+    // width: 634px;
+    width: auto;
+    min-width: 0;
     // padding: 16px 0;
 
     .appointment-resource-wrap {
@@ -37,6 +40,8 @@
     position: sticky;
     top: 93px;
     height: fit-content;
+    flex: 0 0 360px;
+    background-color: #fff;
   }
 }
 
@@ -89,3 +94,20 @@
     }
   }
 }
+
+.parallel-content-retail-wrap {
+  .pisell-product-select-wrapper {
+    .pisell-product-select-tabs-wrapper {
+      top: 0px !important;
+    }
+  }
+
+  .parallel-content-right {
+    top: 16px;
+    margin-top: 0;
+
+    .appointment-cart-item-wrap {
+      height: calc(100vh - 16px) !important;
+    }
+  }
+}

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

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

package/lib/components/appointmentBooking/components/Footer/index.d.ts

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