@pisell/private-materials 6.4.83 → 6.4.84

package/es/components/checkout/components/CashPaymentModule/index.js

@@ -14,8 +14,8 @@ import useEngineContext from "../../../../hooks/useEngineContext";
 import { locales, formatAmount } from '@pisell/utils';
 import checkoutLocales from "../../locales";
 import useToast from "../../../../hooks/useToast";
-import { CashKeyboard } from "../../../../pro/priceKeyboard";
 import { useDebounceFn } from 'ahooks';
+import { CashKeyboard } from "../../../../pro/priceKeyboard";
 import "./index.less";
 export function CashPaymentModule(_ref) {
   var amountSymbol = _ref.amountSymbol,
@@ -67,6 +67,12 @@ export function CashPaymentModule(_ref) {
 
   // 检查是否应该禁用输入框：原本disabled为true 或者 订单金额为0
   var isInputDisabled = disabled || Number(customAmount || 0) === 0;
+  var handleAmountClick = function handleAmountClick(clickedAmount) {
+    if (isAmountButtonsDisabled) return;
+    var amountStr = clickedAmount.toString();
+    setAmount(amountStr);
+    setRoundingAmount(0);
+  };
   var handleCashPayInternal = function handleCashPayInternal() {
     if (isAmountButtonsDisabled) return;
     if (onPaymentComplete) {

package/es/components/checkout/components/ScrollableList/index.js

@@ -241,6 +241,7 @@ var ScrollableList = function ScrollableList(_ref) {
     style: getGridStyle()
   }, children)), isScrollable && /*#__PURE__*/React.createElement("button", {
     style: _objectSpread(_objectSpread({}, bottomGradientStyle), {}, {
+      width: '100%',
       border: 'none',
       background: 'linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, #A78BE1 100%)'
     }, gradientStyle),

package/es/components/checkout/components/SearchAndClientModule/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 export interface IScanResult {
     status: 'success' | 'failed';

package/es/components/checkout/components/WalletPassModule/components/DiscountWallet/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface DiscountWalletProps {
     isCardMode: boolean;

package/es/components/list/List.js

@@ -1,9 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -11,10 +6,14 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React, { useEffect, useMemo, useRef, useCallback, cloneElement, isValidElement } from 'react';
 import { Button } from 'antd';
 import classNames from 'classnames';
-import Tab from "./components/Tab";
 import Pagination from "./components/Pagination";
 import EmptyState from "./components/EmptyState";
 import ScrollLoader from "./components/ScrollLoader";
@@ -22,12 +21,13 @@ import WaterfallList from "./components/WaterfallList";
 import ListItemSkeleton from "./components/ListItemSkeleton";
 import TabSkeleton from "./components/TabSkeleton";
 import "./List.less";
-import { Iconfont } from '@pisell/materials';
+import { Iconfont, PisellTabbar } from '@pisell/materials';
 // import { locales } from '@pisell/utils';
 import listLocales from "./locales";
 import useWaterfall from "./hooks/useWaterfall";
 import { useListState } from "./hooks/useListState";
 import useEngineContext from "../../hooks/useEngineContext";
+import { findProductIdsByPath } from "./utils";
 
 // 虚假数据常量，用于loading状态
 var MOCK_LIST_DATA = function () {
@@ -145,6 +145,7 @@ var List = function List(props) {
       externalCurrentPage: pagination === null || pagination === void 0 ? void 0 : pagination.current,
       tabItems: tabItems,
       defaultPageSize: defaultPageSize,
+      tabStyle: tabStyle,
       onLoadData: onLoadData
     }),
     listState = _useListState.state,
@@ -174,14 +175,16 @@ var List = function List(props) {
     // 否则使用严格相等比较
     return fieldValue === targetValue;
   };
+  var dataIdMap = useMemo(function () {
+    return data.reduce(function (pre, cur) {
+      return _objectSpread(_objectSpread({}, pre), {}, _defineProperty({}, cur.id, cur));
+    }, {});
+  }, [data]);
 
   // 数据分组处理 - 按tab分组数据
   var processedData = useMemo(function () {
     // 如果正在加载且没有数据，使用模拟数据
     var sourceData = loading ? MOCK_LIST_DATA : data || [];
-    console.log("processedData recalculating: tabStyle=".concat(tabStyle, ", activeTab=").concat(activeTab, ", tabItems=").concat(tabItems.length, ", dataLength=").concat(sourceData.length));
-    console.log("sourceData sample: ".concat(JSON.stringify(sourceData.slice(0, 2), null, 2)));
-    console.log("tabGroup: ".concat(tabGroup));
 
     // 如果tab样式是anchor，需要按分组显示数据
     if (tabStyle === 'anchor' && tabItems.length > 0) {
@@ -276,40 +279,51 @@ var List = function List(props) {
           items: filteredData
         }];
       }
-
-      // 查找当前选中的tab
-      var currentTab = tabItems.find(function (tab) {
-        return tab.key === activeTab;
-      });
-      if (currentTab && currentTab.group) {
-        // 如果tab项有group属性，使用group值进行过滤
-        var filterField = 'category'; // 固定使用category字段，因为测试数据都使用这个字段
-        filteredData = filteredData.filter(function (item) {
-          return matchesFieldValue(item[filterField], currentTab.group);
+      if (Array.isArray(activeTab)) {
+        var productIds = findProductIdsByPath(tabItems, activeTab, 0);
+        var items = productIds.map(function (id) {
+          return dataIdMap[id];
         });
-      } else if (currentTab) {
-        // 如果没有group属性，假设tab的key就是要过滤的值
-        var possibleFields = ['category', 'status', 'type', tabGroup];
-        var _loop2 = function _loop2() {
-          var field = _possibleFields[_i];
-          if (field && field !== '字段' && filteredData.some(function (item) {
-            return matchesFieldValue(item[field], activeTab);
-          })) {
-            filteredData = filteredData.filter(function (item) {
+        return [{
+          tabKey: activeTab,
+          tabLabel: "",
+          items: items
+        }];
+      } else {
+        // 查找当前选中的tab
+        var currentTab = tabItems.find(function (tab) {
+          return tab.key === activeTab;
+        });
+        if (currentTab && currentTab.group) {
+          // 如果tab项有group属性，使用group值进行过滤
+          var filterField = 'category'; // 固定使用category字段，因为测试数据都使用这个字段
+          filteredData = filteredData.filter(function (item) {
+            return matchesFieldValue(item[filterField], currentTab.group);
+          });
+        } else if (currentTab) {
+          // 如果没有group属性，假设tab的key就是要过滤的值
+          var possibleFields = ['category', 'status', 'type', tabGroup];
+          var _loop2 = function _loop2() {
+            var field = _possibleFields[_i];
+            if (field && field !== '字段' && filteredData.some(function (item) {
               return matchesFieldValue(item[field], activeTab);
-            });
-            return 1; // break
+            })) {
+              filteredData = filteredData.filter(function (item) {
+                return matchesFieldValue(item[field], activeTab);
+              });
+              return 1; // break
+            }
+          };
+          for (var _i = 0, _possibleFields = possibleFields; _i < _possibleFields.length; _i++) {
+            if (_loop2()) break;
           }
-        };
-        for (var _i = 0, _possibleFields = possibleFields; _i < _possibleFields.length; _i++) {
-          if (_loop2()) break;
         }
+        return [{
+          tabKey: activeTab,
+          tabLabel: (currentTab === null || currentTab === void 0 ? void 0 : currentTab.label) || '',
+          items: filteredData
+        }];
       }
-      return [{
-        tabKey: activeTab,
-        tabLabel: (currentTab === null || currentTab === void 0 ? void 0 : currentTab.label) || '',
-        items: filteredData
-      }];
     }
   }, [data, activeTab, tabItems, tabGroup, tabStyle, loading]);
 
@@ -695,10 +709,9 @@ var List = function List(props) {
     return /*#__PURE__*/React.createElement("div", {
       ref: headerRef,
       className: headerClasses
-    }, /*#__PURE__*/React.createElement(Tab, {
-      className: classNames('pisell-list-tabs', "pisell-list-tabs-".concat(tabStyle)),
-      activeKey: activeTab,
-      items: tabItems,
+    }, /*#__PURE__*/React.createElement(PisellTabbar, {
+      dataSource: tabItems,
+      value: activeTab,
       onChange: handleTabChangeWithScroll
     }));
   };

package/es/components/list/hooks/useListState.d.ts

@@ -6,7 +6,7 @@ export interface ListState {
 }
 export declare type ListAction = {
     type: 'SET_ACTIVE_TAB';
-    payload: string;
+    payload: string[] | string;
 } | {
     type: 'SET_CURRENT_PAGE';
     payload: number;
@@ -25,6 +25,8 @@ export interface UseListStateProps {
     defaultPageSize: number;
     /** 数据加载回调 */
     onLoadData?: (params: LoadDataParams) => void;
+    /** tab样式 */
+    tabStyle: 'anchor' | 'switch' | 'none';
 }
 export interface UseListStateReturn {
     state: ListState;
@@ -32,7 +34,7 @@ export interface UseListStateReturn {
     setCurrentPage: (page: number) => void;
     setStickyActive: (active: boolean) => void;
     resetPage: () => void;
-    handleTabChange: (key: string) => void;
+    handleTabChange: (key: string[] | string) => void;
     handlePageChange: (page: number, size?: number) => void;
     handleShowSizeChange: (current: number, size: number) => void;
     handleLoadMore: () => void;
@@ -40,4 +42,4 @@ export interface UseListStateReturn {
     handleScrollLoad: () => void;
     actualCurrentPage: number;
 }
-export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, }: UseListStateProps) => UseListStateReturn;
+export declare const useListState: ({ externalCurrentPage, tabItems, defaultPageSize, onLoadData, tabStyle, }: UseListStateProps) => UseListStateReturn;

package/es/components/list/hooks/useListState.js

@@ -10,7 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { useReducer, useCallback } from 'react';
+import { useReducer, useCallback, useEffect, useRef } from 'react';
 
 // 状态接口
 
@@ -48,17 +48,32 @@ export var useListState = function useListState(_ref) {
   var externalCurrentPage = _ref.externalCurrentPage,
     tabItems = _ref.tabItems,
     defaultPageSize = _ref.defaultPageSize,
-    onLoadData = _ref.onLoadData;
+    onLoadData = _ref.onLoadData,
+    tabStyle = _ref.tabStyle;
   // 初始状态
   var initialState = {
     activeTab: tabItems.length > 0 ? tabItems[0].key : 'all',
     currentPage: 1,
     isStickyActive: false
   };
+
+  // 是否设置过默认tab
+  var isSetDefaultTabRef = useRef(false);
   var _useReducer = useReducer(listStateReducer, initialState),
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
+  useEffect(function () {
+    if (tabStyle === 'switch' && tabItems.length > 0 && !isSetDefaultTabRef.current) {
+      var _tabItems$;
+      isSetDefaultTabRef.current = true;
+      var defaultTab = [tabItems[0].key];
+      if (((_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 || (_tabItems$ = _tabItems$.children) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.length) > 0) {
+        defaultTab.push('0');
+      }
+      setActiveTab(defaultTab);
+    }
+  }, [tabItems, tabStyle]);
 
   // 计算实际使用的当前页码
   var actualCurrentPage = externalCurrentPage || state.currentPage;

package/es/components/list/styles/header.less

@@ -58,12 +58,12 @@
       top: 0;
       z-index: 10;
       /* 毛玻璃效果 */
-      background: rgba(255, 255, 255, 0.80);
+      background: transparent;
       backdrop-filter: blur(12px);
-      border-bottom: 1px solid #D0D5DD;
-      padding-bottom: 12px;
+      padding: 0;
       box-shadow: 0px 1px 2px rgba(16, 24, 40, 0.05);
       transition: box-shadow 0.2s ease, backdrop-filter 0.2s ease, background 0.2s ease;
+      border: none;
     }
 
   }

package/es/components/list/utils/index.d.ts

@@ -1,4 +1,16 @@
 /**
  * List 组件工具函数导出
  */
-export { useGetText, createGetText, default as createGetTextDefault, type SupportedLanguage, type LocalesObject, type GetTextFunctions } from './getText';
+export { useGetText, createGetText, default as createGetTextDefault, type SupportedLanguage, type LocalesObject, type GetTextFunctions, } from './getText';
+/**
+ * 根据层级路径数组递归查找对应节点的 productIds
+ * @param nodes 当前层级的节点列表
+ * @param levelPath 层级路径数组，每个元素是对应层级的分类 ID
+ * @param currentLevel 当前遍历的层级索引
+ * @returns 找到的节点的 productIds，找不到返回空数组
+ *
+ * @description
+ * 特殊逻辑：如果 levelPath 最后一位是 0，则取倒数第二层节点的 productIds
+ * 例如：[1, 2, 0] -> 取 id=2 节点的 productIds
+ */
+export declare const findProductIdsByPath: (nodes: any[], levelPath: (string | number)[], currentLevel?: number) => number[];

package/es/components/list/utils/index.js

@@ -2,4 +2,46 @@
  * List 组件工具函数导出
  */
 
-export { useGetText, createGetText, default as createGetTextDefault } from "./getText";
+export { useGetText, createGetText, default as createGetTextDefault } from "./getText";
+
+/**
+ * 根据层级路径数组递归查找对应节点的 productIds
+ * @param nodes 当前层级的节点列表
+ * @param levelPath 层级路径数组，每个元素是对应层级的分类 ID
+ * @param currentLevel 当前遍历的层级索引
+ * @returns 找到的节点的 productIds，找不到返回空数组
+ * 
+ * @description
+ * 特殊逻辑：如果 levelPath 最后一位是 0，则取倒数第二层节点的 productIds
+ * 例如：[1, 2, 0] -> 取 id=2 节点的 productIds
+ */
+export var findProductIdsByPath = function findProductIdsByPath(nodes, levelPath) {
+  var currentLevel = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+  // 处理最后一位是 0 的情况：去掉最后一位，取倒数第二层的 productIds
+  var lastItem = levelPath[levelPath.length - 1];
+  var effectivePath = (lastItem === 0 || lastItem === '0') && levelPath.length > 1 ? levelPath.slice(0, -1) : levelPath;
+  if (!nodes || nodes.length === 0 || currentLevel >= effectivePath.length) {
+    return [];
+  }
+  var targetId = effectivePath[currentLevel];
+  // 查找当前层级中匹配的节点（比较时转为字符串以兼容不同类型）
+  var targetNode = nodes.find(function (node) {
+    return String(node.id) === String(targetId) || String(node.key) === String(targetId);
+  });
+  if (!targetNode) {
+    return [];
+  }
+
+  // 如果是最后一层，返回该节点的 productIds
+  if (currentLevel === effectivePath.length - 1) {
+    return targetNode.productIds || [];
+  }
+
+  // 如果还有下一层，递归查找子节点
+  if (targetNode.children && targetNode.children.length > 0) {
+    return findProductIdsByPath(targetNode.children, effectivePath, currentLevel + 1);
+  }
+
+  // 没有子节点但路径还没结束，返回当前节点的 productIds
+  return targetNode.productIds || [];
+};

package/es/components/pay/toB/components/Cache/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const ToBPayCache: (props: {
     open: boolean;

package/es/components/pay/toB/components/MX51/index.js

@@ -1,6 +1,6 @@
 import { forwardRef, useImperativeHandle } from 'react';
-import { webPayment } from '@pisell/utils';
 import useLogger from "../../../../../hooks/useLogger";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 var getUuid = function getUuid() {
   return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxx'.replace(/[xy]/g, function (c) {
     var r = Math.random() * 16 | 0;
@@ -9,7 +9,10 @@ var getUuid = function getUuid() {
   });
 };
 var MX51 = function MX51(props, ref) {
+  var _context$appHelper;
   var logger = useLogger();
+  var context = useEngineContext();
+  var action = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.action;
   var onOpen = function onOpen(_ref) {
     var data = _ref.data,
       payCallback = _ref.payCallback;
@@ -33,20 +36,47 @@ var MX51 = function MX51(props, ref) {
         params: newData
       }
     });
-    // 通过jsbridge调用mx51支付
-    webPayment(newData, function (res) {
-      // 判断是否是同一个支付
-      var isSame = (res === null || res === void 0 ? void 0 : res.uniquePaymentNumber) === uniquePaymentNumber;
-      logger === null || logger === void 0 || logger.addLog({
-        type: 'info',
-        title: 'ToB_MX51_onOpen_callback',
-        metadata: {
-          msg: isSame ? 'uniquePaymentNumber一致' : 'uniquePaymentNumber不一致',
-          res: res
+
+    // 通过action调用mx51支付
+    action({
+      type: 'webpos.handleMX51Pay',
+      data: newData,
+      callback: function callback(res) {
+        var isSame = false;
+        if (res !== null && res !== void 0 && res.uniquePaymentNumber) {
+          // jsbridge调用场景结果
+          var _res = res;
+          // 判断是否是同一个支付
+          isSame = (_res === null || _res === void 0 ? void 0 : _res.uniquePaymentNumber) === uniquePaymentNumber;
+          if (isSame) {
+            payCallback === null || payCallback === void 0 || payCallback(_res);
+          }
+        } else {
+          var _res2$data, _res2$data2;
+          // 原生调用场景结果
+          var _res2 = res;
+          // 转换为MX51PayResult类型，上层调用需要
+          var newRes = {
+            result: (_res2 === null || _res2 === void 0 ? void 0 : _res2.code) == '200' ? true : false,
+            msg: _res2 === null || _res2 === void 0 ? void 0 : _res2.msg,
+            amount: _res2 === null || _res2 === void 0 || (_res2$data = _res2.data) === null || _res2$data === void 0 ? void 0 : _res2$data.amount,
+            surcharge: _res2 === null || _res2 === void 0 || (_res2$data2 = _res2.data) === null || _res2$data2 === void 0 ? void 0 : _res2$data2.surcharge,
+            uniquePaymentNumber: _res2 === null || _res2 === void 0 ? void 0 : _res2.uuid
+          };
+          // 判断是否是同一个支付
+          isSame = (_res2 === null || _res2 === void 0 ? void 0 : _res2.uuid) === uniquePaymentNumber;
+          if (isSame) {
+            payCallback === null || payCallback === void 0 || payCallback(newRes);
+          }
         }
-      });
-      if (isSame) {
-        payCallback === null || payCallback === void 0 || payCallback(res);
+        logger === null || logger === void 0 || logger.addLog({
+          type: 'info',
+          title: 'ToB_MX51_onOpen_callback',
+          metadata: {
+            msg: isSame ? '交易流水号一致' : '交易流水号不一致',
+            res: res
+          }
+        });
       }
     });
   };

package/es/components/pay/toB/types/index.d.ts

@@ -58,3 +58,15 @@ export interface MX51PayResult {
     surcharge: number;
     uniquePaymentNumber: string;
 }
+/**
+ * @title 原生MX51支付结果
+ */
+export interface NativeMX51PayResult {
+    code: string;
+    msg?: string;
+    data: {
+        amount: number;
+        surcharge: number;
+    };
+    uuid: string;
+}

package/es/components/pay/toB/types/index.js

@@ -11,4 +11,8 @@ export * from "./storeTypes";
 /**
  * @title: MX51支付结果
  */
+
+/**
+ * @title 原生MX51支付结果
+ */
 export {};

package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -381,7 +381,7 @@ export var checkTDSAuth = /*#__PURE__*/function () {
               billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
               billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
               billAddrState: paymentInfo.billingAddress.billAddrState,
-              threeDSCompInd: isPre ? '' : threeDSCompInd,
+              threeDSCompInd: isPre ? '' : threeDSCompInd || 'N',
               threeDSServerTransID: isPre ? '' : threeDSServerTransID,
               threeDSRequestorAuthenticationInd: '01',
               threeDSRequestorURL: window.location.href,

package/es/components/pisellSelectCustomerModal/RightPanel/serve.js

@@ -12,7 +12,11 @@ export var getCustomerList = /*#__PURE__*/function () {
           _context.next = 2;
           return request.getRequest().get("/shop/customer/select-list", params, {
             abort: true,
-            fullResult: true
+            fullResult: true,
+            cache: {
+              mode: "remote_local",
+              type: "indexDB"
+            }
           });
         case 2:
           _yield$request$getReq = _context.sent;

package/es/components/ticketBooking/components/ProductDisplayAdapter/ProductDisplayAdapter.js

@@ -90,6 +90,7 @@ var ProductDisplayAdapter = function ProductDisplayAdapter(props) {
         })) || []
       });
     });
+    console.log(tabData, 'tabData123');
     return /*#__PURE__*/React.createElement("div", {
       className: "sku-list-container ".concat(className || ''),
       style: style,

package/es/components/ticketBooking/components/ProductDisplayAdapter/index.less

@@ -1,6 +1,18 @@
 .sku-list-container {
   height: 100%;
   background-color: #4e4e4e;
+  .empty-content {
+    .empty-icon-wrapper {
+      .empty-default-icon {
+        color: rgba(255, 255, 255, 0.8) !important;
+      }
+    }
+    .empty-inner {
+      .empty-text {
+        color: rgba(255, 255, 255, 0.8) !important;
+      }
+    }
+  }
   .sku-list {
     background-color: #4e4e4e;
     overflow: auto;

package/es/components/ticketBooking/components/ProductDisplayAdapter/utils.d.ts

@@ -28,6 +28,8 @@ interface ProductCategory {
     icon?: string;
     slug?: string;
     sort?: number;
+    /** 父级分类 ID，0 或 null/undefined 表示一级分类 */
+    parent_id?: number | null;
 }
 /**
  * 产品项接口
@@ -38,13 +40,42 @@ interface Product {
     category?: ProductCategory[];
     [key: string]: any;
 }
+/**
+ * 分类树节点接口（Switch 模式返回值）
+ */
+export interface CategoryTreeNode {
+    /** 分类 ID，All 节点为 '{父级路径}_all' 格式 */
+    id: number | string;
+    /** 分类唯一标识 兼容 List 组件的 key 字段 */
+    key: number | string;
+    /** 分类名称 兼容 List 组件的 label 字段 */
+    label: string;
+    /** 分类分组 兼容 List 组件的 group 字段 */
+    group: number | string;
+    /** 分类名称 */
+    name: string;
+    /** 分类图标 */
+    icon?: string;
+    /**
+     * 路径式父级标识
+     * - 一级分类：无此字段
+     * - 二级分类：'1'（父级 id）
+     * - 三级分类：'1_2'（路径格式）
+     * - 以此类推
+     */
+    pid?: string;
+    /** 该分类下所有商品的 ID 数组（包含子分类的商品） */
+    productIds: number[];
+    /** 子分类列表，如果有子分类，第一个为 All 节点 */
+    children?: CategoryTreeNode[];
+}
 /**
  * 根据产品数据生成分类 Tabs（Switch 模式）
  * 参考 TestResponsiveWrapper 的 generateSimpleTabItems 函数
  *
  * @param products 产品列表
  * @param tabStyle tab 样式类型
- * @returns TabItem 数组
+ * @returns Switch 模式返回 CategoryTreeNode[]，Anchor 模式返回 TabItem[]
  */
-export declare const generateProductTabs: (products: Product[], tabStyle?: 'switch' | 'anchor') => TabItem[];
+export declare const generateProductTabs: (products: Product[], tabStyle?: 'switch' | 'anchor') => CategoryTreeNode[] | TabItem[];
 export {};