@pisell/private-materials 6.5.27 → 6.5.28

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

@@ -18,7 +18,14 @@ 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();
@@ -31,6 +38,10 @@ 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([]),
@@ -40,7 +51,7 @@ export var useProducts = function useProducts(notAvailableRef) {
   var scheduledTaskQueueIdRef = useRef('booking-schedule-products');
   var paramsRef = useRef(undefined);
   var getProducts = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
       var _products, _notAvailableRef$curr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -73,7 +84,7 @@ export var useProducts = function useProducts(notAvailableRef) {
       }, _callee, null, [[1, 11]]);
     }));
     return function (_x) {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }());
 
@@ -83,21 +94,21 @@ export var useProducts = function useProducts(notAvailableRef) {
       return;
     }
     try {
-      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) {
+      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) {
         console.warn('App 或 tasksManager 不可用');
         return;
       }
 
       // 注册 getProducts 任务函数
-      app.tasksManager.addTaskFunction('getProducts', /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+      _app.tasksManager.addTaskFunction('getProducts', /*#__PURE__*/function () {
+        var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
           var task;
           return _regeneratorRuntime().wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
-                task = _ref2.task;
+                task = _ref3.task;
                 console.log('定时执行 getProducts，参数：', task.payload);
                 _context2.next = 4;
                 return getProducts(task.payload);
@@ -112,14 +123,14 @@ export var useProducts = function useProducts(notAvailableRef) {
           }, _callee2);
         }));
         return function (_x2) {
-          return _ref3.apply(this, arguments);
+          return _ref4.apply(this, arguments);
         };
       }());
 
       // 如果有 scheduleTimePoints，创建定时任务
       if (scheduleTimePoints && scheduleTimePoints.length > 0) {
         // 先清除之前的定时任务
-        app.tasksManager.clearTasks({
+        _app.tasksManager.clearTasks({
           module: 'scheduledTasks',
           queueId: scheduledTaskQueueIdRef.current
         });
@@ -147,14 +158,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
         });
@@ -167,10 +178,10 @@ export var useProducts = function useProducts(notAvailableRef) {
     // 清理函数：组件卸载时清除定时任务
     return function () {
       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) {
-          _app.tasksManager.clearTasks({
+        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({
             module: 'scheduledTasks',
             queueId: scheduledTaskQueueIdRef.current
           });
@@ -181,7 +192,7 @@ export var useProducts = function useProducts(notAvailableRef) {
     };
   }, [scheduleTimePoints]);
   var getScheduleTimePoints = useMemoizedFn( /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
       var scheduleTimePoints;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -204,7 +215,7 @@ export var useProducts = function useProducts(notAvailableRef) {
       }, _callee3);
     }));
     return function (_x3) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }());
   return {

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

@@ -61,6 +61,8 @@ 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;
@@ -124,6 +126,8 @@ 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;
@@ -187,6 +191,8 @@ 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,7 +73,9 @@ 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.terminal-upgrade-cancel': 'Cancel',
+    'pisell2.ticket-booking.collapse': 'Collapse',
+    'pisell2.ticket-booking.expand': 'Expand'
   },
   'zh-CN': {
     'pisell2.ticket-booking.info': '信息',
@@ -149,7 +151,9 @@ 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.terminal-upgrade-cancel': '取消',
+    'pisell2.ticket-booking.collapse': '收起',
+    'pisell2.ticket-booking.expand': '展开'
   },
   'zh-HK': {
     'pisell2.ticket-booking.info': '資訊',
@@ -225,6 +229,8 @@ 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.terminal-upgrade-cancel': '取消',
+    'pisell2.ticket-booking.collapse': '收起',
+    'pisell2.ticket-booking.expand': '展開'
   }
 };

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

@@ -41,7 +41,7 @@ declare type ScanData = {
     };
 };
 export declare const formatScanCustomer: (data: ScanData) => {
-    searchType: "customer" | "product" | "wallet" | "walletPass" | "local_product";
+    searchType: "product" | "customer" | "wallet" | "walletPass" | "local_product";
     data: any;
     scanCode: string;
 } | null;

package/es/components/walletList/index.js

@@ -21,7 +21,7 @@ import { Provider, Context } from "./model";
 import { WalletCard, Carousel } from '@pisell/materials';
 import { LeftOutlined, RightOutlined } from '@ant-design/icons';
 import useEngineContext from "./../../hooks/useEngineContext";
-import { getWalletList, getWalletBalance, getWalletShopList } from "./serve";
+import { getWalletList, batchGetWalletBalance, getWalletShopList } from "./serve";
 import { locales, getUniqueId } from '@pisell/utils';
 import { request } from "./../../utils";
 import { defaultWalletGuideConfig } from "./status";
@@ -124,8 +124,43 @@ var DEFAULT_WALLET_CARD = {
       en: 'Level'
     },
     metadata: {
-      barcodetype: 'barCode',
-      showcaseWalletPass: ['rechargeable', 'piont', 'voucher', 'discount'],
+      showcaseWalletPassNew: [{
+        type: 'rechargeable',
+        display: 1,
+        custom_title: {
+          original: 'Balance',
+          'zh-CN': '充值卡',
+          'zh-HK': '充值卡',
+          en: 'Balance'
+        }
+      }, {
+        type: 'point',
+        display: 1,
+        custom_title: {
+          original: 'Points',
+          'zh-CN': '积分卡',
+          'zh-HK': '積分卡',
+          en: 'Points'
+        }
+      }, {
+        type: 'voucher',
+        display: 1,
+        custom_title: {
+          original: 'Voucher',
+          'zh-CN': '代金券',
+          'zh-HK': '代金券',
+          en: 'Voucher'
+        }
+      }, {
+        type: 'discount',
+        display: 1,
+        custom_title: {
+          original: 'Discount',
+          'zh-CN': '折扣卡',
+          'zh-HK': '折扣卡',
+          en: 'Discount'
+        }
+      }],
       coverImage: '',
       icon: ''
     }
@@ -241,7 +276,7 @@ var WalletList = Provider(function (props) {
       if (isMountedRef.current) {
         setState({
           list: [DEFAULT_WALLET_CARD],
-          balance: DEFAULT_BALANCE,
+          balance: [],
           hasAttempted: true,
           isLoggedIn: false
         });
@@ -390,7 +425,7 @@ var WalletList = Provider(function (props) {
   };
   var initData = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(requestId) {
-      var cachedList, cachedBalance, _yield$Promise$all, _yield$Promise$all2, walletListData, walletBalanceData, _message, _data, isAuthError;
+      var cachedList, cachedBalance, walletListData, walletBalanceData, _message, _data, isAuthError;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -413,7 +448,7 @@ var WalletList = Provider(function (props) {
             // 设置状态为已尝试请求，提供默认数据而不是空列表
             setState({
               list: [DEFAULT_WALLET_CARD],
-              balance: DEFAULT_BALANCE,
+              balance: [],
               hasAttempted: true,
               isLoggedIn: false
             });
@@ -431,6 +466,13 @@ var WalletList = Provider(function (props) {
             try {
               cachedList = getFromLocalStorage(STORAGE_KEY);
               cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
+              // 避免使用旧版数据
+              if (!Array.isArray(cachedBalance) || !cachedBalance.some(function (item) {
+                var _item$hasOwnProperty;
+                return (_item$hasOwnProperty = item.hasOwnProperty) === null || _item$hasOwnProperty === void 0 ? void 0 : _item$hasOwnProperty.call(item, 'gift_card_balance');
+              })) {
+                cachedBalance = null;
+              }
             } catch (e) {
               console.error('Error fetching from localStorage:', e);
             }
@@ -451,12 +493,15 @@ var WalletList = Provider(function (props) {
             return _context3.abrupt("return");
           case 16:
             _context3.next = 18;
-            return Promise.all([getWalletList(), getWalletBalance()]);
+            return getWalletList();
           case 18:
-            _yield$Promise$all = _context3.sent;
-            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
-            walletListData = _yield$Promise$all2[0];
-            walletBalanceData = _yield$Promise$all2[1];
+            walletListData = _context3.sent;
+            _context3.next = 21;
+            return batchGetWalletBalance(walletListData.map(function (item) {
+              return item.wallet_id;
+            }));
+          case 21:
+            walletBalanceData = _context3.sent;
             if (!(!isMountedRef.current || requestIdRef.current !== requestId)) {
               _context3.next = 24;
               break;
@@ -496,36 +541,38 @@ var WalletList = Provider(function (props) {
                       _context2.prev = 2;
                       // 准备重试请求
                       retryBalanceData = walletBalanceData;
-                      retryListData = walletListData; // 如果余额数据为空，重试请求余额
-                      if (walletBalanceData) {
+                      retryListData = walletListData; // 如果列表数据为空，重试请求列表
+                      if (!(Array.isArray(walletListData) && walletListData.length === 0)) {
                         _context2.next = 10;
                         break;
                       }
                       _context2.next = 8;
-                      return getWalletBalance();
+                      return getWalletList();
                     case 8:
-                      retryBalanceData = _context2.sent;
-                      if (retryBalanceData) {
+                      retryListData = _context2.sent;
+                      if (retryListData && retryListData.length > 0) {
                         try {
-                          saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
+                          saveToLocalStorage(STORAGE_KEY, retryListData);
                         } catch (e) {
-                          console.error('Error saving retry balance to localStorage:', e);
+                          console.error('Error saving retry list to localStorage:', e);
                         }
                       }
                     case 10:
-                      if (!(Array.isArray(walletListData) && walletListData.length === 0)) {
+                      if (walletBalanceData) {
                         _context2.next = 15;
                         break;
                       }
                       _context2.next = 13;
-                      return getWalletList({});
+                      return batchGetWalletBalance(retryListData.map(function (item) {
+                        return item.wallet_id;
+                      }));
                     case 13:
-                      retryListData = _context2.sent;
-                      if (retryListData && retryListData.length > 0) {
+                      retryBalanceData = _context2.sent;
+                      if (retryBalanceData) {
                         try {
-                          saveToLocalStorage(STORAGE_KEY, retryListData);
+                          saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
                         } catch (e) {
-                          console.error('Error saving retry list to localStorage:', e);
+                          console.error('Error saving retry balance to localStorage:', e);
                         }
                       }
                     case 15:
@@ -606,57 +653,46 @@ var WalletList = Provider(function (props) {
       metadata = _ref5.metadata,
       name = _ref5.name;
     var _ref6 = metadata || {},
-      _ref6$barcodetype = _ref6.barcodetype,
-      barcodetype = _ref6$barcodetype === void 0 ? 'barCode' : _ref6$barcodetype,
-      _ref6$showcaseWalletP = _ref6.showcaseWalletPass,
-      showcaseWalletPass = _ref6$showcaseWalletP === void 0 ? [] : _ref6$showcaseWalletP,
+      _ref6$showcaseWalletP = _ref6.showcaseWalletPassNew,
+      showcaseWalletPassNew = _ref6$showcaseWalletP === void 0 ? [] : _ref6$showcaseWalletP,
       _ref6$coverImage = _ref6.coverImage,
       coverImage = _ref6$coverImage === void 0 ? '' : _ref6$coverImage,
       _ref6$icon = _ref6.icon,
       icon = _ref6$icon === void 0 ? '' : _ref6$icon;
     var shopName = shop.name;
-    var balance = state.balance;
+    var _state$balance = state.balance,
+      balance = _state$balance === void 0 ? [] : _state$balance;
+    var balanceItem = balance.find(function (bi) {
+      return bi.wallet_id == item.wallet_id;
+    }) || DEFAULT_BALANCE;
 
     // 字段映射关系
-    var balanceKeyMap = {
-      gift_card_balance: 'rechargeable',
-      point_card_balance: 'piont',
-      voucher_count: 'voucher',
-      discount_card_count: 'discount'
+    var _balanceKeyMap = {
+      rechargeable: 'gift_card_balance',
+      point: 'point_card_balance',
+      voucher: 'voucher_count',
+      discount: 'discount_card_count'
     };
-
-    // 根据showcaseWalletPass生成items数组
-    var cardItems = (showcaseWalletPass || []).map(function (key) {
-      var _Object$entries$find;
-      // 找到对应的balance字段
-      var balanceKey = (_Object$entries$find = Object.entries(balanceKeyMap).find(function (_ref7) {
-        var _ref8 = _slicedToArray(_ref7, 2),
-          _ = _ref8[0],
-          value = _ref8[1];
-        return value === key;
-      })) === null || _Object$entries$find === void 0 ? void 0 : _Object$entries$find[0];
-      var value = balanceKey ? balance[balanceKey] || 0 : 0;
-      if (balanceKey === 'voucher_count') {
-        value += balance.good_pass_count;
-      }
-      return {
-        key: key,
-        label: key,
-        hidden: false,
+    var cardItems = showcaseWalletPassNew.map(function (showCaseItem) {
+      var balanceKey = _balanceKeyMap[showCaseItem.type];
+      var value = balanceKey ? balanceItem[balanceKey] || 0 : 0;
+      return _objectSpread(_objectSpread({}, showCaseItem), {}, {
         value: value
-      };
+      });
     });
+
     // 构建WalletCard的props
     // 优先级：接口返回值 > globalState > DEFAULT_CARD_CONFIG
     var cardProps = _objectSpread(_objectSpread(_objectSpread({}, DEFAULT_CARD_CONFIG), globalState), {}, {
       // 最后应用API返回的数据，这些拥有最高优先级
+      id: wallet.id,
       iconImg: icon,
       symbol: symbol,
       cardNo: code,
       walletName: getLocalizedName(name, dvaStore === null || dvaStore === void 0 || (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale),
       shopName: shopName,
-      codeType: barcodetype,
-      items: cardItems,
+      // codeType: barcodetype,
+      items: cardItems.slice(0, 4),
       customBackgroundImage: coverImage,
       isLogin: isUserLoggedIn // 添加登录状态
     });

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

@@ -10,6 +10,10 @@ export declare const getWalletList: () => Promise<WalletPass[]>;
  * @returns
  */
 export declare const getWalletBalance: () => Promise<WalletBalance | null>;
+/**
+ * 批量获取钱包余额信息
+ */
+export declare const batchGetWalletBalance: (walletIds: string[]) => Promise<Record<string, WalletBalance> | null>;
 /**
  * @title: 获取钱包店铺列表
  * @description:

package/es/components/walletList/serve.js

@@ -69,39 +69,72 @@ export var getWalletBalance = /*#__PURE__*/function () {
 }();
 
 /**
- * @title: 获取钱包店铺列表
- * @description: 
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-06-09 11:12
+ * 批量获取钱包余额信息
  */
-export var getWalletShopList = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
+export var batchGetWalletBalance = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(walletIds) {
     var _yield$request$getReq3, data;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           _context3.prev = 0;
           _context3.next = 3;
-          return request.getRequest().get('/h5/wallet/shop/list', params || {}, {
-            // abort: true,
-            useCache: true
+          return request.getRequest().get('/h5/wallet/wallet-pass/balance/batch', {
+            wallet_id: walletIds
           });
         case 3:
           _yield$request$getReq3 = _context3.sent;
           data = _yield$request$getReq3.data;
-          return _context3.abrupt("return", data || null);
+          return _context3.abrupt("return", data || {});
         case 8:
           _context3.prev = 8;
           _context3.t0 = _context3["catch"](0);
-          return _context3.abrupt("return", null);
+          return _context3.abrupt("return", {});
         case 11:
         case "end":
           return _context3.stop();
       }
     }, _callee3, null, [[0, 8]]);
   }));
-  return function getWalletShopList(_x) {
+  return function batchGetWalletBalance(_x) {
     return _ref3.apply(this, arguments);
   };
+}();
+
+/**
+ * @title: 获取钱包店铺列表
+ * @description: 
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2025-06-09 11:12
+ */
+export var getWalletShopList = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(params) {
+    var _yield$request$getReq4, data;
+    return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _context4.prev = 0;
+          _context4.next = 3;
+          return request.getRequest().get('/h5/wallet/shop/list', params || {}, {
+            // abort: true,
+            useCache: true
+          });
+        case 3:
+          _yield$request$getReq4 = _context4.sent;
+          data = _yield$request$getReq4.data;
+          return _context4.abrupt("return", data || null);
+        case 8:
+          _context4.prev = 8;
+          _context4.t0 = _context4["catch"](0);
+          return _context4.abrupt("return", null);
+        case 11:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4, null, [[0, 8]]);
+  }));
+  return function getWalletShopList(_x2) {
+    return _ref4.apply(this, arguments);
+  };
 }();

package/es/components/walletList/types/index.d.ts

@@ -6,14 +6,18 @@ export interface MultiLanguageName {
     en: string;
     [key: string]: string;
 }
+declare type WalletPassType = 'rechargeable' | 'point' | 'voucher' | 'discount';
 export interface WalletMetadata {
     name: MultiLanguageName;
     welcomeText?: string | MultiLanguageName;
     customerName?: string;
     coverImage?: string;
     icon?: string;
-    barcodetype: 'barCode' | 'orCode';
-    showcaseWalletPass?: ('rechargeable' | 'piont' | 'voucher' | 'discount')[];
+    showcaseWalletPassNew?: Array<{
+        type: WalletPassType;
+        custom_title?: string | MultiLanguageName;
+        display?: 0 | 1;
+    }>;
 }
 export interface Shop {
     id: number;
@@ -56,15 +60,10 @@ export interface WalletBalance {
     voucher_count: number;
     discount_card_count: number;
 }
-export interface WalletBalanceItem {
-    key: string;
-    label: string;
-    value: number;
-}
 export interface WalletCardItem {
-    key: string;
-    label: string;
-    hidden: boolean;
+    type: WalletPassType;
+    custom_title?: string | MultiLanguageName;
+    display: 0 | 1;
     value?: number;
 }
 export interface State {
@@ -106,7 +105,7 @@ export interface WalletListProps {
         platform?: 'pc' | 'h5' | 'ipad';
         mode?: 'dark' | 'light';
         cardStyle?: 'normal' | 'full';
-        codeType?: 'barCode' | 'orCode';
+        codeType?: 'barCode' | 'qrCode';
         codeDirection?: 'bottom' | 'top';
         shopName?: boolean;
         showWalletName?: boolean;
@@ -131,7 +130,7 @@ export interface WalletCardProps {
     platform?: 'pc' | 'h5' | 'ipad';
     mode?: 'dark' | 'light';
     cardStyle?: 'normal' | 'full';
-    codeType?: 'barCode' | 'orCode';
+    codeType?: 'barCode' | 'qrCode';
     codeDirection?: 'bottom' | 'top';
     shopName?: boolean;
     showIcon?: boolean;
@@ -192,3 +191,4 @@ export interface CarouselSettings {
         };
     }>;
 }
+export {};

package/es/components/walletList/types/index.js

@@ -1,5 +1,7 @@
 // 多语言名称接口
 
+//rechargeable:充值卡 point:积分卡 voucher:优惠券 discountCard:折扣卡
+
 // 钱包元数据接口
 
 // 商店接口
@@ -10,8 +12,6 @@
 
 // 钱包余额接口
 
-// 钱包余额项接口
-
 // 卡片项接口
 
 // 应用状态接口

package/es/hooks/usePaymentLogger.d.ts

@@ -1,3 +1,4 @@
+/// <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';
@@ -63,3 +62,10 @@ export { default as SkuCard } from './plus/productSelect/ProductCard/SkuCard';
 export { default as PinModal } from './components/pinModal';
 export { default as PinVerifyModal } from './components/pinVerifyModal';
 export { ResponsiveList as SkuList } from './components/list';
+export { OAuthConfig, SaaSAdminAuth, OrgAdminAuth, CustomerAuth, CustomerOAuthConfig, DeviceAuth, POSOperatorAuth, OnlineShopAuth, SaaSManagermentAuth } from './components/authentication/admin';
+export type { SaaSAdminAuthProps, OrgAdminAuthProps, DeviceAuthProps, POSOperatorAuthProps, CustomerOAuthConfigProps } from './components/authentication/admin';
+export { default as ContactInfo } from './plus/contactInfo';
+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';