@pisell/private-materials 6.3.15 → 6.4.1

package/es/components/booking/components/footer/index.less

@@ -1,6 +1,6 @@
 .pisell-lowcode__booking-footer-total {
   width: 100%;
-  padding-bottom: 16px;
+  padding-bottom: 8px;
   display: flex;
   align-items: flex-start;
   justify-content: space-between;
@@ -15,7 +15,8 @@
     display: flex;
     flex-direction: column;
 
-    .pisell-lowcode__booking-footer-left-total {}
+    .pisell-lowcode__booking-footer-left-total {
+    }
 
     .pisell-lowcode__booking-footer-left-arrears {
       font-size: 14px;
@@ -121,6 +122,29 @@
     align-items: center;
     justify-content: center;
     flex: 1;
+    position: relative;
+
+    &.note-button {
+      .note-indicator {
+        position: absolute;
+        top: 0; // 不使用负数偏移
+        right: 0; // 不使用负数偏移
+        transform: translate(12%, -12%); // 向外溢出约 2-3px
+        width: 24px;
+        height: 24px;
+        border-radius: 50%;
+        background-color: #7F56DA; // 紫色
+        color: #fff;
+        font-weight: 700;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        line-height: 1;
+        font-size: 30px;
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+        pointer-events: none;
+      }
+    }
   }
 
   .pisell-lowcode__booking-footer-buttons-item-primary {

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

@@ -10,9 +10,10 @@ import { isWalkIn } from "../../utils";
 import { getSumCapacity } from "../../info2/utilsByBooking";
 import { getDays } from "../../utils";
 import { appointmentTypes } from "../../info/service2/status";
-import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule } from "../../info/service2/utils";
+import { isDaysBooking, formatDayTime, isEventBooking, isNormalProductByDurationSchedule, genRowKey } from "../../info/service2/utils";
 import { isArr, locales, sendWarningLog } from '@pisell/utils';
 import { PisellToast } from "@pisell/materials";
+import { getClientName } from "../../../../plus/clientName/utils";
 var formatNote = function formatNote(data) {
   var _data$notes;
   return ((_data$notes = data.notes) === null || _data$notes === void 0 ? void 0 : _data$notes.orderNote) || "";
@@ -25,7 +26,7 @@ var formatCustomer = function formatCustomer(data) {
   }
   return {
     customer_id: id,
-    customer_name: (_data$client2 = data.client) === null || _data$client2 === void 0 || (_data$client2 = _data$client2.value) === null || _data$client2 === void 0 ? void 0 : _data$client2.name,
+    customer_name: getClientName((_data$client2 = data.client) === null || _data$client2 === void 0 ? void 0 : _data$client2.value),
     email: (_data$client3 = data.client) === null || _data$client3 === void 0 || (_data$client3 = _data$client3.value) === null || _data$client3 === void 0 ? void 0 : _data$client3.email,
     phone: ((_data$client4 = data.client) === null || _data$client4 === void 0 || (_data$client4 = _data$client4.value) === null || _data$client4 === void 0 ? void 0 : _data$client4.phone) || ((_data$client5 = data.client) === null || _data$client5 === void 0 || (_data$client5 = _data$client5.value) === null || _data$client5 === void 0 ? void 0 : _data$client5.mobile),
     country_calling_code: (_data$client6 = data.client) === null || _data$client6 === void 0 || (_data$client6 = _data$client6.value) === null || _data$client6 === void 0 ? void 0 : _data$client6.country_calling_code
@@ -48,8 +49,8 @@ export var formatProductOption = function formatProductOption(option) {
     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),
+      "option_group_id": d.option_group_id,
+      "custom_add_price": Number(d === null || d === void 0 ? void 0 : d.add_price)
     };
   });
 };
@@ -106,8 +107,10 @@ export var formatProductBundle = function formatProductBundle(bundle) {
       "num": d.num,
       "extension_id": d.extension_id,
       "extension_type": d.extension_type,
-      // "price": Number(d?.price),
-      // "price_type": d?.price_type,
+      "price": Number(d === null || d === void 0 ? void 0 : d.price),
+      // checkout 2.0 新增
+      "price_type": d === null || d === void 0 ? void 0 : d.price_type,
+      // checkout 2.0 新增
       "option": formatProductOption(d.option)
     };
   });
@@ -125,7 +128,7 @@ var formatRelationDetails = function formatRelationDetails(list) {
   return (list || []).map(function (item) {
     return {
       num: item.product_quantity,
-      price: item.payment_price || 0,
+      price: item.original_price || 0,
       product_id: item.product_id,
       is_charge_tax: item.is_charge_tax,
       order_detail_id: item.order_detail_id
@@ -250,22 +253,42 @@ export var formatProductPrice = function formatProductPrice(item) {
   }
   return price;
 };
+
+/**
+ * checkout2.0: 单个数量商品总价（原价）,包含所有套餐子商品金额、报价单等等
+ * @param item 
+ * @returns 
+ */
+var formatOriginalPrice = function formatOriginalPrice(item) {
+  var _item$_extend8;
+  return Number((_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.origin_total);
+};
+
+/**
+ * checkout2.0: 商品维度折扣后价格, original_price - 商品折扣金额（商品手动折扣等等）
+ * @param item 
+ * @returns 
+ */
+var formatSellingPrice = function formatSellingPrice(item) {
+  var _item$_extend9;
+  return Number((_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.total);
+};
 var formatMetaData = function formatMetaData(item) {
-  var _item$_extend8, _item$_extend9, _item$_extend11;
+  var _item$_extend10, _item$_extend11, _item$_extend13;
   var metadata = {};
-  if ((_item$_extend8 = item._extend) !== null && _item$_extend8 !== void 0 && _item$_extend8.capacity) {
+  if ((_item$_extend10 = item._extend) !== null && _item$_extend10 !== void 0 && _item$_extend10.capacity) {
     metadata.capacity = item._extend.capacity;
   }
   if (item._extend.groupId) {
     metadata.groupId = item._extend.groupId;
   }
-  if ((_item$_extend9 = item._extend) !== null && _item$_extend9 !== void 0 && _item$_extend9.holder_id) {
-    var _item$_extend10;
-    metadata.holder_id = (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id;
-  }
-  if ((_item$_extend11 = item._extend) !== null && _item$_extend11 !== void 0 && _item$_extend11.multiDayPrices) {
+  if ((_item$_extend11 = item._extend) !== null && _item$_extend11 !== void 0 && _item$_extend11.holder_id) {
     var _item$_extend12;
-    metadata.multiDayPrices = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.multiDayPrices;
+    metadata.holder_id = (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.holder_id;
+  }
+  if ((_item$_extend13 = item._extend) !== null && _item$_extend13 !== void 0 && _item$_extend13.multiDayPrices) {
+    var _item$_extend14;
+    metadata.multiDayPrices = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.multiDayPrices;
   }
   return metadata;
 };
@@ -286,9 +309,9 @@ var formatMetaData = function formatMetaData(item) {
 
 // 获取商品价格 包含组合规格
 var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend13, _item$_extend14, _item$variant2;
-  var other = (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.other;
-  var price = Number((_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price);
+  var _item$_extend15, _item$_extend16, _item$variant2;
+  var other = (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.other;
+  var price = Number((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant2 = item.variant) === null || _item$variant2 === void 0 ? void 0 : _item$variant2.length) > 0) {
@@ -311,7 +334,7 @@ var getSourceProductPrice = function getSourceProductPrice(item) {
  * @Date: 2024-12-07 14:21
  */
 var formatProducts = function formatProducts(item, quantity) {
-  var _item$_extend15, _item$_extend16, _item$_extend17;
+  var _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20;
   var total = Number(item._extend.total);
   var origin_total = Number(item._extend.origin_total);
   var discount_amount = origin_total - total;
@@ -324,25 +347,33 @@ var formatProducts = function formatProducts(item, quantity) {
   var notManualDiscount = discount_list.filter(function (item) {
     return item.type !== 'product';
   });
+  if (item.isCustomItem) {
+    item.product_id = 0;
+  }
   return {
+    "name": item.name,
     "num": quantity || item._extend.quantity,
     "price": formatProductPrice(item),
     "source_product_price": getSourceProductPrice(item),
-    "product_id": (item === null || item === void 0 ? void 0 : item.product_id) || item.id,
+    "product_id": item !== null && item !== void 0 && item.product_id || item.product_id === 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 || item === void 0 ? void 0 : item.note) || '',
+    "note": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.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((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 || (_item$_extend15 = _item$_extend15.other) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.bundle),
+    "product_bundle": formatProductBundle((_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 || (_item$_extend18 = _item$_extend18.other) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.bundle),
     "bundle_edit": item._extend.bundle_edit,
-    "product_option_item": formatProductOption((_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 || (_item$_extend16 = _item$_extend16.other) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.option),
-    "product_variant_id": ((_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 || (_item$_extend17 = _item$_extend17.other) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.product_variant_id) || 0,
+    "product_option_item": formatProductOption((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 || (_item$_extend19 = _item$_extend19.other) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.option),
+    "product_variant_id": ((_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.product_variant_id) || 0,
     "discount_list": notManualDiscount,
-    metadata: formatMetaData(item)
+    metadata: formatMetaData(item),
+    // checkout 需求新增字段
+    "calculated_original_price": formatOriginalPrice(item),
+    "calculated_selling_price": formatSellingPrice(item),
+    "tax_fee": item._extend.tax_fee
   };
 };
 
@@ -360,8 +391,8 @@ var formatDayRelationProducts = function formatDayRelationProducts(data, booking
 
   // 过滤出卡片中的普通商品
   var relation_products = list === null || list === void 0 ? void 0 : list.filter(function (item) {
-    var _item$_extend18;
-    var holderId = (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.holder_id;
+    var _item$_extend21;
+    var holderId = (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.holder_id;
     var bookingHolderId = booking_item._extend.holder_id;
     var isDayBookingProduct = appointmentTypes.includes(item.extension_type);
     return holderId && holderId === bookingHolderId && !isDayBookingProduct;
@@ -387,15 +418,15 @@ var formatAppointmentProductLists = function formatAppointmentProductLists(data)
 
     // 找出预约商品
     list = list.filter(function (item) {
-      var _item$_extend19;
-      return ((_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.holder_id) && !isNormalProductByDurationSchedule(item);
+      var _item$_extend22;
+      return ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.holder_id) && !isNormalProductByDurationSchedule(item);
     });
 
     // 对预约商品列表根据holder_id进行分组
     var groupMap = new Map();
     list.forEach(function (item) {
-      var _item$_extend20;
-      var key = (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.holder_id; // 分组键
+      var _item$_extend23;
+      var key = (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.holder_id; // 分组键
       if (!groupMap.has(key)) {
         groupMap.set(key, []);
       }
@@ -434,6 +465,7 @@ var formatBookings = function formatBookings(data, values) {
   // 是否是跨日预约
   var isDay = isDaysBooking(data);
   var isEvent = isEventBooking(data);
+  // todo 预约商品 普通商品 字段添加
   var list = data.service.value;
 
   // 格式化跨日预约商品列表
@@ -455,6 +487,13 @@ var formatBookings = function formatBookings(data, values) {
   var eventOtherParams = data.eventOtherParams;
   var bookings = [];
   list.forEach(function (item) {
+    // 自定义商品直接使用 _extend 中的数据，并将 id 转换为 0 提交给后端
+    if (item.isCustomItem) {
+      bookings.push(_objectSpread(_objectSpread({}, item._extend), {}, {
+        product_id: 0 // 确保后端接收到的 product_id 为 0
+      }));
+      return;
+    }
     var start_date = item._extend.startDate.format('YYYY-MM-DD');
     var end_date = item._extend.endDate.format('YYYY-MM-DD');
     var end_time = item._extend.endDate.format("HH:mm");
@@ -468,9 +507,9 @@ var formatBookings = function formatBookings(data, values) {
 
     // 跨日预约下的普通商品
     if (isDay) {
-      var _item$_extend21, _item$_extend22, _item$_extend23, _item$_extend24;
-      var startDate = ((_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.startDate) || ((_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.start_date);
-      var endDate = ((_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.endDate) || ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date);
+      var _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27;
+      var startDate = ((_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.startDate) || ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.start_date);
+      var endDate = ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.endDate) || ((_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.end_date);
       var _formatDayTime = formatDayTime({
           startDate: startDate,
           endDate: endDate
@@ -512,7 +551,8 @@ var formatBookings = function formatBookings(data, values) {
         cacheItem: item
       }) : item._extend.number || 1,
       "resources": formatResource(item),
-      "metadata": formatMetaData(item)
+      "metadata": formatMetaData(item),
+      "note": item._extend.note
     }, eventOtherParams || {}), dayParams);
     if (isDay) {
       bookings.push(booking);
@@ -544,10 +584,10 @@ var formatRelationProducts = function formatRelationProducts(data, type) {
   var list = ((_data$service = data.service) === null || _data$service === void 0 ? void 0 : _data$service.value) || [];
   // open items 下的商品
   list = list.filter(function (item) {
-    var _item$_extend25;
+    var _item$_extend28;
     return (
       // 跨日预约把普通商品加在relationProducts 活动预约按之前逻辑
-      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id) && appointmentTypes.includes(item.extension_type)
+      type === 'day' ? isNormalProductByDurationSchedule(item) : ((_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.holder_id) && appointmentTypes.includes(item.extension_type)
     );
   });
   var relationProducts = [];
@@ -626,21 +666,23 @@ export var formatValues = function formatValues(state) {
     // 备注
     values.shop_note = formatNote(state);
   }
-  if (state.bookingId) {
-    values.shop_discount = state.bookingDetail.shop_discount;
-    values.shop_discount_reason = state.bookingDetail.shop_discount_reason;
+
+  // 提交手动价格调整（shop_discount）
+  if (state.shop_discount && Number(state.shop_discount) > 0) {
+    values.shop_discount = state.shop_discount;
+    values.shop_discount_reason = '';
   }
   if (state.contacts) {
     var _state$contacts;
     values.contacts = ((_state$contacts = state.contacts) === null || _state$contacts === void 0 ? void 0 : _state$contacts.value) || [];
   }
-
   // 客户
   var customer = formatCustomer(state);
   values = _objectSpread(_objectSpread({}, values), customer);
 
   // 主体
   values.holder = formatHolder(state, values);
+  // todo
   if (isDay || isEvent) {
     values.relation_products = formatRelationProducts(state, isDay ? "day" : "event");
   } else {
@@ -677,21 +719,35 @@ export var formatValues = function formatValues(state) {
 // 检测预约主体是否为空
 export var checkHolderIsError = function checkHolderIsError(state) {
   var _state$client;
+  var errorRowKey = "";
   var holderError = state.service.value.some(function (item) {
-    var _item$_extend26;
+    var _item$_extend30;
     // 普通商品不需要检测holder
     if (isNormalProductByDurationSchedule(item)) {
       return false;
     }
     if (item._extend.quantity === 1 && !item._extend.holder_id) {
+      var _item$_extend29;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 || (_item$_extend29 = _item$_extend29.other) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.rowKey);
       return true;
     }
-    if (item._extend.quantity > 1 && ((_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 || (_item$_extend26 = _item$_extend26.holder_id) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.length) !== item._extend.quantity) {
+    if (item._extend.quantity > 1 && ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 || (_item$_extend30 = _item$_extend30.holder_id) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.length) !== item._extend.quantity) {
+      var _item$_extend31;
+      errorRowKey = genRowKey(item === null || item === void 0 || (_item$_extend31 = item._extend) === null || _item$_extend31 === void 0 || (_item$_extend31 = _item$_extend31.other) === null || _item$_extend31 === void 0 ? void 0 : _item$_extend31.rowKey);
       return true;
     }
     return false;
   });
   var clientId = (_state$client = state.client) === null || _state$client === void 0 || (_state$client = _state$client.value) === null || _state$client === void 0 ? void 0 : _state$client.id;
+  if (holderError) {
+    var dom = document.getElementById(errorRowKey);
+    if (dom) {
+      dom.scrollIntoView({
+        behavior: 'smooth',
+        block: 'start'
+      });
+    }
+  }
   if (holderError && (!clientId || clientId === 0 || clientId === 1)) {
     PisellToast({
       content: locales.getText('pisell2.text.please-select-the-customer-first')

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

@@ -1,4 +1,4 @@
-import React from "react";
-import "./index.less";
+import React from 'react';
+import './index.less';
 declare const TabPane: React.FC<any>;
 export default TabPane;

package/es/components/booking/components/tabPane/index.js

@@ -1,22 +1,70 @@
-import React from "react";
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import React, { useMemo } from 'react';
 import AuthWrap from "../authWrap";
-import { Skeleton } from "antd";
+import { Skeleton } from 'antd';
 import "./index.less";
-import classNames from "classnames";
+import classNames from 'classnames';
+import useEngineContext from "../../../../hooks/useEngineContext";
+import VoucherCard from "../voucher";
+import ActionButtons from "../actionButtons";
 var TabPane = function TabPane(_ref) {
+  var _context$appHelper, _businessUtils$getApp, _businessUtils$getApp2, _state$service, _state$addons, _state$client;
   var children = _ref.children,
     header = _ref.header,
     footer = _ref.footer,
     style = _ref.style,
     loading = _ref.loading,
-    bodyClassName = _ref.bodyClassName;
+    bodyClassName = _ref.bodyClassName,
+    state = _ref.state,
+    dispatch = _ref.dispatch,
+    source = _ref.source;
+  var context = useEngineContext();
+  var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    businessUtils = _ref2.businessUtils;
+
+  // 是否安装商品券应用
+  var hasGoodPassApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp = businessUtils.getAppByModal) !== null && _businessUtils$getApp !== void 0 && _businessUtils$getApp.call(businessUtils, 'goodpass'));
+  var hasDiscountCardApp = !!(businessUtils !== null && businessUtils !== void 0 && (_businessUtils$getApp2 = businessUtils.getAppByModal) !== null && _businessUtils$getApp2 !== void 0 && _businessUtils$getApp2.call(businessUtils, 'discountcard'));
+
+  // 支付退款状态
+  var paymentRefundedStatus = useMemo(function () {
+    var _state$bookingDetail;
+    return ['partially_refunded', 'refunded'].includes(state === null || state === void 0 || (_state$bookingDetail = state.bookingDetail) === null || _state$bookingDetail === void 0 ? void 0 : _state$bookingDetail.payment_status);
+  }, [state === null || state === void 0 ? void 0 : state.bookingDetail]);
+
+  // 是否显示 voucher 模块的基础条件
+  var voucherBaseCondition = (hasGoodPassApp || hasDiscountCardApp) && ['addons', 'info'].includes(source) && !paymentRefundedStatus;
+
+  // 票务预订显示独立的 voucher 模块
+  var shouldShowTerminalVoucher = voucherBaseCondition && (state === null || state === void 0 ? void 0 : state.isBookingTicket2);
+
+  // 非票务预订显示在 footer 中的 voucher 模块
+  var shouldShowFooterVoucher = voucherBaseCondition && !(state !== null && state !== void 0 && state.isBookingTicket2);
+
+  // 处理订单备注变更
+  var addNote = function addNote(noteValue) {
+    if (dispatch) {
+      dispatch({
+        type: 'setNotes',
+        payload: {
+          orderNote: noteValue,
+          edit: true
+        }
+      });
+    }
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "pisell-lowcode__booking-tab-pane-wrap",
+    className: 'pisell-lowcode__booking-tab-pane-wrap',
     style: style
   }, /*#__PURE__*/React.createElement("div", {
-    className: typeof header === "string" ? "pisell-lowcode__booking-tab-pane-title" : ""
+    className: typeof header === 'string' ? 'pisell-lowcode__booking-tab-pane-title' : ''
   }, header), /*#__PURE__*/React.createElement("div", {
-    className: classNames("pisell-lowcode__booking-tab-pane-body", bodyClassName)
+    className: classNames('pisell-lowcode__booking-tab-pane-body', bodyClassName)
   }, /*#__PURE__*/React.createElement(Skeleton, {
     loading: loading,
     round: true,
@@ -25,11 +73,30 @@ var TabPane = function TabPane(_ref) {
     style: {
       padding: 20
     }
-  }, children)), /*#__PURE__*/React.createElement(AuthWrap, {
-    show: !!footer,
+  }, children)), state && dispatch && (state === null || state === void 0 ? void 0 : state.isBookingTicket2) && /*#__PURE__*/React.createElement("div", {
+    className: "pisell-lowcode__booking-tab-pane-voucher-section"
+  }, /*#__PURE__*/React.createElement(ActionButtons, {
+    state: state,
+    dispatch: dispatch
+  })), /*#__PURE__*/React.createElement(AuthWrap, {
+    show: !!footer || shouldShowFooterVoucher,
     trueRender: /*#__PURE__*/React.createElement("div", {
       className: "pisell-lowcode__booking-tab-pane-footer"
-    }, footer)
+    }, shouldShowFooterVoucher && state && dispatch && /*#__PURE__*/React.createElement(VoucherCard, {
+      state: _objectSpread(_objectSpread({}, state), {}, {
+        service: _objectSpread(_objectSpread({}, state.service || {}), {}, {
+          value: ((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.value) || []
+        }),
+        addons: _objectSpread(_objectSpread({}, state.addons || {}), {}, {
+          value: ((_state$addons = state.addons) === null || _state$addons === void 0 ? void 0 : _state$addons.value) || []
+        }),
+        client: _objectSpread(_objectSpread({}, state.client || {}), {}, {
+          value: ((_state$client = state.client) === null || _state$client === void 0 ? void 0 : _state$client.value) || {}
+        })
+      }),
+      dispatch: dispatch,
+      source: source
+    }), footer)
   })));
 };
 export default TabPane;

package/es/components/booking/components/tabPane/index.less

@@ -5,7 +5,6 @@
   position: relative;
   display: flex;
   flex-direction: column;
-
 }
 
 .pisell-lowcode__booking-tab-pane-title {
@@ -30,6 +29,8 @@
   flex: 1;
   overflow: auto;
   padding: 0 32px;
+  // 为 voucher-section 预留空间
+  padding-bottom: 120px;
 
   .pisell-lowcode__booking-tab-pane-label {
     font-size: 16px;
@@ -45,10 +46,83 @@
   }
 }
 
+// Voucher 和功能按钮区域
+.pisell-lowcode__booking-tab-pane-voucher-section {
+  display: flex;
+  flex-direction: column;
+  padding: 10px;
+  position: relative;
+  z-index: 3;
+  background-color: #1b1b1b;
+  box-shadow: 0 -2px 8px rgba(0, 0, 0, 0.06);
+  
+  .pisell-lowcode__booking-footer-voucher-container {
+    background: var(--base-white, #FFF);
+    padding: 4px;
+    border-radius: 8px;
+  }
+  
+  // ActionButtons 在 voucher-section 中的样式
+  .pisell-lowcode__action-buttons {
+    margin-top: 8px;
+    // 确保按钮可见
+    .action-button {
+      // 重要：确保文字颜色在深色背景下可见
+      color: white !important;
+      
+      &:hover:not(:disabled) {
+        color: white !important;
+      }
+    }
+  }
+}
+
+// 订单备注区域
+.pisell-lowcode__booking-tab-pane-notes-section {
+  background-color: #1b1b1b;
+  position: relative;
+  z-index: 3;
+  
+  .pisell-lowcode__booking-notes {
+    background: var(--base-white, #FFF);
+    padding: 12px;
+    width: 100%;
+    
+    .pisell-lowcode__booking-notes-label {
+      font-weight: 500;
+      color: #333;
+      margin-bottom: 8px;
+    }
+    
+    .pisell-lowcode__booking-notes-input {
+      .pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        font-size: 16px;
+        line-height: 36px;
+      }
+      
+      // 备用选择器，以防万一
+      textarea.pisell-lowcode-input {
+        height: 44px !important;
+        min-height: 44px !important;
+        border-radius: 6px;
+        resize: none;
+      }
+      
+      // 去掉外层包装容器的边框
+      .pisell-lowcode-input-textarea-affix-wrapper {
+        border-width: 1px;
+      }
+    }
+  }
+}
+
 .pisell-lowcode__booking-tab-pane-footer {
-  position: sticky;
-  bottom: 0;
-  left: 0;
+  //position: sticky;
+  //bottom: 0;
+  //left: 0;
   z-index: 2;
   display: block;
   // display: flex;