@pisell/private-materials 6.7.9 → 6.8.1

package/es/plus/clinetSearch/index.js

@@ -55,7 +55,7 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, /*#__PURE__*/React.createElement("div", {
       className: "header-item",
       style: {
-        width: 110
+        width: 180
       }
     }, locales.getText('pisell2.text.client-search.name')), /*#__PURE__*/React.createElement("div", {
       className: "header-item",
@@ -65,19 +65,14 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, locales.getText('pisell2.text.client-search.register-time')), /*#__PURE__*/React.createElement("div", {
       className: "header-item",
       style: {
-        width: 120
-      }
-    }, locales.getText('pisell2.text.client-search.phone')), /*#__PURE__*/React.createElement("div", {
-      className: "header-item",
-      style: {
-        width: 135
+        width: 125
       }
-    }, locales.getText('pisell2.text.client-search.email')), /*#__PURE__*/React.createElement("div", {
+    }, locales.getText('pisell2.text.client-search.membership')), /*#__PURE__*/React.createElement("div", {
       className: "header-item",
       style: {
-        width: 120
+        width: 180
       }
-    }, locales.getText('pisell2.text.client-search.membership')));
+    }, locales.getText('pisell2.text.client-search.contact-info')));
   };
 
   // 自定义结果展示组件
@@ -119,7 +114,7 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
     }, /*#__PURE__*/React.createElement(List, {
       dataSource: searchResults,
       renderItem: function renderItem(item, index) {
-        var _latest_wallet_detail;
+        var _latest_wallet_detail, _item$contacts_info, _item$contacts_info2, _item$contacts_info3;
         var membershipText = (_latest_wallet_detail = item.latest_wallet_detail) === null || _latest_wallet_detail === void 0 || (_latest_wallet_detail = _latest_wallet_detail.wallet) === null || _latest_wallet_detail === void 0 ? void 0 : _latest_wallet_detail.name;
         return /*#__PURE__*/React.createElement(List.Item, {
           key: item.id,
@@ -135,26 +130,11 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }, /*#__PURE__*/React.createElement("div", {
           className: "item-cell",
           style: {
-            width: 110
+            width: 180
           }
         }, /*#__PURE__*/React.createElement(ClientName, {
           dataSource: item
-        })), /*#__PURE__*/React.createElement("div", {
-          className: "item-cell",
-          style: {
-            width: 110
-          }
-        }, dayjs(item.created_at).format('YYYY-MM-DD') || '-'), /*#__PURE__*/React.createElement("div", {
-          className: "item-cell",
-          style: {
-            width: 120
-          }
-        }, item.phone || '-'), /*#__PURE__*/React.createElement("div", {
-          className: "item-cell",
-          style: {
-            width: 135
-          }
-        }, /*#__PURE__*/React.createElement("div", {
+        }), /*#__PURE__*/React.createElement("div", null, item.phone || '-'), /*#__PURE__*/React.createElement("div", {
           style: {
             overflow: 'hidden',
             textOverflow: 'ellipsis',
@@ -163,7 +143,12 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
         }, item.email || '-')), /*#__PURE__*/React.createElement("div", {
           className: "item-cell",
           style: {
-            width: 120
+            width: 110
+          }
+        }, dayjs(item.created_at).format('YYYY-MM-DD') || '-'), /*#__PURE__*/React.createElement("div", {
+          className: "item-cell",
+          style: {
+            width: 125
           }
         }, membershipText && translationOriginal !== null && translationOriginal !== void 0 && translationOriginal(membershipText) ? /*#__PURE__*/React.createElement(Tag, {
           color: "gold",
@@ -177,7 +162,20 @@ var ClientSearch = /*#__PURE__*/forwardRef(function (_ref, ref) {
             borderRadius: 16,
             marginRight: 0
           }
-        }, translationOriginal === null || translationOriginal === void 0 ? void 0 : translationOriginal(membershipText)) : '-')));
+        }, translationOriginal === null || translationOriginal === void 0 ? void 0 : translationOriginal(membershipText)) : '-'), /*#__PURE__*/React.createElement("div", {
+          className: "item-cell",
+          style: {
+            width: 180
+          }
+        }, /*#__PURE__*/React.createElement(ClientName, {
+          dataSource: item === null || item === void 0 || (_item$contacts_info = item.contacts_info) === null || _item$contacts_info === void 0 ? void 0 : _item$contacts_info.value
+        }), (item === null || item === void 0 || (_item$contacts_info2 = item.contacts_info) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.value) === null || _item$contacts_info2 === void 0 || (_item$contacts_info2 = _item$contacts_info2.phone) === null || _item$contacts_info2 === void 0 ? void 0 : _item$contacts_info2.phone) || '-', /*#__PURE__*/React.createElement("div", {
+          style: {
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap'
+          }
+        }, (item === null || item === void 0 || (_item$contacts_info3 = item.contacts_info) === null || _item$contacts_info3 === void 0 || (_item$contacts_info3 = _item$contacts_info3.value) === null || _item$contacts_info3 === void 0 ? void 0 : _item$contacts_info3.email) || '-'))));
       }
     }))));
   };

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

@@ -31,6 +31,7 @@ declare const _default: {
         'pisell2.text.client-search.phone': string;
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
+        'pisell2.text.client-search.contact-info': string;
     };
     'zh-CN': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -64,6 +65,7 @@ declare const _default: {
         'pisell2.text.client-search.phone': string;
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
+        'pisell2.text.client-search.contact-info': string;
     };
     'zh-HK': {
         'pisell2.text.leave-empty-for-walk-in': string;
@@ -97,6 +99,7 @@ declare const _default: {
         'pisell2.text.client-search.phone': string;
         'pisell2.text.client-search.email': string;
         'pisell2.text.client-search.membership': string;
+        'pisell2.text.client-search.contact-info': string;
     };
 };
 export default _default;

package/es/plus/clinetSearch/locales.js

@@ -17,7 +17,7 @@ export default {
     'pisell2.text.save': 'Save',
     'pisell2.text.save-and-select': 'Save and select',
     'pisell2.text.no-results-found': 'No results found.',
-    'pisell2.text.create-new-client': 'Create new client',
+    'pisell2.text.create-new-client': 'Create new customer',
     'pisell2.text.result-found': 'Result found',
     'pisell2.text.personnel-list': 'Personnel list',
     'pisell2.text.load-more': 'Load more',
@@ -30,7 +30,8 @@ export default {
     'pisell2.text.client-search.register-time': 'Registration Time',
     'pisell2.text.client-search.phone': 'Phone Number',
     'pisell2.text.client-search.email': 'Email Address',
-    'pisell2.text.client-search.membership': 'Membership'
+    'pisell2.text.client-search.membership': 'Membership',
+    'pisell2.text.client-search.contact-info': 'Contact info'
   },
   'zh-CN': {
     'pisell2.text.leave-empty-for-walk-in': '如未注册游客则留空',
@@ -63,7 +64,8 @@ export default {
     'pisell2.text.client-search.register-time': '注册时间',
     'pisell2.text.client-search.phone': '电话号码',
     'pisell2.text.client-search.email': '邮箱',
-    'pisell2.text.client-search.membership': '会员'
+    'pisell2.text.client-search.membership': '会员',
+    'pisell2.text.client-search.contact-info': '联系信息'
   },
   'zh-HK': {
     'pisell2.text.leave-empty-for-walk-in': '如未註冊遊客則留空',
@@ -96,6 +98,7 @@ export default {
     'pisell2.text.client-search.register-time': '註冊時間',
     'pisell2.text.client-search.phone': '電話號碼',
     'pisell2.text.client-search.email': '電郵地址',
-    'pisell2.text.client-search.membership': '會員'
+    'pisell2.text.client-search.membership': '會員',
+    'pisell2.text.client-search.contact-info': '聯繫信息'
   }
 };

package/es/plus/clinetSearch/types.d.ts

@@ -10,6 +10,18 @@ export interface ClientData {
     nickname: string;
     shop_id: number;
     updated_at: string;
+    contacts_info: {
+        value: {
+            first_name?: string;
+            last_name?: string;
+            phone?: {
+                phone?: string;
+                country_calling_code?: string;
+                country_code?: string;
+            };
+            email?: string;
+        };
+    };
 }
 export interface ClientSearchProps {
     dataSource?: any;

package/es/plus/productSelect/CategoryTabs/index.d.ts

@@ -14,6 +14,7 @@ interface IProps {
     loading?: boolean;
     skeleton?: React.ReactNode;
     style?: React.CSSProperties;
+    id?: string;
 }
 declare const CategoryTabs: React.ForwardRefExoticComponent<IProps & React.RefAttributes<unknown>>;
 export default CategoryTabs;

package/es/plus/productSelect/CategoryTabs/index.js

@@ -105,7 +105,8 @@ var CategoryTabs = /*#__PURE__*/forwardRef(function (props, ref) {
   }
   return /*#__PURE__*/React.createElement(IntersectionObserverProvider, null, items.length > 0 && /*#__PURE__*/React.createElement("div", {
     className: "".concat(PREFIX, "__tabs-wrapper ").concat(className || ''),
-    style: style
+    style: style,
+    id: props.id || ''
   }, /*#__PURE__*/React.createElement(TabsStructure, {
     variant: "pill",
     backgroundVariant: "onPage",

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

@@ -212,10 +212,7 @@ var FooterButtons = function FooterButtons(_ref) {
         className: "pisell-wallet-pass-gallery_footer-buttons-item pisell-wallet-pass-gallery_footer-buttons-item-primary"
       }, locales.getText('wallet-pass-gallery.recharge')));
     }
-
-    // 根据按钮数量设置不同的类名
-    var buttonCount = buttons.length;
-    var className = "pisell-wallet-pass-gallery_footer-buttons pisell-wallet-pass-gallery_footer-buttons-count-".concat(buttonCount);
+    var className = "pisell-wallet-pass-gallery_footer-buttons";
     return buttons.length > 0 ? /*#__PURE__*/React.createElement("div", {
       className: className
     }, buttons) : null;
@@ -223,6 +220,7 @@ var FooterButtons = function FooterButtons(_ref) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-gallery_footer"
   }, renderButtons()), /*#__PURE__*/React.createElement(PisellModal, {
+    destroyOnClose: true,
     platform: platform,
     mobileModalHeight: "auto",
     headerDivider: false,

package/es/plus/walletPassGallery/components/footerButton/index.less

@@ -1,83 +1,38 @@
 .pisell-wallet-pass-gallery_footer {
   position: relative;
-  left: 0;
-  right: 0;
-  bottom: 0;
   background-color: #fff;
   padding: 24px;
   z-index: 100;
   border-top: 1px solid #d0d5de;
-  margin-left: -20px;
-  margin-right: -20px;
+  margin-left: -24px;
+  margin-right: -24px;
   &-buttons {
     display: flex;
     gap: 12px;
     width: 100%;
 
-
-.pisell-wallet-pass-gallery_footer-buttons-item-secondary{
-    overflow: hidden;
-    display: flex;
-    >span{
-      display: block;
-      // width: 100%;
-      flex:1;
+    .pisell-wallet-pass-gallery_footer-buttons-item-secondary {
+      overflow: hidden;
+      display: inline-block;
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
       text-wrap: nowrap;
-    }
-}
-
-
-    // 按钮数量样式
-    // 单个按钮占满宽度
-    &-count-1 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: 100%;
-      }
-    }
-    
-    // 两个按钮各占一半
-    &-count-2 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(50% - 6px);
+      > span {
+        display: inline;
       }
     }
-    
-    // 三个按钮各占三分之一
-    &-count-3 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(33.33% - 8px);
-      }
-    }
-    
-    // 四个按钮各占四分之一
-    &-count-4 {
-      .pisell-wallet-pass-gallery_footer-buttons-item {
-        flex: 1;
-        width: calc(25% - 9px);
-      }
-    }
-    
-    // Ant Design按钮覆盖样式
-    :global(.ant-btn) {
-      height: 48px;
-      border-radius: 6px;
-      font-size: 16px;
-      font-weight: 500;
-      width: 100%;
+
+    .pisell-wallet-pass-gallery_footer-buttons-item {
+      flex-grow: 1;
     }
-    
+
     &-item {
       // 修饰符：主按钮
       &-primary {
-        background-color: var(--theme-color, #7F56D9);
+        background-color: var(--theme-color, #7f56d9);
       }
-      
+
       // 修饰符：次按钮
       &-secondary {
         background-color: #fff;
@@ -90,4 +45,4 @@
 
 .pisell-wallet-pass-gallery_footer:empty {
   display: none;
-}
+}

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

@@ -4,6 +4,7 @@ interface PassDetailProps {
     dataSource?: any | null;
     platform?: 'pc' | 'h5';
     buttonGroupList?: any[][];
+    showTimeLine?: boolean;
 }
 declare const PassDetail: (props: PassDetailProps) => React.JSX.Element | null;
 export default PassDetail;

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

@@ -1,3 +1,7 @@
+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 _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -20,16 +24,20 @@ import Recharge from "../recharge";
 import FooterButtons from "../footerButton";
 import useEngineContext from "../../../../hooks/useEngineContext";
 import "./index.less";
+import { formatScheduleText } from "../../../../components/wallet/utils";
+import localeTexts from "../../locales";
+import { request } from "../../../../utils";
 var Text = Typography.Text;
 var PassDetail = function PassDetail(props) {
-  var _context$appHelper, _store$getState, _dataSource$machineco, _getDetail$data, _getDetail$data2, _dataSource$machineco2;
-  if (!props.dataSource) return null;
+  var _context$appHelper, _context$appHelper2, _store$getState, _context$engine, _context$appHelper3, _dataSource$machineco, _getDetail$data, _getDetail$data2, _dataSource$machineco2;
   var _usePisellConfig = usePisellConfig(),
     _usePisellConfig$symb = _usePisellConfig.symbol,
     symbol = _usePisellConfig$symb === void 0 ? '$' : _usePisellConfig$symb;
   var dataSource = props.dataSource,
     _props$platform = props.platform,
-    platform = _props$platform === void 0 ? 'pc' : _props$platform;
+    platform = _props$platform === void 0 ? 'pc' : _props$platform,
+    _props$showTimeLine = props.showTimeLine,
+    showTimeLine = _props$showTimeLine === void 0 ? true : _props$showTimeLine;
   var _useState = useState('detail'),
     _useState2 = _slicedToArray(_useState, 2),
     activeKey = _useState2[0],
@@ -47,38 +55,54 @@ var PassDetail = function PassDetail(props) {
       store: {}
     },
     store = _ref.store;
-  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 ? void 0 : _store$getState.shop.timezone) || 'Asia/Shanghai';
-  var _ref2 = dataSource || {},
-    _ref2$id = _ref2.id,
-    id = _ref2$id === void 0 ? '' : _ref2$id,
-    _ref2$code = _ref2.code,
-    code = _ref2$code === void 0 ? '' : _ref2$code,
-    _ref2$tag = _ref2.tag,
-    tag = _ref2$tag === void 0 ? '' : _ref2$tag,
-    _ref2$product_title = _ref2.product_title,
-    product_title = _ref2$product_title === void 0 ? '' : _ref2$product_title,
-    _ref2$encoded = _ref2.encoded,
-    encoded = _ref2$encoded === void 0 ? '' : _ref2$encoded,
-    balance = _ref2.balance,
-    _ref2$expire_date = _ref2.expire_date,
-    expire_date = _ref2$expire_date === void 0 ? '' : _ref2$expire_date,
-    _ref2$product = _ref2.product,
-    product = _ref2$product === void 0 ? {} : _ref2$product;
-  var _ref3 = product || {},
-    _ref3$description = _ref3.description,
-    description = _ref3$description === void 0 ? '' : _ref3$description,
-    _ref3$extension_data = _ref3.extension_data,
-    extension_data = _ref3$extension_data === void 0 ? [] : _ref3$extension_data,
-    _ref3$customer_order_ = _ref3.customer_order_behavior_count,
-    customer_order_behavior_count = _ref3$customer_order_ === void 0 ? 0 : _ref3$customer_order_;
+  var _ref2 = ((_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.constants) || {
+      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';
+  locales.init(localeTexts, (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || 'en');
+  if ((_context$appHelper3 = context.appHelper) !== null && _context$appHelper3 !== void 0 && (_context$appHelper3 = _context$appHelper3.utils) !== null && _context$appHelper3 !== void 0 && _context$appHelper3.request) {
+    var _context$appHelper4;
+    request.setRequest((_context$appHelper4 = context.appHelper) === null || _context$appHelper4 === void 0 || (_context$appHelper4 = _context$appHelper4.utils) === null || _context$appHelper4 === void 0 ? void 0 : _context$appHelper4.request);
+  }
+  var _ref3 = dataSource || {},
+    _ref3$id = _ref3.id,
+    id = _ref3$id === void 0 ? '' : _ref3$id,
+    _ref3$code = _ref3.code,
+    code = _ref3$code === void 0 ? '' : _ref3$code,
+    _ref3$tag = _ref3.tag,
+    tag = _ref3$tag === void 0 ? '' : _ref3$tag,
+    _ref3$product_title = _ref3.product_title,
+    product_title = _ref3$product_title === void 0 ? '' : _ref3$product_title,
+    _ref3$encoded = _ref3.encoded,
+    encoded = _ref3$encoded === void 0 ? '' : _ref3$encoded,
+    balance = _ref3.balance,
+    _ref3$expire_date = _ref3.expire_date,
+    expire_date = _ref3$expire_date === void 0 ? '' : _ref3$expire_date,
+    _ref3$product = _ref3.product,
+    product = _ref3$product === void 0 ? {} : _ref3$product,
+    custom_schedule_snapshot = _ref3.custom_schedule_snapshot,
+    customer_id = _ref3.customer_id;
+  var _ref4 = product || {},
+    _ref4$description = _ref4.description,
+    description = _ref4$description === void 0 ? '' : _ref4$description,
+    _ref4$extension_data = _ref4.extension_data,
+    extension_data = _ref4$extension_data === void 0 ? [] : _ref4$extension_data,
+    _ref4$customer_order_ = _ref4.customer_order_behavior_count,
+    customer_order_behavior_count = _ref4$customer_order_ === void 0 ? 0 : _ref4$customer_order_;
   var _getDetail = useRequest(function () {
     return getDetailApi({
-      id: id
+      id: id,
+      apiPrefix: apiPrefix,
+      order_behavior_count_customer_id: customer_id
     });
   }, {
     ready: !!id,
-    refreshDeps: [id]
+    refreshDeps: [id, customer_id]
   });
+  var scheduleList = useMemo(function () {
+    return (custom_schedule_snapshot === null || custom_schedule_snapshot === void 0 ? void 0 : custom_schedule_snapshot.data) || [];
+  }, [custom_schedule_snapshot]);
   useEffect(function () {
     if (tag === 'product_discount_card') {
       setActiveKey('detail');
@@ -113,6 +137,33 @@ var PassDetail = function PassDetail(props) {
     };
   }, []);
   var descs = useMemo(function () {
+    var _context$engine2;
+    var detail = formatScheduleText(scheduleList, context === null || context === void 0 || (_context$engine2 = context.engine) === null || _context$engine2 === void 0 || (_context$engine2 = _context$engine2.props) === null || _context$engine2 === void 0 ? void 0 : _context$engine2.locale);
+    var expireText = expire_date ? expire_date : locales.getText('wallet-pass-gallery.expireDate');
+    if (scheduleList.length > 0) {
+      // 换行展示
+      var validityTexts = "";
+      var excludedText = "";
+      var includedText = "";
+      detail.forEach(function (item) {
+        if (item.validityTexts.length > 0) {
+          validityTexts = "".concat(validityTexts).concat(item.validityTexts.join('\n'), "\n");
+        }
+        if (item.excluded_date.length > 0) {
+          excludedText = "".concat(excludedText).concat(item.excluded_date.join('\n'), "\n");
+        }
+        if (item.included_date.length > 0) {
+          includedText = "".concat(includedText).concat(item.included_date.join('\n'), "\n");
+        }
+      });
+      expireText = /*#__PURE__*/React.createElement("span", {
+        className: "wallet-detail-expire-text"
+      }, validityTexts, excludedText && /*#__PURE__*/React.createElement("div", {
+        className: "wallet-detail-expire-text-title"
+      }, locales.getText('page.wallet.notValidDate')), excludedText, includedText && /*#__PURE__*/React.createElement("div", {
+        className: "wallet-detail-expire-text-title"
+      }, locales.getText('page.wallet.includedDate')), includedText);
+    }
     var data = [{
       label: locales.getText('wallet-pass-gallery.cardName'),
       value: product_title
@@ -122,7 +173,7 @@ var PassDetail = function PassDetail(props) {
       isLink: false
     }, {
       label: locales.getText('wallet-pass-gallery.validDate'),
-      value: expire_date ? expire_date : locales.getText('wallet-pass-gallery.expireDate')
+      value: expireText
     }];
     //折扣卡显示折扣字段 其他显示余额字段
     if (tag === 'product_discount_card') {
@@ -191,14 +242,16 @@ var PassDetail = function PassDetail(props) {
   };
   var renderTimeLine = function renderTimeLine() {
     if (tag === 'product_discount_card') return null;
+    if (!showTimeLine) return null;
     return /*#__PURE__*/React.createElement(TimelineSection, {
       code: code,
       tag: tag,
       timezone: timezone
     });
   };
+  if (!props.dataSource) return null;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: classNames("pisell-wallet-pass-gallery_detail", "pisell-wallet-pass-gallery_detail-".concat(platform))
+    className: classNames("pisell-wallet-pass-gallery_detail", "pisell-wallet-pass-gallery_detail-".concat(platform), _defineProperty({}, "pisell-wallet-pass-gallery_detail-with-footer", platform === 'h5' && tag === 'gift_card'))
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-gallery_detail-content",
     ref: containerRef

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

@@ -18,6 +18,10 @@
     padding: 20px 0px;
   }
 
+  &-with-footer {
+    height: calc(100% - 90px);
+  }
+
   .pisell-wallet-pass-gallery_detail-content {
     overflow-y: auto;
     height: 100%;

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

@@ -32,6 +32,10 @@ var Recharge = function Recharge(_ref) {
     storage = _ref2.storage;
   var dvaStore = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getStore) === null || _context$appHelper2$g === void 0 || (_context$appHelper2$g = _context$appHelper2$g.call(_context$appHelper2)) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.getState();
   var shop = (dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 || (_dvaStore$core = _dvaStore$core.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.shop) || {};
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
   useEffect(function () {
     if (detailData) {
       setChargeItem(((detailData === null || detailData === void 0 ? void 0 : detailData.gift_option) || [])[0]);
@@ -44,6 +48,7 @@ var Recharge = function Recharge(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
+            setLoading(true);
             params = {
               voucher_id: (detailData === null || detailData === void 0 ? void 0 : detailData.id) || '',
               product_id: (detailData === null || detailData === void 0 ? void 0 : detailData.product_id) || '',
@@ -57,9 +62,9 @@ var Recharge = function Recharge(_ref) {
                 currency_format: (shop === null || shop === void 0 ? void 0 : shop.currency_format) || ''
               }
             };
-            _context.next = 4;
+            _context.next = 5;
             return orderRechargeProduct(params);
-          case 4:
+          case 5:
             data = _context.sent;
             if (data !== null && data !== void 0 && data.order_id) {
               storage === null || storage === void 0 || (_storage$set = storage.set) === null || _storage$set === void 0 || _storage$set.call(storage, 'orderId', data.order_id);
@@ -69,23 +74,28 @@ var Recharge = function Recharge(_ref) {
                 callback: function callback() {}
               });
             }
-            _context.next = 11;
+            _context.next = 12;
             break;
-          case 8:
-            _context.prev = 8;
+          case 9:
+            _context.prev = 9;
             _context.t0 = _context["catch"](0);
             console.error(locales.getText('wallet-pass-gallery.log.rechargeOrderFailed'), _context.t0);
-          case 11:
+          case 12:
+            _context.prev = 12;
+            setLoading(false);
+            return _context.finish(12);
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 8]]);
+      }, _callee, null, [[0, 9, 12, 15]]);
     }));
     return function handleRecharge() {
       return _ref3.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/React.createElement(Drawer, {
+    destroyOnClose: true,
     title: locales.getText('wallet-pass-gallery.rechargeOptions'),
     open: open,
     zIndex: 999,
@@ -97,7 +107,8 @@ var Recharge = function Recharge(_ref) {
       block: true,
       size: "large",
       onClick: handleRecharge,
-      disabled: !(chargeItem !== null && chargeItem !== void 0 && chargeItem.id)
+      disabled: !(chargeItem !== null && chargeItem !== void 0 && chargeItem.id),
+      loading: loading
     }, locales.getText('wallet-pass-gallery.recharge'))
   }, /*#__PURE__*/React.createElement("div", {
     className: "pisell-wallet-pass-gallery_recharge"

package/es/plus/walletPassGallery/index.js

@@ -82,7 +82,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
               num: 20,
               skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
               tags: TAGS,
-              filter_wallet_id: walletId || undefined
+              filter_wallet_id: walletId || undefined,
+              "with": ['customScheduleSnapshot']
             });
           case 3:
             res = _context.sent;
@@ -121,7 +122,8 @@ var WalletPassGallery = function WalletPassGallery(props) {
               num: 20,
               skip: (d === null || d === void 0 ? void 0 : d.nextId) || 1,
               tags: TAGS,
-              filter_wallet_id: walletId || undefined
+              filter_wallet_id: walletId || undefined,
+              "with": ['customScheduleSnapshot']
             });
           case 3:
             res = _context2.sent;
@@ -552,7 +554,9 @@ var WalletPassGallery = function WalletPassGallery(props) {
       },
       block: true
     }, locales.getText('wallet-pass-gallery.button.add'))), /*#__PURE__*/React.createElement(PisellModal, {
-      platform: 'h5',
+      zIndex: 997,
+      destroyOnClose: true,
+      platform: platform,
       visible: !!_currentItem,
       onCancel: function onCancel() {
         return setCurrentItemId('');

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

@@ -17,6 +17,7 @@ export interface IWalletListParmsProps {
     skip?: number;
     filter_wallet_id?: string;
     available: 0 | 1;
+    with?: string[];
 }
 /**
  * 钱包列表项属性接口
@@ -171,6 +172,8 @@ export declare const getAssetList: (params: IAssetListProps) => Promise<{
  */
 export declare const getDetailApi: (params: {
     id: string;
+    order_behavior_count_customer_id: string;
+    apiPrefix: string;
 }) => Promise<IDetailResponse>;
 /**
  * 详情响应数据结构，供组件消费