@pisell/private-materials 6.6.59 → 6.6.60

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -52,28 +52,6 @@ import { useDebounceFn } from 'ahooks';
 import { useOsKey } from "../../context";
 import { useIsActive } from "../../context/IsActiveContext";
 import { useShopDiscountModule } from "../../hooks/pisellos/useShopDiscountModule";
-// ============= 内存监控埋点（不影响业务逻辑） =============
-var MEM_STATS_KEY = '__pisellTicketBookingMemStats';
-var getMemStats = function getMemStats() {
-  var g = globalThis;
-  if (!g[MEM_STATS_KEY]) {
-    g[MEM_STATS_KEY] = {
-      mountedAt: Date.now(),
-      storeCreateCount: 0,
-      intervalDateSetCount: 0,
-      intervalDateTickCount: 0,
-      postCartUpdateCount: 0,
-      postCartUpdateBytes: 0,
-      lastHeartbeatHeapMB: 0,
-      crossedThresholdsMB: []
-    };
-  }
-  return g[MEM_STATS_KEY];
-};
-// 水位越线阈值（MB），由低到高，单页面周期内每个阈值只触发一次
-var HEAP_CROSS_THRESHOLDS_MB = [800, 1200, 1500, 2000, 2500];
-// ========================================================
-
 export var _formatBookingDetail = function _formatBookingDetail(data, modalState) {
   var _bookings$list, _bookings$list2;
   var customer_id = data.customer_id,
@@ -271,9 +249,6 @@ var TicketBooking = function TicketBooking(props) {
   var Toast = useToast();
   var _persistentRef = useRef(false);
   var _initStateRef = useRef({});
-  // 内存监控埋点：镜像最新 state，供心跳定时器读取，避免闭包钉在初次 render
-  var _memStateRef = useRef(null);
-  _memStateRef.current = state;
   var _listTimerRef = useRef();
   var _timerRef = useRef();
   var _callbackFnRef = useRef();
@@ -491,96 +466,6 @@ var TicketBooking = function TicketBooking(props) {
     };
   }, []);
 
-  // ============= 内存监控心跳：每 5 分钟上报一次；水位跨越阈值即时上报 =============
-  useEffect(function () {
-    var stats = getMemStats();
-    // 新页面周期开始，重置 mountedAt 和 crossedThresholds（仅当此单例首次用于本组件）
-    if (!stats.mountedAt || Date.now() - stats.mountedAt > 24 * 60 * 60 * 1000) {
-      stats.mountedAt = Date.now();
-      stats.crossedThresholdsMB = [];
-    }
-    var buildPayload = function buildPayload(extra) {
-      var _store$getState$globa, _store$getState4, _s$modalState$service, _s$modalState, _s$list$bookingList$l, _s$list, _s$bookingId;
-      var s = _memStateRef.current || {};
-      var perfMem = performance.memory || {};
-      var shopId = (_store$getState$globa = store === null || store === void 0 || (_store$getState4 = store.getState) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.call(store)) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.global) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.globalConfig) === null || _store$getState4 === void 0 ? void 0 : _store$getState4.id) !== null && _store$getState$globa !== void 0 ? _store$getState$globa : '';
-      var jsHeapUsedMB = perfMem.usedJSHeapSize ? +(perfMem.usedJSHeapSize / 1024 / 1024).toFixed(2) : -1;
-      var jsHeapTotalMB = perfMem.totalJSHeapSize ? +(perfMem.totalJSHeapSize / 1024 / 1024).toFixed(2) : -1;
-      var jsHeapLimitMB = perfMem.jsHeapSizeLimit ? +(perfMem.jsHeapSizeLimit / 1024 / 1024).toFixed(2) : -1;
-      var payload = {
-        page_alive_sec: Math.round((Date.now() - stats.mountedAt) / 1000),
-        shop_id: shopId,
-        url: typeof location !== 'undefined' ? location.href.slice(0, 200) : '',
-        js_heap_used_mb: jsHeapUsedMB,
-        js_heap_total_mb: jsHeapTotalMB,
-        js_heap_limit_mb: jsHeapLimitMB,
-        dom_nodes_count: typeof document !== 'undefined' ? document.getElementsByTagName('*').length : -1,
-        cart_items_count: (_s$modalState$service = s === null || s === void 0 || (_s$modalState = s.modalState) === null || _s$modalState === void 0 || (_s$modalState = _s$modalState.service) === null || _s$modalState === void 0 || (_s$modalState = _s$modalState.value) === null || _s$modalState === void 0 ? void 0 : _s$modalState.length) !== null && _s$modalState$service !== void 0 ? _s$modalState$service : 0,
-        booking_list_count: (_s$list$bookingList$l = s === null || s === void 0 || (_s$list = s.list) === null || _s$list === void 0 || (_s$list = _s$list.bookingList) === null || _s$list === void 0 ? void 0 : _s$list.length) !== null && _s$list$bookingList$l !== void 0 ? _s$list$bookingList$l : 0,
-        modal_open: !!(s !== null && s !== void 0 && s.open),
-        booking_id: (_s$bookingId = s === null || s === void 0 ? void 0 : s.bookingId) !== null && _s$bookingId !== void 0 ? _s$bookingId : 0,
-        board_config_loaded: !!(s !== null && s !== void 0 && s.bookingConfig),
-        store_create_count: stats.storeCreateCount,
-        interval_date_set_count: stats.intervalDateSetCount,
-        interval_date_tick_count: stats.intervalDateTickCount,
-        post_cart_update_count: stats.postCartUpdateCount,
-        post_cart_update_mb: +(stats.postCartUpdateBytes / 1024 / 1024).toFixed(2),
-        ua: typeof navigator !== 'undefined' ? navigator.userAgent.slice(0, 120) : ''
-      };
-      if (extra) Object.assign(payload, extra);
-      return payload;
-    };
-    var doSend = function doSend(title, extra) {
-      try {
-        var payload = buildPayload(extra);
-        sendWarningLog({
-          title: title,
-          content: Object.entries(payload).map(function (_ref) {
-            var _ref2 = _slicedToArray(_ref, 2),
-              key = _ref2[0],
-              value = _ref2[1];
-            return {
-              key: key,
-              value: String(value !== null && value !== void 0 ? value : '')
-            };
-          })
-        });
-      } catch (e) {}
-    };
-
-    // 心跳：立即发一次（记录进入时基线），然后每 5 分钟发一次
-    doSend('TicketBookingMemHeartbeat', {
-      reason: 'mounted'
-    });
-    var heartbeatTimer = setInterval(function () {
-      var perfMem = performance.memory || {};
-      var heapMB = perfMem.usedJSHeapSize ? perfMem.usedJSHeapSize / 1024 / 1024 : -1;
-      stats.lastHeartbeatHeapMB = heapMB;
-      doSend('TicketBookingMemHeartbeat', {
-        reason: 'heartbeat'
-      });
-
-      // 水位越线检测：本轮心跳时发现某阈值被跨越且之前未上报过
-      if (heapMB > 0) {
-        for (var _i = 0, _HEAP_CROSS_THRESHOLD = HEAP_CROSS_THRESHOLDS_MB; _i < _HEAP_CROSS_THRESHOLD.length; _i++) {
-          var th = _HEAP_CROSS_THRESHOLD[_i];
-          if (heapMB >= th && !stats.crossedThresholdsMB.includes(th)) {
-            stats.crossedThresholdsMB.push(th);
-            doSend('TicketBookingMemHeapCross', {
-              reason: 'heap_cross',
-              threshold_mb: th,
-              current_heap_mb: +heapMB.toFixed(2)
-            });
-          }
-        }
-      }
-    }, 5 * 60 * 1000);
-    return function () {
-      clearInterval(heartbeatTimer);
-    };
-  }, []);
-  // ================================================================================
-
   // 日期选择变更事件
   var _onDateChange = function _onDateChange(date, dateString) {
     _setIntervalTime(false);
@@ -594,10 +479,6 @@ var TicketBooking = function TicketBooking(props) {
   var _setIntervalTime = function _setIntervalTime(isInterval) {
     clearInterval(_timerRef.current);
     if (isInterval) {
-      try {
-        var _s = getMemStats();
-        _s.intervalDateSetCount = (_s.intervalDateSetCount || 0) + 1;
-      } catch (e) {}
       setState({
         isTimeChange: false,
         isDateChange: false
@@ -607,10 +488,6 @@ var TicketBooking = function TicketBooking(props) {
       }
       _setDataChange(dayjs());
       _timerRef.current = setInterval(function () {
-        try {
-          var _s2 = getMemStats();
-          _s2.intervalDateTickCount = (_s2.intervalDateTickCount || 0) + 1;
-        } catch (e) {}
         _setDataChange(dayjs());
       }, 1000 * 60);
     }
@@ -684,6 +561,7 @@ var TicketBooking = function TicketBooking(props) {
     } catch (error) {
       console.error(error);
     }
+    console.log('formatedProducts', total, formatedProducts);
     var fees = [];
     var products = [];
     var _iterator3 = _createForOfIteratorHelper(formatedProducts),
@@ -747,41 +625,42 @@ var TicketBooking = function TicketBooking(props) {
         message: (_locales$getText2 = locales.getText('pisell2.product.card.cart-items')) === null || _locales$getText2 === void 0 ? void 0 : _locales$getText2(products.length)
       });
     }
-    interaction === null || interaction === void 0 || (_interaction$utils4 = interaction.utils) === null || _interaction$utils4 === void 0 || (_interaction$utils4$p = _interaction$utils4.postMessageToApp) === null || _interaction$utils4$p === void 0 || _interaction$utils4$p.call(_interaction$utils4, {
+    console.log('start post message, config:', {
       module: 'cds',
       key: 'cartUpdate',
       data: {
         currency_symbol: getSymbolic(),
-        total: total.expectAmount,
+        total: total.productAmount,
         // 小计
         products: products,
         fees: fees
       }
     });
-    // 内存监控埋点：统计 cartUpdate 消息的累计次数和字节数
-    try {
-      var _s = getMemStats();
-      _s.postCartUpdateCount = (_s.postCartUpdateCount || 0) + 1;
-      var _payload = {
+    interaction === null || interaction === void 0 || (_interaction$utils4 = interaction.utils) === null || _interaction$utils4 === void 0 || (_interaction$utils4$p = _interaction$utils4.postMessageToApp) === null || _interaction$utils4$p === void 0 || _interaction$utils4$p.call(_interaction$utils4, {
+      module: 'cds',
+      key: 'cartUpdate',
+      data: {
         currency_symbol: getSymbolic(),
         total: total.expectAmount,
+        // 小计
         products: products,
         fees: fees
-      };
-      _s.postCartUpdateBytes = (_s.postCartUpdateBytes || 0) + JSON.stringify(_payload).length;
-    } catch (e) {}
+      }
+    });
   }, [state === null || state === void 0 || (_state$modalState2 = state.modalState) === null || _state$modalState2 === void 0 || (_state$modalState2 = _state$modalState2.service) === null || _state$modalState2 === void 0 ? void 0 : _state$modalState2.value]);
 
   /**
    * 设置弹窗内的状态
    */
   var _setModalState = function _setModalState(props) {
+    var _newVal$service2;
     console.log('同步state到外层', props);
     var newVal = _objectSpread({}, props);
     if (newVal.service) {
       var _newVal$service;
       newVal.service.value = (newVal === null || newVal === void 0 || (_newVal$service = newVal.service) === null || _newVal$service === void 0 ? void 0 : _newVal$service.value) || [];
     }
+    console.log(newVal === null || newVal === void 0 || (_newVal$service2 = newVal.service) === null || _newVal$service2 === void 0 ? void 0 : _newVal$service2.value, 'newVal.service.value');
     setState({
       modalState: _objectSpread(_objectSpread({}, state.modalState), newVal)
     });
@@ -817,14 +696,14 @@ var TicketBooking = function TicketBooking(props) {
     }, 100);
   };
   var _setShopOpeningHours = function _setShopOpeningHours() {
-    var _getData, _store$getState5;
-    var time = (getData === null || getData === void 0 || (_getData = getData('operating_day_boundary')) === null || _getData === void 0 ? void 0 : _getData.time) || (store === null || store === void 0 || (_store$getState5 = store.getState) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.call(store)) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.global) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.shopDetail) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.operating_day_boundary) === null || _store$getState5 === void 0 ? void 0 : _store$getState5.time);
+    var _getData, _store$getState4;
+    var time = (getData === null || getData === void 0 || (_getData = getData('operating_day_boundary')) === null || _getData === void 0 ? void 0 : _getData.time) || (store === null || store === void 0 || (_store$getState4 = store.getState) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.call(store)) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.global) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.shopDetail) === null || _store$getState4 === void 0 || (_store$getState4 = _store$getState4.operating_day_boundary) === null || _store$getState4 === void 0 ? void 0 : _store$getState4.time);
     if (time) {
       localStorage.setItem('shopOpeningHours', time);
     }
   };
   var _getAddTimeProducts = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -847,7 +726,7 @@ var TicketBooking = function TicketBooking(props) {
       }, _callee);
     }));
     return function _getAddTimeProducts() {
-      return _ref3.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
 
@@ -855,7 +734,7 @@ var TicketBooking = function TicketBooking(props) {
    * 获取board配置
    */
   var _getBoardConfig = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var bookingConfigParams, isHasCache, cachedBoardConfig, _cachedBoardConfig$co, data;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -909,7 +788,7 @@ var TicketBooking = function TicketBooking(props) {
       }, _callee2, null, [[3, 11]]);
     }));
     return function _getBoardConfig() {
-      return _ref4.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var _addVisibilityListener = function _addVisibilityListener(callback) {
@@ -1035,9 +914,9 @@ var TicketBooking = function TicketBooking(props) {
         // 储存参数, 添加服务商品时使用
         sessionStorage.setItem('pisell2.booking.serviceParams', JSON.stringify(data));
       } else {
-        var _store$getState6;
+        var _store$getState5;
         // 当前时区的时间
-        var timezone = store === null || store === void 0 || (_store$getState6 = store.getState) === null || _store$getState6 === void 0 || (_store$getState6 = _store$getState6.call(store)) === null || _store$getState6 === void 0 || (_store$getState6 = _store$getState6.global) === null || _store$getState6 === void 0 || (_store$getState6 = _store$getState6.globalConfig) === null || _store$getState6 === void 0 ? void 0 : _store$getState6.timezone;
+        var timezone = store === null || store === void 0 || (_store$getState5 = store.getState) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.call(store)) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.global) === null || _store$getState5 === void 0 || (_store$getState5 = _store$getState5.globalConfig) === null || _store$getState5 === void 0 ? void 0 : _store$getState5.timezone;
         initState.modalState.date.value = dayjs.tz(new Date(), timezone);
         // 兜底, 没有传递则清空下
         sessionStorage.removeItem('pisell2.booking.serviceParams');
@@ -1047,6 +926,7 @@ var TicketBooking = function TicketBooking(props) {
       }
       if (data !== null && data !== void 0 && data.eventBookingServiceParams) {}
     }
+    console.log(initState, 'initState');
     setState(_objectSpread(_objectSpread({}, initState), {}, _defineProperty(_defineProperty({}, state.renderType === 'eventBooking' ? 'eventOpen' : 'open', true), "bookingId", state.bookingId)));
   };
   var _rebook = useMemoizedFn(function () {
@@ -1065,7 +945,7 @@ var TicketBooking = function TicketBooking(props) {
    *
    */
   var _getBookingDetail = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(bookingId) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(bookingId) {
       var renderType, openRebook, getDetail, data;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -1087,6 +967,7 @@ var TicketBooking = function TicketBooking(props) {
                 })
               });
             }
+            console.log('getBookingDetail', data);
 
             // 格式化储存
             _initBookingData('edit', data);
@@ -1095,14 +976,14 @@ var TicketBooking = function TicketBooking(props) {
                 _rebook();
               });
             }
-          case 9:
+          case 10:
           case "end":
             return _context3.stop();
         }
       }, _callee3);
     }));
     return function _getBookingDetail(_x) {
-      return _ref5.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   /**
@@ -1110,16 +991,16 @@ var TicketBooking = function TicketBooking(props) {
    *
    */
   var _openModal = function _openModal(props) {
-    var _ref6 = props || {},
-      bookingId = _ref6.bookingId,
-      serviceParams = _ref6.serviceParams,
-      params = _ref6.params,
-      eventBookingServiceParams = _ref6.eventBookingServiceParams,
-      _ref6$renderType = _ref6.renderType,
-      renderType = _ref6$renderType === void 0 ? 'booking' : _ref6$renderType,
-      openRebook = _ref6.openRebook,
-      _ref6$isParallelResou = _ref6.isParallelResourcesBooking,
-      isParallelResourcesBooking = _ref6$isParallelResou === void 0 ? true : _ref6$isParallelResou;
+    var _ref4 = props || {},
+      bookingId = _ref4.bookingId,
+      serviceParams = _ref4.serviceParams,
+      params = _ref4.params,
+      eventBookingServiceParams = _ref4.eventBookingServiceParams,
+      _ref4$renderType = _ref4.renderType,
+      renderType = _ref4$renderType === void 0 ? 'booking' : _ref4$renderType,
+      openRebook = _ref4.openRebook,
+      _ref4$isParallelResou = _ref4.isParallelResourcesBooking,
+      isParallelResourcesBooking = _ref4$isParallelResou === void 0 ? true : _ref4$isParallelResou;
     setState({
       isShowInfo: false
     });
@@ -1156,7 +1037,7 @@ var TicketBooking = function TicketBooking(props) {
     });
   };
   var _scanBookingDetailResult = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(detail) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(detail) {
       var _Toast$loading, _result;
       var result, objDetail;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -1210,7 +1091,7 @@ var TicketBooking = function TicketBooking(props) {
       }, _callee4);
     }));
     return function _scanBookingDetailResult(_x2) {
-      return _ref7.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   /**

package/es/components/ticketBooking/index.js

@@ -206,18 +206,12 @@ export default (function (props) {
     request.setRequest(context.appHelper.utils.request);
   }, []);
   useMemo(function () {
-    try {
-      var g = globalThis;
-      if (g.__pisellTicketBookingMemStats) {
-        g.__pisellTicketBookingMemStats.storeCreateCount = (g.__pisellTicketBookingMemStats.storeCreateCount || 0) + 1;
-      }
-    } catch (e) {}
     var store = createStore(_objectSpread(_objectSpread({}, cloneDeep(initialState)), {}, {
       bookingConfigParams: bookingConfigParams,
       productExtensionType: productExtensionType
     }));
     storeRef.current = store;
-  }, [JSON.stringify(bookingConfigParams), JSON.stringify(productExtensionType)]);
+  }, [bookingConfigParams, productExtensionType]);
   useMemo(function () {
     if (BookingTicket) {
       var _businessUtils$getApp;

package/es/pro/Login2.0/components/phoneValidation.js

@@ -12,7 +12,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  */
 export var validatePhoneNumber = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(value, getText) {
-    var phone, countryCode, match, usCanadaReg, auReg;
+    var phone, countryCode, match;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -55,7 +55,7 @@ export var validatePhoneNumber = /*#__PURE__*/function () {
           throw new Error(getText('pisell-phone-validation-required'));
         case 16:
           _context.t0 = countryCode;
-          _context.next = _context.t0 === '86' ? 19 : _context.t0 === '852' ? 22 : _context.t0 === '853' ? 25 : _context.t0 === '886' ? 28 : _context.t0 === '1' ? 31 : _context.t0 === '44' ? 35 : _context.t0 === '61' ? 38 : _context.t0 === '81' ? 42 : _context.t0 === '82' ? 45 : _context.t0 === '65' ? 48 : _context.t0 === '60' ? 51 : _context.t0 === '66' ? 54 : _context.t0 === '84' ? 57 : _context.t0 === '63' ? 60 : _context.t0 === '62' ? 63 : _context.t0 === '91' ? 66 : 69;
+          _context.next = _context.t0 === '86' ? 19 : _context.t0 === '852' ? 22 : _context.t0 === '853' ? 25 : _context.t0 === '886' ? 28 : _context.t0 === '1' ? 31 : _context.t0 === '44' ? 34 : _context.t0 === '61' ? 37 : _context.t0 === '81' ? 40 : _context.t0 === '82' ? 43 : _context.t0 === '65' ? 46 : _context.t0 === '60' ? 49 : _context.t0 === '66' ? 52 : _context.t0 === '84' ? 55 : _context.t0 === '63' ? 58 : _context.t0 === '62' ? 61 : _context.t0 === '91' ? 64 : 67;
           break;
         case 19:
           if (/^1[3-9]\d{9}$/.test(phone)) {
@@ -64,7 +64,7 @@ export var validatePhoneNumber = /*#__PURE__*/function () {
           }
           throw new Error(getText('pisell-phone-validation-china'));
         case 21:
-          return _context.abrupt("break", 72);
+          return _context.abrupt("break", 70);
         case 22:
           if (/^[5-9]\d{7}$/.test(phone)) {
             _context.next = 24;
@@ -72,7 +72,7 @@ export var validatePhoneNumber = /*#__PURE__*/function () {
           }
           throw new Error(getText('pisell-phone-validation-hongkong'));
         case 24:
-          return _context.abrupt("break", 72);
+          return _context.abrupt("break", 70);
         case 25:
           if (/^6\d{7}$/.test(phone)) {
             _context.next = 27;
@@ -80,7 +80,7 @@ export var validatePhoneNumber = /*#__PURE__*/function () {
           }
           throw new Error(getText('pisell-phone-validation-macau'));
         case 27:
-          return _context.abrupt("break", 72);
+          return _context.abrupt("break", 70);
         case 28:
           if (/^9\d{8}$/.test(phone)) {
             _context.next = 30;
@@ -88,119 +88,112 @@ export var validatePhoneNumber = /*#__PURE__*/function () {
           }
           throw new Error(getText('pisell-phone-validation-taiwan'));
         case 30:
-          return _context.abrupt("break", 72);
+          return _context.abrupt("break", 70);
         case 31:
-          // 美国/加拿大
-          // NANP 标准 10 位格式：3位区号[2-9] + 3位局号[2-9] + 4位
-          usCanadaReg = /^[2-9]\d{2}[2-9]\d{6}$/;
-          if (usCanadaReg.test(phone)) {
-            _context.next = 34;
+          if (/^\d{10}$/.test(phone)) {
+            _context.next = 33;
             break;
           }
           throw new Error(getText('pisell-phone-validation-us-canada'));
+        case 33:
+          return _context.abrupt("break", 70);
         case 34:
-          return _context.abrupt("break", 72);
-        case 35:
           if (/^7\d{9}$/.test(phone)) {
-            _context.next = 37;
+            _context.next = 36;
             break;
           }
           throw new Error(getText('pisell-phone-validation-uk'));
+        case 36:
+          return _context.abrupt("break", 70);
         case 37:
-          return _context.abrupt("break", 72);
-        case 38:
-          // 澳大利亚
-          // const reg = /^(\+?0)?4\d{8}$/;
-          // 固话前缀 02/03/07/08, 手机前缀 04/05, 首位 0 可选
-          auReg = /^0?[2-578]\d{8}$/;
-          if (auReg.test(phone)) {
-            _context.next = 41;
+          if (/^(\+?0)?4\d{8}$/.test(phone)) {
+            _context.next = 39;
             break;
           }
           throw new Error(getText('pisell-phone-validation-australia'));
-        case 41:
-          return _context.abrupt("break", 72);
-        case 42:
+        case 39:
+          return _context.abrupt("break", 70);
+        case 40:
           if (/^[789]0\d{8}$/.test(phone)) {
-            _context.next = 44;
+            _context.next = 42;
             break;
           }
           throw new Error(getText('pisell-phone-validation-japan'));
-        case 44:
-          return _context.abrupt("break", 72);
-        case 45:
+        case 42:
+          return _context.abrupt("break", 70);
+        case 43:
           if (/^1[0-9]\d{7,8}$/.test(phone)) {
-            _context.next = 47;
+            _context.next = 45;
             break;
           }
           throw new Error(getText('pisell-phone-validation-korea'));
-        case 47:
-          return _context.abrupt("break", 72);
-        case 48:
+        case 45:
+          return _context.abrupt("break", 70);
+        case 46:
           if (/^[89]\d{7}$/.test(phone)) {
-            _context.next = 50;
+            _context.next = 48;
             break;
           }
           throw new Error(getText('pisell-phone-validation-singapore'));
-        case 50:
-          return _context.abrupt("break", 72);
-        case 51:
+        case 48:
+          return _context.abrupt("break", 70);
+        case 49:
           if (/^1[0-9]\d{7,8}$/.test(phone)) {
-            _context.next = 53;
+            _context.next = 51;
             break;
           }
           throw new Error(getText('pisell-phone-validation-malaysia'));
-        case 53:
-          return _context.abrupt("break", 72);
-        case 54:
+        case 51:
+          return _context.abrupt("break", 70);
+        case 52:
           if (/^[689]\d{8}$/.test(phone)) {
-            _context.next = 56;
+            _context.next = 54;
             break;
           }
           throw new Error(getText('pisell-phone-validation-thailand'));
-        case 56:
-          return _context.abrupt("break", 72);
-        case 57:
+        case 54:
+          return _context.abrupt("break", 70);
+        case 55:
           if (/^[3579]\d{8}$/.test(phone)) {
-            _context.next = 59;
+            _context.next = 57;
             break;
           }
           throw new Error(getText('pisell-phone-validation-vietnam'));
-        case 59:
-          return _context.abrupt("break", 72);
-        case 60:
+        case 57:
+          return _context.abrupt("break", 70);
+        case 58:
           if (/^9\d{9}$/.test(phone)) {
-            _context.next = 62;
+            _context.next = 60;
             break;
           }
           throw new Error(getText('pisell-phone-validation-philippines'));
-        case 62:
-          return _context.abrupt("break", 72);
-        case 63:
+        case 60:
+          return _context.abrupt("break", 70);
+        case 61:
           if (/^8\d{8,11}$/.test(phone)) {
-            _context.next = 65;
+            _context.next = 63;
             break;
           }
           throw new Error(getText('pisell-phone-validation-indonesia'));
-        case 65:
-          return _context.abrupt("break", 72);
-        case 66:
+        case 63:
+          return _context.abrupt("break", 70);
+        case 64:
           if (/^[6-9]\d{9}$/.test(phone)) {
-            _context.next = 68;
+            _context.next = 66;
             break;
           }
           throw new Error(getText('pisell-phone-validation-india'));
-        case 68:
-          return _context.abrupt("break", 72);
-        case 69:
+        case 66:
+          return _context.abrupt("break", 70);
+        case 67:
           if (/^\d{6,15}$/.test(phone)) {
-            _context.next = 71;
+            _context.next = 69;
             break;
           }
           throw new Error(getText('pisell-phone-validation-invalid'));
-        case 71:
-          return _context.abrupt("break", 72);
-        case 72:
+        case 69:
+          return _context.abrupt("break", 70);
+        case 70:
         case "end":
           return _context.stop();
       }

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

@@ -323,7 +323,7 @@ var processItemsTax = (items, state, options) => {
       }
     }
   }
-  return { originTax: expectedOriginTax, tax: expectedTax };
+  return { originTax: expectedOriginTax, tax: expectedTax, taxDecimal: preciseTax };
 };
 var clearTaxFee = (state) => {
   var _a, _b;
@@ -376,7 +376,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(serviceResult.originTax);
-      totalTax = totalTax.plus(serviceResult.tax);
+      totalTax = totalTax.plus(serviceResult.taxDecimal);
     }
     if ((_c = state == null ? void 0 : state.addons) == null ? void 0 : _c.value) {
       const addonsResult = processItemsTax(state.addons.value, state, {
@@ -385,7 +385,7 @@ var getTax = (state, options) => {
         computed
       });
       totalOriginTax = totalOriginTax.plus(addonsResult.originTax);
-      totalTax = totalTax.plus(addonsResult.tax);
+      totalTax = totalTax.plus(addonsResult.taxDecimal);
     }
   }
   return {