@pisell/private-materials 3.3.55 → 3.3.57

package/es/components/appointmentBooking/locales.d.ts

@@ -106,6 +106,7 @@ declare const _default: {
         'pisell2.appointment.add-guests': string;
         'pisell2.appointment.policy': string;
         'pisell2.appointment.policy.confirm': string;
+        'pisell2.appointment.resource.tip': (val: string) => string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -223,6 +224,7 @@ declare const _default: {
         'pisell2.appointment.add-guests': string;
         'pisell2.appointment.policy': string;
         'pisell2.appointment.policy.confirm': string;
+        'pisell2.appointment.resource.tip': (val: string) => string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;
@@ -340,6 +342,7 @@ declare const _default: {
         'pisell2.appointment.add-guests': string;
         'pisell2.appointment.policy': string;
         'pisell2.appointment.policy.confirm': string;
+        'pisell2.appointment.resource.tip': (val: string) => string;
         'pisell2.text.apply': string;
         'pisell2.text.goodpass': string;
         'pisell2.text.goodpass.product-vouchers': string;

package/es/components/appointmentBooking/locales.js

@@ -122,6 +122,9 @@ export default {
     'pisell2.appointment.add-guests': 'Add guests',
     'pisell2.appointment.policy': 'You have read and agreed to this policy',
     'pisell2.appointment.policy.confirm': 'Confirm',
+    'pisell2.appointment.resource.tip': function pisell2AppointmentResourceTip(val) {
+      return "Tip: Change ".concat(val || 'resource', " using the dropdown in the cart.");
+    },
     'pisell2.text.apply': 'Apply',
     'pisell2.text.goodpass': 'GoodPass',
     'pisell2.text.goodpass.product-vouchers': 'Product Vouchers',
@@ -255,6 +258,9 @@ export default {
     'pisell2.appointment.add-guests': '添加预约人',
     'pisell2.appointment.policy': '您已仔细阅读并同意此协议',
     'pisell2.appointment.policy.confirm': '确定',
+    'pisell2.appointment.resource.tip': function pisell2AppointmentResourceTip(val) {
+      return "\u63D0\u793A\uFF1A\u5728\u53F3\u4FA7\u8D2D\u7269\u8F66\u4E2D\uFF0C\u901A\u8FC7\u4E0B\u62C9\u6846\u4FEE\u6539\u201C".concat(val || '资源', "\u201D");
+    },
     'pisell2.text.apply': '应用',
     'pisell2.text.goodpass': '商品券',
     'pisell2.text.goodpass.product-vouchers': '商品兑换券',
@@ -388,6 +394,9 @@ export default {
     'pisell2.appointment.add-guests': '添加預約人',
     'pisell2.appointment.policy': '您已仔細閱讀並同意此協議',
     'pisell2.appointment.policy.confirm': '確定',
+    'pisell2.appointment.resource.tip': function pisell2AppointmentResourceTip(val) {
+      return "\u63D0\u793A\uFF1A\u5728\u53F3\u5074\u8CFC\u7269\u8ECA\u4E2D\uFF0C\u900F\u904E\u4E0B\u62C9\u6846\u4FEE\u6539\u201C".concat(val || '資源', "\u201D");
+    },
     'pisell2.text.apply': '應用',
     'pisell2.text.goodpass': '商品券',
     'pisell2.text.goodpass.product-vouchers': '商品兌換券',

package/es/components/booking/components/TabProduct/productItem/index.js

@@ -1,7 +1,9 @@
 import React, { useMemo } from 'react';
-import { formatAmount, image, locales } from '@pisell/utils';
+import { image, locales } from '@pisell/utils';
 import classNames from 'classnames';
 import { getDiscountTime } from "../../../utils";
+import Decimal from 'decimal.js';
+import PisellPriceText from "../../../../productSelect/components/pisellPriceText";
 import "./index.less";
 var ProductItem = function ProductItem(_ref) {
   var item = _ref.item,
@@ -9,6 +11,13 @@ var ProductItem = function ProductItem(_ref) {
     amountSymbol = _ref.amountSymbol,
     style = _ref.style,
     className = _ref.className;
+  var price = item.price,
+    is_bundle = item.is_bundle,
+    minimum_markup_price = item.minimum_markup_price;
+  var _price = price;
+  if (is_bundle) {
+    _price = new Decimal(price).plus(new Decimal(minimum_markup_price)).toFixed(2);
+  }
   var stockText = useMemo(function () {
     if (item.is_track === 0) {
       return false;
@@ -45,6 +54,9 @@ var ProductItem = function ProductItem(_ref) {
     className: "server-product-time"
   }, stockText), /*#__PURE__*/React.createElement("div", {
     className: "server-product-price"
-  }, formatAmount(item.price, 2, amountSymbol))));
+  }, /*#__PURE__*/React.createElement(PisellPriceText, {
+    value: _price,
+    isMini: is_bundle
+  }))));
 };
 export default ProductItem;

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

@@ -16,7 +16,9 @@ var Drawer = function Drawer(props) {
   var _props$hideScrollBar = props.hideScrollBar,
     hideScrollBar = _props$hideScrollBar === void 0 ? true : _props$hideScrollBar,
     _props$showGoBack = props.showGoBack,
-    showGoBack = _props$showGoBack === void 0 ? true : _props$showGoBack;
+    showGoBack = _props$showGoBack === void 0 ? true : _props$showGoBack,
+    _props$mask = props.mask,
+    mask = _props$mask === void 0 ? false : _props$mask;
   return /*#__PURE__*/React.createElement(OriginDrawer, _extends({
     width: '600px',
     closable: false,
@@ -30,7 +32,7 @@ var Drawer = function Drawer(props) {
       padding: 0
     },
     push: false,
-    mask: false
+    mask: mask
   }), /*#__PURE__*/React.createElement("div", {
     className: classNames('pisell-lowcode__booking-drawer-title-wrap')
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -517,7 +517,7 @@ var Footer = function Footer(props) {
             }
           case 32:
             // 回调关闭弹窗
-            state === null || state === void 0 || state.callback(callbackData);
+            state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要

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

@@ -22,7 +22,7 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { PisellInput, PisellGoodPassCard, PisellToast } from '@pisell/materials';
 import { useIsBooking4Shop } from "../../hooks/useIsBooking4Shop";
 import "./index.less";
-import { useMemoizedFn } from "ahooks";
+import { useMemoizedFn, useDebounceFn } from 'ahooks';
 var ShopDiscountHooks = {
   onInited: 'shopDiscount:onInited',
   onDestroy: 'shopDiscount:onDestroy',
@@ -98,25 +98,33 @@ var VoucherCard = function VoucherCard(props) {
     });
     return val;
   }, [state.service.value]);
+  var _useDebounceFn = useDebounceFn(function () {
+      var _state$service;
+      // console.log('state.service.value1', state.service.value);
+      if (productRef.current === state.service.value || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
+        return;
+      }
+      if (isBooking4Shop) {
+        var val = shopDiscount.calcDiscount(state.service.value);
+        // console.log('input: ', state.service.value);
+        // console.log('output: ', val);
+        productRef.current = val.productList;
+        // console.log('val.productList', val.productList);
+        dispatch({
+          type: 'setService',
+          payload: _objectSpread(_objectSpread({}, services), {}, {
+            value: ((val === null || val === void 0 ? void 0 : val.productList) || []).filter(Boolean)
+          })
+        });
+      }
+    }, {
+      wait: 500
+    }),
+    run = _useDebounceFn.run;
 
   // 更新productList
   useEffect(function () {
-    var _state$service;
-    if (productRef.current === state.service.value || !((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length)) {
-      return;
-    }
-    if (isBooking4Shop) {
-      var val = shopDiscount.calcDiscount(state.service.value);
-      console.log('input: ', state.service.value);
-      console.log('output: ', val);
-      productRef.current = val.productList;
-      dispatch({
-        type: 'setService',
-        payload: _objectSpread(_objectSpread({}, services), {}, {
-          value: ((val === null || val === void 0 ? void 0 : val.productList) || []).filter(Boolean)
-        })
-      });
-    }
+    run();
   }, [JSON.stringify(serviceMemo), isBooking4Shop]);
   var fn = useMemoizedFn(function (result) {
     var _result$productList;

package/es/components/booking/info/client/index.js

@@ -401,7 +401,8 @@ var Client = function Client() {
       isPreview: false,
       drawerProps: {
         title: locales.getText('pisell2.text.select-customer'),
-        destroyOnClose: true
+        destroyOnClose: true,
+        mask: state.drawerMask
       },
       mode: "single",
       createItemText: locales.getText('pisell2.text.create-new-customer'),

package/es/components/booking/info/pet/index.js

@@ -623,6 +623,9 @@ var Pet = function Pet(props) {
           form_id: formDataConfig === null || formDataConfig === void 0 ? void 0 : formDataConfig.form_id
         })].concat(_toConsumableArray(((_state$pet11 = state.pet) === null || _state$pet11 === void 0 || (_state$pet11 = _state$pet11.formData) === null || _state$pet11 === void 0 || (_state$pet11 = _state$pet11[0]) === null || _state$pet11 === void 0 ? void 0 : _state$pet11.options) || [])));
       },
+      drawerProps: {
+        mask: state.drawerMask
+      },
       getHolders: getHolders,
       addCallbackService: _addCallback,
       loading: valueLoading,

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

@@ -540,7 +540,7 @@ export var isAllNormalProductByState = function isAllNormalProductByState(state)
   return isAllNormalProduct(state.service.value);
 };
 var getGeneralParams = function getGeneralParams(item, state, isParallelResource) {
-  var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8;
+  var _formData$, _item$_extend5, _item$_extend6, _item$_extend7, _item$_extend8, _item$_extend9;
   var pet = state.pet,
     service = state.service;
   var _ref8 = pet || {},
@@ -614,7 +614,8 @@ var getGeneralParams = function getGeneralParams(item, state, isParallelResource
     addHolderButtonText: (formData === null || formData === void 0 || (_formData$ = formData[0]) === null || _formData$ === void 0 || (_formData$ = _formData$.form) === null || _formData$ === void 0 ? void 0 : _formData$.title) || "",
     holder_id: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.holder_id,
     start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.startDate : "",
-    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date) : ""
+    end_date: !isNormalProduct ? (item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.endDate) || (item === null || item === void 0 || (_item$_extend8 = item._extend) === null || _item$_extend8 === void 0 ? void 0 : _item$_extend8.end_date) : "",
+    rowKey: "rowKey-".concat(item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 || (_item$_extend9 = _item$_extend9.other) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.rowKey)
   }, parallelResourceOtherParams);
 };
 var calcAddTimeTotalPrice = function calcAddTimeTotalPrice(total, addTimeProducts) {
@@ -637,50 +638,49 @@ export var formatProducts = function formatProducts(lists, state) {
   var normalList = [];
   var groupList = [];
   var formItem = function formItem(item) {
-    var _item$_extend9, _item$_extend10, _item$_extend11, _item$_extend13, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _resourceItem, _item$_extend22, _item$_extend23, _item$_extend24, _item$_extend25, _item$_extend26;
+    var _item$_extend10, _item$_extend11, _item$_extend12, _item$_extend14, _item$_extend15, _item$_extend16, _item$_extend17, _item$_extend18, _item$_extend19, _item$_extend20, _item$_extend21, _item$_extend22, _resourceItem, _item$_extend23, _item$_extend24, _item$_extend25, _item$_extend26, _item$_extend27;
     var _isDayBookingProduct = isDayBookingProduct(item, state);
-    var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend9 = item._extend) === null || _item$_extend9 === void 0 ? void 0 : _item$_extend9.holder_id);
-    var options = formatOptions(item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 || (_item$_extend10 = _item$_extend10.other) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.option);
-    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.bundle);
+    var clientTitle = getHolderName(state, item === null || item === void 0 || (_item$_extend10 = item._extend) === null || _item$_extend10 === void 0 ? void 0 : _item$_extend10.holder_id);
+    var options = formatOptions(item === null || item === void 0 || (_item$_extend11 = item._extend) === null || _item$_extend11 === void 0 || (_item$_extend11 = _item$_extend11.other) === null || _item$_extend11 === void 0 ? void 0 : _item$_extend11.option);
+    var bundle = formatBundle(item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 || (_item$_extend12 = _item$_extend12.other) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.bundle);
     // 是否是普通商品
     var isNormalProduct = !appointmentTypes.includes(item === null || item === void 0 ? void 0 : item.extension_type) || (state === null || state === void 0 ? void 0 : state.renderType) === 'eventBooking';
     var resourceItem = {};
     var errorMessage = '';
     if (_isDayBookingProduct || isGeneral) {
-      var _item$_extend12;
-      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend12 = item._extend) === null || _item$_extend12 === void 0 ? void 0 : _item$_extend12.resource, state);
+      var _item$_extend13;
+      resourceItem = getResourceItem(item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.resource, state);
       errorMessage = getErrorMessage(item, resourceItem, isDayBooking(state));
     }
     var generalParams = isGeneral ? getGeneralParams(item, state, !!isParallelResource) : {};
-    console.log(isNormalProduct, 'isNormalProduct');
     return _objectSpread(_objectSpread({
       id: item === null || item === void 0 ? void 0 : item.id,
       _id: item === null || item === void 0 ? void 0 : item._id,
       name: item === null || item === void 0 ? void 0 : item.title,
-      price: item === null || item === void 0 || (_item$_extend13 = item._extend) === null || _item$_extend13 === void 0 ? void 0 : _item$_extend13.price,
-      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.total, item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.relation_details),
-      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.origin_total, item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.relation_details),
+      price: item === null || item === void 0 || (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.price,
+      total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.total, item === null || item === void 0 || (_item$_extend16 = item._extend) === null || _item$_extend16 === void 0 ? void 0 : _item$_extend16.relation_details),
+      origin_total: calcAddTimeTotalPrice(item === null || item === void 0 || (_item$_extend17 = item._extend) === null || _item$_extend17 === void 0 ? void 0 : _item$_extend17.origin_total, item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.relation_details),
       num: item === null || item === void 0 ? void 0 : item._extend.quantity,
       image: item === null || item === void 0 ? void 0 : item.cover,
       isShowNote: true,
       note: item === null || item === void 0 ? void 0 : item.note,
-      like_status: item === null || item === void 0 || (_item$_extend18 = item._extend) === null || _item$_extend18 === void 0 ? void 0 : _item$_extend18.like_status,
+      like_status: item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.like_status,
       bundle: bundle,
       options: options,
       errorMessage: errorMessage,
-      product_option_string: item === null || item === void 0 || (_item$_extend19 = item._extend) === null || _item$_extend19 === void 0 || (_item$_extend19 = _item$_extend19.other) === null || _item$_extend19 === void 0 ? void 0 : _item$_extend19.product_option_string,
-      discount_reason: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.discount_reason,
-      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.resource,
+      product_option_string: item === null || item === void 0 || (_item$_extend20 = item._extend) === null || _item$_extend20 === void 0 || (_item$_extend20 = _item$_extend20.other) === null || _item$_extend20 === void 0 ? void 0 : _item$_extend20.product_option_string,
+      discount_reason: item === null || item === void 0 || (_item$_extend21 = item._extend) === null || _item$_extend21 === void 0 ? void 0 : _item$_extend21.discount_reason,
+      resource_id: isNormalProduct ? 0 : item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.resource,
       relation_form_name: isNormalProduct ? '' : ((_resourceItem = resourceItem) === null || _resourceItem === void 0 ? void 0 : _resourceItem.labelText) || item.relation_form_name,
       holder_title: clientTitle,
-      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend22 = item._extend) === null || _item$_extend22 === void 0 ? void 0 : _item$_extend22.start_date : '',
-      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.end_date : '',
-      holder_id: (item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.holder_id) || 0,
+      start_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend23 = item._extend) === null || _item$_extend23 === void 0 ? void 0 : _item$_extend23.start_date : '',
+      end_date: !isNormalProduct ? item === null || item === void 0 || (_item$_extend24 = item._extend) === null || _item$_extend24 === void 0 ? void 0 : _item$_extend24.end_date : '',
+      holder_id: (item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.holder_id) || 0,
       isNormalProduct: isNormalProduct,
       locale: state.locale,
       symbol: state.amountSymbol,
-      relation_products: (item === null || item === void 0 || (_item$_extend25 = item._extend) === null || _item$_extend25 === void 0 ? void 0 : _item$_extend25.relation_details) || [],
-      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.items) || [])
+      relation_products: (item === null || item === void 0 || (_item$_extend26 = item._extend) === null || _item$_extend26 === void 0 ? void 0 : _item$_extend26.relation_details) || [],
+      items: isEventBooking(state) ? [] : formItems((item === null || item === void 0 || (_item$_extend27 = item._extend) === null || _item$_extend27 === void 0 ? void 0 : _item$_extend27.items) || [])
     }, generalParams), {}, {
       _origin: item
     });
@@ -688,8 +688,8 @@ export var formatProducts = function formatProducts(lists, state) {
 
   // 将商品分为组商品和非组商品
   lists.forEach(function (item) {
-    var _item$_extend27;
-    if (!(item !== null && item !== void 0 && (_item$_extend27 = item._extend) !== null && _item$_extend27 !== void 0 && _item$_extend27.groupId)) {
+    var _item$_extend28;
+    if (!(item !== null && item !== void 0 && (_item$_extend28 = item._extend) !== null && _item$_extend28 !== void 0 && _item$_extend28.groupId)) {
       normalList.push(formItem(item));
     } else {
       groupList.push(item);
@@ -698,8 +698,8 @@ export var formatProducts = function formatProducts(lists, state) {
 
   // 根据item._extend.groupId 进行分组
   var groups = groupList.reduce(function (prev, item) {
-    var _item$_extend28;
-    var groupId = item === null || item === void 0 || (_item$_extend28 = item._extend) === null || _item$_extend28 === void 0 ? void 0 : _item$_extend28.groupId;
+    var _item$_extend29;
+    var groupId = item === null || item === void 0 || (_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.groupId;
     if (!prev[groupId]) {
       prev[groupId] = [];
     }
@@ -869,8 +869,8 @@ export var isHasDayAppointmentProduct = function isHasDayAppointmentProduct(stat
       // 如果该购物车中没选择任何商品，则不需要验证，所以直接用1来填充
       // services: !holderProducts?.length ? [1] : holderProducts?.filter((d: any) => appointmentTypes.includes(d.extension_type))
       services: services.filter(function (item) {
-        var _item$_extend29;
-        return ((_item$_extend29 = item._extend) === null || _item$_extend29 === void 0 ? void 0 : _item$_extend29.holder_id) == d.form_record_id && checkType(item.extension_type);
+        var _item$_extend30;
+        return ((_item$_extend30 = item._extend) === null || _item$_extend30 === void 0 ? void 0 : _item$_extend30.holder_id) == d.form_record_id && checkType(item.extension_type);
       })
     });
   });

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

@@ -27,8 +27,8 @@ import { updateServiceDate } from "../info/date";
 import useEngineContext from "../../../hooks/useEngineContext";
 import Notes from "../info/notes";
 import "../info/index.less";
-import { Skeleton } from "antd";
-import classNames from "classnames";
+import { Skeleton } from 'antd';
+import classNames from 'classnames';
 import useCreateBookingPageHeader from "../hooks/useCreateBookingPageHeader";
 import { getLocale } from "../../../utils/locales";
 var defaultModules = {
@@ -76,7 +76,7 @@ var Info = Provider(function (props) {
       });
     }
   }, []);
-  useEffect(function () {
+  useMemo(function () {
     var _context$appHelper, _context$appHelper$ge, _context$appHelper2, _context$appHelper2$i, _context$appHelper3;
     var isFranchisee = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.businessUtils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getAppByModal) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper, 'franchisee');
     modal.dispatch({

package/es/components/booking/info2/service/addService/utils.d.ts

@@ -77,7 +77,7 @@ export declare const setDefaultCapacitys: ({ capacitys, cacheItem }: any) => any
  * @Author: zhiwei.Wang
  * @Date: 2024-06-01 13:25
  */
-export declare const getProductExtend: ({ cacheItem, state }: any) => any;
+export declare const getProductExtend: ({ cacheItem, state, isDisabledTime }: any) => any;
 /**
  * @title: 格式化服务列表
  * @description: 后端列表返回的product_resource.resources 的optional_resource等不是最新数据

package/es/components/booking/info2/service/addService/utils.js

@@ -472,7 +472,8 @@ var getIsAutoClose = function getIsAutoClose(cacheItem) {
  */
 export var getProductExtend = function getProductExtend(_ref10) {
   var cacheItem = _ref10.cacheItem,
-    state = _ref10.state;
+    state = _ref10.state,
+    isDisabledTime = _ref10.isDisabledTime;
   // 有endDate 说明是在编辑已经保存过的商品, 没有则是编辑还没保存过的商品
   var isNew = cacheItem.new || !cacheItem._extend.endDate;
   var _cacheItem = _objectSpread({}, cacheItem);
@@ -552,7 +553,9 @@ export var getProductExtend = function getProductExtend(_ref10) {
     if (_cacheItem._extend.bundle_edit !== undefined) {
       _cacheItem._extend.bundle_edit = 1;
     }
-    _cacheItem._time = new Date().getTime();
+    if (!isDisabledTime) {
+      _cacheItem._time = new Date().getTime();
+    }
   } else {
     // if (!_cacheItem._data.timeObj) {
     // _cacheItem._data.timeObj = getTimeObj({

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

@@ -539,6 +539,7 @@ var Info = function Info(_, ref) {
     ,
     zIndex: state.service.changeService ? 999 : 1000,
     forceRender: true,
+    mask: state.drawerMask,
     open: state.service.editModal && !((_state$service$cacheI6 = state.service.cacheItem) !== null && _state$service$cacheI6 !== void 0 && _state$service$cacheI6.autoClose),
     title: locales.getText('pisell2.text.edit-service'),
     onClose: function onClose() {

package/es/components/eventBooking/components/Provider/Header/index.d.ts

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

package/es/components/eventBooking/components/bookingDetailModal/components/BookingOptions.js

@@ -3,6 +3,8 @@ import OpenCard from "../../OpenCard";
 import { PisellCheckboxGroup, PisellText } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import { useEventDetail } from "../../../../Sales";
+import Decimal from 'decimal.js';
+import PisellPriceText from "../../../../productSelect/components/pisellPriceText";
 var BookingOptions = function BookingOptions(props) {
   var _detail$bookingOption, _detail$bookingOption2;
   var _useEventDetail = useEventDetail(),
@@ -27,12 +29,29 @@ var BookingOptions = function BookingOptions(props) {
     optionClassName: "option-item ".concat((detail === null || detail === void 0 || (_detail$bookingOption2 = detail.bookingOptions) === null || _detail$bookingOption2 === void 0 ? void 0 : _detail$bookingOption2.length) > 1 ? 'option-item-pointer' : ''),
     value: currentBookingOption,
     renderOption: function renderOption(option) {
+      var _ref = option._originData || {},
+        price = _ref.price,
+        is_bundle = _ref.is_bundle,
+        minimum_markup_price = _ref.minimum_markup_price;
+      if (!option._originData || !is_bundle) {
+        return /*#__PURE__*/React.createElement("div", {
+          className: "item"
+        }, /*#__PURE__*/React.createElement("span", null, option.label), /*#__PURE__*/React.createElement(PisellText.Amount, {
+          value: option.price,
+          showCurrencySymbol: true,
+          className: "price"
+        }));
+      }
+      var _price = price;
+      if (is_bundle) {
+        _price = new Decimal(price).plus(new Decimal(minimum_markup_price)).toFixed(2);
+      }
       return /*#__PURE__*/React.createElement("div", {
         className: "item"
-      }, /*#__PURE__*/React.createElement("span", null, option.label), /*#__PURE__*/React.createElement(PisellText.Amount, {
-        value: option.price,
-        showCurrencySymbol: true,
-        className: "price"
+      }, /*#__PURE__*/React.createElement("span", null, option.label), /*#__PURE__*/React.createElement(PisellPriceText, {
+        className: "price",
+        value: _price,
+        isMini: true
       }));
     },
     onChange: onChange

package/es/components/eventBooking/components/progressBar/index.js

@@ -9,7 +9,9 @@ import { PisellHeaderProgressBar, PisellModal } from '@pisell/materials';
 import { useSales } from "../../../Sales";
 import { locales } from '@pisell/utils';
 import "./index.less";
+import useEngineContext from "../../../../hooks/useEngineContext";
 var ProgressBar = function ProgressBar(_ref) {
+  var _context$appHelper;
   var title = _ref.title,
     description = _ref.description,
     _ref$showClose = _ref.showClose,
@@ -29,6 +31,9 @@ var ProgressBar = function ProgressBar(_ref) {
     setOpen = _useState2[1];
   var _useSales = useSales(),
     removeSessionStorage = _useSales.removeSessionStorage;
+  var context = useEngineContext();
+  var _ref2 = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
+    interaction = _ref2.interaction;
 
   /**
    * @title: 点击关闭
@@ -54,6 +59,17 @@ var ProgressBar = function ProgressBar(_ref) {
    * @Date: 2025-02-10 17:46
    */
   var handleOk = function handleOk() {
+    var _interaction$utils, _interaction$utils$is;
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils)) {
+      interaction.utils.postMessageToApp({
+        module: 'global',
+        key: 'paymentResultAction',
+        data: {
+          actionType: 'backHome'
+        }
+      });
+      return;
+    }
     onClose === null || onClose === void 0 || onClose();
     setOpen(false);
     // 清空数据

package/es/components/eventBooking/index.d.ts

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

package/es/components/pay/toC/PaymentList/index.js

@@ -36,7 +36,7 @@ var offline = ['pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.cust
  * @Date: 2024-08-16 10:52
  */
 var PaymentList = function PaymentList(props, ref) {
-  var _props$store2, _props$store4;
+  var _context$appHelper, _props$store2, _props$store4;
   // 支付列表
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -53,6 +53,8 @@ var PaymentList = function PaymentList(props, ref) {
     loading = _useState6[0],
     setLoading = _useState6[1];
   var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    interaction = _context$appHelper$ut.interaction;
 
   // 支付列表, 补充图标 兼容受控方式
   var _paymentList = useMemo(function () {
@@ -139,6 +141,10 @@ var PaymentList = function PaymentList(props, ref) {
     setPaymentList(list);
     return list;
   };
+  var isApp = useMemo(function () {
+    var _interaction$utils, _interaction$utils$is;
+    return interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils);
+  }, []);
 
   /**
    * @title: 唯一初始化
@@ -149,13 +155,13 @@ var PaymentList = function PaymentList(props, ref) {
    * @Date: 2024-08-16 10:53
    */
   var init = function init(list) {
-    var _context$appHelper;
+    var _context$appHelper2;
     // 打开loading
     setLoading(true);
-    var platform = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.constants) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.platform) || 'h5';
+    var platform = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.constants) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.platform) || 'h5';
 
     // 过滤数据
-    var _filterPaymentList = filterPaymentList(list, platform),
+    var _filterPaymentList = filterPaymentList(list, platform, isApp),
       paymentList = _filterPaymentList.paymentList,
       walletPass = _filterPaymentList.walletPass;
 

package/es/components/pay/toC/PaymentList/serve.d.ts

@@ -20,7 +20,7 @@ export declare const getPaymentList: (values: any) => Promise<{
  * @Author: zhiwei.Wang
  * @Date: 2024-08-16 10:57
  */
-export declare const filterPaymentList: (list: any[], platform?: string) => {
+export declare const filterPaymentList: (list: any[], platform: string | undefined, isApp: boolean) => {
     message: string;
     status: string;
     paymentList: any[];

package/es/components/pay/toC/PaymentList/serve.js

@@ -60,6 +60,7 @@ export var getPaymentList = /*#__PURE__*/function () {
  */
 export var filterPaymentList = function filterPaymentList(list) {
   var platform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'h5';
+  var isApp = arguments.length > 2 ? arguments[2] : undefined;
   var paymentList = _toConsumableArray(list);
   var _paymentKeys = _toConsumableArray(paymentKeys);
 
@@ -77,7 +78,7 @@ export var filterPaymentList = function filterPaymentList(list) {
   // }
 
   // 非微信环境隐藏微信支付
-  if (!isWx()) {
+  if (!isWx() && !isApp) {
     arr = arr.concat(['globepay.wechat.jsapi', 'superpay.wechat.h5']);
   }
 
@@ -96,6 +97,11 @@ export var filterPaymentList = function filterPaymentList(list) {
     arr = arr.concat(['mw.apple']);
   }
 
+  // iosApp内不展示谷歌支付
+  if (isIOS() && isApp) {
+    arr = arr.concat(['mw.google']);
+  }
+
   // 删除以上key
   _paymentKeys = _paymentKeys.filter(function (d) {
     return !arr.includes(d);