@pisell/private-materials 3.2.5 → 3.2.7

package/es/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/es/components/eftpos/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

package/es/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "payo" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "payo" | "windcave" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/es/components/eftposPay/store/index.d.ts

@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "tyro" | "payo" | "windcave" | "stripe" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/es/components/login/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface LoginProps {
     title: string;

package/es/components/pisellSelectCustomerModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';

package/es/components/productExtension/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

package/es/components/taxSelect/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 import "./index.less";
 interface TaxSelectProps {

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

@@ -1,5 +1,19 @@
 import React from 'react';
 import './index.less';
+declare global {
+    interface Window {
+        PKPass?: any;
+        GoogleWalletPass?: any;
+    }
+    interface Navigator {
+        pkpass?: {
+            addPass(pass: any): Promise<string>;
+        };
+        googlewallet?: {
+            addPass(pass: any): Promise<string>;
+        };
+    }
+}
 interface DetailProps {
     detail: {
         id?: string;

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

@@ -24,6 +24,9 @@ import { request } from "./../../../utils";
 import { WalletBar, FooterButtons } from "../components";
 import "./index.less";
 var Text = Typography.Text;
+
+// 为Web PKI API添加TypeScript声明
+
 dayjs.extend(timezone);
 dayjs.extend(utc);
 var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -308,7 +311,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
 
               // 如果是积分卡 移除掉2024-8-10之前的数据
               if (((_filterList$i3 = filterList[i]) === null || _filterList$i3 === void 0 ? void 0 : _filterList$i3.tag) === 'point_card' && dayjs.tz((_filterList$i4 = filterList[i]) === null || _filterList$i4 === void 0 ? void 0 : _filterList$i4.created_at, timezone).unix() < stateTimeUnix) {
-                filterList.splice(i, 1); // 移除当前索引的元素  
+                filterList.splice(i, 1); // 移除当前索引的元素
               }
             }
             setTimeLineData(formatTimeLineDta(filterList));
@@ -337,24 +340,142 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
       getTimeTreeList();
     }
   }, [code]);
-  var onAppleClick = function onAppleClick() {
-    if (isWechat()) {
-      setWechatModalOpen(true);
-      setCopyUrl(apple_wallet_url);
-      return;
-    }
-    window.open(apple_wallet_url, '_blank');
-  };
-  var onGoogleClick = function onGoogleClick() {
-    if (isWechat()) {
-      setWechatModalOpen(true);
-      setCopyUrl(google_wallet_url);
-      return;
-    }
-    if (google_wallet_url) {
-      window.open(google_wallet_url);
-    }
-  };
+  /**
+   * 添加钱包卡片的公共函数
+   * @param url 钱包卡片URL
+   * @param type 钱包类型('apple'或'google')
+   * @returns Promise<void>
+   */
+  var addWalletPass = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, type) {
+      var response, passData, _pass, result, blob, _url, a;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (url) {
+              _context3.next = 2;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 2:
+            if (!isWechat()) {
+              _context3.next = 6;
+              break;
+            }
+            setWechatModalOpen(true);
+            setCopyUrl(url);
+            return _context3.abrupt("return");
+          case 6:
+            console.log('%c [ window.PKPass ]-395', 'font-size:13px; color:#bf2c9f;', window.PKPass);
+            console.log('%c [ navigator.pkpass ]-396', 'font-size:13px; color:#bf2c9f;', navigator.pkpass);
+            // 根据不同类型处理不同API
+            if (!(type === 'apple')) {
+              _context3.next = 46;
+              break;
+            }
+            _context3.prev = 9;
+            _context3.next = 12;
+            return fetch('/generate-pass');
+          case 12:
+            response = _context3.sent;
+            alert(response);
+            console.log('%c [ response ]-400', 'font-size:13px; color:#bf2c9f;', response);
+            _context3.next = 17;
+            return response.arrayBuffer();
+          case 17:
+            passData = _context3.sent;
+            console.log('%c [ passData ]-402', 'font-size:13px; color:#bf2c9f;', passData);
+            console.log('%c [ window.PKPass ]-404', 'font-size:13px; color:#bf2c9f;', window.PKPass);
+            // 2. 调用 Web PKI API
+
+            alert(window.PKPass + 'window.PKPass');
+            alert(navigator.pkpass + 'navigator.pkpass');
+            if (!(window.PKPass && navigator.pkpass)) {
+              _context3.next = 30;
+              break;
+            }
+            _pass = new window.PKPass(passData);
+            _context3.next = 26;
+            return navigator.pkpass.addPass(_pass);
+          case 26:
+            result = _context3.sent;
+            // 3. 根据结果触发自定义事件
+            if (result === 'added') {
+              console.log('Pass 添加成功！');
+              // 触发自定义事件，例如发送分析、更新UI等
+              window.dispatchEvent(new CustomEvent('passAdded'));
+            } else {
+              console.log('用户取消了操作');
+            }
+            _context3.next = 39;
+            break;
+          case 30:
+            alert('浏览器不支持 Web PKI');
+            // 浏览器不支持 Web PKI，回退到直接下载
+            blob = new Blob([passData], {
+              type: 'application/vnd.apple.pkpass'
+            });
+            _url = URL.createObjectURL(blob);
+            a = document.createElement('a');
+            alert(_url + 'url');
+            a.href = _url;
+            a.download = 'pass.pkpass';
+            a.click();
+            URL.revokeObjectURL(_url);
+          case 39:
+            _context3.next = 44;
+            break;
+          case 41:
+            _context3.prev = 41;
+            _context3.t0 = _context3["catch"](9);
+            console.error('添加失败:', _context3.t0);
+          case 44:
+            _context3.next = 46;
+            break;
+          case 46:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[9, 41]]);
+    }));
+    return function addWalletPass(_x, _x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var onAppleClick = /*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.next = 2;
+            return addWalletPass(apple_wallet_url, 'apple');
+          case 2:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function onAppleClick() {
+      return _ref5.apply(this, arguments);
+    };
+  }();
+  var onGoogleClick = /*#__PURE__*/function () {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
+            return addWalletPass(google_wallet_url, 'google');
+          case 2:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function onGoogleClick() {
+      return _ref6.apply(this, arguments);
+    };
+  }();
   var isWechat = function isWechat() {
     return /MicroMessenger/i.test(window.navigator.userAgent);
   };

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

@@ -11,7 +11,9 @@
     display: flex;
     gap: 12px;
     width: 100%;
-    
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
     // 按钮数量样式
     // 单个按钮占满宽度
     &-count-1 {

package/es/components/walletList/index.js

@@ -32,16 +32,37 @@ import { WalletCardItem, DEFAULT_CARD_CONFIG } from "./types";
 // 添加 localStorage 相关的操作函数
 var STORAGE_KEY = 'pisell_wallet_list_data';
 var STORAGE_KEY_BALANCE = 'pisell_wallet_balance_data';
+
+// 确保localStorage函数在所有环境下都能正确使用
+var safeLocalStorage = {
+  getItem: function getItem(key) {
+    try {
+      return typeof localStorage !== 'undefined' ? localStorage.getItem(key) : null;
+    } catch (error) {
+      console.error('Error accessing localStorage:', error);
+      return null;
+    }
+  },
+  setItem: function setItem(key, value) {
+    try {
+      if (typeof localStorage !== 'undefined') {
+        localStorage.setItem(key, value);
+      }
+    } catch (error) {
+      console.error('Error writing to localStorage:', error);
+    }
+  }
+};
 var saveToLocalStorage = function saveToLocalStorage(key, data) {
   try {
-    localStorage.setItem(key, JSON.stringify(data));
+    safeLocalStorage.setItem(key, JSON.stringify(data));
   } catch (error) {
     console.error('Error saving to localStorage:', error);
   }
 };
 var getFromLocalStorage = function getFromLocalStorage(key) {
   try {
-    var data = localStorage.getItem(key);
+    var data = safeLocalStorage.getItem(key);
     return data ? JSON.parse(data) : null;
   } catch (error) {
     console.error('Error reading from localStorage:', error);
@@ -156,7 +177,6 @@ var WalletList = Provider(function (props) {
   // 先获取list
   var _state$list = state.list,
     list = _state$list === void 0 ? [] : _state$list,
-    loading = state.loading,
     error = state.error,
     authError = state.authError,
     hasAttempted = state.hasAttempted,
@@ -171,6 +191,7 @@ var WalletList = Provider(function (props) {
 
   // 组件挂载时执行一次请求
   useEffect(function () {
+    console.log('%c [  ]-221', 'font-size:13px; color:#bf2c9f;', 22121212);
     // 组件卸载时取消所有操作
     return function () {
       isMountedRef.current = false;
@@ -191,7 +212,6 @@ var WalletList = Provider(function (props) {
         setState({
           list: [DEFAULT_WALLET_CARD],
           balance: DEFAULT_BALANCE,
-          loading: false,
           hasAttempted: true,
           isLoggedIn: false
         });
@@ -364,7 +384,6 @@ var WalletList = Provider(function (props) {
             setState({
               list: [DEFAULT_WALLET_CARD],
               balance: DEFAULT_BALANCE,
-              loading: false,
               hasAttempted: true,
               isLoggedIn: false
             });
@@ -376,43 +395,58 @@ var WalletList = Provider(function (props) {
             }
             return _context3.abrupt("return");
           case 9:
-            // 从 localStorage 获取缓存数据
-            cachedList = getFromLocalStorage(STORAGE_KEY);
-            cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE); // 如果有缓存数据，先使用缓存数据
+            // 从本地缓存获取数据，使用try-catch包裹防止错误
+            cachedList = null;
+            cachedBalance = null;
+            try {
+              cachedList = getFromLocalStorage(STORAGE_KEY);
+              cachedBalance = getFromLocalStorage(STORAGE_KEY_BALANCE);
+            } catch (e) {
+              console.error('Error fetching from localStorage:', e);
+            }
+
+            // 如果有缓存数据，先使用缓存数据
             if (cachedList && cachedBalance) {
               setState({
                 list: cachedList,
                 balance: cachedBalance,
-                loading: false,
                 hasAttempted: false
               });
             }
-            _context3.prev = 12;
+            _context3.prev = 13;
             if (isMountedRef.current) {
-              _context3.next = 15;
+              _context3.next = 16;
               break;
             }
             return _context3.abrupt("return");
-          case 15:
-            _context3.next = 17;
+          case 16:
+            _context3.next = 18;
             return Promise.all([getWalletList(), getWalletBalance()]);
-          case 17:
+          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];
             if (!(!isMountedRef.current || requestIdRef.current !== requestId)) {
-              _context3.next = 23;
+              _context3.next = 24;
               break;
             }
             return _context3.abrupt("return");
-          case 23:
+          case 24:
             // 如果获取到有效数据，保存到 localStorage
             if (walletListData && walletListData.length > 0) {
-              saveToLocalStorage(STORAGE_KEY, walletListData);
+              try {
+                saveToLocalStorage(STORAGE_KEY, walletListData);
+              } catch (e) {
+                console.error('Error saving wallet list to localStorage:', e);
+              }
             }
             if (walletBalanceData) {
-              saveToLocalStorage(STORAGE_KEY_BALANCE, walletBalanceData);
+              try {
+                saveToLocalStorage(STORAGE_KEY_BALANCE, walletBalanceData);
+              } catch (e) {
+                console.error('Error saving wallet balance to localStorage:', e);
+              }
             }
 
             // 添加判断逻辑：如果walletBalanceData为空或walletListData为空，2秒后重试
@@ -442,7 +476,11 @@ var WalletList = Provider(function (props) {
                     case 8:
                       retryBalanceData = _context2.sent;
                       if (retryBalanceData) {
-                        saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
+                        try {
+                          saveToLocalStorage(STORAGE_KEY_BALANCE, retryBalanceData);
+                        } catch (e) {
+                          console.error('Error saving retry balance to localStorage:', e);
+                        }
                       }
                     case 10:
                       if (!(Array.isArray(walletListData) && walletListData.length === 0)) {
@@ -454,14 +492,17 @@ var WalletList = Provider(function (props) {
                     case 13:
                       retryListData = _context2.sent;
                       if (retryListData && retryListData.length > 0) {
-                        saveToLocalStorage(STORAGE_KEY, retryListData);
+                        try {
+                          saveToLocalStorage(STORAGE_KEY, retryListData);
+                        } catch (e) {
+                          console.error('Error saving retry list to localStorage:', e);
+                        }
                       }
                     case 15:
                       // 更新状态
                       setState({
                         list: retryListData || [],
                         balance: retryBalanceData,
-                        loading: false,
                         hasAttempted: true
                       });
                       _context2.next = 21;
@@ -473,7 +514,6 @@ var WalletList = Provider(function (props) {
                       setState({
                         list: walletListData || [],
                         balance: walletBalanceData,
-                        loading: false,
                         hasAttempted: true
                       });
                     case 21:
@@ -487,34 +527,32 @@ var WalletList = Provider(function (props) {
               setState({
                 list: walletListData || [],
                 balance: walletBalanceData,
-                loading: false,
                 hasAttempted: true
               });
             }
-            _context3.next = 34;
+            _context3.next = 35;
             break;
-          case 28:
-            _context3.prev = 28;
-            _context3.t0 = _context3["catch"](12);
+          case 29:
+            _context3.prev = 29;
+            _context3.t0 = _context3["catch"](13);
             if (!(!isMountedRef.current || requestIdRef.current !== requestId)) {
-              _context3.next = 32;
+              _context3.next = 33;
               break;
             }
             return _context3.abrupt("return");
-          case 32:
+          case 33:
             // 判断是否是登录超时错误
             isAuthError = (_context3.t0 === null || _context3.t0 === void 0 ? void 0 : _context3.t0.code) === 4001 || (_context3.t0 === null || _context3.t0 === void 0 || (_message = _context3.t0.message) === null || _message === void 0 ? void 0 : _message.includes('login time out')) || (_context3.t0 === null || _context3.t0 === void 0 || (_data = _context3.t0.data) === null || _data === void 0 ? void 0 : _data.code) === 4001;
             setState({
-              loading: false,
               error: _context3.t0 instanceof Error ? _context3.t0 : new Error('加载失败'),
               authError: isAuthError,
               hasAttempted: true
             });
-          case 34:
+          case 35:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[12, 28]]);
+      }, _callee3, null, [[13, 29]]);
     }));
     return function initData(_x) {
       return _ref3.apply(this, arguments);

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

@@ -163,7 +163,7 @@ export declare const DEFAULT_CARD_CONFIG: {
     readonly codeDirection: "bottom";
     readonly showShopName: true;
     readonly showWalletName: true;
-    readonly showIcon: false;
+    readonly showIcon: true;
     readonly iconImg: "";
     readonly showCardNo: true;
     readonly showCode: true;

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

@@ -37,7 +37,7 @@ export var DEFAULT_CARD_CONFIG = {
   codeDirection: 'bottom',
   showShopName: true,
   showWalletName: true,
-  showIcon: false,
+  showIcon: true,
   iconImg: '',
   showCardNo: true,
   showCode: true,

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;

package/lib/components/eftpos/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {

package/lib/components/eftposPay/hooks.d.ts

@@ -19,7 +19,7 @@ export declare const useStoreRef: <T extends {
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"tyro" | "windcave" | "payo" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"tyro" | "payo" | "windcave" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eftposPay/store/index.d.ts

@@ -297,8 +297,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "refund" | "pay" | "fullPay" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "tyro" | "windcave" | "payo" | "stripe" | undefined;
-        action?: "amount" | "deviceList" | "pay" | undefined;
+        eftpos?: "tyro" | "payo" | "windcave" | "stripe" | undefined;
+        action?: "amount" | "pay" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;

package/lib/components/login/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 export interface LoginProps {
     title: string;

package/lib/components/pisellSelectCustomerModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PopoverProps } from 'antd';
 import { CustomerCardProps } from './CustomerCard';
 import './index.less';

package/lib/components/productExtension/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

package/lib/components/taxSelect/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SelectProps } from "antd";
 import "./index.less";
 interface TaxSelectProps {

package/lib/components/wallet/Detail/index.d.ts

@@ -1,5 +1,19 @@
 import React from 'react';
 import './index.less';
+declare global {
+    interface Window {
+        PKPass?: any;
+        GoogleWalletPass?: any;
+    }
+    interface Navigator {
+        pkpass?: {
+            addPass(pass: any): Promise<string>;
+        };
+        googlewallet?: {
+            addPass(pass: any): Promise<string>;
+        };
+    }
+}
 interface DetailProps {
     detail: {
         id?: string;