@pisell/private-materials 6.8.83 → 6.8.84

package/es/components/eftposPay/locales.js

@@ -149,7 +149,20 @@ export default {
     },
     'page.eftpos-pay.text.tyro': function pageEftposPayTextTyro(key) {
       return key;
-    }
+    },
+    // 汇付天下定制文案
+    'page.eftpos-pay.text.huifu.scan.title': 'Scan to Pay (Alipay · WeChat Pay · UnionPay)',
+    'page.eftpos-pay.text.huifu.scan.gun.connected': 'Scanner Connected',
+    'page.eftpos-pay.text.huifu.scan.gun.connected-desc': 'Scan the customer’s payment code to collect payment',
+    'page.eftpos-pay.text.huifu.scan.gun.not-connected': 'Scanner Not Connected',
+    'page.eftpos-pay.text.huifu.scan.gun.not-connected-desc': 'Connect the scanner to scan the customer’s payment code',
+    'page.eftpos-pay.text.huifu.scan.camera-title': 'Click to use the camera',
+    'page.eftpos-pay.text.huifu.scan.camera-desc': 'Align the customer’s payment code within the frame',
+    'page.eftpos-pay.text.huifu.scan.input-title': 'Or enter the payment code manually',
+    'page.eftpos-pay.text.huifu.scan.input-placeholder': 'Enter payment code',
+    'page.eftpos-pay.text.huifu.scan.input-tip': 'Tip: The payment code is 18 digits',
+    'page.eftpos-pay.text.huifu.scan.cancel': 'Cancel',
+    'page.eftpos-pay.text.huifu.scan.confirm': 'Confirm Payment'
   },
   'zh-CN': {
     'page.eftpos-pay.text.loading': function pageEftposPayTextLoading(mode) {
@@ -447,7 +460,20 @@ export default {
         return '请使用以下选项之一回答此问题';
       }
       return key;
-    }
+    },
+    // 汇付天下定制文案
+    'page.eftpos-pay.text.huifu.scan.title': '扫码支付（支付宝 · 微信支付 · 银联）',
+    'page.eftpos-pay.text.huifu.scan.gun.connected': '扫码枪已连接',
+    'page.eftpos-pay.text.huifu.scan.gun.connected-desc': '直接扫描消费者付款码即可',
+    'page.eftpos-pay.text.huifu.scan.gun.not-connected': '未连接扫码枪',
+    'page.eftpos-pay.text.huifu.scan.gun.not-connected-desc': '连接扫码枪后可直接扫码消费者付款码',
+    'page.eftpos-pay.text.huifu.scan.camera-title': '点击可使用设备摄像头',
+    'page.eftpos-pay.text.huifu.scan.camera-desc': '将消费者付款码对准扫描框',
+    'page.eftpos-pay.text.huifu.scan.input-title': '或手动输入付款码',
+    'page.eftpos-pay.text.huifu.scan.input-placeholder': '请输入',
+    'page.eftpos-pay.text.huifu.scan.input-tip': '提示：付款码为18位数字',
+    'page.eftpos-pay.text.huifu.scan.cancel': '取消',
+    'page.eftpos-pay.text.huifu.scan.confirm': '确认支付'
   },
   'zh-HK': {
     'page.eftpos-pay.text.loading': function pageEftposPayTextLoading(mode) {
@@ -745,6 +771,19 @@ export default {
         return '請使用以下選項之一回答此問題';
       }
       return key;
-    }
+    },
+    // 汇付天下定制文案
+    'page.eftpos-pay.text.huifu.scan.title': '掃碼支付（支付寶 · 微信支付 · 銀聯）',
+    'page.eftpos-pay.text.huifu.scan.gun.connected': '掃碼槍已連接',
+    'page.eftpos-pay.text.huifu.scan.gun.connected-desc': '直接掃描消費者付款碼即可',
+    'page.eftpos-pay.text.huifu.scan.gun.not-connected': '未連接掃碼槍',
+    'page.eftpos-pay.text.huifu.scan.gun.not-connected-desc': '連接掃碼槍後可直接掃碼消費者付款碼',
+    'page.eftpos-pay.text.huifu.scan.camera-title': '點擊可使用設備攝像頭',
+    'page.eftpos-pay.text.huifu.scan.camera-desc': '將消費者付款碼對準掃描框',
+    'page.eftpos-pay.text.huifu.scan.input-title': '或手動輸入付款碼',
+    'page.eftpos-pay.text.huifu.scan.input-placeholder': '請輸入',
+    'page.eftpos-pay.text.huifu.scan.input-tip': '提示：付款碼為18位數字',
+    'page.eftpos-pay.text.huifu.scan.cancel': '取消',
+    'page.eftpos-pay.text.huifu.scan.confirm': '確認支付'
   }
 };

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

@@ -4,4 +4,5 @@ export { default as Payo } from './payo';
 export { default as Windcave } from './windcave/windcave';
 export { default as Tyro } from './tyro';
 export { default as Linkly } from './linkly';
+export { default as Huifu } from './huifu';
 export declare const getInitState: (type: string, params?: any) => State;

package/es/components/eftposPay/manufacturer.js

@@ -3,12 +3,15 @@ import getPayoInitState from "./payo/const";
 import getTyroInitState from "./tyro/const";
 import getWindcaveInitState from "./windcave/const";
 import getLinklyInitState from "./linkly/const";
+import getHuifuInitState from "./huifu/const";
 export { getAmonunt } from "./helper";
 export { default as Payo } from "./payo";
 export { default as Windcave } from "./windcave/windcave";
 export { default as Tyro } from "./tyro";
 export { default as Linkly } from "./linkly";
+export { default as Huifu } from "./huifu";
 export var getInitState = function getInitState(type, params) {
+  console.log('type = ', type);
   switch (type) {
     case EftposEnum.Payo:
       return getPayoInitState(params);
@@ -18,6 +21,8 @@ export var getInitState = function getInitState(type, params) {
       return getTyroInitState(params);
     case EftposEnum.Linkly:
       return getLinklyInitState(params);
+    case EftposEnum.Huifu:
+      return getHuifuInitState(params);
     default:
       throw new Error('未知的厂商类型');
   }

package/es/components/eftposPay/pay.js

@@ -10,7 +10,7 @@ import { getPayParams } from "./helper";
 import Manual from "./component/manual";
 import Signature from "./component/signature";
 import { StatusEnum, PayRouteEnum, ClientEnum } from "./const";
-import { Payo, Windcave, Tyro, Linkly } from "./manufacturer";
+import { Payo, Windcave, Tyro, Linkly, Huifu } from "./manufacturer";
 import { useContextData, useDispatch, updateStatus, backUpProduction, updateComponent, backUpFree, updateState } from "./store";
 import "./index.less";
 
@@ -156,7 +156,7 @@ var Pay = function Pay(_ref) {
     style: data.type === 'step' ? {} : {
       display: 'none'
     }
-  }, /*#__PURE__*/React.createElement(Header, {
+  }, data.status !== StatusEnum.Init && /*#__PURE__*/React.createElement(Header, {
     status: data.status,
     title: data.title,
     subTitle: data.subTitle
@@ -182,6 +182,10 @@ var Pay = function Pay(_ref) {
     key: data.key,
     api: api,
     onChange: onChange
+  }) : null, data.eftpos === 'huifu' ? /*#__PURE__*/React.createElement(Huifu, {
+    key: data.key,
+    onChange: onChange,
+    isNativeApp: isMobile
   }) : null) : null, data.type === PayRouteEnum.Unset && Comm ? /*#__PURE__*/React.createElement(Comm, {
     onChange: onChange,
     api: api,

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

@@ -91,6 +91,10 @@ export declare type State = {
     };
     backup?: Omit<State, 'backup'>;
     client: ClientEnum;
+    /** 原始参数 - 用于 retry 时完整恢复 */
+    originalParams?: {
+        [key: string]: unknown;
+    };
 };
 export declare type Action = {
     type: EActionTypes;
@@ -174,7 +178,7 @@ export declare const updateCustom: (payload: {
 export declare const updateStatus: (status: 'loading' | 'warn' | 'fail' | 'success' | 'question') => {
     type: EActionTypes;
     payload: {
-        status: "success" | "warn" | "loading" | "fail" | "question";
+        status: "loading" | "warn" | "fail" | "success" | "question";
     };
 };
 /**
@@ -297,8 +301,8 @@ export declare const backUpFree: (payload: Partial<State>) => {
         amount?: string | number | undefined;
         mode?: "pay" | "fullPay" | "refund" | "query" | undefined;
         order_id?: string | number | undefined;
-        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | undefined;
-        action?: "amount" | "pay" | "deviceList" | undefined;
+        eftpos?: "payo" | "tyro" | "windcave" | "stripe" | "linkly" | "huifu" | undefined;
+        action?: "pay" | "amount" | "deviceList" | undefined;
         key?: number | undefined;
         step?: number | undefined;
         title?: string | undefined;
@@ -308,7 +312,7 @@ export declare const backUpFree: (payload: Partial<State>) => {
         net?: boolean | undefined;
         component?: string | undefined;
         form?: string | undefined;
-        status?: "success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question" | undefined;
+        status?: "init" | "loading" | "warn" | "fail" | "success" | "pedding" | "resove" | "reject" | "question" | undefined;
         warn?: string | undefined;
         steps?: {
             /** 用于重置当前步骤 */
@@ -344,6 +348,9 @@ export declare const backUpFree: (payload: Partial<State>) => {
         } | undefined;
         backup?: Omit<State, "backup"> | undefined;
         client?: ClientEnum | undefined;
+        originalParams?: {
+            [key: string]: unknown;
+        } | undefined;
     };
 };
 export declare function reducers(state: State, action: Action): State;

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

@@ -9,6 +9,9 @@ import './index.less';
  */
 declare function KioskSkuDetail(props: KioskSkuDetailProps): JSX.Element;
 export default KioskSkuDetail;
+/**
+ * @description 从原生回调 payload 中提取 productId
+ */
 export interface KioskSkuDetailProps {
     /** 商品 id（可选：目前默认从 URL 读取，props 仅作为兜底以兼容老用法） */
     productId?: number | string;