@pisell/private-materials 3.2.6 → 3.2.8

package/es/components/booking/components/footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/es/components/booking/info/addServiceVariant/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 interface AddServiceVariantProps {
     globalState: any;
     setGlobalState: any;

package/es/components/booking/info/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/es/components/booking/info/service/addService/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PisellDrawerProps } from '../../../components/drawer';
 import './index.less';
 interface AddServiceProps {

package/es/components/booking/info/service/addTimeModal/index.d.ts

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

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/component/fail/failCustom.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ className, isMobile, onChange }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 declare const _default: ({ onChange, className, isMobile }: ActionProps) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/fail/unknow.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ActionProps } from '../../const';
 /**
  * @title: 支付状态未知页面

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/index.d.ts

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

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

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

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/ruleSetting/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: 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) {
@@ -111,6 +114,14 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     setIsScrolling = _useState24[1];
   var isUserClickRef = useRef(false);
   var scrollTimeoutRef = useRef(null);
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    addWalletLoading = _useState26[0],
+    setAddWalletLoading = _useState26[1];
+  var _useState27 = useState(false),
+    _useState28 = _slicedToArray(_useState27, 2),
+    isAddingToWallet = _useState28[0],
+    setIsAddingToWallet = _useState28[1];
   var anchorOptions = useMemo(function () {
     // 始终包含detail选项
     var options = [{
@@ -308,7 +319,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 +348,128 @@ 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<boolean> 是否添加成功
+   */
+  var addWalletPass = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, type) {
+      var response, passData, blob, downloadUrl, a;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (url) {
+              _context3.next = 3;
+              break;
+            }
+            PisellToast({
+              content: locales.getText('page.wallet.urlEmpty') || '钱包链接为空',
+              duration: 2
+            });
+            return _context3.abrupt("return", false);
+          case 3:
+            if (!isWechat()) {
+              _context3.next = 7;
+              break;
+            }
+            setWechatModalOpen(true);
+            setCopyUrl(url);
+            return _context3.abrupt("return", false);
+          case 7:
+            setAddWalletLoading(true);
+            _context3.prev = 8;
+            if (!(type === 'apple')) {
+              _context3.next = 27;
+              break;
+            }
+            _context3.next = 12;
+            return fetch(url);
+          case 12:
+            response = _context3.sent;
+            if (response.ok) {
+              _context3.next = 15;
+              break;
+            }
+            throw new Error("HTTP error! status: ".concat(response.status));
+          case 15:
+            _context3.next = 17;
+            return response.arrayBuffer();
+          case 17:
+            passData = _context3.sent;
+            blob = new Blob([passData], {
+              type: 'application/vnd.apple.pkpass'
+            });
+            downloadUrl = URL.createObjectURL(blob);
+            a = document.createElement('a');
+            a.href = downloadUrl;
+            a.download = 'pass.pkpass';
+            a.click();
+            URL.revokeObjectURL(downloadUrl); // 清理创建的URL
+            _context3.next = 28;
+            break;
+          case 27:
+            window.open(url);
+          case 28:
+            _context3.next = 34;
+            break;
+          case 30:
+            _context3.prev = 30;
+            _context3.t0 = _context3["catch"](8);
+            console.error('Failed to add wallet:', _context3.t0);
+            PisellToast({
+              content: locales.getText('page.wallet.error.addFailed'),
+              duration: 3
+            });
+          case 34:
+            _context3.prev = 34;
+            setAddWalletLoading(false);
+            return _context3.finish(34);
+          case 37:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3, null, [[8, 30, 34, 37]]);
+    }));
+    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);
   };
@@ -597,10 +712,10 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
 
   // 添加ref用于获取容器元素
   var detailWrapperRef = useRef(null);
-  var _useState25 = useState(undefined),
-    _useState26 = _slicedToArray(_useState25, 2),
-    contentHeight = _useState26[0],
-    setContentHeight = _useState26[1];
+  var _useState29 = useState(undefined),
+    _useState30 = _slicedToArray(_useState29, 2),
+    contentHeight = _useState30[0],
+    setContentHeight = _useState30[1];
 
   // 添加锚点导航ref
   var anchorWrapperRef = useRef(null);
@@ -768,6 +883,7 @@ var Detail = /*#__PURE__*/forwardRef(function (props, ref) {
     className: "wallet-detail-card-content-section-empty"
   }, /*#__PURE__*/React.createElement(PisellEmpty, null))))))), platform === 'h5' && /*#__PURE__*/React.createElement(FooterButtons, {
     step: "detail",
+    addWalletLoading: addWalletLoading,
     onAppleWalletClick: tag === 'gift_card' ? addWalletCard : undefined,
     onRechargeClick: tag === 'gift_card' && (detail === null || detail === void 0 || (_detail$machinecode_c = detail.machinecode_config) === null || _detail$machinecode_c === void 0 ? void 0 : _detail$machinecode_c.hide_recharge) === 0 ? handleRecharge : undefined,
     platform: platform,

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

@@ -21,6 +21,14 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.urlEmpty': string;
+        'page.wallet.notIOS': string;
+        'page.wallet.addSuccess': string;
+        'page.wallet.addFailed': string;
+        'page.wallet.useAppleInstead': string;
+        'page.wallet.openedInBrowser': string;
+        'page.wallet.openFailed': string;
+        'page.wallet.loading': string;
     };
     'zh-CN': {
         'page.wallet.copyTitle': string;
@@ -44,6 +52,14 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.urlEmpty': string;
+        'page.wallet.notIOS': string;
+        'page.wallet.addSuccess': string;
+        'page.wallet.addFailed': string;
+        'page.wallet.useAppleInstead': string;
+        'page.wallet.openedInBrowser': string;
+        'page.wallet.openFailed': string;
+        'page.wallet.loading': string;
     };
     'zh-HK': {
         'page.wallet.copyTitle': string;
@@ -67,6 +83,14 @@ declare const _default: {
         'page.wallet.addGoogle': string;
         'page.wallet.viewDetails': string;
         'page.wallet.expireDate': string;
+        'page.wallet.urlEmpty': string;
+        'page.wallet.notIOS': string;
+        'page.wallet.addSuccess': string;
+        'page.wallet.addFailed': string;
+        'page.wallet.useAppleInstead': string;
+        'page.wallet.openedInBrowser': string;
+        'page.wallet.openFailed': string;
+        'page.wallet.loading': string;
     };
 };
 export default _default;

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

@@ -23,7 +23,15 @@ export default {
     'page.wallet.addIos': 'Add to Apple Wallet',
     'page.wallet.addGoogle': 'Add to Google Wallet',
     'page.wallet.viewDetails': 'See details',
-    'page.wallet.expireDate': 'Long term'
+    'page.wallet.expireDate': 'Long term',
+    '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',
+    'page.wallet.addFailed': 'Failed to add to wallet',
+    'page.wallet.useAppleInstead': 'You are using an iOS device, would you like to use Apple Wallet instead of Google Wallet?',
+    'page.wallet.openedInBrowser': 'Opened in browser',
+    'page.wallet.openFailed': 'Failed to open wallet link',
+    'page.wallet.loading': 'Loading wallet...'
   },
   'zh-CN': {
     // 简体中文翻译
@@ -49,7 +57,15 @@ export default {
     'page.wallet.addIos': '添加到苹果钱包',
     'page.wallet.addGoogle': '添加到谷歌钱包',
     'page.wallet.viewDetails': '查看详情',
-    'page.wallet.expireDate': '长期'
+    'page.wallet.expireDate': '长期',
+    'page.wallet.urlEmpty': '钱包链接为空',
+    'page.wallet.notIOS': '非iOS设备不支持Apple Wallet',
+    'page.wallet.addSuccess': '已成功添加到钱包',
+    'page.wallet.addFailed': '添加钱包失败',
+    'page.wallet.useAppleInstead': '您正在使用iOS设备，是否使用Apple Wallet代替Google Wallet?',
+    'page.wallet.openedInBrowser': '已在浏览器中打开',
+    'page.wallet.openFailed': '打开钱包链接失败',
+    'page.wallet.loading': '正在加载钱包...'
   },
   'zh-HK': {
     // 繁体中文翻译
@@ -75,6 +91,14 @@ export default {
     'page.wallet.addIos': '添加到蘋果錢包',
     'page.wallet.addGoogle': '添加到谷歌錢包',
     'page.wallet.viewDetails': '查看詳情',
-    'page.wallet.expireDate': '長期'
+    'page.wallet.expireDate': '長期',
+    'page.wallet.urlEmpty': '錢包連結為空',
+    'page.wallet.notIOS': '非iOS設備不支持Apple Wallet',
+    'page.wallet.addSuccess': '已成功添加到錢包',
+    'page.wallet.addFailed': '添加錢包失敗',
+    'page.wallet.useAppleInstead': '您正在使用iOS設備，是否使用Apple Wallet代替Google Wallet?',
+    'page.wallet.openedInBrowser': '已在瀏覽器中打開',
+    'page.wallet.openFailed': '打開錢包連結失敗',
+    'page.wallet.loading': '正在加載錢包...'
   }
 };

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

@@ -8,6 +8,7 @@ export interface FooterButtonsProps {
     disabled?: boolean;
     platform?: 'pc' | 'h5';
     isIOS?: boolean;
+    addWalletLoading?: boolean;
 }
 /**
  * 通用底部按钮组件

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

@@ -16,7 +16,9 @@ var FooterButtons = function FooterButtons(_ref) {
     _ref$platform = _ref.platform,
     platform = _ref$platform === void 0 ? 'h5' : _ref$platform,
     _ref$isIOS = _ref.isIOS,
-    isIOS = _ref$isIOS === void 0 ? false : _ref$isIOS;
+    isIOS = _ref$isIOS === void 0 ? false : _ref$isIOS,
+    _ref$addWalletLoading = _ref.addWalletLoading,
+    addWalletLoading = _ref$addWalletLoading === void 0 ? false : _ref$addWalletLoading;
   // 如果是PC端，部分页面可能不需要底部按钮
   if (platform === 'pc') {
     return null; // PC端不显示底部固定按钮
@@ -41,6 +43,7 @@ var FooterButtons = function FooterButtons(_ref) {
         // 添加到钱包按钮
         if (onAppleWalletClick) {
           buttons.push( /*#__PURE__*/React.createElement(Button, {
+            loading: addWalletLoading,
             key: "apple-wallet",
             onClick: onAppleWalletClick,
             disabled: disabled,

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

@@ -11,7 +11,23 @@
     display: flex;
     gap: 12px;
     width: 100%;
-    
+
+
+.wallet-footer-buttons-item-secondary{
+    overflow: hidden;
+    display: flex;
+    >span{
+      display: block;
+      // width: 100%;
+      flex:1;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      text-wrap: nowrap;
+    }
+}
+
+
     // 按钮数量样式
     // 单个按钮占满宽度
     &-count-1 {

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

@@ -39,6 +39,7 @@ declare const _default: {
         'page.wallet.button.addToAppleWallet': string;
         'page.wallet.button.addToGoogleWallet': string;
         'page.wallet.button.recharge': string;
+        'page.wallet.error.addFailed': string;
     };
     'zh-CN': {
         'page.wallet.rechargeableCard': string;
@@ -80,6 +81,7 @@ declare const _default: {
         'page.wallet.button.addToAppleWallet': string;
         'page.wallet.button.addToGoogleWallet': string;
         'page.wallet.button.recharge': string;
+        'page.wallet.error.addFailed': string;
     };
     'zh-HK': {
         'page.wallet.rechargeableCard': string;
@@ -121,6 +123,7 @@ declare const _default: {
         'page.wallet.button.addToAppleWallet': string;
         'page.wallet.button.addToGoogleWallet': string;
         'page.wallet.button.recharge': string;
+        'page.wallet.error.addFailed': string;
     };
 };
 export default _default;

package/es/components/wallet/locales.js

@@ -41,7 +41,8 @@ export default {
     'page.wallet.button.add': 'Add',
     'page.wallet.button.addToAppleWallet': 'Add to Apple Wallet',
     'page.wallet.button.addToGoogleWallet': 'Add to Google Wallet',
-    'page.wallet.button.recharge': 'Recharge'
+    'page.wallet.button.recharge': 'Recharge',
+    'page.wallet.error.addFailed': 'Add failed, please try again.'
   },
   'zh-CN': {
     // Simplified Chinese translations
@@ -85,7 +86,8 @@ export default {
     'page.wallet.button.add': '添加',
     'page.wallet.button.addToAppleWallet': '添加到苹果钱包',
     'page.wallet.button.addToGoogleWallet': '添加到Google钱包',
-    'page.wallet.button.recharge': '充值'
+    'page.wallet.button.recharge': '充值',
+    'page.wallet.error.addFailed': '添加钱包失败，请重试。'
   },
   'zh-HK': {
     'page.wallet.rechargeableCard': '充值卡',
@@ -128,6 +130,7 @@ export default {
     'page.wallet.button.add': '添加',
     'page.wallet.button.addToAppleWallet': '添加到蘋果錢包',
     'page.wallet.button.addToGoogleWallet': '添加到Google錢包',
-    'page.wallet.button.recharge': '充值'
+    'page.wallet.button.recharge': '充值',
+    'page.wallet.error.addFailed': '添加錢包失敗，請重試。'
   }
 };