@pisell/private-materials 6.3.113 → 6.3.115

package/es/components/authentication/admin/POSOperatorAuth/locales.js

@@ -61,35 +61,5 @@ export default {
     // Messages
     'auth.save.success': '設置保存成功',
     'auth.save.error': '設置保存失敗'
-  },
-  ja: {
-    'pos.operator.auth.title': 'POSオペレーター認証',
-    'pos.operator.auth.description': 'POS端末および販売時点管理システムを使用するスタッフの認証方法を設定します。',
-    'pos.operator.auth.methods.title': '認証方法',
-    'pos.operator.auth.methods.description': 'POS端末および販売時点管理システムを使用するスタッフの認証方法を設定します。ドラッグして優先順位を変更します。',
-    'auth.method.digit_id_pin.title': '数字ID + PIN',
-    'auth.method.digit_id_pin.description': '従業員IDとPINコードでクイックログイン',
-    'auth.button.cancel': 'キャンセル',
-    'auth.button.save': '保存',
-    'auth.button.settings': '設定',
-    'auth.category.general': '一般',
-    'auth.category.passwordFree': 'パスワードなし',
-    'auth.save.success': '設定が正常に保存されました',
-    'auth.save.error': '設定の保存に失敗しました'
-  },
-  pt: {
-    'pos.operator.auth.title': 'Autenticação de Operador POS',
-    'pos.operator.auth.description': 'Configure métodos de autenticação para funcionários que usam terminais POS e sistemas de ponto de venda.',
-    'pos.operator.auth.methods.title': 'Métodos de Autenticação',
-    'pos.operator.auth.methods.description': 'Configure métodos de autenticação para funcionários que usam terminais POS e sistemas de ponto de venda. Arraste para reordenar por prioridade.',
-    'auth.method.digit_id_pin.title': 'ID Digital + PIN',
-    'auth.method.digit_id_pin.description': 'Login rápido com ID do funcionário e código PIN',
-    'auth.button.cancel': 'Cancelar',
-    'auth.button.save': 'Salvar',
-    'auth.button.settings': 'Configurações',
-    'auth.category.general': 'Geral',
-    'auth.category.passwordFree': 'Sem senha',
-    'auth.save.success': 'Configurações salvas com sucesso',
-    'auth.save.error': 'Falha ao salvar configurações'
   }
 };

package/es/components/authentication/admin/SaaSAdminAuth/locales.js

@@ -70,39 +70,5 @@ export default {
     // Category badges
     'auth.category.general': '通用',
     'auth.category.oauth': 'OAuth'
-  },
-  ja: {
-    'saas.admin.auth.title': 'SaaSプラットフォーム管理者認証',
-    'saas.admin.auth.description': 'SaaSプラットフォーム管理者ポータルおよびその他の管理チャネルの認証方法を設定します。',
-    'saas.admin.auth.methods.title': '認証方法',
-    'saas.admin.auth.methods.description': 'SaaSプラットフォーム管理者が利用できる認証方法を設定します。ドラッグして優先順位を変更します。',
-    'saas.admin.password.settings.title': 'パスワード設定',
-    'saas.admin.password.settings.description': 'SaaSプラットフォーム管理者アカウント専用のパスワード要件を設定します。これらのルールはすべてのプラットフォーム管理ユーザーに適用されます。',
-    'auth.button.cancel': 'キャンセル',
-    'auth.button.save': '保存',
-    'auth.button.settings': '設定',
-    'auth.save.success': '設定が正常に保存されました',
-    'auth.save.error': '設定の保存に失敗しました',
-    'auth.oauth.config.message': 'まず認証設定ページでOAuth設定を設定してください',
-    'auth.oauth.config.link': '設定をクリック',
-    'auth.category.general': '一般',
-    'auth.category.oauth': 'OAuth'
-  },
-  pt: {
-    'saas.admin.auth.title': 'Autenticação de Administrador da Plataforma SaaS',
-    'saas.admin.auth.description': 'Configure métodos de autenticação para o portal de administrador da plataforma SaaS e outros canais administrativos.',
-    'saas.admin.auth.methods.title': 'Métodos de Autenticação',
-    'saas.admin.auth.methods.description': 'Configure métodos de autenticação que estarão disponíveis para administradores da plataforma SaaS. Arraste para reordenar por prioridade.',
-    'saas.admin.password.settings.title': 'Configurações de Senha',
-    'saas.admin.password.settings.description': 'Configure requisitos de senha especificamente para contas de administrador da plataforma SaaS. Essas regras se aplicam a todos os usuários administrativos da plataforma.',
-    'auth.button.cancel': 'Cancelar',
-    'auth.button.save': 'Salvar',
-    'auth.button.settings': 'Configurações',
-    'auth.save.success': 'Configurações salvas com sucesso',
-    'auth.save.error': 'Falha ao salvar configurações',
-    'auth.oauth.config.message': 'Configure as configurações OAuth na página de Configuração de Autenticação primeiro',
-    'auth.oauth.config.link': 'clique para configurar',
-    'auth.category.general': 'Geral',
-    'auth.category.oauth': 'OAuth'
   }
 };

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

@@ -427,7 +427,7 @@ var Footer = function Footer(props) {
    */
   var handleSave = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref4) {
-      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, loadingTimer, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window, callbackData, values, api;
+      var type, _ref4$messageShow, messageShow, isHasDayProducts, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window, callbackData, values, api;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -452,31 +452,27 @@ var Footer = function Footer(props) {
             // 区分loading, 是点击的checkout 还是save
             _setLoading = type === 'checkout' ? setCheckoutLoading : setLoading;
             _setLoading(true);
-            // 超时保护: 超过20秒自动关闭loading
-            loadingTimer = setTimeout(function () {
-              _setLoading(false);
-            }, 20000);
             _getApis = getApis(), createBooking = _getApis.createBooking, editBooking = _getApis.editBooking;
             editApi = state.renderType === 'eventBooking' ? editEventBooking : editBooking;
             createApi = state.renderType === 'eventBooking' ? createEventBooking : createBooking;
             saveOtherValue = {};
             if (!(type === 'save')) {
-              _context4.next = 21;
+              _context4.next = 20;
               break;
             }
-            _context4.next = 17;
+            _context4.next = 16;
             return state === null || state === void 0 || (_state$onSave = state.onSave) === null || _state$onSave === void 0 ? void 0 : _state$onSave.call(state, state.client);
-          case 17:
+          case 16:
             _context4.t0 = _context4.sent;
             if (_context4.t0) {
-              _context4.next = 20;
+              _context4.next = 19;
               break;
             }
             _context4.t0 = {};
-          case 20:
+          case 19:
             saveOtherValue = _context4.t0;
-          case 21:
-            _context4.prev = 21;
+          case 20:
+            _context4.prev = 20;
             callbackData = null; // 格式化提交的参数
             values = formatValues(_objectSpread(_objectSpread({}, state), saveOtherValue)); // 区分是新增还是编辑
             api = state.bookingId ? editApi : createApi; // 增加日志记录
@@ -532,45 +528,43 @@ var Footer = function Footer(props) {
 
             // 如果有addons改动, 则先保存
             if (!addonsEdit) {
-              _context4.next = 29;
+              _context4.next = 28;
               break;
             }
-            _context4.next = 29;
+            _context4.next = 28;
             return handleSaveAddons();
-          case 29:
+          case 28:
             if (!infoEdit) {
-              _context4.next = 34;
+              _context4.next = 33;
               break;
             }
-            _context4.next = 32;
+            _context4.next = 31;
             return api(values, state.bookingId);
-          case 32:
+          case 31:
             callbackData = _context4.sent;
             if (messageShow) {
               message.success(locales.getText(state.bookingId ? 'pisell2.text.appointment-updated' : 'pisell2.text.created-successfully'));
             }
-          case 34:
+          case 33:
             // 回调关闭弹窗
             state === null || state === void 0 || state.callback(callbackData, type);
-            clearTimeout(loadingTimer);
             _setLoading(false);
 
             // return数据  checkout时需要
             return _context4.abrupt("return", callbackData || values);
-          case 40:
-            _context4.prev = 40;
-            _context4.t1 = _context4["catch"](21);
+          case 38:
+            _context4.prev = 38;
+            _context4.t1 = _context4["catch"](20);
             console.log(_context4.t1);
             if ((_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.code) === 70101) {
               message.error(_context4.t1 === null || _context4.t1 === void 0 ? void 0 : _context4.t1.message);
             }
-            clearTimeout(loadingTimer);
             _setLoading(false);
-          case 46:
+          case 43:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[21, 40]]);
+      }, _callee4, null, [[20, 38]]);
     }));
     return function handleSave(_x2) {
       return _ref5.apply(this, arguments);

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

@@ -270,9 +270,9 @@ var formatHolders = function formatHolders(state, item, values) {
  * @Date: 2024-12-23 12:05
  */
 export var formatProductPrice = function formatProductPrice(item) {
-  var _item$_extend6, _item$price, _item$_extend7, _item$variant;
+  var _item$_extend6, _item$_extend7, _item$variant;
   var other = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.other;
-  var price = Number((_item$price = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price !== void 0 ? _item$price : item === null || item === void 0 || (_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
+  var price = Number((_item$_extend7 = item._extend) === null || _item$_extend7 === void 0 ? void 0 : _item$_extend7.price);
 
   // 组合规格: 根据当前选择的组合规格id 和商品的组合规格列表 获取当前商品的价格
   if ((other === null || other === void 0 ? void 0 : other.product_variant_id) > 0 && (item === null || item === void 0 || (_item$variant = item.variant) === null || _item$variant === void 0 ? void 0 : _item$variant.length) > 0) {
@@ -341,9 +341,9 @@ var formatMetaData = function formatMetaData(item, isMultiDayPrices) {
 
 // 获取商品价格 包含组合规格
 var getSourceProductPrice = function getSourceProductPrice(item) {
-  var _item$_extend14, _item$price2, _item$_extend15, _item$variant2;
+  var _item$_extend14, _item$_extend15, _item$variant2;
   var other = (_item$_extend14 = item._extend) === null || _item$_extend14 === void 0 ? void 0 : _item$_extend14.other;
-  var price = Number((_item$price2 = item === null || item === void 0 ? void 0 : item.price) !== null && _item$price2 !== void 0 ? _item$price2 : (_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.price);
+  var price = Number((_item$_extend15 = item._extend) === null || _item$_extend15 === void 0 ? void 0 : _item$_extend15.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) {

package/es/components/booking/editBookingModal/locales.js

@@ -16,17 +16,5 @@ export default {
     'pisell2.text.booking.confirm-changes': '確認預約變更',
     'pisell2.text.booking.time-change': '時間變更',
     'pisell2.text.booking.resource-change.detail': '資源變更詳情'
-  },
-  ja: {
-    'pisell2.text.login': 'ログイン',
-    'pisell2.text.booking.confirm-changes': '予約変更を確認',
-    'pisell2.text.booking.time-change': '時間変更',
-    'pisell2.text.booking.resource-change.detail': 'リソース変更の詳細'
-  },
-  pt: {
-    'pisell2.text.login': 'Login',
-    'pisell2.text.booking.confirm-changes': 'Confirmar Alterações na Reserva',
-    'pisell2.text.booking.time-change': 'Alteração de Horário',
-    'pisell2.text.booking.resource-change.detail': 'Detalhes da Alteração de Recurso'
   }
 };

package/es/components/booking/editBookingModal/mock.js

@@ -381,8 +381,6 @@ export var mockBooking = {
               "en": "Guests",
               "zh-CN": "人数",
               "zh-HK": "人數",
-              "ja": "ゲスト",
-              "pt": "Convidados",
               "original": "Guests"
             },
             "min": 1,
@@ -424,8 +422,6 @@ export var mockBooking = {
             "auto": "",
             "zh-CN": null,
             "zh-HK": null,
-            "ja": null,
-            "pt": null,
             "kitchen": null,
             "original": ""
           },
@@ -2549,8 +2545,6 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
-          "ja": null,
-          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },
@@ -2605,8 +2599,6 @@ export var mockProps = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
-              "ja": null,
-              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2639,8 +2631,6 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
-          "ja": null,
-          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },
@@ -2695,8 +2685,6 @@ export var mockProps = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
-              "ja": null,
-              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2729,8 +2717,6 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
-          "ja": null,
-          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },
@@ -2785,8 +2771,6 @@ export var mockProps = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
-              "ja": null,
-              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2819,8 +2803,6 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
-          "ja": null,
-          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },
@@ -2961,8 +2943,6 @@ export var mockProps = {
               "auto": "",
               "zh-CN": null,
               "zh-HK": null,
-              "ja": null,
-              "pt": null,
               "kitchen": null,
               "original": ""
             },
@@ -2995,8 +2975,6 @@ export var mockProps = {
           "auto": "预约商品-Wang",
           "zh-CN": null,
           "zh-HK": null,
-          "ja": null,
-          "pt": null,
           "kitchen": null,
           "original": "预约商品-Wang"
         },

package/es/components/booking/hooks/useClearCart.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-declare const useClearCart: (state: any, dispatch: any) => React.JSX.Element;
+declare const useClearCart: (state: any, dispatch: any) => false | React.JSX.Element;
 export default useClearCart;

package/es/components/booking/hooks/useClearCart.js

@@ -2,59 +2,29 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 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); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useMemo, useState, useCallback } from 'react';
+import React, { useMemo } from 'react';
 import classNames from 'classnames';
-import { Iconfont, PisellModal } from '@pisell/materials';
+import { Iconfont } from '@pisell/materials';
 import { locales } from "@pisell/utils";
 var useClearCart = function useClearCart(state, dispatch) {
   var _state$service3;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
-  var handleOpenModal = useCallback(function () {
-    setOpen(true);
-  }, []);
-  var handleConfirm = useCallback(function () {
+  var handleClear = function handleClear() {
+    // 清除购物车
     dispatch({
       type: 'setService',
       payload: {
         value: []
       }
     });
-    setOpen(false);
-  }, []);
-  var handleCancel = useCallback(function () {
-    setOpen(false);
-  }, []);
+  };
   return useMemo(function () {
     var _state$service, _state$service2;
-    var showClearBtn = !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit;
-    return /*#__PURE__*/React.createElement(React.Fragment, null, showClearBtn && /*#__PURE__*/React.createElement("span", {
+    return !!((_state$service = state.service) !== null && _state$service !== void 0 && (_state$service = _state$service.value) !== null && _state$service !== void 0 && _state$service.length) && !state.channelDisabledEdit && /*#__PURE__*/React.createElement("span", {
       className: classNames('pisell-lowcode__booking-service-clear-btn', _defineProperty({}, 'pisell-lowcode__booking-service-clear-btn-disabled', !((_state$service2 = state.service) !== null && _state$service2 !== void 0 && (_state$service2 = _state$service2.value) !== null && _state$service2 !== void 0 && _state$service2.length))),
-      onClick: handleOpenModal
+      onClick: handleClear
     }, /*#__PURE__*/React.createElement(Iconfont, {
       type: "pisell2-trash-01"
-    }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart'))), /*#__PURE__*/React.createElement(PisellModal, {
-      open: open,
-      platform: "pc",
-      title: locales.getText('pisell2.booking.info.text.clear-cart-modal.title'),
-      onOk: handleConfirm,
-      onCancel: handleCancel,
-      okText: locales.getText('pisell2.booking.info.text.clear-cart-modal.confirm'),
-      cancelText: locales.getText('pisell2.booking.info.text.clear-cart-modal.cancel'),
-      destroyOnClose: true
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        margin: '24px 0'
-      }
-    }, /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart-modal.content')))));
-  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length, state.channelDisabledEdit, open]);
+    }), " ", /*#__PURE__*/React.createElement("span", null, locales.getText('pisell2.booking.info.text.clear-cart')));
+  }, [(_state$service3 = state.service) === null || _state$service3 === void 0 || (_state$service3 = _state$service3.value) === null || _state$service3 === void 0 ? void 0 : _state$service3.length, state.channelDisabledEdit]);
 };
 export default useClearCart;

package/es/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/es/components/booking/info/header/index.js

@@ -52,19 +52,19 @@ var header = function header(_ref) {
   var statusList = [{
     label: locales.getText('pisell2.text.status.new'),
     key: 'new',
-    color: '#91caff'
+    color: '#079455'
   }, {
     label: locales.getText('pisell2.text.status.confirmed'),
     key: 'confirmed',
-    color: '#b7eb8f'
+    color: '#7F56D9'
   }, {
     label: locales.getText('pisell2.text.status.arrived'),
     key: 'arrived',
-    color: '#d3adf7'
+    color: '#088AB2'
   }, {
     label: locales.getText('pisell2.text.status.started'),
     key: 'started',
-    color: '#fffb8f'
+    color: '#155EEF'
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       style: {
@@ -72,7 +72,7 @@ var header = function header(_ref) {
       }
     }, locales.getText('pisell2.text.status.cancelled')),
     key: 'cancelled',
-    color: '#bfbfbf'
+    color: '#DC6803'
   }, {
     label: /*#__PURE__*/React.createElement("span", {
       style: {
@@ -80,11 +80,11 @@ var header = function header(_ref) {
       }
     }, locales.getText('pisell2.text.status.no_show')),
     key: 'no_show',
-    color: '#ffa39e'
+    color: '#D92D20'
   }, {
     label: locales.getText('pisell2.text.status.completed'),
     key: 'completed',
-    color: '#ffd591'
+    color: '#4A5578'
   }];
 
   // 销售渠道

package/es/components/booking/info/header/index.less

@@ -21,7 +21,7 @@
 
   .booking-order-sales-channel {
     width: 100%;
-    color: var(--Gray-900, #101828);
+    color: var(--Base-White, #FFF);
     font-size: 14px;
     font-style: normal;
     font-weight: 400;
@@ -37,7 +37,7 @@
   }
 
   .booking-header-left {
-    color: var(--Gray-900, #101828);
+    color: var(--Base-White, #FFF);
     font-size: 18px;
     font-style: normal;
     font-weight: 400;
@@ -48,17 +48,17 @@
       display: flex;
       align-items: center;
       gap: 10px;
-      color: var(--Gray-900, #101828) !important;
+      color: var(--Base-White, #FFF) !important;
       font-size: 18px;
       font-style: normal;
       font-weight: 400;
       cursor: pointer;
-      border: 1px solid var(--Gray-900, #101828);
+      border: 1px solid #fff;
       padding: 4px 12px;
       border-radius: 24px;
 
       span {
-        color: var(--Gray-900, #101828) !important;
+        color: var(--Base-White, #FFF) !important;
       }
 
       .booking-header-right-status-icon {

package/es/components/booking/info/service/index.less

@@ -8,10 +8,8 @@
     line-height: 24px; /* 150% */
     display: flex;
     align-items: center;
-    margin-bottom: 16px !important;
-    // padding: 12px 0;
-    padding: 0 !important;
-    width: max-content;
+    margin-bottom: 4px;
+    padding: 12px 0;
     .anticon {
       font-size: 18px;
       margin-right: 6px;

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

@@ -183,8 +183,6 @@ export default {
         "en": "",
         "zh-CN": "",
         "zh-HK": "",
-        "ja": "",
-        "pt": "",
         "original": "成人"
       },
       id: 1,
@@ -195,8 +193,6 @@ export default {
         "en": "",
         "zh-CN": "",
         "zh-HK": "",
-        "ja": "",
-        "pt": "",
         "original": "儿童"
       },
       id: 2,

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

@@ -36,8 +36,6 @@ import { PisellAdjustPriceInputNumber } from '@pisell/materials';
 import { editSessionProduct } from "../../../info/utils";
 import { isNormalProductByDurationSchedule } from "../../../info/service2/utils";
 import { addService, genServiceKey, getIsShowNumber } from "../../../../ticketBooking/utils";
-import { Decimal } from "decimal.js";
-import { setProductPrice } from "./utils";
 var submitLock = false;
 var Info = function Info(_, ref) {
   var _state$service4, _state$bookingConfig2, _state$bookingConfig3, _state$service$cacheI4, _state$service$cacheI5, _state$service6, _window$BaseMaterials, _state$service8, _state$service$cacheI10, _state$bookingConfig5, _state$service$cacheI11, _state$service$cacheI12, _state$service9, _state$service$resour2, _state$service$cacheI13, _state$service$cacheI14;
@@ -220,7 +218,7 @@ var Info = function Info(_, ref) {
    * @Date: 2024-01-09 14:04
    */
   var onFinish = function onFinish(values) {
-    var _resourcesRef$current, _item$_extend, _item2, _item$_extend2;
+    var _resourcesRef$current, _item$_extend;
     var isSuccess = (_resourcesRef$current = resourcesRef.current) === null || _resourcesRef$current === void 0 ? void 0 : _resourcesRef$current.check();
     if (isShowTimeAndResource && !isSuccess) {
       return;
@@ -251,41 +249,13 @@ var Info = function Info(_, ref) {
       endDate = _getServiceTimes.endDate;
     _extend.startDate = startDate;
     _extend.endDate = endDate;
-    if (isChangeTotal.current) {
-      var _extend$other, _extend$other2;
-      // 计算折扣比例
-      var discountRatio = new Decimal(values.total).div(_item._extend.origin_total);
-
-      // 处理子商品
-      var _bundles = (_extend === null || _extend === void 0 || (_extend$other = _extend.other) === null || _extend$other === void 0 ? void 0 : _extend$other.bundle) || [];
-      var childProductsTotal = new Decimal(0);
-      if (_bundles.length > 0) {
-        _bundles.forEach(function (bundle) {
-          // 计算子商品折扣后的单价（保留两位小数）
-          var discountedPrice = new Decimal(bundle.original_price).mul(discountRatio).toDecimalPlaces(2, Decimal.ROUND_HALF_UP);
-          bundle.bundle_selling_price = discountedPrice.toNumber();
-
-          // 累计子商品折扣后总价
-          childProductsTotal = childProductsTotal.add(discountedPrice.mul(bundle.quantity));
-        });
-      }
-
-      // 计算主商品折扣后的单价
-      var mainProductTotal = new Decimal(values.total).sub(childProductsTotal);
-      var mainProductQuantity = ((_extend$other2 = _extend.other) === null || _extend$other2 === void 0 ? void 0 : _extend$other2.quantity) || _extend.quantity || 1;
-      _extend.main_product_selling_price = mainProductTotal.div(mainProductQuantity).toNumber();
-    }
     if (_extend.bundle_edit !== undefined) {
       _extend.bundle_edit = 1;
     }
     _item._extend = _extend;
     _item._time = new Date().getTime();
     _item._serviceKey = genServiceKey(_item);
-    var _id = (_item2 = _item) === null || _item2 === void 0 ? void 0 : _item2._id;
-    _item = setProductPrice(_item, {
-      newTotal: values.total,
-      origin_total: (_item$_extend2 = _item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.origin_total
-    });
+    var _id = _item === null || _item === void 0 ? void 0 : _item._id;
 
     // 判断是新增还是编辑
     if (!_list.some(function (d) {
@@ -483,11 +453,11 @@ var Info = function Info(_, ref) {
     var isSession = isSessionProduct(item);
     var sessionValue = {};
     if (isSession) {
-      var _item$_extend3, _item$_extend4, _item$_extend5;
+      var _item$_extend2, _item$_extend3, _item$_extend4;
       sessionValue.startEndTime = {
-        startDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.start_date,
-        endDate: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.end_date,
-        duration: item === null || item === void 0 || (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.duration
+        startDate: item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_date,
+        endDate: item === null || item === void 0 || (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.end_date,
+        duration: item === null || item === void 0 || (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration
       };
     }