@pisell/private-materials 3.4.55 → 3.4.56

package/es/plus/walletPassGallery/serve.d.ts

@@ -17,6 +17,7 @@ export interface IWalletListParmsProps {
     skip?: number;
     filter_wallet_id?: string;
     available: 0 | 1;
+    with?: string[];
 }
 /**
  * 钱包列表项属性接口
@@ -171,6 +172,8 @@ export declare const getAssetList: (params: IAssetListProps) => Promise<{
  */
 export declare const getDetailApi: (params: {
     id: string;
+    order_behavior_count_customer_id: string;
+    apiPrefix: string;
 }) => Promise<IDetailResponse>;
 /**
  * 详情响应数据结构，供组件消费

package/es/plus/walletPassGallery/serve.js

@@ -214,10 +214,12 @@ export var getDetailApi = /*#__PURE__*/function () {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
           _context6.next = 2;
-          return request.getRequest().get("/h5/machinecode/lowcode/detail/".concat(params.id), {
+          return request.getRequest().get("".concat(params.apiPrefix || '/h5', "/machinecode/lowcode/detail/").concat(params.id), {
             order_behavior_count: 1,
             // 订单行为次数
-            order_behavior_count_customer: 1 // 客户订单行为次数
+            order_behavior_count_customer: 1,
+            // 客户订单行为次数
+            order_behavior_count_customer_id: params.apiPrefix === '/shop' ? params.order_behavior_count_customer_id : undefined
           }, {
             isOriginHost: true
           });

package/es/pro/Login2.0/AuthModal.js

@@ -84,7 +84,7 @@ var AuthModal = function AuthModal() {
 
   // 转换配置为 Login2 所需的格式
   var login2Config = useMemo(function () {
-    var _config$auth, _authMethods$email, _authMethods$phone, _authMethods$google, _authMethods$facebook, _authMethods$apple, _authMethods$guest, _config$page, _config$page2, _config$page3, _config$page4, _config$page5, _config$page6, _config$page7;
+    var _config$auth, _authMethods$email, _authMethods$phone, _authMethods$google, _authMethods$facebook, _authMethods$apple, _authMethods$guest, _config$page, _config$page2, _config$page3, _config$page4, _config$page5, _config$page6, _config$logoSize, _config$logoSize2, _config$page7;
     if (!localesInitialized) {
       return {
         loginMethods: [],
@@ -302,7 +302,11 @@ var AuthModal = function AuthModal() {
           show: config !== null && config !== void 0 && config.logo ? true : false,
           url: config === null || config === void 0 ? void 0 : config.logo,
           // 直接从 config.logo 读取
-          position: 'center'
+          position: 'center',
+          size: {
+            width: (config === null || config === void 0 || (_config$logoSize = config.logoSize) === null || _config$logoSize === void 0 ? void 0 : _config$logoSize.width) || 48,
+            height: (config === null || config === void 0 || (_config$logoSize2 = config.logoSize) === null || _config$logoSize2 === void 0 ? void 0 : _config$logoSize2.height) || 48
+          }
         } : undefined,
         themeColor: (config === null || config === void 0 || (_config$page7 = config.page) === null || _config$page7 === void 0 || (_config$page7 = _config$page7.login) === null || _config$page7 === void 0 || (_config$page7 = _config$page7.ui) === null || _config$page7 === void 0 ? void 0 : _config$page7.themeColor) || '#7F56D9',
         formLabels: {
@@ -325,7 +329,7 @@ var AuthModal = function AuthModal() {
 
   // 转换配置为 Register2 所需的格式
   var register2Config = useMemo(function () {
-    var _config$auth2, _authMethods$email2, _authMethods$phone2, _authMethods$google2, _authMethods$facebook2, _authMethods$apple2, _config$page8, _config$page9, _config$page10, _config$auth3;
+    var _config$auth2, _authMethods$email2, _authMethods$phone2, _authMethods$google2, _authMethods$facebook2, _authMethods$apple2, _config$page8, _config$page9, _config$logoSize3, _config$logoSize4, _config$page10, _config$auth3;
     if (!localesInitialized) {
       return {
         registrationMethods: [],
@@ -471,7 +475,11 @@ var AuthModal = function AuthModal() {
           show: config.logo ? true : false,
           url: config.logo,
           // 直接从 config.logo 读取
-          position: 'center'
+          position: 'center',
+          size: {
+            width: (config === null || config === void 0 || (_config$logoSize3 = config.logoSize) === null || _config$logoSize3 === void 0 ? void 0 : _config$logoSize3.width) || 48,
+            height: (config === null || config === void 0 || (_config$logoSize4 = config.logoSize) === null || _config$logoSize4 === void 0 ? void 0 : _config$logoSize4.height) || 48
+          }
         } : undefined,
         themeColor: ((_config$page10 = config.page) === null || _config$page10 === void 0 || (_config$page10 = _config$page10.register) === null || _config$page10 === void 0 || (_config$page10 = _config$page10.ui) === null || _config$page10 === void 0 ? void 0 : _config$page10.themeColor) || '#7F56D9',
         passwordRules: transformPasswordRules((_config$auth3 = config.auth) === null || _config$auth3 === void 0 ? void 0 : _config$auth3.password),

package/es/pro/Login2.0/index.less

@@ -326,21 +326,21 @@
     .login2-submit-button {
       height: 44px;
       border-radius: 8px;
-      border: 1px solid var(--theme-color, #7f56d9);
-      background: var(--theme-color, #7f56d9);
+      border: 1px solid var(--custom-button-bg-color, var(--theme-color, #7f56d9));
+      background: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
       box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05);
       font-size: 16px;
       font-weight: 600;
-      color: #ffffff;
+      color: var(--custom-button-text-color, #ffffff);
 
       &:hover:not(:disabled) {
-        background: #6941c6;
-        border-color: #6941c6;
+        background: var(--custom-button-bg-color, #6941c6);
+        border-color: var(--custom-button-bg-color, #6941c6);
       }
 
       &:focus {
-        background: var(--theme-color, #7f56d9);
-        border-color: var(--theme-color, #7f56d9);
+        background: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
+        border-color: var(--custom-button-bg-color, var(--theme-color, #7f56d9));
         box-shadow: 0px 1px 2px 0px rgba(16, 24, 40, 0.05),
           0px 0px 0px 4px rgba(127, 86, 217, 0.1);
       }

package/es/pro/pisellPaymentList/example.d.ts

@@ -4,6 +4,7 @@
  * 这个文件演示了如何使用 PisellPaymentList 和 PisellPaymentListItem 组件
  * 包括如何通过 Context 访问父组件配置
  */
+/// <reference types="react" />
 export declare const BasicExample: () => JSX.Element;
 export declare const ChildrenExample: () => JSX.Element;
 export declare const CustomItemExample: () => JSX.Element;

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

@@ -96,7 +96,7 @@ var VoucherCard = (props) => {
       return {
         _id: item._id,
         quantity: item.num,
-        bundle: item._bundleOrigin,
+        bundle: item.bundle,
         options: item._optionsOrigin,
         product: {
           ...item._productOrigin
@@ -122,6 +122,7 @@ var VoucherCard = (props) => {
     );
     pisellos.effects.on("appointmentBooking_cart:onAddItem", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateQuotationPrice", onCartChange);
+    pisellos.effects.on("appointmentBooking_cart:onUpdateBookingDate", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onUpdateCartItemNums", onCartChange);
     pisellos.effects.on("appointmentBooking_cart:onRemoveItem", onCartChange);
     pisellos.effects.on(

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

@@ -51,23 +51,26 @@ var import_useEngineContext = __toESM(require("../../../hooks/useEngineContext")
 var formatProducts = (values) => {
   let arr = [];
   arr = values.map((item) => {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const bundleDiscountList = (0, import_utils.getBundleDiscountList)(((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
+    const discount_list = [...(item == null ? void 0 : item.discount_list) || []];
+    discount_list.push(...bundleDiscountList);
     return {
       order_detail_id: item.order_detail_id || 0,
       num: item._extend.quantity,
       price: (0, import_utils.formatProductPrice)(item),
       product_id: item.id,
-      discount_list: (item == null ? void 0 : item.discount_list) || [],
+      discount_list: discount_list || [],
       discount_amount: 0,
       product_discount_reason: "",
       is_charge_tax: item.is_charge_tax,
       note: "",
       discountway: "num",
       discount_type: "discount",
-      bundle_edit: (_a = item._extend) == null ? void 0 : _a.bundle_edit,
-      product_bundle: (0, import_utils.formatProductBundle)((_c = (_b = item._extend) == null ? void 0 : _b.other) == null ? void 0 : _c.bundle),
-      "product_option_item": (0, import_utils.formatProductOption)((_e = (_d = item._extend) == null ? void 0 : _d.other) == null ? void 0 : _e.option),
-      "product_variant_id": ((_g = (_f = item._extend) == null ? void 0 : _f.other) == null ? void 0 : _g.product_variant_id) || 0
+      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),
+      "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
     };
   });
   return arr;
@@ -241,12 +244,12 @@ var Addons = (0, import_model.Provider)((props) => {
           isAddons: true,
           _key: e.key,
           _extend: {
-            price: _detail.price,
             other: e,
             quantity: (e == null ? void 0 : e.quantity) || 1
           },
           quantity: (e == null ? void 0 : e.quantity) || 1
         };
+        product._extend.price = (0, import_utils2.getMainPrice)(product, _detail.price);
         let _total = (0, import_utils2.getProductTotalPrice)(product);
         product._extend.total = _total;
         product._extend.origin_total = _total;

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

@@ -16,6 +16,11 @@ export declare const formatProductOption: (option: any) => any;
  * @Date: 2024-02-19 09:26
  */
 export declare const formatProductBundle: (bundle: any) => any;
+/**
+ * 获取子商品折扣信息
+ * @param item
+ */
+export declare const getBundleDiscountList: (bundle: any[]) => any[];
 export interface ResourceItem {
     [key: string]: any;
 }
@@ -37,5 +42,6 @@ export declare const checkResourcesFormat: (resources: any[], service: any, isCh
  * @Date: 2024-12-23 12:05
  */
 export declare const formatProductPrice: (item: any) => number;
+export declare const getMainProductSellingPrice: (item: any) => number | undefined;
 export declare const formatValues: (state: any) => any;
 export declare const checkHolderIsError: (state: any) => any;

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

@@ -35,7 +35,9 @@ __export(utils_exports, {
   formatProductBundle: () => formatProductBundle,
   formatProductOption: () => formatProductOption,
   formatProductPrice: () => formatProductPrice,
-  formatValues: () => formatValues
+  formatValues: () => formatValues,
+  getBundleDiscountList: () => getBundleDiscountList,
+  getMainProductSellingPrice: () => getMainProductSellingPrice
 });
 module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
@@ -47,6 +49,7 @@ var import_status = require("../../info/service2/status");
 var import_utils4 = require("../../info/service2/utils");
 var import_utils5 = require("@pisell/utils");
 var import_materials = require("@pisell/materials");
+var import_decimal = __toESM(require("decimal.js"));
 var formatNote = (data) => {
   var _a;
   return ((_a = data.notes) == null ? void 0 : _a.orderNote) || "";
@@ -71,10 +74,10 @@ var formatProductOption = (option) => {
   }
   return option.map((d) => {
     return {
-      num: d.num,
-      option_group_item_id: d.product_option_item_id || d.option_group_item_id,
-      option_group_id: d.option_group_id
-      // "add_price": Number(d?.add_price),
+      "num": d.num,
+      "option_group_item_id": d.product_option_item_id || d.option_group_item_id,
+      "option_group_id": d.option_group_id,
+      "custom_add_price": Number(d == null ? void 0 : d.add_price)
     };
   });
 };
@@ -101,20 +104,44 @@ var formatProductBundle = (bundle) => {
   } catch (error) {
   }
   return bundle.map((d) => {
+    const option = formatProductOption(d.option);
+    const option_price = option.reduce((temp, item) => {
+      return temp + Number(item.num) * item.custom_add_price;
+    }, 0);
     return {
-      bundle_group_id: d.group_id,
-      bundle_id: d.id,
-      bundle_product_id: (d == null ? void 0 : d._bundle_product_id) || (d == null ? void 0 : d.product_id),
-      bundle_variant_id: d.bundle_variant_id,
-      num: d.num,
-      extension_id: d.extension_id,
-      extension_type: d.extension_type,
-      // "price": Number(d?.price),
-      // "price_type": d?.price_type,
-      option: formatProductOption(d.option)
+      "bundle_group_id": d.group_id,
+      "bundle_id": d.id,
+      "bundle_product_id": (d == null ? void 0 : d._bundle_product_id) || (d == null ? void 0 : d.product_id),
+      "bundle_variant_id": d.bundle_variant_id,
+      "num": d.num,
+      "extension_id": d.extension_id,
+      "extension_type": d.extension_type,
+      "price": Number(d == null ? void 0 : d.product_price),
+      "price_type": d == null ? void 0 : d.price_type,
+      "price_type_ext": d == null ? void 0 : d.price_type_ext,
+      "custom_price": (d == null ? void 0 : d.custom_price) || Math.abs(new import_decimal.default((d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.product_price)).sub(option_price).toNumber()).toFixed(2),
+      "custom_price_type": d == null ? void 0 : d.price_type,
+      "option": option,
+      "bundle_selling_price": d == null ? void 0 : d.price,
+      "bundle_sum_price": (d == null ? void 0 : d.original_price) || (d == null ? void 0 : d.original_total),
+      metadata: {
+        custom_product_bundle_map_id: d._id
+      }
     };
   });
 };
+var getBundleDiscountList = (bundle) => {
+  if (!bundle) {
+    return [];
+  }
+  let discountList = [];
+  bundle.forEach((d) => {
+    if (d.discount_list && (0, import_utils5.isArr)(d.discount_list)) {
+      discountList.push(...d.discount_list.filter((item) => !item.id));
+    }
+  });
+  return discountList;
+};
 var getSubType = (item) => {
   var _a;
   const _type = (_a = item.duration) == null ? void 0 : _a.type;
@@ -219,7 +246,7 @@ var formatProductPrice = (item) => {
   return price;
 };
 var formatMetaData = (item, isMultiDayPrices) => {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f, _g;
   let metadata = {};
   if ((_a = item._extend) == null ? void 0 : _a.capacity) {
     metadata.capacity = item._extend.capacity;
@@ -233,6 +260,9 @@ var formatMetaData = (item, isMultiDayPrices) => {
   if (isMultiDayPrices && ((_d = item._extend) == null ? void 0 : _d.multiDayPrices)) {
     metadata.multiDayPrices = (_e = item._extend) == null ? void 0 : _e.multiDayPrices;
   }
+  if ((_f = item._extend) == null ? void 0 : _f.unique_identification_number) {
+    metadata.unique_identification_number = (_g = item._extend) == null ? void 0 : _g.unique_identification_number;
+  }
   return metadata;
 };
 var getSourceProductPrice = (item) => {
@@ -249,34 +279,52 @@ var getSourceProductPrice = (item) => {
   }
   return price;
 };
+var getMainProductSellingPrice = (item) => {
+  var _a, _b, _c, _d, _e;
+  if (!(0, import_utils5.isNumber)((_a = item._extend) == null ? void 0 : _a.main_product_selling_price)) {
+    return void 0;
+  }
+  let optionPrice = new import_decimal.default(0);
+  if (((_b = item._extend.other) == null ? void 0 : _b.option) && Array.isArray((_c = item._extend.other) == null ? void 0 : _c.option)) {
+    optionPrice = (_d = item._extend.other) == null ? void 0 : _d.option.reduce((accumulator, currentValue) => {
+      const currentPrice = new import_decimal.default(currentValue.price || 0);
+      const currentNum = new import_decimal.default(currentValue.num || 0);
+      return accumulator.add(currentPrice.mul(currentNum));
+    }, optionPrice);
+  }
+  return new import_decimal.default((_e = item._extend) == null ? void 0 : _e.main_product_selling_price).add(optionPrice).toNumber();
+};
 var formatProducts = (item, quantity) => {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const total = Number(item._extend.total);
   const origin_total = Number(item._extend.origin_total);
   const discount_amount = origin_total - total;
-  const discount_list = (item == null ? void 0 : item.discount_list) || [];
+  const bundleDiscountList = getBundleDiscountList(((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle) || []);
+  const discount_list = [...(item == null ? void 0 : item.discount_list) || []];
+  discount_list.push(...bundleDiscountList);
   const discount_type = discount_amount < 0 ? "change_price" : "discount";
   const notManualDiscount = discount_list.filter(
     (item2) => item2.type !== "product"
   );
   return {
-    num: quantity || item._extend.quantity,
-    price: formatProductPrice(item),
-    source_product_price: getSourceProductPrice(item),
-    product_id: (item == null ? void 0 : item.product_id) || item.id,
-    discount_amount: notManualDiscount.length > 0 ? 0 : discount_amount,
-    product_discount_reason: item._extend.discount_reason || "",
-    is_charge_tax: item.is_charge_tax,
-    note: (item == null ? void 0 : item.note) || "",
-    discountway: item._extend.discountway || "num",
-    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((_b = (_a = item._extend) == null ? void 0 : _a.other) == null ? void 0 : _b.bundle),
-    bundle_edit: item._extend.bundle_edit,
-    product_option_item: formatProductOption((_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.option),
-    product_variant_id: ((_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.product_variant_id) || 0,
-    discount_list: notManualDiscount,
+    "num": quantity || item._extend.quantity,
+    "price": formatProductPrice(item),
+    "main_product_selling_price": getMainProductSellingPrice(item) ?? formatProductPrice(item),
+    "source_product_price": getSourceProductPrice(item),
+    "product_id": (item == null ? void 0 : item.product_id) || item.id,
+    "discount_amount": notManualDiscount.length > 0 ? 0 : discount_amount,
+    "product_discount_reason": item._extend.discount_reason || "",
+    "is_charge_tax": item.is_charge_tax,
+    "note": (item == null ? void 0 : item.note) || "",
+    "discountway": item._extend.discountway || "num",
+    "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((_d = (_c = item._extend) == null ? void 0 : _c.other) == null ? void 0 : _d.bundle),
+    "bundle_edit": item._extend.bundle_edit || bundleDiscountList.length ? 1 : 0,
+    "product_option_item": formatProductOption((_f = (_e = item._extend) == null ? void 0 : _e.other) == null ? void 0 : _f.option),
+    "product_variant_id": ((_h = (_g = item._extend) == null ? void 0 : _g.other) == null ? void 0 : _h.product_variant_id) || 0,
+    "discount_list": notManualDiscount,
     metadata: formatMetaData(item, false)
   };
 };
@@ -537,5 +585,7 @@ var checkHolderIsError = (state) => {
   formatProductBundle,
   formatProductOption,
   formatProductPrice,
-  formatValues
+  formatValues,
+  getBundleDiscountList,
+  getMainProductSellingPrice
 });

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

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const FormItemChildrenWrap: (props: any) => JSX.Element;
 export default FormItemChildrenWrap;

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

@@ -96,11 +96,19 @@ var VoucherCard = (props) => {
         price: value.price,
         total: (_a3 = value == null ? void 0 : value._extend) == null ? void 0 : _a3.total,
         discount_list: value.discount_list,
-        origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total
+        origin_total: (_b2 = value == null ? void 0 : value._extend) == null ? void 0 : _b2.origin_total,
+        quantity: value._extend.quantity,
+        startDate: value._extend.startDate,
+        quantity: value._extend.quantity
       };
     });
     return val;
   }, [state.service.value]);
+  const serviceTotal = (0, import_react.useMemo)(() => {
+    return serviceMemo.reduce((total, item) => {
+      return total + (item.total || 0);
+    }, 0);
+  }, [serviceMemo]);
   const addonsMemo = (0, import_react.useMemo)(() => {
     var _a2;
     const val = (_a2 = state.addons.value || []) == null ? void 0 : _a2.map((value) => {
@@ -192,6 +200,12 @@ var VoucherCard = (props) => {
   }, [state.bookingId, isBooking4Shop, fn]);
   const productListToValue = (0, import_ahooks.useMemoizedFn)((list, edit) => {
     const { serviceList, addonsList } = (0, import_utils2.getServiceAddons)(list);
+    const newTotal = serviceList.reduce((total, item) => {
+      return total + (item._extend.total || 0);
+    }, 0);
+    if (newTotal !== serviceTotal) {
+      edit = true;
+    }
     serviceValueRef.current = serviceList;
     addonsValueRef.current = addonsList;
     let other = {};
@@ -207,12 +221,14 @@ var VoucherCard = (props) => {
         ...other
       }
     });
-    dispatch({
-      type: "setAddons",
-      payload: {
-        value: addonsList,
-        ...other
-      }
+    setTimeout(() => {
+      dispatch({
+        type: "setAddons",
+        payload: {
+          value: addonsList,
+          ...other
+        }
+      });
     });
   });
   const onScanCode = async () => {

package/lib/components/booking/info/clientVariant/hooks/useIsLowSpeedNetwork.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const useIsLowSpeedNetwork: () => import("react").MutableRefObject<boolean>;
 export default useIsLowSpeedNetwork;

package/lib/components/booking/info/service/like/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const Like: ({ status, onChange, className, style, }: {
     style?: any;

package/lib/components/booking/info/service2/utils.d.ts

@@ -244,4 +244,4 @@ export declare const updateAppointmentServicePrice: (state: any, { start_date, e
  * @Author: WangHan
  * @Date: 2024-12-24 11:32
  */
-export declare const updateServicePrice: (state: any) => Promise<any> | never[];
+export declare const updateServicePrice: (state: any) => never[] | Promise<any>;

package/lib/components/booking/info/service2/utils.js

@@ -367,6 +367,7 @@ var formatBundle = (bundle) => {
       num: item == null ? void 0 : item.num,
       price: item == null ? void 0 : item.price,
       total: item == null ? void 0 : item.price,
+      origin_total: item.original_total,
       price_type: item == null ? void 0 : item.price_type,
       bundle_sum_price: item == null ? void 0 : item.bundle_sum_price,
       bundle_sum_type: item == null ? void 0 : item.bundle_sum_type,

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

@@ -229,16 +229,16 @@ var Info = (props) => {
           _extend: {
             start_date: state.date.value,
             quantity: (e == null ? void 0 : e.quantity) || 1,
-            price: _detail.price,
             product_name: item.title,
             other
           },
           new: 1
         };
-        console.log(cacheItem, "cacheItem", e);
+        cacheItem._extend.price = (0, import_utils3.getMainPrice)(_detail, _detail.price);
         let _total = (0, import_utils3.getProductTotalPrice)(cacheItem);
         cacheItem._extend.total = _total;
         cacheItem._extend.origin_total = _total;
+        debugger;
         const _isEdit = !!state.service.cacheItem;
         if (_isEdit) {
           cacheItem._id = (_a3 = state.service.cacheItem) == null ? void 0 : _a3._id;

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

@@ -153,6 +153,7 @@ export declare const getIsOnlySession: (item: any) => boolean;
  * @Date: 2024-01-26 14:09
  */
 export declare const getServerItemExtend: (state: any, cacheItem: any, timeObj: any) => any;
+export declare const getMainPrice: (item: any, price?: number) => number;
 export declare const getProductTotalPrice: (item: any) => number;
 /**
  * @title: 判断 duration
@@ -165,10 +166,10 @@ export declare const getProductTotalPrice: (item: any) => number;
 export declare const getDuration: (duration: number | {
     type: string;
     value: number;
-}) => number | {
+}) => number | "flexible" | {
     type: string;
     value: number;
-} | "flexible";
+};
 export declare const isWalkIn: (customer_id?: number | string) => boolean;
 export declare const getIsEdit: (state: any) => boolean;
 export {};

package/lib/components/booking/utils.js

@@ -46,6 +46,7 @@ __export(utils_exports, {
   getIsEject: () => getIsEject,
   getIsOnlySession: () => getIsOnlySession,
   getLastServer: () => getLastServer,
+  getMainPrice: () => getMainPrice,
   getNowTime: () => getNowTime,
   getProductTotalPrice: () => getProductTotalPrice,
   getResourceTimeIsUsable: () => getResourceTimeIsUsable,
@@ -66,6 +67,7 @@ var import_utils = require("@pisell/utils");
 var import_utils2 = require("./info/service2/utils");
 var import_lodash = require("lodash");
 var import_utilsByBooking = require("./info2/utilsByBooking");
+var import_decimal = __toESM(require("decimal.js"));
 var Request = class {
   request = {};
   constructor() {
@@ -609,6 +611,15 @@ var getServerItemExtend = (state, cacheItem, timeObj) => {
   }
   return _extend;
 };
+var getMainPrice = (item, price) => {
+  var _a;
+  let newPrice = new import_decimal.default(price || item._extend.price || 0);
+  let other = (_a = item._extend) == null ? void 0 : _a.other;
+  if (other == null ? void 0 : other.product_variant_id) {
+    newPrice = new import_decimal.default((other == null ? void 0 : other.price) || 0);
+  }
+  return newPrice.toNumber();
+};
 var getProductTotalPrice = (item) => {
   var _a;
   let price = Number(item._extend.price);
@@ -698,6 +709,7 @@ var getIsEdit = (state) => {
   getIsEject,
   getIsOnlySession,
   getLastServer,
+  getMainPrice,
   getNowTime,
   getProductTotalPrice,
   getResourceTimeIsUsable,

package/lib/components/eftpos/deviceList/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

package/lib/components/eftpos/form/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang

package/lib/components/eftpos/group/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
 export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {

package/lib/components/eftpos/hooks.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Eftpos } from './const';
 /**
  * @title: tyro 设备连接

package/lib/components/eftpos/icon/apiKey.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/icon/device.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
 }) => JSX.Element;

package/lib/components/eftpos/receipt/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置

package/lib/components/eftposPay/amount.d.ts

@@ -8,7 +8,7 @@ import { PosProps } from './const';
  */
 declare const _default: ({ className, onChange, onClose, formatAmount, isMobile, net, client }: {
     className?: string | undefined;
-    onChange?: ((status: "success" | "page" | "fail" | "print" | "mark_tx_processed", params?: string | {
+    onChange?: ((status: "page" | "success" | "print" | "fail" | "mark_tx_processed", params?: string | {
         [keys: string]: unknown;
     } | undefined, other?: any) => void) | undefined;
     onClose: () => void;

package/lib/components/eftposPay/component/alert/warn.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const _default: () => JSX.Element;
 export default _default;

package/lib/components/eftposPay/component/header/titlebar.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './titlebar.less';
 declare enum EPopupTitleBarVariantType {
     BackTitleClose = "back-title-cancel",

package/lib/components/eftposPay/component/step/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { StatusType } from '../../const';
 declare const _default: (props: {
     status: StatusType;

package/lib/components/eftposPay/component/step/step.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: (props: {
     status: string;
     pedding?: string;