@pisell/private-materials 3.3.78 → 3.3.80

package/es/utils/index.d.ts

@@ -18,6 +18,6 @@ declare let modal: Omit<ModalStaticFunctions, 'warn'>;
 export declare const setModal: (m: Omit<ModalStaticFunctions, 'warn'>) => void;
 export declare const saveConfirm: () => Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd/es/modal/interface").ModalFuncProps | ((prevConfig: import("antd/es/modal/interface").ModalFuncProps) => import("antd/es/modal/interface").ModalFuncProps)) => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
 }>;
 export { modal };

package/lib/businessModel/SalesModel/Sales/index.js

@@ -35,7 +35,6 @@ __export(Sales_exports, {
 });
 module.exports = __toCommonJS(Sales_exports);
 var import_react = __toESM(require("react"));
-var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext"));
 var defaultData = {};
 var SALES_MODEL_SESSION_STORAGE_KEY = "shop_h5_sales_model_data";
 var SalesContext = (0, import_react.createContext)(
@@ -46,13 +45,14 @@ var SalesProvider = (props) => {
   const dataRef = (0, import_react.useRef)({});
   const [data, setData] = (0, import_react.useState)(defaultData);
   const [hooks, setHooks] = (0, import_react.useState)(props.hooks);
-  const context = (0, import_useEngineContext.default)();
-  const utils = context.appHelper.utils || {};
   const _setData = (newData) => {
     dataRef.current = { ...dataRef.current, ...newData };
     console.log("sales_model_newData", dataRef.current);
     if (config == null ? void 0 : config.useSessionStorage) {
-      setSessionStorage();
+      sessionStorage.setItem(
+        SALES_MODEL_SESSION_STORAGE_KEY,
+        JSON.stringify(dataRef.current || {})
+      );
     }
     setData({ ...dataRef.current });
   };
@@ -60,28 +60,14 @@ var SalesProvider = (props) => {
     return dataRef.current;
   };
   const setSessionStorage = () => {
-    var _a, _b, _c;
-    const history = ((_a = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a.call(utils)) || {};
-    const cacheId = ((_c = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query) == null ? void 0 : _c.cacheId) || "";
-    const sessionData = { ...dataRef.current || {}, cacheId };
     sessionStorage.setItem(
-      `${SALES_MODEL_SESSION_STORAGE_KEY}`,
-      JSON.stringify(sessionData || {})
+      SALES_MODEL_SESSION_STORAGE_KEY,
+      JSON.stringify(dataRef.current || {})
     );
   };
   const getSessionStorage = () => {
-    var _a, _b, _c;
-    const history = ((_a = utils == null ? void 0 : utils.getHistory) == null ? void 0 : _a.call(utils)) || {};
-    const strResult = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
-    const result = strResult ? JSON.parse(strResult || "{}") : {};
-    const cacheId = ((_c = (_b = history == null ? void 0 : history.location) == null ? void 0 : _b.query) == null ? void 0 : _c.cacheId) || "";
-    if (!cacheId && !(result == null ? void 0 : result.cacheId)) {
-      return result;
-    }
-    if (cacheId && (result == null ? void 0 : result.cacheId) === cacheId) {
-      return result;
-    }
-    return {};
+    const result = sessionStorage.getItem(SALES_MODEL_SESSION_STORAGE_KEY);
+    return JSON.parse(result || "{}");
   };
   const removeSessionStorage = () => {
     sessionStorage.removeItem(SALES_MODEL_SESSION_STORAGE_KEY);

package/lib/components/Sales/Resource/index.js

@@ -90,7 +90,7 @@ var ResourceProvider = ({
     resourceMap.forEach((v) => renderData.push(v));
     return renderData;
   };
-  const getResourceList = (0, import_ahooks.useRequest)(import_serve.getSpecialResourceListApi, {
+  const getResourceList = (0, import_ahooks.useRequest)(import_serve.getResourceListApi, {
     manual: true,
     onSuccess: (res) => {
       const formatData = formatResourceList(res);

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

@@ -3,10 +3,3 @@ export declare const getResourceListApi: (params: {
     shop_id: string;
     form_data_status: string;
 }) => Promise<any>;
-/**
- * @title: 获取特殊资源列表
- * @Author: xiangfeng.xue
- */
-export declare const getSpecialResourceListApi: (params: {
-    event_item_ids?: string | number[];
-}) => Promise<any>;

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

@@ -19,21 +19,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/Sales/Resource/serve.ts
 var serve_exports = {};
 __export(serve_exports, {
-  getResourceListApi: () => getResourceListApi,
-  getSpecialResourceListApi: () => getSpecialResourceListApi
+  getResourceListApi: () => getResourceListApi
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("../../../utils");
 var getResourceListApi = (params) => {
   return import_utils.request.getRequest().get("/h5/form/data/v1", params, { useCache: true });
 };
-var getSpecialResourceListApi = (params) => {
-  return import_utils.request.getRequest().get("/h5/eventbookingv2/item/specify-resources", params, {
-    useCache: true
-  });
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getResourceListApi,
-  getSpecialResourceListApi
+  getResourceListApi
 });

package/lib/components/Sales/Summary/utils.d.ts

@@ -25,7 +25,7 @@ export declare const calculateSubtotal: (items: CartItem[]) => string;
  * @return {*}
  * @Author: xiangfeng.xue
  */
-export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => Decimal | "0.00";
+export declare const calculateTaxFee: (shopInfo: any, items: CartItem[]) => "0.00" | Decimal;
 /**
  * 计算所有价格明细
  * @param items - 购物车商品数组

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

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

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

@@ -46,7 +46,7 @@ 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, _e;
+  var _a, _b, _c, _d;
   const appointmentBooking = (0, import_hooks.useAppointmentBooking)();
   const {
     carts,
@@ -78,7 +78,6 @@ var CartItem = ({ onNext }) => {
     return (0, import_utils2.formatHolder)(accountLists);
   }, [accountLists, isFormSubject]);
   const hasGoodPassApp = !!((_a = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _a.call(businessUtils, "goodpass"));
-  const hasDiscountCardApp = !!((_b = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _b.call(businessUtils, "discountcard"));
   const handleClickCard = (e, type, val) => {
     console.log(e, type, val, "handleClickCard");
     if (type === "note") {
@@ -188,8 +187,8 @@ var CartItem = ({ onNext }) => {
           hideAddBtn: false,
           holders,
           disabledEdit: isLastStep,
-          isShowChangeResource: (_d = (_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.key) == null ? void 0 : _d.startsWith("select-resource"),
-          isShowDelete: ((_e = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _e.key) === "select-service",
+          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",
           isShowPackageNote: false,
           isShowChangeHolder: isLastStep ? false : isFormSubject && isLogin,
           isShowHolder: isFormSubject,
@@ -206,7 +205,7 @@ var CartItem = ({ onNext }) => {
         onChange: (e, type, key) => handleClickCard(e, type, key)
       }
     )),
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp || hasDiscountCardApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "appointment-footer" }, hasGoodPassApp ? /* @__PURE__ */ import_react.default.createElement(import_Voucher.default, { currentUser, products: carts }) : null, /* @__PURE__ */ import_react.default.createElement(import_Total.default, null), (carts == null ? void 0 : carts.length) > 0 && (deposit == null ? void 0 : deposit.hasDeposit) ? /* @__PURE__ */ import_react.default.createElement(import_Deposit.default, null) : null, /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, { onNext }))
   ));
 };
 var Item_default = CartItem;

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

@@ -1,5 +1,5 @@
 .appointment-cart-item-wrap {
-  height: calc(var(--vh, 1vh) * 100 - 100px);
+  height: calc(100vh - 100px);
   display: flex;
   flex-direction: column;
 
@@ -39,7 +39,7 @@
   flex-direction: column;
   align-items: start;
 
-  > div {
+  >div {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -105,4 +105,4 @@
     flex: none;
     z-index: 10;
   }
-}
+}

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

@@ -107,7 +107,7 @@
     margin-top: 0;
 
     .appointment-cart-item-wrap {
-      height: calc(var(--vh, 1vh) * 100 - 16px) !important;
+      height: calc(100vh - 16px) !important;
     }
   }
 }

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

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

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

@@ -74,7 +74,7 @@ var Header = () => {
     return ((_c = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _c.description) || "";
   }, [(_a = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a.key, currentSelectedResources]);
   const handleBack = async () => {
-    var _a2;
+    var _a2, _b;
     const key = (_a2 = currentStep == null ? void 0 : currentStep.step) == null ? void 0 : _a2.key;
     const types = {
       "select-time": "time",
@@ -89,7 +89,8 @@ var Header = () => {
     }
     if (key === "select-service") {
       appointmentBooking.clearCart();
-      if (appointmentBooking.isCartHasDurationProduct()) {
+      const type = await checkProductType((_b = carts == null ? void 0 : carts[0]) == null ? void 0 : _b.id);
+      if (type === "duration") {
         appointmentBooking.deleteCartItemInfo("time");
       }
     }

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

@@ -74,7 +74,9 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
     let type = "";
     if (!isRetailTemplate) {
       type = await checkProductType(item == null ? void 0 : item.id);
-      appointmentBooking.openProductDetail(item.id);
+      if (type === "session") {
+        appointmentBooking.openProductDetail(item.id);
+      }
     }
     utils == null ? void 0 : utils.action({
       type: "pisell1.productDetail",
@@ -84,10 +86,6 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
       },
       callback: async (data) => {
         var _a, _b;
-        if (data.isCancel) {
-          appointmentBooking.closeProductDetail();
-          return;
-        }
         const product = {
           ...data,
           options: (data == null ? void 0 : data.option) || []
@@ -98,6 +96,13 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
           appointmentBooking.storeProduct(product);
           return;
         }
+        if (data == null ? void 0 : data.isCancel) {
+          if (type === "session") {
+            appointmentBooking.closeProductDetail();
+            appointmentBooking.getAvailableDate();
+          }
+          return;
+        }
         const session = data == null ? void 0 : data.session;
         if (session) {
           const startDate = (0, import_dayjs.default)(session == null ? void 0 : session.start_at).format("YYYY-MM-DD");
@@ -109,6 +114,7 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
               endTime: `${endDate} ${session == null ? void 0 : session.end_time}`
             }
           });
+          appointmentBooking.closeProductDetail();
           await appointmentBooking.getAvailableDate({
             startDate,
             endDate
@@ -126,23 +132,16 @@ var Services = (0, import_react.forwardRef)((props, ref) => {
             await appointmentBooking.getAvailableDate();
           }
         }
-        appointmentBooking.closeProductDetail();
         if (isDateSelectedFirst) {
           const index = (currentStep == null ? void 0 : currentStep.index) + 2;
-          if (type === "duration" || appointmentBooking.isCartHasDurationProduct()) {
-            const { stepList } = (0, import_hooks.useAppointmentBookingStep)();
-            const hasResourceStep = stepList == null ? void 0 : stepList.find(
-              (item2) => (item2 == null ? void 0 : item2.key) === "select-resource"
+          if (type === "duration") {
+            const description = import_utils.locales.getText(
+              "pisell2.appointment.select.time"
+            );
+            appointmentBooking.addStep(
+              { index, key: "select-time", description },
+              "select-resource"
             );
-            if (hasResourceStep) {
-              const description = import_utils.locales.getText(
-                "pisell2.appointment.select.time"
-              );
-              appointmentBooking.addStep(
-                { index, key: "select-time", description },
-                "select-resource"
-              );
-            }
           } else {
             removeStep("select-time");
           }

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

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

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

@@ -76,7 +76,6 @@ var VoucherCard = (props) => {
     return discountList.filter((item) => !!item.isAvailable).map((discount) => {
       return {
         ...discount,
-        isDisabled: discount.isDisabled || discount.isDisabledForProductUsed,
         savedAmount: shopDiscount.calcDiscountApplicableProductTotalPrice(discount)
       };
     });
@@ -123,7 +122,6 @@ var VoucherCard = (props) => {
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
-    pisellos.effects.on("appointmentBooking_cart:onUpdateCartItemNums", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(
       ShopDiscountHooks.onDiscountListChange,
@@ -171,11 +169,6 @@ var VoucherCard = (props) => {
       import_utils.locales.getText("pisell2.text.goodpass.login")
     ), /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.text.goodpass.login-tip"))));
   };
-  const mixedSort = (val) => {
-    return [...val].sort((a, b) => {
-      return Number(b == null ? void 0 : b.isSelected) - Number(a == null ? void 0 : a.isSelected);
-    });
-  };
   const renderVoucherInfo = () => {
     return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: "voucher-title" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "voucher-title-left" }, import_utils.locales.getText("pisell2.text.goodpass")), /* @__PURE__ */ import_react.default.createElement(
       "span",
@@ -208,7 +201,6 @@ var VoucherCard = (props) => {
         {
           style: { width: "100%" },
           dataSource: availableData,
-          mixedSort,
           onChange: (val) => {
             const detail = shopDiscount.setDiscountSelected({
               discountId: val.id,
@@ -223,7 +215,6 @@ var VoucherCard = (props) => {
         import_materials.PisellInput,
         {
           value: code,
-          allowClear: true,
           onChange: (e) => {
             var _a2;
             setCode((_a2 = e.target) == null ? void 0 : _a2.value);

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

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

package/lib/components/appointmentBooking/deposit/components/PolicyModal/index.js

@@ -63,6 +63,7 @@ var DepositModal = (props) => {
     } catch (error) {
       console.log(error);
       onChange && onChange(error);
+      debugger;
     } finally {
       setLoading(false);
     }

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

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

package/lib/components/appointmentBooking/index.js

@@ -58,17 +58,6 @@ var AppointmentBooking = () => {
       }
     });
   }, []);
-  (0, import_react.useEffect)(() => {
-    const setRealVH = () => {
-      const vh = window.innerHeight * 0.01;
-      document.documentElement.style.setProperty("--vh", `${vh}px`);
-    };
-    setRealVH();
-    window.addEventListener("resize", setRealVH);
-    return () => {
-      window.removeEventListener("resize", setRealVH);
-    };
-  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/appointmentBooking/index.less

@@ -3,7 +3,7 @@
   flex-direction: column;
   align-items: center;
   background: #ffffff;
-  height: calc(var(--vh, 1vh) * 100);
+  height: 100vh;
   overflow-y: auto;
 
   .pisell-section-headers {

package/lib/components/appointmentBooking/locales.js

@@ -132,7 +132,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "Confirm",
     "pisell2.appointment.resource.tip": (val) => `Tip: Change ${val || "resource"} using the dropdown in the cart.`,
     "pisell2.text.apply": "Apply",
-    "pisell2.text.goodpass": "Promotion",
+    "pisell2.text.goodpass": "GoodPass",
     "pisell2.text.goodpass.product-vouchers": "Product Vouchers",
     "pisell2.text.goodpass.view-more": "View More",
     "pisell2.text.goodpass.code": "Code",
@@ -250,7 +250,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "确定",
     "pisell2.appointment.resource.tip": (val) => `提示：在右侧购物车中，通过下拉框修改“${val || "资源"}”`,
     "pisell2.text.apply": "应用",
-    "pisell2.text.goodpass": "促销",
+    "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兑换券",
     "pisell2.text.goodpass.view-more": "查看更多",
     "pisell2.text.goodpass.code": "券码",
@@ -368,7 +368,7 @@ var locales_default = {
     "pisell2.appointment.policy.confirm": "確定",
     "pisell2.appointment.resource.tip": (val) => `提示：在右側購物車中，透過下拉框修改“${val || "資源"}”`,
     "pisell2.text.apply": "應用",
-    "pisell2.text.goodpass": "促銷",
+    "pisell2.text.goodpass": "商品券",
     "pisell2.text.goodpass.product-vouchers": "商品兌換券",
     "pisell2.text.goodpass.view-more": "查看更多",
     "pisell2.text.goodpass.code": "券碼",

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

@@ -106,13 +106,11 @@ var formatProductValues = (data) => {
       ...d,
       id: d.product_id,
       title: d.product_title,
-      isAddons: true,
       quantity: d.product_quantity,
       cover: d.product_cover,
       price: Number(d.source_product_price),
       _extend: {
         total: Number(d.selling_price),
-        origin_total: Number(d.selling_price),
         payment_price: Number(d.payment_price),
         price: Number(d.source_product_price),
         quantity: d.product_quantity,
@@ -238,7 +236,6 @@ var Addons = (0, import_model.Provider)((props) => {
         let product = {
           ..._detail,
           _id: (0, import_utils3.getUniqueId)(),
-          isAddons: true,
           _key: e.key,
           _extend: {
             price: _detail.price,
@@ -249,11 +246,7 @@ var Addons = (0, import_model.Provider)((props) => {
         };
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
-        product._extend.origin_total = _total;
-        let _item = _list.find((d) => {
-          var _a2;
-          return d._extend.other.rowKey === e.rowKey && !d.booking_id && !((_a2 = d.discount_list) == null ? void 0 : _a2.length);
-        });
+        let _item = _list.find((d) => d._extend.other.rowKey === e.rowKey);
         if (_item) {
           _item._extend.quantity = _item._extend.quantity + product.quantity;
         } else {
@@ -399,7 +392,6 @@ var Addons = (0, import_model.Provider)((props) => {
         let product = {
           ...item,
           ..._detail,
-          isAddons: true,
           // 编辑商品时清除折扣信息
           discount_list: [],
           _extend: {
@@ -413,8 +405,8 @@ var Addons = (0, import_model.Provider)((props) => {
         }
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
-        product._extend.origin_total = _total;
         let _list = [...state.addons.value];
+        console.log("cacheItem", product);
         _list = _list.map((d) => d._id === product._id ? product : d);
         dispatch({
           type: "setAddons",

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/addons/model.js

@@ -34,9 +34,6 @@ var { Provider, Context } = (0, import_utils.miniRedux)({
     },
     setAddons(state, payload) {
       state.setGlobalState({ addons: { ...state.addons, ...payload } });
-    },
-    setService(state, payload) {
-      state.setGlobalState({ service: { ...state.service, ...payload } });
     }
   }
 });

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

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

package/lib/components/booking/components/TabProduct/selectProductItem/index.js

@@ -101,11 +101,7 @@ var SelectProductItem = ({
           disabled
         }
       ),
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "server-select-product-total" }, item._extend.origin_total !== item._extend.total && /* @__PURE__ */ import_react.default.createElement("span", { className: "server-select-product-origin-total" }, (0, import_utils.formatAmount)(
-        item._extend.origin_total * item._extend.quantity,
-        2,
-        amountSymbol
-      )), (0, import_utils.formatAmount)(
+      /* @__PURE__ */ import_react.default.createElement("div", { className: "server-select-product-total" }, (0, import_utils.formatAmount)(
         item._extend.total * item._extend.quantity,
         2,
         amountSymbol

package/lib/components/booking/components/TabProduct/selectProductItem/index.less

@@ -66,7 +66,6 @@
       font-style: normal;
       font-weight: 400;
 
-
       .server-select-product-total {
         color: var(--Base-Black, #000);
         font-size: 16px;
@@ -74,11 +73,6 @@
         font-weight: 500;
         line-height: 24px;
       }
-      .server-select-product-origin-total {
-        text-decoration: line-through;
-        color: #4e4e4e;
-        margin-right: 12px;
-      }
     }
 
 

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

@@ -50,8 +50,7 @@ var getProductAmount = (state, isEdit) => {
           const _duration = (0, import_utils3.isDayBookingProduct)(item, state) ? item._extend.duration : 0;
           duration += _duration;
         } else {
-          const quantity = item._extend.quantity || 1;
-          price += Number(item._extend.total) * Number(quantity);
+          price += Number(item._extend.total);
           price += getRelationDetailsTotal(item._extend.relation_details || []);
           duration += import_utils.flexibleObj.getValue(item._extend.duration);
         }

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

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

@@ -54,7 +54,7 @@ var import_useIsBooking4Shop = require("../../hooks/useIsBooking4Shop");
 var import_utils4 = require("@pisell/utils");
 var import_dayjs = __toESM(require("dayjs"));
 var Footer = (props) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const { state, buttons, dispatch, source } = props;
   const [showDetail, setShowDetail] = (0, import_react.useState)(false);
   const [loading, setLoading] = (0, import_react.useState)(false);
@@ -194,7 +194,6 @@ var Footer = (props) => {
     return false;
   }, [state, params]);
   const hasGoodPassApp = !!((_h = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _h.call(businessUtils, "goodpass"));
-  const hasDiscountCardApp = !!((_i = businessUtils == null ? void 0 : businessUtils.getAppByModal) == null ? void 0 : _i.call(businessUtils, "discountcard"));
   console.log("has goodpass app:", hasGoodPassApp);
   const goCheckout = async (order_id) => {
     var _a2, _b2;
@@ -799,7 +798,7 @@ var Footer = (props) => {
   }, [
     state.bookingId,
     state.bookingDetail,
-    (_j = state.addons) == null ? void 0 : _j.load,
+    (_i = state.addons) == null ? void 0 : _i.load,
     state.renderType
   ]);
   const menuChange = (e) => {
@@ -882,7 +881,7 @@ var Footer = (props) => {
         label: import_utils.locales.getText("pisell1.text.rounding")
       }
     ];
-  }, [total, (_k = state.bookingDetail) == null ? void 0 : _k.surcharge, state, state.bookingId]);
+  }, [total, (_j = state.bookingDetail) == null ? void 0 : _j.surcharge, state, state.bookingId]);
   const orderTotalList = (0, import_react.useMemo)(() => {
     return [
       // 订单已付金额
@@ -916,12 +915,8 @@ var Footer = (props) => {
         label: import_utils.locales.getText("pisell2.text.refunded-amount")
       }
     ];
-  }, [total, (_l = state.bookingDetail) == null ? void 0 : _l.surcharge, state, state.bookingId]);
-  const paymentRefundedStatus = (0, import_react.useMemo)(() => {
-    var _a2;
-    return ["partially_refunded", "refunded"].includes((_a2 = state == null ? void 0 : state.bookingDetail) == null ? void 0 : _a2.payment_status);
-  }, [state == null ? void 0 : state.bookingDetail]);
-  return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, (hasGoodPassApp || hasDiscountCardApp) && ["addons", "info"].includes(source) && !paymentRefundedStatus ? /* @__PURE__ */ import_react.default.createElement(import_voucher.default, { state, dispatch, source }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
+  }, [total, (_k = state.bookingDetail) == null ? void 0 : _k.surcharge, state, state.bookingId]);
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton, { title: false, round: true, loading: showFooter, active: true }, hasGoodPassApp && source === "info" ? /* @__PURE__ */ import_react.default.createElement(import_voucher.default, { state, dispatch }) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__booking-footer-total" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-total" }, totalText), /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-lowcode__booking-footer-left-arrears" }, arrearsText)), /* @__PURE__ */ import_react.default.createElement(
     "span",
     {
       className: "pisell-lowcode__booking-footer-right",