@pisell/private-materials 3.4.91 → 3.4.92

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

@@ -1,7 +1,7 @@
+/// <reference types="react" />
 import { SelectProps } from 'antd';
-import React from 'react';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;
 }
-declare const Holder: (props: HolderProps) => React.JSX.Element;
+declare const Holder: (props: HolderProps) => JSX.Element;
 export default Holder;

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

@@ -1,10 +1,10 @@
+/// <reference types="react" />
 import { SelectProps } from "antd";
-import React from "react";
 interface StartTimeProps extends SelectProps {
     locale?: string;
     slice?: number;
     selectProps?: SelectProps;
     timeObjChange?: any;
 }
-declare const StartTime: (props: StartTimeProps) => React.JSX.Element;
+declare const StartTime: (props: StartTimeProps) => JSX.Element;
 export default StartTime;

package/es/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;
@@ -6,5 +6,5 @@ export interface InfoProps {
     onChange?: (item: any, type: "edit" | "remove") => void;
     menus?: any[];
 }
-declare const NoteItem: (props: InfoProps) => React.JSX.Element;
+declare const NoteItem: (props: InfoProps) => JSX.Element;
 export default NoteItem;

package/es/components/booking/notes/NoteBlock/index.d.ts

@@ -1,4 +1,4 @@
-import React from "react";
+/// <reference types="react" />
 import "./index.less";
 export interface InfoProps {
     title?: string;
@@ -13,5 +13,5 @@ export interface InfoProps {
     maxLength?: number;
     noteType: string;
 }
-declare const NoteBlock: (props: InfoProps) => React.JSX.Element;
+declare const NoteBlock: (props: InfoProps) => JSX.Element;
 export default NoteBlock;

package/es/components/booking/notes/addNote/index.d.ts

@@ -1,4 +1,3 @@
-import React from "react";
 import "./index.less";
-declare const AddNote: ({ value, onChange, wait, title, placeholder }: any) => React.JSX.Element;
+declare const AddNote: ({ value, onChange, wait, title, placeholder }: any) => JSX.Element;
 export default AddNote;

package/es/components/ecocup/components/AddCustomerModal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface IProps {
     visible: boolean;
@@ -6,5 +5,5 @@ interface IProps {
     onCancel: () => void;
     onOk: (values: Record<string, any>) => void;
 }
-declare const AddCustomerModal: (props: IProps) => React.JSX.Element;
+declare const AddCustomerModal: (props: IProps) => JSX.Element;
 export default AddCustomerModal;

package/es/components/ecocup/components/CupActionList/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ECupActionType, ICup, ICustomer } from '../../types';
 import './index.less';
 interface IProps {
@@ -10,5 +9,5 @@ interface IProps {
     onRemove: (cup: ICup) => void;
     onAction: (type: ECupActionType, cup: ICup) => void;
 }
-declare const CupActionList: (props: IProps) => React.JSX.Element;
+declare const CupActionList: (props: IProps) => JSX.Element;
 export default CupActionList;

package/es/components/ecocup/components/CupActionModal/hooks.d.ts

@@ -1,5 +1,5 @@
 import { ECupActionType } from '../../types';
 export declare const useCupAction: () => {
-    run: (this: unknown, cupId: string, action: ECupActionType) => Promise<boolean>;
+    run: (cupId: string, action: ECupActionType) => Promise<boolean>;
     loading: boolean;
 };

package/es/components/ecocup/components/CupActionModal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 import { ICustomer, ICup, ECupActionType } from '../../types';
 interface IProps {
@@ -11,5 +10,5 @@ interface IProps {
         customerData: ICustomer;
     };
 }
-declare const CupActionModal: (props: IProps) => React.JSX.Element;
+declare const CupActionModal: (props: IProps) => JSX.Element;
 export default CupActionModal;

package/es/components/ecocup/components/CupInfoCard/index.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import './index.less';
 interface IProps {
     type: 'rentInfo' | 'markInfo' | 'belongInfo' | 'otherBelongInfo';
@@ -6,5 +6,5 @@ interface IProps {
     isMultipleShop?: boolean;
     isMultipleTime?: boolean;
 }
-declare const CupInfoCard: (props: IProps) => React.JSX.Element;
+declare const CupInfoCard: (props: IProps) => JSX.Element;
 export default CupInfoCard;

package/es/components/ecocup/components/CupStatusModal/hooks.d.ts

@@ -1,6 +1,6 @@
 import { ECupActionType, ICup } from '../../types';
 export declare const useCupAction: () => {
-    run: (this: unknown, cupId: string, action: ECupActionType) => Promise<boolean>;
+    run: (cupId: string, action: ECupActionType) => Promise<boolean>;
     loading: boolean;
 };
 /**
@@ -8,7 +8,7 @@ export declare const useCupAction: () => {
  * @return {*}
  */
 export declare const useBatchCupAction: () => {
-    run: (this: unknown, eco_cup_ids: number[] | string[]) => Promise<boolean>;
+    run: (eco_cup_ids: number[] | string[]) => Promise<boolean>;
     loading: boolean;
 };
 /**

package/es/components/ecocup/components/CupStatusModal/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import { ECupScanStatus, ICup } from '../../types';
 import './index.less';
 interface IProps {
@@ -10,5 +9,5 @@ interface IProps {
         cupData: ICup;
     };
 }
-declare const CupStatusModal: (props: IProps) => React.JSX.Element;
+declare const CupStatusModal: (props: IProps) => JSX.Element;
 export default CupStatusModal;

package/es/components/ecocup/components/CustomerAndCupModal/hooks.d.ts

@@ -2,13 +2,13 @@
  * 获取客户详情
  */
 export declare const useCustomerDetail: () => {
-    run: (this: unknown, id: string) => Promise<any>;
+    run: (id: string) => Promise<any>;
     loading: boolean;
 };
 /**
  * 批量租用杯子
  */
 export declare const useBatchRentCups: () => {
-    run: (this: unknown, id: string, cupIds: string[]) => Promise<boolean>;
+    run: (id: string, cupIds: string[]) => Promise<boolean>;
     loading: boolean;
 };

package/es/components/ecocup/components/CustomerAndCupModal/index.d.ts

@@ -1,7 +1,3 @@
-/**
- * 先选择的客户，然后选择杯子
- */
-import React from 'react';
 import './index.less';
 import { ICup, ICustomer } from '../../types';
 interface IProps {
@@ -16,5 +12,5 @@ interface IProps {
         cupData?: ICup;
     };
 }
-declare const CustomerAndCupModal: (props: IProps) => React.JSX.Element;
+declare const CustomerAndCupModal: (props: IProps) => JSX.Element;
 export default CustomerAndCupModal;

package/es/components/ecocup/components/CustomerCard/index.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
+/// <reference types="react" />
 import './index.less';
 import { ICustomer } from '../../types';
 interface IProps extends Partial<ICustomer> {
     /** 是否为多个客户，为 true 时显示 "Multiple customers" */
     isMultiple?: boolean;
 }
-declare const CustomerCard: (props: IProps) => React.JSX.Element | null;
+declare const CustomerCard: (props: IProps) => JSX.Element | null;
 export default CustomerCard;

package/es/components/ecocup/components/MoreDropdown/index.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
+/// <reference types="react" />
 interface MoreDropdownProps {
     locales: any;
     onClick?: (key: string) => void;
     buttonText?: string;
     showFields?: string[];
 }
-declare const MoreDropdown: (props: MoreDropdownProps) => React.JSX.Element;
+declare const MoreDropdown: (props: MoreDropdownProps) => JSX.Element;
 export default MoreDropdown;

package/es/components/ecocup/components/PageHeader/index.d.ts

@@ -5,5 +5,5 @@ interface CustomPageHeaderProps {
     rightContent?: React.ReactNode;
     isReturn?: boolean;
 }
-declare const CustomPageHeader: (props: CustomPageHeaderProps) => React.JSX.Element;
+declare const CustomPageHeader: (props: CustomPageHeaderProps) => JSX.Element;
 export default CustomPageHeader;

package/es/components/ecocup/components/SearchBar/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.less';
 interface SearchBarProps {
     scanListenerKey: string;
@@ -10,5 +9,5 @@ interface SearchBarProps {
     customerId?: string;
     onCupStatusValidate?: (data: any) => void;
 }
-declare const SearchBar: (props: SearchBarProps) => React.JSX.Element;
+declare const SearchBar: (props: SearchBarProps) => JSX.Element;
 export default SearchBar;

package/es/components/ecocup/components/SettingModal/index.d.ts

@@ -1,9 +1,8 @@
-import React from 'react';
 import './index.less';
 interface IProps {
     visible: boolean;
     data?: Record<string, any>;
     onCancel: () => void;
 }
-declare const SettingModal: (props: IProps) => React.JSX.Element;
+declare const SettingModal: (props: IProps) => JSX.Element;
 export default SettingModal;

package/es/components/ecocup/cupList/hooks/useColumns.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import '../index.less';
 interface IProps {
     onClickAction: (type: string, record: any) => void;
@@ -38,7 +37,7 @@ export declare const useColumns: (props: IProps) => ({
     key: string;
     hidden: boolean | undefined;
     width: number;
-    render: (text: string, record: any) => React.JSX.Element | null;
+    render: (text: string, record: any) => JSX.Element | null;
     align?: undefined;
     with?: undefined;
 })[];

package/es/components/ecocup/cupList/hooks/useSummary.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
+/// <reference types="react" />
 import '../index.less';
-export declare const useSummary: (locales: any, staticsData: any, isPartner?: boolean) => () => React.JSX.Element;
+export declare const useSummary: (locales: any, staticsData: any, isPartner?: boolean) => () => JSX.Element;

package/es/components/ecocup/cupList/index.d.ts

@@ -1,7 +1,6 @@
-import React from 'react';
 import './index.less';
 interface CupListProps {
     data: any[];
 }
-declare const CupList: (props: CupListProps) => React.JSX.Element;
+declare const CupList: (props: CupListProps) => JSX.Element;
 export default CupList;

package/es/components/ecocup/cupProject/index.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
+/// <reference types="react" />
 import './index.less';
-export default function EcoCupProject(): React.JSX.Element;
+export default function EcoCupProject(): JSX.Element;

package/es/components/ecocup/customerList/index.d.ts

@@ -1,7 +1,7 @@
-import React from 'react';
+/// <reference types="react" />
 import './index.less';
 interface CustomerListProps {
     data: any[];
 }
-export default function CustomerList(props: CustomerListProps): React.JSX.Element;
+export default function CustomerList(props: CustomerListProps): JSX.Element;
 export {};

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

@@ -5,5 +5,5 @@ interface DeviceProps {
     onSave: (device: DeviceProp) => void;
     children?: React.ReactNode;
 }
-declare const Device: (props: DeviceProps) => React.JSX.Element;
+declare const Device: (props: DeviceProps) => JSX.Element;
 export default Device;

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

@@ -1,3 +1,3 @@
-import React from 'react';
-declare const _default: ({ input, ...formItemProps }: any) => React.JSX.Element;
+/// <reference types="react" />
+declare const _default: ({ input, ...formItemProps }: any) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 /**
  * @title: 递归循环表单数据
  * @Author: hongbing.wang
@@ -8,7 +7,7 @@ declare const CustomFormItem: ({ formItemList, level, onChange, }: {
     formItemList: any[];
     level?: number | undefined;
     onChange?: ((...agrn: unknown[]) => unknown) | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default CustomFormItem;
 declare type helpMappingType = {
     [key: string]: {

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

@@ -1,6 +1,6 @@
-import React from 'react';
+/// <reference types="react" />
 import { RadioGroupProps } from 'antd';
-export declare const CheckboxGroup: ({ direction, options, ...props }: any) => React.JSX.Element;
+export declare const CheckboxGroup: ({ direction, options, ...props }: any) => JSX.Element;
 export declare const RadioGroup: ({ direction, options, ...props }: RadioGroupProps & {
     direction?: "vertical" | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;

package/es/components/eftpos/icon/apiKey.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/es/components/eftpos/icon/device.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
+/// <reference types="react" />
 declare const _default: ({ color }: {
     color?: string | undefined;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Eftpos, DeviceStatus } from './const';
 import './index.less';
 interface PosProps {
@@ -43,5 +42,5 @@ interface PosProps {
     getPosComm: (...agrn: unknown[]) => any;
     savePos: (...agrn: unknown[]) => any;
 }
-declare const _default: (props: PosProps) => React.JSX.Element;
+declare const _default: (props: PosProps) => JSX.Element;
 export default _default;

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

@@ -1,8 +1,8 @@
-import React from 'react';
+/// <reference types="react" />
 import { Eftpos } from './const';
 export default function Log({ device, type, tyroUrl, tyroVersion, }: {
     device: any;
     type: Eftpos;
     tyroUrl: string;
     tyroVersion: string;
-}): React.JSX.Element;
+}): JSX.Element;

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

@@ -1,9 +1,8 @@
-import React from "react";
 import { DeviceProp } from "./const";
 interface PosProps {
     eftposName: string;
     formItemList: any[];
     onSave: (device: DeviceProp) => void;
 }
-declare const PosForm: ({ onSave, formItemList }: PosProps) => React.JSX.Element;
+declare const PosForm: ({ onSave, formItemList }: PosProps) => JSX.Element;
 export default PosForm;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 /**
  * @title: 自定义组件设置
  * @description: 自定义组件设置
@@ -20,5 +20,5 @@ export declare const getCommName: (commConfig: any, name: string[]) => any;
 export declare const getCommDefaultVal: (commConfig: any) => {
     [x: number]: any;
 };
-declare const _default: (props: any) => React.JSX.Element;
+declare const _default: (props: any) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import './index.css';
 /**
  * @title: 自定义组件设置
@@ -27,5 +26,5 @@ export declare const getCommDefaultVal: (commConfig: any) => {
  * @Author: hongbing.wang
  * @Date: 2024-08-20 13:22
  */
-declare const _default: (props: any) => React.JSX.Element;
+declare const _default: (props: any) => JSX.Element;
 export default _default;

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { PosProps } from './const';
 /**
  * @title: 支付金额信息配置页
@@ -17,5 +16,5 @@ declare const _default: ({ className, onChange, onClose, formatAmount, isMobile,
     isMobile: boolean;
     net: boolean;
     client: string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/es/components/eftposPay/amount.js

@@ -12,11 +12,13 @@ import { locales } from '@pisell/utils';
 import { InputNumber, Button, message } from 'antd';
 import { Decimal } from 'decimal.js';
 import React, { useMemo, useState } from 'react';
+import { useMount } from 'ahooks';
 import Alert from "./component/alert";
 import Titlebar from "./component/header/titlebar";
 import { getAmonunt } from "./manufacturer";
 import { limitDecimals } from "./helper";
 import { useDispatch, useContextData, updateComponent, updateState } from "./store";
+import payLog from "./utils/payLog";
 
 /**
  * @title: 支付金额信息配置页
@@ -108,6 +110,14 @@ export default (function (_ref) {
     var currentMoneyDeci = new Decimal(currentMoney);
     return moneyDeci.sub(currentMoneyDeci).toFixed(2, Decimal.ROUND_HALF_UP);
   }, [currentMoney, money]);
+  useMount(function () {
+    payLog.log('金额页面展示', {
+      amount: currentMoney,
+      surcharge: totalSurMoney,
+      total: total,
+      surRate: curSurRate
+    });
+  });
 
   /**
    * @title:提交
@@ -143,7 +153,9 @@ export default (function (_ref) {
       surRateMoney: "".concat(surRateMoney),
       totalUnit: formatAmount(total, 2, symbol)
     };
-    console.log('amount pay = ', pay);
+    payLog.log('金额页-确认提交', {
+      pay: pay
+    });
     dispatch(updateState({
       pay: pay
     }));
@@ -162,6 +174,7 @@ export default (function (_ref) {
       setStatus(true);
       return;
     }
+    payLog.log('金额页-点击取消');
     onClose();
   };
 
@@ -172,6 +185,7 @@ export default (function (_ref) {
    * @Date: 2024-08-19 09:53
    */
   var onEdit = function onEdit() {
+    payLog.log('金额页-点击编辑');
     setStatus(false);
     setTempSurRate(curSurRate);
     setTempSurMoney(curSurMoney);

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

@@ -1,11 +1,10 @@
-import React from 'react';
 import { PosProps, RouteType } from './const';
-declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "mode" | "type" | "getApi"> & {
+declare const App: ({ action, api, device_number, terminal, tyroUrl, tyroVersion, onChangeParams, isMobile, channel, formatAmount, ...props }: Omit<PosProps, "type" | "mode" | "getApi"> & {
     action: RouteType;
     device_number: string | number;
     api: ReturnType<PosProps['getApi']>;
     isMobile: boolean;
     channel?: string | undefined;
     formatAmount(amount: number | string, precision: number, symbol: string): string;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default App;

package/es/components/eftposPay/app.js

@@ -21,6 +21,7 @@ import { RouteEnum, ClientEnum, RestoreEumn } from "./const";
 import Device from "./device";
 import Pay from "./pay";
 import { useContextData, useDispatch, updateState, updateClient } from "./store";
+import payLog from "./utils/payLog";
 var App = function App(_ref) {
   var action = _ref.action,
     api = _ref.api,
@@ -116,7 +117,6 @@ var App = function App(_ref) {
         }));
       }
     }
-    console.log('状态切换 = ', status, params, other);
     props.onChangeStatus(status, params, other);
   }, []);
 
@@ -126,6 +126,7 @@ var App = function App(_ref) {
    * @Date: 2024-08-20 13:09
    */
   var onClose = function onClose() {
+    payLog.log('关闭支付');
     onChange('fail', {
       number: data.number,
       uniquePaymentNumber: data.number,

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

@@ -2,5 +2,5 @@ import React from 'react';
 import './index.less';
 declare const _default: ({ children }: {
     children: React.ReactNode;
-}) => React.JSX.Element;
+}) => JSX.Element;
 export default _default;

package/es/components/eftposPay/component/alert/warn.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
-declare const _default: () => React.JSX.Element;
+/// <reference types="react" />
+declare const _default: () => JSX.Element;
 export default _default;

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

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

package/es/components/eftposPay/component/fail/failCustom.js

@@ -14,6 +14,7 @@ import { getInitState } from "../../manufacturer";
 import XClose from '@pisell/icon/es/XClose';
 import { useDispatch, useContextData, updateState, updateComponent } from "../../store";
 import Header from "../header";
+import payLog from "../../utils/payLog";
 export default (function (_ref) {
   var _ref$className = _ref.className,
     className = _ref$className === void 0 ? '' : _ref$className,
@@ -40,13 +41,15 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:30
    */
   var onRetry = function onRetry() {
+    payLog.log('自定义失败页：重试');
     onChange('page', 'pay');
     var params = _objectSpread(_objectSpread({}, originalParams || {}), {}, {
       mode: mode,
       name: name,
       symbol: symbol,
       amount: amount,
-      order_id: order_id
+      order_id: order_id,
+      client: client
     });
     // 非查询模式，清空支付流水号
     if (mode !== ModeEnum.Query) {
@@ -67,7 +70,8 @@ export default (function (_ref) {
       symbol: symbol,
       amount: amount,
       order_id: order_id,
-      number: ''
+      number: '',
+      client: client
     }))));
     onChange('page', 'amount');
   };
@@ -80,6 +84,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:31
    */
   var onManually = function onManually() {
+    payLog.log('自定义失败页：点击手动标记');
     dispatch(updateState({
       manual: {
         title: locales.getText('page.eftpos-pay.text.request.unknown.title')(mode),
@@ -89,6 +94,7 @@ export default (function (_ref) {
     dispatch(updateComponent('Manual'));
   };
   var onNotin = function onNotin() {
+    payLog.log('自定义失败页：点击打印小票');
     onChange('print', [], 'print_on_timeout');
   };
 
@@ -99,6 +105,7 @@ export default (function (_ref) {
    * @Date: 2024-08-20 11:32
    */
   var onClose = function onClose() {
+    payLog.log('自定义失败页：关闭');
     onChange('fail', {
       number: number,
       uniquePaymentNumber: number,
@@ -106,9 +113,10 @@ export default (function (_ref) {
       order_id: order_id
     });
   };
-
-  // 错误页 通知外界 开发关闭按钮
   useMount(function () {
+    payLog.log('自定义失败页展示', {
+      status: failCustom === null || failCustom === void 0 ? void 0 : failCustom.status
+    });
     if ((failCustom === null || failCustom === void 0 ? void 0 : failCustom.status) === 'fail') {
       onChange('page', 'fail');
     }

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

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