@pisell/private-materials 6.7.9 → 6.8.1

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 () {
@@ -136,7 +136,8 @@ var List = function List(props) {
     } : _props$emptyConfig,
     pagination = props.pagination,
     _props$loading = props.loading,
-    loading = _props$loading === void 0 ? false : _props$loading;
+    loading = _props$loading === void 0 ? false : _props$loading,
+    renderSearch = props.renderSearch;
   console.log('List props', props);
   var tabItems = tabStyle === 'none' ? [] : tabData || [];
 
@@ -145,6 +146,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,6 +176,11 @@ 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 () {
@@ -273,40 +280,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];
+        });
+        return [{
+          tabKey: activeTab,
+          tabLabel: "",
+          items: items
+        }];
+      } else {
+        // 查找当前选中的tab
+        var currentTab = tabItems.find(function (tab) {
+          return tab.key === activeTab;
         });
-      } 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) {
+        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]);
 
@@ -593,18 +611,26 @@ var List = function List(props) {
       rowGap: "".concat(rowGap, "px")
     };
     if (displayStyle === 'grid') {
+      return _objectSpread(_objectSpread({}, baseStyle), {}, {
+        display: 'grid',
+        gridTemplateColumns: "repeat(".concat(columns, ", 1fr)")
+      });
+      /*
       if (layoutDirection === 'vertical') {
-        return _objectSpread(_objectSpread({}, baseStyle), {}, {
-          display: 'grid',
-          gridTemplateColumns: "repeat(".concat(columns, ", 1fr)")
-        });
+          return {
+              ...baseStyle,
+              display: 'grid',
+              gridTemplateColumns: `repeat(${columns}, 1fr)`,
+          };
       } else {
-        return _objectSpread(_objectSpread({}, baseStyle), {}, {
-          display: 'grid',
-          gridTemplateRows: "repeat(".concat(rows, ", 1fr)"),
-          gridAutoFlow: 'column'
-        });
+          return {
+              ...baseStyle,
+              display: 'grid',
+              gridTemplateRows: `repeat(${rows}, 1fr)`,
+              gridAutoFlow: 'column',
+          };
       }
+      */
     } else {
       // 瀑布流布局 - 使用新的瀑布流实现
       return _objectSpread(_objectSpread({}, baseStyle), {}, {
@@ -689,15 +715,27 @@ var List = function List(props) {
         tabStyle: tabStyle
       }));
     }
-    return /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      id: "level1-wrap"
+    }), /*#__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, {
+      levelConfig: {
+        level1: {
+          positionId: "#level1-wrap"
+        },
+        level2: {
+          positionId: "#level2-wrap"
+        }
+      },
+      style: {
+        height: "100%"
+      },
+      dataSource: tabItems,
+      value: activeTab,
       onChange: handleTabChangeWithScroll
-    }));
+    })));
   };
 
   // 渲染列表内容
@@ -733,7 +771,9 @@ var List = function List(props) {
       }), paginationType === 'scroll' && {
         overflow: layoutDirection === 'horizontal' ? 'auto hidden' : 'hidden auto'
       })
-    }, layoutDirection === 'vertical' && renderTabs(), totalDataLength === 0 && !loading ? /*#__PURE__*/React.createElement(EmptyState, {
+    }, renderSearch === null || renderSearch === void 0 ? void 0 : renderSearch(), /*#__PURE__*/React.createElement("div", {
+      id: "level2-wrap"
+    }), layoutDirection === 'vertical' && renderTabs(), totalDataLength === 0 && !loading ? /*#__PURE__*/React.createElement(EmptyState, {
       config: emptyConfig,
       hasData: totalDataLength > 0
     }) : /*#__PURE__*/React.createElement("div", {
@@ -807,7 +847,7 @@ var List = function List(props) {
       layoutDirection: layoutDirection,
       paginationType: paginationType
     })));
-  }, [displayStyle, layoutDirection, paginationType, listStyle, processedData, renderItem, loading, children, height, scrollLoadState, emptyConfig, totalDataLength, tabStyle]);
+  }, [displayStyle, layoutDirection, paginationType, listStyle, processedData, renderItem, loading, children, height, scrollLoadState, emptyConfig, totalDataLength, tabStyle, renderSearch]);
 
   // 渲染底部工具栏
   var renderFooter = function renderFooter() {
@@ -929,10 +969,13 @@ var List = function List(props) {
   });
 
   // 计算容器样式 - 直接计算，无需memo
-  var finalContainerStyle = _objectSpread(_objectSpread({}, containerStyle), {}, {
+  var finalContainerStyle = _objectSpread(_objectSpread(_objectSpread({}, containerStyle), {}, {
     position: 'relative'
   }, layoutDirection === 'vertical' && height !== 'auto' && {
     overflowY: 'hidden'
+  }), layoutDirection === 'horizontal' && {
+    display: 'flex',
+    flexDirection: "row"
   });
 
   // 渲染主要内容区域
@@ -942,7 +985,7 @@ var List = function List(props) {
       return renderContent();
     } else {
       // 左右排版：保持原有结构
-      return /*#__PURE__*/React.createElement(React.Fragment, null, renderTabs(), renderContent());
+      return /*#__PURE__*/React.createElement(React.Fragment, null, renderContent(), renderTabs());
     }
   };
   return /*#__PURE__*/React.createElement("div", {

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,8 @@ 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 } from 'react';
+import { PisellTabbar } from '@pisell/materials';
 
 // 状态接口
 
@@ -48,7 +49,8 @@ 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',
@@ -59,6 +61,12 @@ export var useListState = function useListState(_ref) {
     _useReducer2 = _slicedToArray(_useReducer, 2),
     state = _useReducer2[0],
     dispatch = _useReducer2[1];
+  useEffect(function () {
+    if (tabStyle === 'switch' && tabItems.length > 0) {
+      var defaultTab = PisellTabbar.getDefaultActiveKey(tabItems, 'id');
+      setActiveTab(defaultTab);
+    }
+  }, [tabItems]);
 
   // 计算实际使用的当前页码
   var actualCurrentPage = externalCurrentPage || state.currentPage;

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

@@ -35,5 +35,9 @@
     position: relative;
   }
 
+  #level2-wrap {
+    margin-bottom: 12px;
+  }
+
   /* 空状态样式已移至 EmptyState 组件 */
 }

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

@@ -315,7 +315,7 @@
   &.list-content-horizontal {
     /* 水平排版时，允许水平滚动 */
     overflow-x: auto;
-    overflow-y: hidden;
+    overflow-y: auto;
 
     &.list-content-grid {
       .list-items {

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

@@ -1,7 +1,7 @@
 /* 头部Tab栏样式 */
 
 .pisell-list-header {
-  padding: 16px;
+  padding: 0;
 
   &.pisell-list-header-sticky {
     position: sticky;
@@ -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/types.d.ts

@@ -133,6 +133,7 @@ export interface ListProps<TItem extends BaseListItem = BaseListItem> {
     /** 状态配置 */
     emptyConfig?: EmptyStateConfig;
     loading?: boolean;
+    renderSearch?: () => ReactNode;
 }
 /** 向后兼容的非泛型版本 */
 export interface LegacyListProps extends ListProps<any> {

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/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,
@@ -476,16 +476,7 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
   // 返回iframe
   return new Promise(function (res, rej) {
     var timer = null;
-
-    // 120秒没成功 认为失败
-    timer = setTimeout(function () {
-      log({
-        msg: '第五步: 60秒超时则走N逻辑',
-        data: challengeData
-      });
-      rej('time out');
-    }, 2 * 60 * 1000);
-    window.addEventListener('message', function (event) {
+    var handleMessage = function handleMessage(event) {
       // loadingSpinnerAnimation("on");
       if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
         if (typeof event.data.cres == 'string') {
@@ -496,7 +487,18 @@ export var createChallengeIframe = function createChallengeIframe(challengeData,
           closeIframe();
         }
       }
-    }, false);
+    };
+
+    // 120秒没成功 认为失败
+    timer = setTimeout(function () {
+      log({
+        msg: '第五步: 60秒超时则走N逻辑',
+        data: challengeData
+      });
+      window.removeEventListener('message', handleMessage);
+      rej('time out');
+    }, 2 * 60 * 1000);
+    window.addEventListener('message', handleMessage, false);
   });
 };
 

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

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

package/es/components/pay/toC/PaymentMethods/WalletPass/serve.d.ts

@@ -50,6 +50,12 @@ export declare type WalletPassDataType = {
     shop: Shop;
     wallet_pass_usage?: any;
     balance_par_value: string;
+    custom_schedule_snapshot?: {
+        data: any[];
+    };
+    metadata?: {
+        validity_type: string;
+    };
 };
 declare type Shop = {
     id: number;

package/es/components/pay/toC/PaymentMethods/WalletPass/utils.js

@@ -11,7 +11,7 @@ var voucherTime = function voucherTime(data) {
 export var formatMachineCodeServer2CardList = function formatMachineCodeServer2CardList(data) {
   var selectId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   return (data || []).map(function (item) {
-    var _item$shop, _item$unified_message, _item$product;
+    var _item$shop, _item$unified_message, _item$product, _item$custom_schedule, _item$metadata;
     return {
       id: item.id,
       name: item.product_name,
@@ -30,7 +30,9 @@ export var formatMachineCodeServer2CardList = function formatMachineCodeServer2C
       cover: (_item$product = item.product) === null || _item$product === void 0 ? void 0 : _item$product.cover,
       qrCode: item.code,
       validDate: voucherTime(item),
-      originData: item
+      originData: item,
+      scheduleList: ((_item$custom_schedule = item.custom_schedule_snapshot) === null || _item$custom_schedule === void 0 ? void 0 : _item$custom_schedule.data) || [],
+      validDateBySchedule: ((_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.validity_type) === 'custom_schedule_validity'
     };
   });
 };

package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.js

@@ -130,6 +130,8 @@ var PaymentReturnContent = function PaymentReturnContent(_ref) {
     src: "".concat(prefix, "/payment-content.png"),
     alt: "success"
   })), /*#__PURE__*/React.createElement("div", {
+    className: "payment-return-content-text"
+  }, locales.getText('tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater')), /*#__PURE__*/React.createElement("div", {
     className: "payment-return-content-buttons"
   }, /*#__PURE__*/React.createElement(Button, {
     block: true,

package/es/components/pay/toC/PaymentMethods/components/PaymentReturnContent/index.less

@@ -1,16 +1,26 @@
 .payment-return-content {
   padding: 100px 46px 0;
+  max-height: 100vh;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
 
   .payment-return-content-img {
     width: 100%;
-    margin-bottom: 60px;
     min-height: 270px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     img {
-      width: 100%;
+      max-width: 100%;
       height: 100%;
+      max-height: 480px;
     }
   }
-  
+  .payment-return-content-text {
+    color: var(--Gray-600, #475467);
+    text-align: center;
+  }
   .payment-return-content-buttons {
     display: flex;
     flex-direction: column;

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

@@ -31,6 +31,7 @@ import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
 import { getIsWalletPassAndTripartitePayment } from "./utils";
+import { saleChannelMap } from "./status";
 import "./index.less";
 /**
  * @title: C端支付
@@ -142,11 +143,12 @@ var ToCPay = function ToCPay(props, ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             sale_channel = (initProps === null || initProps === void 0 || (_initProps$order = initProps.order) === null || _initProps$order === void 0 ? void 0 : _initProps$order.sale_channel) || 'online-store';
-            _context.next = 3;
+            sale_channel = saleChannelMap[sale_channel] || sale_channel;
+            _context.next = 4;
             return getWalletNameAndPopupStatus({
               setting_type: "".concat(sale_channel, "-wallet-setting")
             });
-          case 3:
+          case 4:
             _yield$getWalletNameA = _context.sent;
             wallet = _yield$getWalletNameA.wallet;
             wallet_setting = _yield$getWalletNameA.wallet_setting;
@@ -164,7 +166,7 @@ var ToCPay = function ToCPay(props, ref) {
               type: 'setWalletSetting',
               payload: setting
             });
-          case 9:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -509,7 +511,8 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: 'paymentInit'
               }
             });
-          case 18:
+            throw _context5.t0;
+          case 19:
           case "end":
             return _context5.stop();
         }