@pisell/private-materials 6.9.2 → 6.9.4

package/es/plus/productSelect/index.js

@@ -1,5 +1,5 @@
 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); }
-var _excluded = ["dataSource", "emptyDescription", "showSearch", "scrollDom", "offsetDom", "style", "token", "onChange", "value", "selectedItems", "productListSetting", "customScrollParent", "loading", "layout", "hideCategoryWhenOne"];
+var _excluded = ["dataSource", "emptyDescription", "showSearch", "scrollDom", "offsetDom", "style", "token", "onChange", "value", "selectedItems", "productListSetting", "customScrollParent", "loading", "layout", "hideCategoryWhenOne", "tabSwitchMode"];
 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; }
@@ -15,7 +15,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useEffect, useCallback, useMemo, useRef, useState, useLayoutEffect } from 'react';
 import classNames from 'classnames';
-import { Input } from '@pisell/materials';
+import { Input, PisellTabbarTemplate1 } from '@pisell/materials';
 import { locales } from '@pisell/utils';
 import SearchLg from '@pisell/icon/es/SearchLg';
 import CategoryTabs, { CategorySkeleton } from "./CategoryTabs";
@@ -28,6 +28,7 @@ import localeTexts from "./locales";
 import useEngineContext from "../../hooks/useEngineContext";
 import { PisellEmpty } from '@pisell/materials';
 import "./index.less";
+import { isArr } from '@pisell/utils';
 // 虚假数据常量，用于loading状态
 var MOCK_DATA = function () {
   var mockData = [];
@@ -70,6 +71,8 @@ var index = function index(_ref) {
     layout = _ref.layout,
     _ref$hideCategoryWhen = _ref.hideCategoryWhenOne,
     hideCategoryWhenOne = _ref$hideCategoryWhen === void 0 ? false : _ref$hideCategoryWhen,
+    _ref$tabSwitchMode = _ref.tabSwitchMode,
+    tabSwitchMode = _ref$tabSwitchMode === void 0 ? 'anchor' : _ref$tabSwitchMode,
     rest = _objectWithoutProperties(_ref, _excluded);
   var context = useEngineContext();
   locales.init(localeTexts, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.storage) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.get('umi_locale')) || 'en');
@@ -78,7 +81,7 @@ var index = function index(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     keyword = _useState2[0],
     setKeyword = _useState2[1];
-  var _useState3 = useState(''),
+  var _useState3 = useState(['0']),
     _useState4 = _slicedToArray(_useState3, 2),
     activeKey = _useState4[0],
     setActiveKey = _useState4[1];
@@ -90,8 +93,10 @@ var index = function index(_ref) {
   var containerRef = useRef(null);
   var _customScrollParent = customScrollParent || scrollDom;
   var gridComponents = useMemo(function () {
-    return createGridComponents(layout);
-  }, [layout]);
+    return createGridComponents(layout, {
+      tabSwitchMode: tabSwitchMode
+    });
+  }, [layout, tabSwitchMode]);
   var _filteredList = useMemo(function () {
     if (!keyword) return dataSource;
     return dataSource.filter(function (product) {
@@ -103,6 +108,38 @@ var index = function index(_ref) {
     var _list = _filteredList || [];
     return groupProductsByCategory(_list);
   }, [_filteredList]);
+
+  /**
+   * @title: 根据模式获取显示的数据列表
+   * @description: anchor模式显示全部分类数据，switch模式只显示当前选中分类的产品
+   */
+  var _displayList = useMemo(function () {
+    // anchor模式：显示全部数据（包含分类和产品）
+    if (tabSwitchMode === 'anchor') {
+      return _groupedList;
+    }
+    // switch模式：只显示当前选中分类的产品，不显示分类标题
+    if (!activeKey) {
+      return _groupedList;
+    }
+    return _groupedList.filter(function (item) {
+      // 过滤掉分类标题项
+      if (item.__typename === 'category') {
+        return false;
+      }
+      // 只保留当前选中分类的产品
+      if (isArr(activeKey)) {
+        if (activeKey.includes('0')) {
+          return true;
+        }
+        return activeKey.includes(String(item.__categoryId));
+      }
+      if (activeKey === '0') {
+        return true;
+      }
+      return String(item.__categoryId) === activeKey;
+    });
+  }, [tabSwitchMode, _groupedList, activeKey]);
   var _categories = useMemo(function () {
     return _groupedList.filter(function (item) {
       return item.__typename === 'category';
@@ -123,24 +160,28 @@ var index = function index(_ref) {
    * @Date: 2025-10-09 15:13
    */
   var isHideCategory = useMemo(function () {
+    // 装修设置的隐藏分类
+    if ((productListSetting === null || productListSetting === void 0 ? void 0 : productListSetting.layout) === 0) {
+      return true;
+    }
     if (hideCategoryWhenOne) {
       // 只有一个分类或者没有分类
       return (_categories === null || _categories === void 0 ? void 0 : _categories.length) === 1 || !(_categories !== null && _categories !== void 0 && _categories.length);
     }
     return false;
-  }, [_categories, hideCategoryWhenOne]);
+  }, [_categories, hideCategoryWhenOne, productListSetting === null || productListSetting === void 0 ? void 0 : productListSetting.layout]);
   useEffect(function () {
     if (!(_categories !== null && _categories !== void 0 && _categories.length)) {
-      setActiveKey('');
+      setActiveKey([]);
       return;
     }
     if (!activeKey) {
-      switchCategory(_categories[0].key);
+      switchCategory('0');
     } else {
       var found = _categories.find(function (category) {
         return category.key === activeKey;
       });
-      if (!found) switchCategory(_categories[0].key);
+      if (!found) switchCategory('0');
     }
   }, [_categories]);
   useLayoutEffect(function () {
@@ -182,23 +223,42 @@ var index = function index(_ref) {
   }, []);
   var lastActiveKeyRef = useRef('');
 
-  // 项目进入视口时的回调
+  /**
+   * @title: 项目进入视口时的回调
+   * @description: 仅在anchor模式下生效，用于滚动时自动切换高亮的分类Tab
+   */
   var handleItemIntersectionIn = useCallback(function (item) {
+    // switch模式下不需要监听滚动来切换Tab
+    if (tabSwitchMode === 'switch') {
+      return;
+    }
     var _key = String(item.__categoryId);
     if (!isIndicatorVisibleRef.current && _key && _key !== lastActiveKeyRef.current) {
       setActiveKey(_key);
       lastActiveKeyRef.current = _key;
     }
-  }, []);
+  }, [tabSwitchMode]);
   var _listContext = useMemo(function () {
     return {
       onItemIntersectionIn: handleItemIntersectionIn,
       onItemIntersectionOut: function onItemIntersectionOut() {}
     };
   }, [handleItemIntersectionIn]);
+
+  /**
+   * @title: 切换分类
+   * @description: anchor模式下滚动到对应锚点，switch模式下只切换数据
+   */
   var switchCategory = function switchCategory(key) {
-    setActiveKey(key);
+    setActiveKey(isArr(key) ? key : [key]);
     lastActiveKeyRef.current = key; // 同步ref值
+
+    // switch模式下只需要切换activeKey，不需要滚动
+    if (tabSwitchMode === 'switch') {
+      return;
+    }
+
+    // 以下是anchor模式的滚动逻辑
     debounceIndicator(300);
     var categoryIndex = _groupedList.findIndex(function (item) {
       return item.__typename === 'category' && String(item.id) === key;
@@ -250,7 +310,18 @@ var index = function index(_ref) {
       // switchCategory('');
       setKeyword(e.target.value);
     }
-  })) : null, !isHideCategory ? /*#__PURE__*/React.createElement(CategoryTabs, {
+  })) : null, !isHideCategory ? tabSwitchMode === 'switch' ? /*#__PURE__*/React.createElement(PisellTabbarTemplate1, {
+    style: {
+      position: "sticky",
+      top: 0,
+      zIndex: 10,
+      background: 'var(--ps-container-bg, #fff)'
+    },
+    dataSource: _categories,
+    value: activeKey,
+    onChange: switchCategory,
+    className: "".concat(PREFIX, "__tabs-wrapper")
+  }) : /*#__PURE__*/React.createElement(CategoryTabs, {
     activeKey: activeKey,
     items: _categories,
     onChange: switchCategory,
@@ -264,7 +335,7 @@ var index = function index(_ref) {
   }, /*#__PURE__*/React.createElement(ProductList, {
     className: classNames("".concat(PREFIX, "__product-list"), _defineProperty({}, "".concat(PREFIX, "__product-list_hide_category"), isHideCategory)),
     loading: loading,
-    data: loading ? MOCK_DATA : _groupedList,
+    data: loading ? MOCK_DATA : _displayList,
     _customScrollParent: scrollParent,
     context: _listContext,
     components: gridComponents,

package/es/plus/saasCreateOrganization/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SCOProps } from './types';
 import './index.less';
 declare const SaasCreateOrganization: (props: SCOProps) => JSX.Element;

package/es/plus/saasRegister/components/VertifyEmail.d.ts

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

package/es/plus/selectHolder/components/ErrorTip/index.d.ts

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

package/es/plus/skuOptionsSelection/components/OptionsCard/index.d.ts

@@ -1,6 +1,7 @@
 /**
  * 单规格商品卡片，点击后需要拉起弹窗展示具体的规格信息
  */
+/// <reference types="react" />
 import { RenderItemProps } from '../../../../pro/Selector/types';
 import './index.less';
 declare const OptionsCard: (props: RenderItemProps & {

package/es/plus/skuOptionsSelection/components/OptionsModal/index.js

@@ -38,6 +38,7 @@ var OptionsModal = function OptionsModal(props) {
   var customConfig = useStore(function (s) {
     return s.customConfig;
   });
+  console.log(customConfig, 'customConfig>>>>>>>');
   useEffect(function () {
     var _props$modalValue;
     if (!!(props !== null && props !== void 0 && (_props$modalValue = props.modalValue) !== null && _props$modalValue !== void 0 && _props$modalValue.quantity)) {

package/es/plus/skuOptionsSelection/components/VariantCard/index.d.ts

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

package/es/plus/skuOptionsSelection/components/VariantCard/index.js

@@ -46,7 +46,7 @@ var VariantCard = function VariantCard(props) {
       fontWeight: priceConfig === null || priceConfig === void 0 ? void 0 : priceConfig.fontWeight,
       color: priceConfig === null || priceConfig === void 0 ? void 0 : priceConfig.color
     }
-  }, priceText) : null));
+  }, locales.getText('pisell2.skuOptionsSelection.variantItemCard.price'), ":", priceText) : null));
 };
 function formatPriceText(params) {
   var symbol = params.symbol || '$';

package/es/plus/skuOptionsSelection/locales.d.ts

@@ -5,6 +5,7 @@ declare const _default: {
         'pisell2.skuOptionsSelection.titleExtra.totalPrice': string;
         'pisell2.skuOptionsSelection.optionItemCard.editSelections': string;
         'pisell2.skuOptionsSelection.variantItemCard.soldOut': string;
+        'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
     };
@@ -14,6 +15,7 @@ declare const _default: {
         'pisell2.skuOptionsSelection.titleExtra.totalPrice': string;
         'pisell2.skuOptionsSelection.optionItemCard.editSelections': string;
         'pisell2.skuOptionsSelection.variantItemCard.soldOut': string;
+        'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
     };
@@ -23,6 +25,7 @@ declare const _default: {
         'pisell2.skuOptionsSelection.titleExtra.totalPrice': string;
         'pisell2.skuOptionsSelection.optionItemCard.editSelections': string;
         'pisell2.skuOptionsSelection.variantItemCard.soldOut': string;
+        'pisell2.skuOptionsSelection.variantItemCard.price': string;
         'pisell2.skuOptionsSelection.optionItemCard.typeText': string;
         'pisell2.skuOptionsSelection.optionItemCard.overSelected': string;
     };

package/es/plus/skuOptionsSelection/locales.js

@@ -5,6 +5,7 @@ export default {
     'pisell2.skuOptionsSelection.titleExtra.totalPrice': 'Subtotal: {{price}}',
     'pisell2.skuOptionsSelection.optionItemCard.editSelections': 'Edit selections',
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': 'Out of stock',
+    'pisell2.skuOptionsSelection.variantItemCard.price': 'Price',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': 'Type',
     'pisell2.skuOptionsSelection.optionItemCard.overSelected': 'Over selected'
   },
@@ -14,6 +15,7 @@ export default {
     'pisell2.skuOptionsSelection.titleExtra.totalPrice': '小计：{{price}}',
     'pisell2.skuOptionsSelection.optionItemCard.editSelections': '编辑选择',
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': '库存不足',
+    'pisell2.skuOptionsSelection.variantItemCard.price': '价格',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': '类型',
     'pisell2.skuOptionsSelection.optionItemCard.overSelected': '已达上限'
   },
@@ -23,6 +25,7 @@ export default {
     'pisell2.skuOptionsSelection.titleExtra.totalPrice': '小計：{{price}}',
     'pisell2.skuOptionsSelection.optionItemCard.editSelections': '編輯選擇',
     'pisell2.skuOptionsSelection.variantItemCard.soldOut': '庫存不足',
+    'pisell2.skuOptionsSelection.variantItemCard.price': '價格',
     'pisell2.skuOptionsSelection.optionItemCard.typeText': '類型',
     'pisell2.skuOptionsSelection.optionItemCard.overSelected': '已達上限'
   }

package/es/plus/skuOptionsSelection/utils/transformBundleGroup.js

@@ -45,7 +45,7 @@ export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
     });
 
     // Selector数据源
-    var selectorDataSource = {
+    var selectorDataSource = _defineProperty({
       id: item.id,
       title: (item === null || item === void 0 ? void 0 : item.name) || '',
       mode: (item === null || item === void 0 ? void 0 : item.max_quantity) === 1 ? 'single' : 'multiple',
@@ -62,6 +62,11 @@ export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
         autoValidate: true,
         required: Number(item === null || item === void 0 ? void 0 : item.min_quantity) > 0 ? true : false
       },
+      layout: {
+        type: 'antdGrid',
+        columns: 2,
+        gutter: [16, 16]
+      },
       headerProps: {
         renderExtra: function renderExtra(props) {
           return /*#__PURE__*/React.createElement(TitleExtra, props || {});
@@ -70,7 +75,11 @@ export var transformBundleGroup = function transformBundleGroup(bundleGroup) {
       stepperProps: {
         horizontalPadding: '8px'
       }
-    };
+    }, "layout", {
+      type: 'antdGrid',
+      columns: 2,
+      gutter: [16, 16]
+    });
 
     // 渲染选项卡片
     selectorDataSource.renderItem = function (itemProps) {

package/es/plus/skuOptionsSelection/utils/transformOptionGroup.js

@@ -32,6 +32,11 @@ export var transformOptionGroup = function transformOptionGroup(optionGroup) {
           max: optionItem === null || optionItem === void 0 ? void 0 : optionItem.max_quantity,
           autoValidate: true
         },
+        layout: {
+          type: 'antdGrid',
+          columns: 2,
+          gutter: [16, 16]
+        },
         _extra: {
           canSell: canSell,
           hasStock: hasStock
@@ -70,6 +75,11 @@ export var transformOptionGroup = function transformOptionGroup(optionGroup) {
       },
       stepperProps: {
         horizontalPadding: '8px'
+      },
+      layout: {
+        type: 'antdGrid',
+        columns: 2,
+        gutter: [16, 16]
       }
     };
 

package/es/plus/skuOptionsSelection/utils/transformSelectorValueToValue.js

@@ -153,5 +153,6 @@ export var transformSelectorValueToValue = function transformSelectorValueToValu
       }
     }
   }
+  console.log('transformValue>>>>>', transformValue);
   return transformValue;
 };

package/es/plus/skuOptionsSelection/utils/transformValueToSelectorValue.js

@@ -184,6 +184,8 @@ var createBundleValue = function createBundleValue(v, dataSource) {
       });
       _createdValue.data._data = _data;
     }
+    _createdValue.data.num = (v1 === null || v1 === void 0 ? void 0 : v1.num) || 1;
+    _createdValue.data.quantity = (v1 === null || v1 === void 0 ? void 0 : v1.quantity) || 1;
     _createdValue.quantity = (_createdValue.quantity || 0) + ((v1 === null || v1 === void 0 ? void 0 : v1.quantity) || 0);
     var _pricePrefix = ((_findedBundleItem2 = findedBundleItem) === null || _findedBundleItem2 === void 0 ? void 0 : _findedBundleItem2.price_type) === 'markdown' ? -1 : 1;
     _createdValue.totalPrice = new Decimal(_createdValue.totalPrice || 0).plus(new Decimal((v1 === null || v1 === void 0 ? void 0 : v1.price) || 0).times((v1 === null || v1 === void 0 ? void 0 : v1.quantity) || 1).times(_pricePrefix)).toNumber();

package/es/plus/skuOptionsSelection/utils/transformVariantGroup.js

@@ -36,6 +36,11 @@ export var transformVariantGroup = function transformVariantGroup(variantGroup)
         ruleConfig: {
           autoValidate: true
         },
+        layout: {
+          type: 'antdGrid',
+          columns: 2,
+          gutter: [16, 16]
+        },
         _extra: {
           canSell: canSell,
           hasStock: hasStock
@@ -72,6 +77,11 @@ export var transformVariantGroup = function transformVariantGroup(variantGroup)
       },
       stepperProps: {
         horizontalPadding: '8px'
+      },
+      layout: {
+        type: 'antdGrid',
+        columns: 2,
+        gutter: [16, 16]
       }
     };
 

package/es/plus/walletPassGallery/components/passDetail/index.js

@@ -56,7 +56,7 @@ var PassDetail = function PassDetail(props) {
     },
     store = _ref.store;
   var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.constants) || {
-      apiPrefix: "/h5"
+      apiPrefix: '/h5'
     },
     apiPrefix = _ref2.apiPrefix;
   var timezone = (store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.symbol) === null || _store$getState === void 0 || (_store$getState = _store$getState.shop) === null || _store$getState === void 0 ? void 0 : _store$getState.timezone) || 'Asia/Shanghai';
@@ -142,9 +142,9 @@ var PassDetail = function PassDetail(props) {
     var expireText = expire_date ? expire_date : locales.getText('wallet-pass-gallery.expireDate');
     if (scheduleList.length > 0) {
       // 换行展示
-      var validityTexts = "";
-      var excludedText = "";
-      var includedText = "";
+      var validityTexts = '';
+      var excludedText = '';
+      var includedText = '';
       detail.forEach(function (item) {
         if (item.validityTexts.length > 0) {
           validityTexts = "".concat(validityTexts).concat(item.validityTexts.join('\n'), "\n");
@@ -246,7 +246,8 @@ var PassDetail = function PassDetail(props) {
     return /*#__PURE__*/React.createElement(TimelineSection, {
       code: code,
       tag: tag,
-      timezone: timezone
+      timezone: timezone,
+      apiPrefix: apiPrefix
     });
   };
   if (!props.dataSource) return null;

package/es/plus/walletPassGallery/components/passList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 interface IPassListProps {
     dataSource: any[];
     value?: string | number;

package/es/plus/walletPassGallery/components/timelineSection/index.d.ts

@@ -1,8 +1,10 @@
+/// <reference types="react" />
 import './index.less';
 interface TimelineSectionProps {
     code: string;
     tag: string;
     timezone: string;
+    apiPrefix?: '/shop' | '/h5';
 }
 declare const TimelineSection: (props: TimelineSectionProps) => JSX.Element;
 export default TimelineSection;

package/es/plus/walletPassGallery/components/timelineSection/index.js

@@ -11,7 +11,7 @@ import timezonePlugin from 'dayjs/plugin/timezone';
 import utcPlugin from 'dayjs/plugin/utc';
 import { locales } from '@pisell/utils';
 import { Timeline, Skeleton, PisellEmpty, usePisellConfig, PisellModal, PisellStatisticList, Button } from '@pisell/materials';
-import { getAssetList } from "../../serve";
+import { getAssetList, getActiveLogs } from "../../serve";
 import "./index.less";
 dayjs.extend(timezonePlugin);
 dayjs.extend(utcPlugin);
@@ -19,7 +19,8 @@ var stateTimeUnix = 1723255863; // 2024.8.10 时间戳
 var TimelineSection = function TimelineSection(props) {
   var code = props.code,
     tag = props.tag,
-    timezone = props.timezone;
+    timezone = props.timezone,
+    apiPrefix = props.apiPrefix;
   var _usePisellConfig = usePisellConfig(),
     _usePisellConfig$symb = _usePisellConfig.symbol,
     symbol = _usePisellConfig$symb === void 0 ? '$' : _usePisellConfig$symb;
@@ -87,6 +88,11 @@ var TimelineSection = function TimelineSection(props) {
     }, amount && currency_symbol ? formatCurrencyAmount(amount, action === 'order_expend') : ''));
   }, [assetActionEnum, formatCurrencyAmount]);
   var assetListReq = useRequest(function () {
+    if (apiPrefix === '/shop') {
+      return getActiveLogs({
+        filter_card_id: code
+      });
+    }
     return getAssetList({
       num: '99',
       skip: '1',
@@ -165,7 +171,7 @@ var TimelineSection = function TimelineSection(props) {
       label: locales.getText('wallet-pass-gallery.viewOrder'),
       value: timeLineDetail && timeLineDetail !== null && timeLineDetail !== void 0 && timeLineDetail.resource_code ? "#".concat(timeLineDetail === null || timeLineDetail === void 0 ? void 0 : timeLineDetail.resource_code) : timeLineDetail !== null && timeLineDetail !== void 0 && timeLineDetail.transaction_id ? "#".concat(timeLineDetail === null || timeLineDetail === void 0 ? void 0 : timeLineDetail.transaction_id) : '',
       isLink: !!(timeLineDetail && timeLineDetail !== null && timeLineDetail !== void 0 && timeLineDetail.resource_id),
-      link: timeLineDetail && timeLineDetail !== null && timeLineDetail !== void 0 && timeLineDetail.resource_id ? "/order/details?id=".concat(timeLineDetail === null || timeLineDetail === void 0 ? void 0 : timeLineDetail.resource_id) : undefined
+      link: timeLineDetail && timeLineDetail !== null && timeLineDetail !== void 0 && timeLineDetail.resource_id ? apiPrefix === '/shop' ? "/admin/order/orders/detail?id=".concat(timeLineDetail === null || timeLineDetail === void 0 ? void 0 : timeLineDetail.resource_id) : "/order/details?id=".concat(timeLineDetail === null || timeLineDetail === void 0 ? void 0 : timeLineDetail.resource_id) : undefined
     }],
     labelColor: "#101828",
     valueColor: "#101828",

package/es/plus/walletPassGallery/index.js

@@ -106,7 +106,7 @@ var WalletPassGallery = function WalletPassGallery(props) {
               tags: TAGS,
               filter_wallet_id: walletId || undefined,
               filter_holder_id: holderId || undefined,
-              with: ['holder.detail']
+              with: ['customScheduleSnapshot', 'holder.detail']
             });
           case 5:
             res = _context.sent;
@@ -149,7 +149,7 @@ var WalletPassGallery = function WalletPassGallery(props) {
               tags: TAGS,
               filter_wallet_id: walletId || undefined,
               filter_holder_id: holderId || undefined,
-              with: ['holder.detail']
+              with: ['customScheduleSnapshot', 'holder.detail']
             });
           case 5:
             res = _context2.sent;

package/es/plus/walletPassGallery/index.less

@@ -100,7 +100,7 @@
       position: absolute;
       font-size: 24px;
       top: 0px;
-      left: 22px;
+      left: 12px;
     }
 
     .header-title {

package/es/plus/walletPassGallery/serve.d.ts

@@ -166,6 +166,14 @@ export interface IAssetItem {
 export declare const getAssetList: (params: IAssetListProps) => Promise<{
     list: IAssetItem[];
 }>;
+/**
+ * 资产明细（admin）
+ */
+export declare const getActiveLogs: (params: {
+    filter_card_id: string;
+}) => Promise<{
+    list: IAssetItem[];
+}>;
 /**
  * 获取资产详情
  * @param params 接口请求参数