@pisell/private-materials 6.7.7 → 6.7.8

package/es/components/ticketBooking/hooks/pisellos/useProducts.js

@@ -18,14 +18,7 @@ import { useBookingTicket } from "./bookingTicket";
 import { useState, useEffect, useRef } from 'react';
 import useEngineContext, { usePlatform } from "../../../../hooks/useEngineContext";
 import dayjs from 'dayjs';
-// 等待函数
-var sleep = function sleep(ms) {
-  return new Promise(function (resolve) {
-    return setTimeout(resolve, ms);
-  });
-};
 export var useProducts = function useProducts(notAvailableRef) {
-  var _context$appHelper;
   var bookingTicket = useBookingTicket();
   var context = useEngineContext();
   var platform = usePlatform();
@@ -38,10 +31,6 @@ export var useProducts = function useProducts(notAvailableRef) {
     loading = _useState4[0],
     setLoading = _useState4[1];
   var isFirstLoadRef = useRef(true);
-  var isFirstLoadDataRef = useRef(true);
-  var _ref = ((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils) || {},
-    getApp = _ref.getApp;
-  var app = getApp();
 
   // 日程时间段列表 HH:mm格式
   var _useState5 = useState([]),
@@ -51,7 +40,7 @@ export var useProducts = function useProducts(notAvailableRef) {
   var scheduledTaskQueueIdRef = useRef('booking-schedule-products');
   var paramsRef = useRef(undefined);
   var getProducts = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
       var _products, _notAvailableRef$curr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -84,7 +73,7 @@ export var useProducts = function useProducts(notAvailableRef) {
       }, _callee, null, [[1, 11]]);
     }));
     return function (_x) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }());
 
@@ -94,21 +83,21 @@ export var useProducts = function useProducts(notAvailableRef) {
       return;
     }
     try {
-      var _context$appHelper2, _context$appHelper2$g;
-      var _app = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getApp) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2);
-      if (!_app || !_app.tasksManager) {
+      var _context$appHelper, _context$appHelper$ge;
+      var app = context === null || context === void 0 || (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 || (_context$appHelper = _context$appHelper.utils) === null || _context$appHelper === void 0 || (_context$appHelper$ge = _context$appHelper.getApp) === null || _context$appHelper$ge === void 0 ? void 0 : _context$appHelper$ge.call(_context$appHelper);
+      if (!app || !app.tasksManager) {
         console.warn('App 或 tasksManager 不可用');
         return;
       }
 
       // 注册 getProducts 任务函数
-      _app.tasksManager.addTaskFunction('getProducts', /*#__PURE__*/function () {
-        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
+      app.tasksManager.addTaskFunction('getProducts', /*#__PURE__*/function () {
+        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
           var task;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                task = _ref3.task;
+                task = _ref2.task;
                 console.log('定时执行 getProducts，参数：', task.payload);
                 _context2.next = 4;
                 return getProducts(task.payload);
@@ -123,14 +112,14 @@ export var useProducts = function useProducts(notAvailableRef) {
           }, _callee2);
         }));
         return function (_x2) {
-          return _ref4.apply(this, arguments);
+          return _ref3.apply(this, arguments);
         };
       }());
 
       // 如果有 scheduleTimePoints，创建定时任务
       if (scheduleTimePoints && scheduleTimePoints.length > 0) {
         // 先清除之前的定时任务
-        _app.tasksManager.clearTasks({
+        app.tasksManager.clearTasks({
           module: 'scheduledTasks',
           queueId: scheduledTaskQueueIdRef.current
         });
@@ -158,14 +147,14 @@ export var useProducts = function useProducts(notAvailableRef) {
         });
 
         // 添加定时任务到 scheduledTasks 模块
-        _app.tasksManager.addTask({
+        app.tasksManager.addTask({
           module: 'scheduledTasks',
           queueId: scheduledTaskQueueIdRef.current,
           tasks: tasks
         });
 
         // 开始执行定时任务队列
-        _app.tasksManager.run({
+        app.tasksManager.run({
           module: 'scheduledTasks',
           queueId: scheduledTaskQueueIdRef.current
         });
@@ -178,10 +167,10 @@ export var useProducts = function useProducts(notAvailableRef) {
     // 清理函数：组件卸载时清除定时任务
     return function () {
       try {
-        var _context$appHelper3, _context$appHelper3$g;
-        var _app2 = context === null || context === void 0 || (_context$appHelper3 = context.appHelper) === null || _context$appHelper3 === void 0 || (_context$appHelper3 = _context$appHelper3.utils) === null || _context$appHelper3 === void 0 || (_context$appHelper3$g = _context$appHelper3.getApp) === null || _context$appHelper3$g === void 0 ? void 0 : _context$appHelper3$g.call(_context$appHelper3);
-        if (_app2 && _app2.tasksManager) {
-          _app2.tasksManager.clearTasks({
+        var _context$appHelper2, _context$appHelper2$g;
+        var _app = context === null || context === void 0 || (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 || (_context$appHelper2 = _context$appHelper2.utils) === null || _context$appHelper2 === void 0 || (_context$appHelper2$g = _context$appHelper2.getApp) === null || _context$appHelper2$g === void 0 ? void 0 : _context$appHelper2$g.call(_context$appHelper2);
+        if (_app && _app.tasksManager) {
+          _app.tasksManager.clearTasks({
             module: 'scheduledTasks',
             queueId: scheduledTaskQueueIdRef.current
           });
@@ -192,7 +181,7 @@ export var useProducts = function useProducts(notAvailableRef) {
     };
   }, [scheduleTimePoints]);
   var getScheduleTimePoints = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
       var scheduleTimePoints;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -215,7 +204,7 @@ export var useProducts = function useProducts(notAvailableRef) {
       }, _callee3);
     }));
     return function (_x3) {
-      return _ref5.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }());
   return {

package/es/components/ticketBooking/locales.d.ts

@@ -61,8 +61,6 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
-        'pisell2.ticket-booking.collapse': string;
-        'pisell2.ticket-booking.expand': string;
     };
     'zh-CN': {
         'pisell2.ticket-booking.info': string;
@@ -126,8 +124,6 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
-        'pisell2.ticket-booking.collapse': string;
-        'pisell2.ticket-booking.expand': string;
     };
     'zh-HK': {
         'pisell2.ticket-booking.info': string;
@@ -191,8 +187,6 @@ declare const _default: {
         'pisell2.ticket-booking.terminal-upgrade-description': string;
         'pisell2.ticket-booking.terminal-upgrade-ok': string;
         'pisell2.ticket-booking.terminal-upgrade-cancel': string;
-        'pisell2.ticket-booking.collapse': string;
-        'pisell2.ticket-booking.expand': string;
     };
 };
 export default _default;

package/es/components/ticketBooking/locales.js

@@ -73,9 +73,7 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal Version Reminder',
     'pisell2.ticket-booking.terminal-upgrade-description': 'Your Terminal version is outdated. Please upgrade Terminal to use all features.',
     'pisell2.ticket-booking.terminal-upgrade-ok': 'I understand',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': 'Cancel',
-    'pisell2.ticket-booking.collapse': 'Collapse',
-    'pisell2.ticket-booking.expand': 'Expand'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': 'Cancel'
   },
   'zh-CN': {
     'pisell2.ticket-booking.info': '信息',
@@ -151,9 +149,7 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal版本提醒',
     'pisell2.ticket-booking.terminal-upgrade-description': '检测到您的Terminal版本较低，请升级Terminal以使用完整功能',
     'pisell2.ticket-booking.terminal-upgrade-ok': '我知道了',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消',
-    'pisell2.ticket-booking.collapse': '收起',
-    'pisell2.ticket-booking.expand': '展开'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消'
   },
   'zh-HK': {
     'pisell2.ticket-booking.info': '資訊',
@@ -229,8 +225,6 @@ export default {
     'pisell2.ticket-booking.terminal-upgrade-title': 'Terminal版本提醒',
     'pisell2.ticket-booking.terminal-upgrade-description': '檢測到您的Terminal版本較低，請升級Terminal以使用完整功能',
     'pisell2.ticket-booking.terminal-upgrade-ok': '我知道了',
-    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消',
-    'pisell2.ticket-booking.collapse': '收起',
-    'pisell2.ticket-booking.expand': '展開'
+    'pisell2.ticket-booking.terminal-upgrade-cancel': '取消'
   }
 };

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

@@ -73,9 +73,6 @@ export declare const rulesHooks: {
         num: any;
         quantity: any;
         vouchersApplicable: any;
-        startDate: any;
-        bundle: any;
-        options: any;
     };
     setProduct(product: Record<string, any>, values: {
         total: number;

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

@@ -2,14 +2,10 @@ var _excluded = ["detail"];
 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 _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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-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 _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 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; }
 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; }
@@ -166,30 +162,21 @@ export var addService = function addService(list, addItem, state) {
     // 是否设置过 只追加到第一个中
     var isSetCount = false;
     value = list.map(function (item) {
-      var _item$_extend;
       // 是否商品券折扣的商品
       var isGoodPassDiscountProduct = (item.discount_list || []).some(function (item) {
         return item.type === 'good_pass';
       });
       var isEdit = item === null || item === void 0 ? void 0 : item.edit;
-      // 子商品是否有商品券折扣的商品
-      var bundleDiscountList = [];
-      ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 || (_item$_extend = _item$_extend.other) === null || _item$_extend === void 0 ? void 0 : _item$_extend.bundle) || []).forEach(function (item) {
-        bundleDiscountList.push.apply(bundleDiscountList, _toConsumableArray((item === null || item === void 0 ? void 0 : item.discount_list) || []));
-      });
-      var isGoodPassBundleProduct = bundleDiscountList.some(function (item) {
-        return item.type === 'good_pass';
-      });
-      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit && !isGoodPassBundleProduct) {
-        var _item$_extend2, _addItem$_extend2, _item$_extend3;
+      if (isSameProduct(item, addItem) && !isSetCount && !isGoodPassDiscountProduct && !isEdit) {
+        var _item$_extend, _addItem$_extend2, _item$_extend2;
         isNotSame = false;
-        var _quantity = ((item === null || item === void 0 || (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend2 = addItem._extend) === null || _addItem$_extend2 === void 0 ? void 0 : _addItem$_extend2.quantity) || 1);
+        var _quantity = ((item === null || item === void 0 || (_item$_extend = item._extend) === null || _item$_extend === void 0 ? void 0 : _item$_extend.quantity) || 1) + ((addItem === null || addItem === void 0 || (_addItem$_extend2 = addItem._extend) === null || _addItem$_extend2 === void 0 ? void 0 : _addItem$_extend2.quantity) || 1);
         count = _quantity;
         isSetCount = true;
         return _objectSpread(_objectSpread({}, item), {}, {
           _extend: _objectSpread(_objectSpread({}, item._extend), {}, {
             quantity: _quantity,
-            other: _objectSpread(_objectSpread({}, ((_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.other) || {}), {}, {
+            other: _objectSpread(_objectSpread({}, ((_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.other) || {}), {}, {
               quantity: _quantity
             })
           })
@@ -266,11 +253,11 @@ export var getIsShowNumber = function getIsShowNumber(item, state) {
 
 // 生成服务key
 export var genServiceKey = function genServiceKey(item) {
-  var _item$_extend4, _item$_extend5, _item$_extend6;
+  var _item$_extend3, _item$_extend4, _item$_extend5;
   var product_id = item.product_id;
-  var durationKey = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.duration;
-  var start_time = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.start_time;
-  var total = (_item$_extend6 = item._extend) === null || _item$_extend6 === void 0 ? void 0 : _item$_extend6.total;
+  var durationKey = (_item$_extend3 = item._extend) === null || _item$_extend3 === void 0 ? void 0 : _item$_extend3.duration;
+  var start_time = (_item$_extend4 = item._extend) === null || _item$_extend4 === void 0 ? void 0 : _item$_extend4.start_time;
+  var total = (_item$_extend5 = item._extend) === null || _item$_extend5 === void 0 ? void 0 : _item$_extend5.total;
   var resourceKey = '';
   Object.values(item._extend.resource || []).forEach(function (resources) {
     resources.forEach(function (resource) {
@@ -375,21 +362,17 @@ export var getShopDiscountKey = function getShopDiscountKey(osKey) {
 export var rulesHooks = {
   // 获取商品关键信息
   getProduct: function getProduct(product) {
-    var _product$_extend, _product$_extend2, _product$_extend3;
     var detail = {
       booking_id: product.booking_id,
       id: product.id,
       _id: product._id,
-      price: product._extend.price,
+      price: product.price,
       total: product._extend.total,
       discount_list: product.discount_list,
       origin_total: product._extend.origin_total,
       num: product._extend.quantity,
       quantity: product._extend.quantity || 1,
-      vouchersApplicable: product.vouchersApplicable,
-      startDate: (_product$_extend = product._extend) === null || _product$_extend === void 0 ? void 0 : _product$_extend.startDate,
-      bundle: ((_product$_extend2 = product._extend) === null || _product$_extend2 === void 0 || (_product$_extend2 = _product$_extend2.other) === null || _product$_extend2 === void 0 ? void 0 : _product$_extend2.bundle) || [],
-      options: ((_product$_extend3 = product._extend) === null || _product$_extend3 === void 0 || (_product$_extend3 = _product$_extend3.other) === null || _product$_extend3 === void 0 ? void 0 : _product$_extend3.option) || []
+      vouchersApplicable: product.vouchersApplicable
     };
     return detail;
   },
@@ -397,14 +380,8 @@ export var rulesHooks = {
     var detail = _objectSpread(_objectSpread({}, product), {}, {
       _id: values._id || product._id,
       discount_list: values.discount_list,
-      _extend: _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, product._extend), {}, {
-        other: _objectSpread(_objectSpread({}, product._extend.other), 'bundle' in values ? {
-          bundle: values.bundle
-        } : {})
-      }, 'total' in values ? {
+      _extend: _objectSpread(_objectSpread(_objectSpread({}, product._extend), 'total' in values ? {
         total: values.total
-      } : {}), 'main_product_selling_price' in values ? {
-        main_product_selling_price: values.main_product_selling_price
       } : {}), 'quantity' in values ? {
         quantity: values.quantity
       } : {})

package/es/components/wallet/Detail/index.js

@@ -22,7 +22,6 @@ import localeTexts from "./locales";
 import { getAssetList, getDetailApi } from "./serve";
 import { request } from "./../../../utils";
 import { WalletBar, FooterButtons, UsageRules } from "../components";
-import { formatScheduleText } from "../utils";
 import "./index.less";
 var Text = Typography.Text;
 
@@ -55,9 +54,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     _detail$expire_date = detail.expire_date,
     expire_date = _detail$expire_date === void 0 ? '' : _detail$expire_date,
     _detail$product = detail.product,
-    product = _detail$product === void 0 ? {} : _detail$product,
-    custom_schedule_snapshot = detail.custom_schedule_snapshot;
-  console.log(detail, 'detail22');
+    product = _detail$product === void 0 ? {} : _detail$product;
   var _ref = product || {},
     _ref$description = _ref.description,
     description = _ref$description === void 0 ? '' : _ref$description,
@@ -301,36 +298,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       onGoogleClick();
     }
   };
-  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 () {
-    var detail = formatScheduleText(scheduleList, 'zh-CN');
-    var expireText = expire_date ? expire_date : locales.getText('page.wallet.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('page.wallet.cardName'),
       value: product_title
@@ -340,7 +308,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       isLink: false
     }, {
       label: locales.getText('page.wallet.validDate'),
-      value: expireText
+      value: expire_date ? expire_date : locales.getText('page.wallet.expireDate')
     }];
     //折扣卡显示折扣字段 其他显示余额字段
     if (tag === 'product_discount_card') {

package/es/components/wallet/Detail/index.less

@@ -373,14 +373,3 @@
   font-weight: 500;
   line-height: 24px;
 }
-
-.wallet-detail-expire-text {
-  white-space: pre-wrap;
-}
-
-.wallet-detail-expire-text-title {
-  font-size: 14px;
-  font-weight: 500;
-  line-height: 20px;
-  color: #667085;
-}

package/es/components/wallet/Detail/locales.d.ts

@@ -21,8 +21,6 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
-        'page.wallet.notValidDate': string;
-        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;
@@ -71,8 +69,6 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
-        'page.wallet.notValidDate': string;
-        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;
@@ -121,8 +117,6 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
-        'page.wallet.notValidDate': string;
-        'page.wallet.includedDate': string;
         'page.wallet.urlEmpty': string;
         'page.wallet.notIOS': string;
         'page.wallet.addSuccess': string;

package/es/components/wallet/Detail/locales.js

@@ -24,10 +24,6 @@ export default {
     'page.wallet.addGoogle': 'Add to Google Wallet',
     'page.wallet.viewDetails': 'See details',
     'page.wallet.expireDate': 'Long term',
-    'page.wallet.notValidDate': 'Not valid on',
-    // 不可用日期
-    'page.wallet.includedDate': 'Included dates',
-    // 包含日期
     'page.wallet.urlEmpty': 'Wallet link is empty',
     'page.wallet.notIOS': 'Apple Wallet is not supported on non-iOS devices',
     'page.wallet.addSuccess': 'Successfully added to wallet',
@@ -80,10 +76,6 @@ export default {
     'page.wallet.addGoogle': '添加到谷歌钱包',
     'page.wallet.viewDetails': '查看详情',
     'page.wallet.expireDate': '长期',
-    'page.wallet.notValidDate': '不可用日期',
-    // 不可用日期
-    'page.wallet.includedDate': '包含日期',
-    // 包含日期
     'page.wallet.urlEmpty': '钱包链接为空',
     'page.wallet.notIOS': '非iOS设备不支持Apple Wallet',
     'page.wallet.addSuccess': '已成功添加到钱包',
@@ -95,7 +87,7 @@ export default {
     // Usage Rules
     'page.wallet.usageRules': '使用规则',
     'page.wallet.usageRulesSubtitle': '请仔细阅读以下使用条件',
-    'page.wallet.timeUsageLimits': '使用频次限制',
+    'page.wallet.timeUsageLimits': '时间使用限制',
     'page.wallet.totalQuantityControl': '总量控制',
     'page.wallet.dailyLimit': '每日限制:',
     'page.wallet.weeklyLimit': '每周限制:',
@@ -136,10 +128,6 @@ export default {
     'page.wallet.addGoogle': '添加到谷歌錢包',
     'page.wallet.viewDetails': '查看詳情',
     'page.wallet.expireDate': '長期',
-    'page.wallet.notValidDate': '不可用日期',
-    // 不可用日期
-    'page.wallet.includedDate': '包含日期',
-    // 包含日期
     'page.wallet.urlEmpty': '錢包連結為空',
     'page.wallet.notIOS': '非iOS設備不支持Apple Wallet',
     'page.wallet.addSuccess': '已成功添加到錢包',
@@ -151,7 +139,7 @@ export default {
     // Usage Rules
     'page.wallet.usageRules': '使用規則',
     'page.wallet.usageRulesSubtitle': '請仔細閱讀以下使用條件',
-    'page.wallet.timeUsageLimits': '使用頻次限制',
+    'page.wallet.timeUsageLimits': '時間使用限制',
     'page.wallet.totalQuantityControl': '總量控制',
     'page.wallet.dailyLimit': '每日限制:',
     'page.wallet.weeklyLimit': '每週限制:',

package/es/components/wallet/Voucher/index.js

@@ -48,17 +48,6 @@ var Voucher = Provider(function (props) {
     }
   }, [globalState.setup]);
 
-  // 添加处理后退按钮的方法
-  var handleBack = useCallback(function () {
-    if (recordViewRef.current) {
-      recordViewRef.current.closeDetailModal();
-    }
-    // 更新状态
-    setGlobalState({
-      setup: 'list'
-    });
-  }, [recordViewRef, setGlobalState]);
-
   // 渲染卡片项
   var renderItem = function renderItem(item) {
     return /*#__PURE__*/React.createElement(WalletCard, {
@@ -78,6 +67,16 @@ var Voucher = Provider(function (props) {
   if (isEmpty) {
     return /*#__PURE__*/React.createElement(PisellEmpty, null);
   }
+  // 添加处理后退按钮的方法
+  var handleBack = useCallback(function () {
+    if (recordViewRef.current) {
+      recordViewRef.current.closeDetailModal();
+    }
+    // 更新状态
+    setGlobalState({
+      setup: 'list'
+    });
+  }, [recordViewRef, setGlobalState]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, platform !== 'pc' && /*#__PURE__*/React.createElement(Title, {
     className: "wallet-voucher-title"
   }, locales.getText('page.wallet.voucher')), /*#__PURE__*/React.createElement(CardMetricItem, {

package/es/components/wallet/components/WalletCard.js

@@ -1,4 +1,4 @@
-var _excluded = ["id", "tag", "product_title", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "par_value", "unified_messages", "custom_schedule_snapshot", "metadata"];
+var _excluded = ["id", "tag", "product_title", "balance", "code", "encoded", "expire_date", "shop", "limit_status", "product_cover", "par_value", "unified_messages"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 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; }
@@ -40,8 +40,6 @@ var WalletCard = function WalletCard(_ref) {
     par_value = _item$par_value === void 0 ? '' : _item$par_value,
     _item$unified_message = item.unified_messages,
     unified_messages = _item$unified_message === void 0 ? {} : _item$unified_message,
-    custom_schedule_snapshot = item.custom_schedule_snapshot,
-    metadata = item.metadata,
     rest = _objectWithoutProperties(item, _excluded);
 
   // 获取平台
@@ -60,8 +58,6 @@ var WalletCard = function WalletCard(_ref) {
   // 是否禁用
   var isDisabled = limit_status !== 'enable';
   return /*#__PURE__*/React.createElement(PisellWalletPassCard, _extends({}, rest, {
-    scheduleList: (custom_schedule_snapshot === null || custom_schedule_snapshot === void 0 ? void 0 : custom_schedule_snapshot.data) || [],
-    validDateBySchedule: (metadata === null || metadata === void 0 ? void 0 : metadata.validity_type) === 'custom_schedule_validity',
     balanceTitle: balanceTitle,
     showDetail: false,
     showRedeem: false,

package/es/components/wallet/index.js

@@ -72,8 +72,7 @@ var Wallet = Provider(function () {
     document.body.id = 'body';
     getList({
       num: 999,
-      skip: 1,
-      with: ['customScheduleSnapshot']
+      skip: 1
     });
   }, []);
   var transformData = function transformData(data) {
@@ -478,8 +477,7 @@ var Wallet = Provider(function () {
               // 重新获取列表
               getList({
                 num: 999,
-                skip: 1,
-                with: ['customScheduleSnapshot']
+                skip: 1
               }, code);
             }
 

package/es/components/wallet/serve.d.ts

@@ -15,7 +15,6 @@ export interface IWalletListParmsProps {
     used_status?: string;
     num?: number;
     skip?: number;
-    with?: string[];
 }
 /**
  * 钱包列表项属性接口
@@ -49,12 +48,6 @@ export interface IWalletListItemProps {
     machinecode_config?: {
         hide_recharge?: number;
     };
-    metadata: {
-        validity_type: string;
-    };
-    custom_schedule_snapshot: {
-        data: any[];
-    };
 }
 /**
  * 商店信息接口

package/es/hooks/usePaymentLogger.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface LogData {
     key: string;
     value: any;

package/es/index.d.ts

@@ -23,7 +23,6 @@ export { default as EftposPay } from './components/eftposPay';
 export { default as ToCPay } from './components/pay/toC';
 export { default as ToBPay } from './components/pay/toB';
 export { default as Eftpos } from './components/eftpos';
-export { default as Wallet } from './components/wallet';
 export { default as WalletList } from './components/walletList';
 export { default as BookingDashboard } from './components/booking/dashboard';
 export { default as PisellSelectCustomerModal } from './components/pisellSelectCustomerModal';
@@ -70,7 +69,4 @@ export { default as ContactInfoModal } from './plus/contactInfoModal';
 export { Login2, Register2, AuthModal } from './pro/Login2.0';
 export { default as WalletEditor } from './plus/walletEditor';
 export { default as WalletPassGallery } from './plus/walletPassGallery';
-export { default as WalletPassDetail } from './plus/walletPassGallery/components/passDetail';
-export { default as SettingsRegistry } from './components/systemSettings/registry';
 export { default as WebPosLogin } from './plus/webPosLogin';
-export { default as PaymentModal } from './components/checkout/plugin';

package/es/index.js

@@ -27,7 +27,6 @@ export { default as EftposPay } from "./components/eftposPay";
 export { default as ToCPay } from "./components/pay/toC";
 export { default as ToBPay } from "./components/pay/toB";
 export { default as Eftpos } from "./components/eftpos";
-export { default as Wallet } from "./components/wallet";
 export { default as WalletList } from "./components/walletList";
 export { default as BookingDashboard } from "./components/booking/dashboard";
 export { default as PisellSelectCustomerModal } from "./components/pisellSelectCustomerModal";
@@ -73,7 +72,4 @@ export { default as ContactInfoModal } from "./plus/contactInfoModal";
 export { Login2, Register2, AuthModal } from "./pro/Login2.0";
 export { default as WalletEditor } from "./plus/walletEditor";
 export { default as WalletPassGallery } from "./plus/walletPassGallery";
-export { default as WalletPassDetail } from "./plus/walletPassGallery/components/passDetail";
-export { default as SettingsRegistry } from "./components/systemSettings/registry";
-export { default as WebPosLogin } from "./plus/webPosLogin";
-export { default as PaymentModal } from "./components/checkout/plugin";
+export { default as WebPosLogin } from "./plus/webPosLogin";

package/es/plus/clientCard/locales.js

@@ -1,8 +1,8 @@
 export default {
   en: {
-    'pisell2.text.add-client': 'Add Customer',
-    'pisell2.text.change-client': 'Change Customer',
-    'pisell2.text.remove-client': ' Remove Customer'
+    'pisell2.text.add-client': 'Add client',
+    'pisell2.text.change-client': 'Change Client',
+    'pisell2.text.remove-client': ' Remove Client'
   },
   'zh-CN': {
     'pisell2.text.add-client': '添加客户',