@pisell/private-materials 6.3.104 → 6.3.106

package/es/components/kioskSkuDetail/index.js

@@ -117,6 +117,11 @@ function KioskSkuDetail(props) {
     isEdit = _useState14[0],
     setIsEdit = _useState14[1];
   var skuOptionsSelectionRef = useRef(null);
+  // 原生初始化传入的数据
+  var _useState15 = useState(null),
+    _useState16 = _slicedToArray(_useState15, 2),
+    nativeInitData = _useState16[0],
+    setNativeInitData = _useState16[1];
   /**
    * @description 防止“原生多次初始化/快速切换”导致请求乱序覆盖
    */
@@ -137,6 +142,7 @@ function KioskSkuDetail(props) {
       bundle: [],
       option: []
     });
+    setNativeInitData(null);
   }, []);
   var loadByProductId = useCallback( /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(productId) {
@@ -250,7 +256,7 @@ function KioskSkuDetail(props) {
   var loadRef = useRef(loadByProductId);
   loadRef.current = loadByProductId;
   useEffect(function () {
-    var _interaction$utils, _interaction$utils$po, _interaction$utils2, _interaction$utils2$m, _interaction$utils3, _interaction$utils3$m;
+    var _interaction$utils, _interaction$utils$po, _interaction$utils2, _interaction$utils2$m, _interaction$utils3, _interaction$utils3$m, _interaction$utils4, _interaction$utils4$m;
     // 通知原生初始化
     interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$po = _interaction$utils.postMessageToApp) === null || _interaction$utils$po === void 0 || _interaction$utils$po.call(_interaction$utils, {
       module: 'wallet_pass',
@@ -269,8 +275,24 @@ function KioskSkuDetail(props) {
       if (id || id === 0) loadRef.current(id);
       setIsEdit(false);
     });
+    // 原生初始化调用-新购流程
+    interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || (_interaction$utils3$m = _interaction$utils3.mountFunction) === null || _interaction$utils3$m === void 0 || _interaction$utils3$m.call(_interaction$utils3, 'wallet_pass', 'restore_recharge_wallet_pass', function (_data) {
+      var data = JSON.parse(_data || '{}');
+      console.log('重置状态', data === null || data === void 0 ? void 0 : data.productId);
+      console.log('宽', window.innerWidth);
+      console.log('高', window.innerHeight);
+      console.log('设备像素比', window.devicePixelRatio);
+      // 原生会预渲染页面，真正展示时再调用这里；该方法可能被多次调用
+      resetForInit();
+
+      // 原生回调入参就是 productId：直接触发加载（不走“state→effect”链）
+      if (data !== null && data !== void 0 && data.productId || (data === null || data === void 0 ? void 0 : data.productId) === 0) loadRef.current(data === null || data === void 0 ? void 0 : data.productId);
+      setIsEdit(false);
+      // 原生初始化传入的数据
+      setNativeInitData(data);
+    });
     // 原生初始化调用-购物车编辑
-    interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || (_interaction$utils3$m = _interaction$utils3.mountFunction) === null || _interaction$utils3$m === void 0 || _interaction$utils3$m.call(_interaction$utils3, 'wallet_pass', 'edit_buy_wallet_pass', function (data) {
+    interaction === null || interaction === void 0 || (_interaction$utils4 = interaction.utils) === null || _interaction$utils4 === void 0 || (_interaction$utils4$m = _interaction$utils4.mountFunction) === null || _interaction$utils4$m === void 0 || _interaction$utils4$m.call(_interaction$utils4, 'wallet_pass', 'edit_buy_wallet_pass', function (data) {
       console.log('编辑状态', data);
       var productData = JSON.parse(data);
       /**
@@ -296,6 +318,7 @@ function KioskSkuDetail(props) {
         option: []
       });
       setIsEdit(true);
+      setNativeInitData(productData);
     });
 
     // URL 有 productId：挂载时只加载一次
@@ -368,16 +391,20 @@ function KioskSkuDetail(props) {
       quantity: quantity,
       variantId: skuValue.product_variant_id,
       pricePerUnit: unitPrice,
-      isWebBuyWalletPass: true
+      isWebBuyWalletPass: true,
+      // 特定字段
+      balance: nativeInitData === null || nativeInitData === void 0 ? void 0 : nativeInitData.balance,
+      walletCodeId: nativeInitData === null || nativeInitData === void 0 ? void 0 : nativeInitData.walletCodeId,
+      walletPassCodeId: nativeInitData === null || nativeInitData === void 0 ? void 0 : nativeInitData.walletPassCodeId
     };
     interaction.utils.postMessageToApp({
       module: 'wallet_pass',
       key: 'buy_wallet_pass',
-      data: {
+      data: _objectSpread(_objectSpread({}, nativeInitData || {}), {}, {
         // 把洗好的数据放这里
         productData: obj,
         isEdit: isEdit
-      }
+      })
     });
   };
   var onBack = function onBack() {
@@ -420,7 +447,9 @@ function KioskSkuDetail(props) {
     dangerouslySetInnerHTML: {
       __html: descriptionText
     }
-  })), !!priceRangeText && /*#__PURE__*/React.createElement("div", {
+  })), nativeInitData !== null && nativeInitData !== void 0 && nativeInitData.balance ? /*#__PURE__*/React.createElement("div", {
+    className: "pisell-kiosk-sku-detail__price-range"
+  }, locales.getText('pisell2.text.kiosk.sku.detail.balance'), ": ", symbol, nativeInitData === null || nativeInitData === void 0 ? void 0 : nativeInitData.balance) : !!priceRangeText && /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__price-range"
   }, priceRangeText, " ", currency_code), !!errorText && /*#__PURE__*/React.createElement("div", {
     className: "pisell-kiosk-sku-detail__error"
@@ -506,10 +535,10 @@ function getQueryFirstMatch(params) {
 function useDesignStageScale(params) {
   var designWidth = params.designWidth;
   var designHeight = params.designHeight;
-  var _useState15 = useState(1),
-    _useState16 = _slicedToArray(_useState15, 2),
-    scale = _useState16[0],
-    setScale = _useState16[1];
+  var _useState17 = useState(1),
+    _useState18 = _slicedToArray(_useState17, 2),
+    scale = _useState18[0],
+    setScale = _useState18[1];
   useEffect(function () {
     var update = function update() {
       var viewportWidth = window.innerWidth || designWidth;

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

@@ -6,6 +6,7 @@ declare const _default: {
         'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
         'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
     };
     'zh-CN': {
         'pisell2.text.kiosk.sku.detail.btn.back': string;
@@ -14,6 +15,7 @@ declare const _default: {
         'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
         'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
     };
     'zh-TW': {
         'pisell2.text.kiosk.sku.detail.btn.back': string;
@@ -22,6 +24,25 @@ declare const _default: {
         'pisell2.text.kiosk.sku.detail.btn.update': string;
         'pisell2.text.kiosk.sku.detail.loading.options': string;
         'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
+    };
+    ja: {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
+    };
+    pt: {
+        'pisell2.text.kiosk.sku.detail.btn.back': string;
+        'pisell2.text.kiosk.sku.detail.item.total': string;
+        'pisell2.text.kiosk.sku.detail.btn.add.to.cart': string;
+        'pisell2.text.kiosk.sku.detail.btn.update': string;
+        'pisell2.text.kiosk.sku.detail.loading.options': string;
+        'pisell2.text.kiosk.sku.detail.toast.select.variant': string;
+        'pisell2.text.kiosk.sku.detail.balance': string;
     };
 };
 export default _default;

package/es/components/kioskSkuDetail/locales.js

@@ -5,7 +5,8 @@ export default {
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': 'Add to cart',
     'pisell2.text.kiosk.sku.detail.btn.update': 'Update',
     'pisell2.text.kiosk.sku.detail.loading.options': 'Loading options…',
-    'pisell2.text.kiosk.sku.detail.toast.select.variant': 'Please select a top-up option'
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': 'Please select a top-up option',
+    'pisell2.text.kiosk.sku.detail.balance': 'Balance'
   },
   'zh-CN': {
     'pisell2.text.kiosk.sku.detail.btn.back': '返回',
@@ -13,7 +14,8 @@ export default {
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入购物车',
     'pisell2.text.kiosk.sku.detail.btn.update': '更新',
     'pisell2.text.kiosk.sku.detail.loading.options': '正在加载选项…',
-    'pisell2.text.kiosk.sku.detail.toast.select.variant': '请选择充值选项'
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': '请选择充值选项',
+    'pisell2.text.kiosk.sku.detail.balance': '余额'
   },
   'zh-TW': {
     'pisell2.text.kiosk.sku.detail.btn.back': '返回',
@@ -21,6 +23,25 @@ export default {
     'pisell2.text.kiosk.sku.detail.btn.add.to.cart': '加入購物車',
     'pisell2.text.kiosk.sku.detail.btn.update': '更新',
     'pisell2.text.kiosk.sku.detail.loading.options': '正在載入選項…',
-    'pisell2.text.kiosk.sku.detail.toast.select.variant': '請選擇充值選項'
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': '請選擇充值選項',
+    'pisell2.text.kiosk.sku.detail.balance': '餘額'
+  },
+  ja: {
+    'pisell2.text.kiosk.sku.detail.btn.back': '戻る',
+    'pisell2.text.kiosk.sku.detail.item.total': '小計',
+    'pisell2.text.kiosk.sku.detail.btn.add.to.cart': 'カートに追加',
+    'pisell2.text.kiosk.sku.detail.btn.update': '更新',
+    'pisell2.text.kiosk.sku.detail.loading.options': 'オプションを読み込み中…',
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': 'チャージオプションを選択してください',
+    'pisell2.text.kiosk.sku.detail.balance': '残高'
+  },
+  pt: {
+    'pisell2.text.kiosk.sku.detail.btn.back': 'Voltar',
+    'pisell2.text.kiosk.sku.detail.item.total': 'Subtotal',
+    'pisell2.text.kiosk.sku.detail.btn.add.to.cart': 'Adicionar ao carrinho',
+    'pisell2.text.kiosk.sku.detail.btn.update': 'Atualizar',
+    'pisell2.text.kiosk.sku.detail.loading.options': 'Carregando opções…',
+    'pisell2.text.kiosk.sku.detail.toast.select.variant': 'Por favor, selecione uma opção de recarga',
+    'pisell2.text.kiosk.sku.detail.balance': 'Saldo'
   }
 };

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

@@ -20,5 +20,19 @@ declare const _default: {
         "pisell2.text.password-error": string;
         "pisell2.text.email-error": string;
     };
+    ja: {
+        'pisell2.text.login': string;
+        "pisell2.text.email-placeholder": string;
+        "pisell2.text.password-placeholder": string;
+        "pisell2.text.password-error": string;
+        "pisell2.text.email-error": string;
+    };
+    pt: {
+        'pisell2.text.login': string;
+        "pisell2.text.email-placeholder": string;
+        "pisell2.text.password-placeholder": string;
+        "pisell2.text.password-error": string;
+        "pisell2.text.email-error": string;
+    };
 };
 export default _default;

package/es/components/login/locales.js

@@ -19,5 +19,19 @@ export default {
     "pisell2.text.password-placeholder": "請輸入密碼",
     "pisell2.text.password-error": "請輸入正確的密碼",
     "pisell2.text.email-error": "請輸入正確的電子郵件"
+  },
+  ja: {
+    'pisell2.text.login': "ログイン",
+    "pisell2.text.email-placeholder": "メールアドレスを入力してください",
+    "pisell2.text.password-placeholder": "パスワードを入力してください",
+    "pisell2.text.password-error": "正しいパスワードを入力してください",
+    "pisell2.text.email-error": "正しいメールアドレスを入力してください"
+  },
+  pt: {
+    'pisell2.text.login': "Login",
+    "pisell2.text.email-placeholder": "Por favor, insira o e-mail",
+    "pisell2.text.password-placeholder": "Por favor, insira a senha",
+    "pisell2.text.password-error": "Por favor, insira a senha correta",
+    "pisell2.text.email-error": "Por favor, insira o e-mail correto"
   }
 };

package/es/components/pay/toC/PaymentList/serve.js

@@ -15,7 +15,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { request } from "../../../../utils";
 import { paymentKeys } from "./status";
-import { isWx, isIOS } from '@pisell/utils';
+import { isWx, isSafari, isIOS } from '@pisell/utils';
 import { paymentTypes, isCustomPayment } from "./status";
 import { formatCreditCardSurchargeList, formatCreditCardSurchargeText } from "./utils";
 
@@ -106,7 +106,7 @@ export var filterPaymentList = function filterPaymentList(list) {
   // }
 
   // 非IOS 隐藏苹果支付
-  if (!isIOS()) {
+  if (!isIOS() && !isSafari()) {
     arr = arr.concat(['mw.apple']);
   }
 

package/es/components/pay/toC/PaymentMethods/MWCreditCard/List/index.js

@@ -15,6 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useImperativeHandle, forwardRef, useMemo, useContext } from 'react';
 import { Button } from 'antd';
 import { locales } from '@pisell/utils';
+import { useDebounceFn } from 'ahooks';
 import { PisellModal, Iconfont, PisellCheckboxGroup, PisellRow, getBankCardTypeImg, PisellLoading, PisellText } from '@pisell/materials';
 import classNames from 'classnames';
 import { Context } from "../../../model";
@@ -126,12 +127,15 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
             // 关闭管理卡模式
             setManage(false);
 
+            // 重置确认按钮loading状态
+            setOkLoading(false);
+
             // 选中第一个卡
             setCurrentCard(0);
 
             // 异步 获取信用卡列表
             _getCreditCardList();
-          case 6:
+          case 7:
           case "end":
             return _context2.stop();
         }
@@ -266,21 +270,32 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
    * @Author: zhiwei.Wang
    * @Date: 2024-08-16 11:11
    */
-  var onOk = function onOk() {
-    var _props$onChange;
-    // 管理卡模式下, 则执行删除卡操作
-    if (manage) {
-      setManage(false);
-      handleBatchDeleteCards();
-      return;
-    }
+  // 确认按钮loading状态
+  var _useState13 = useState(false),
+    _useState14 = _slicedToArray(_useState13, 2),
+    okLoading = _useState14[0],
+    setOkLoading = _useState14[1];
+  var _useDebounceFn = useDebounceFn(function () {
+      var _props$onChange;
+      // 管理卡模式下, 则执行删除卡操作
+      if (manage) {
+        setManage(false);
+        handleBatchDeleteCards();
+        return;
+      }
 
-    // 否则回调到外部
-    var cur = creditCardList.find(function (d) {
-      return d.id === currentCard;
-    });
-    (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, cur);
-  };
+      // 展示loading, 防止重复点击
+      setOkLoading(true);
+
+      // 否则回调到外部
+      var cur = creditCardList.find(function (d) {
+        return d.id === currentCard;
+      });
+      (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, cur);
+    }, {
+      wait: 300
+    }),
+    onOk = _useDebounceFn.run;
 
   // 渲染列表
   var renderList = useMemo(function () {
@@ -330,7 +345,8 @@ var MWCreditCardList = function MWCreditCardList(props, ref) {
     okText: manage ? locales.getText('tocPay.text.done') : okText,
     onOk: onOk,
     okButtonProps: {
-      disabled: !currentCard
+      disabled: !currentCard,
+      loading: okLoading
     },
     bodyStyle: {
       padding: 24

package/es/components/pay/toC/PaymentMethods/MWCreditCard/tds2.js

@@ -367,15 +367,7 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
           timer = null; // 返回promise
           return _context3.abrupt("return", new Promise(function (res, rej) {
             var _threeDSMethodData$pa7;
-            // 10秒内没有成功则走N逻辑
-            timer = setTimeout(function () {
-              res(defaultReturnParams);
-              log({
-                msg: '第三步: 10秒超时则走N逻辑',
-                data: threeDSMethodData
-              });
-            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
-            window.addEventListener('message', function (event) {
+            var handleMessage = function handleMessage(event) {
               // 判断域名
               if (event.origin.indexOf(postmessageUrl) !== -1 || event.origin.indexOf('securesuite') !== -1) {
                 // 返回 threeDSServerTransID 则 res
@@ -388,6 +380,8 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                   if (timer) {
                     clearTimeout(timer);
                   }
+                  // 移除监听器，防止重复触发
+                  window.removeEventListener('message', handleMessage);
                   // 10秒内成功则走Y逻辑
                   res({
                     threeDSServerTransID: event.data.threeDSServerTransID,
@@ -395,7 +389,19 @@ export var createThreeDSMethodIframe = /*#__PURE__*/function () {
                   });
                 }
               }
-            }, false);
+            };
+
+            // 10秒内没有成功则走N逻辑
+            timer = setTimeout(function () {
+              // 超时也要移除监听器
+              window.removeEventListener('message', handleMessage);
+              res(defaultReturnParams);
+              log({
+                msg: '第三步: 10秒超时则走N逻辑',
+                data: threeDSMethodData
+              });
+            }, (threeDSMethodData === null || threeDSMethodData === void 0 || (_threeDSMethodData$pa7 = threeDSMethodData.pay_info) === null || _threeDSMethodData$pa7 === void 0 ? void 0 : _threeDSMethodData$pa7.tdsMethodTimeoutMS) || 10000);
+            window.addEventListener('message', handleMessage, false);
           }));
         case 28:
         case "end":
@@ -467,7 +473,7 @@ export var checkTDSAuth = /*#__PURE__*/function () {
               billAddrLine1: paymentInfo.billingAddress.billAddrLine1,
               billAddrPostCode: paymentInfo.billingAddress.billAddrPostCode,
               billAddrState: paymentInfo.billingAddress.billAddrState,
-              threeDSCompInd: isPre ? '' : threeDSCompInd,
+              threeDSCompInd: isPre ? '' : threeDSCompInd || 'N',
               threeDSServerTransID: isPre ? '' : threeDSServerTransID,
               threeDSRequestorAuthenticationInd: '01',
               threeDSRequestorURL: window.location.href,

package/es/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/es/components/pay/toC/PaymentMethods/WalletPass/List/index.d.ts

@@ -13,6 +13,7 @@ export interface WalletPassListProps {
     onChangeDebounce?: boolean;
     loading?: boolean;
     onLoadingChange?: (loading: boolean) => void;
+    customer_id?: number;
 }
 export declare type WalletPassListRef = {
     init: (params: MachineCodeListParams, formatList?: (val: WalletPassDataType[]) => WalletPassDataType[]) => void;

package/es/components/pay/toC/PaymentMethods/WalletPass/List/index.js

@@ -1,5 +1,10 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -23,7 +28,8 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
     walletSetting = props.walletSetting,
     onLoadingChange = props.onLoadingChange,
     propsLoading = props.loading,
-    onChangeDebounce = props.onChangeDebounce;
+    onChangeDebounce = props.onChangeDebounce,
+    customer_id = props.customer_id;
   var _useState = useState(propsData || []),
     _useState2 = _slicedToArray(_useState, 2),
     data = _useState2[0],
@@ -59,24 +65,29 @@ var WalletPassList = /*#__PURE__*/forwardRef(function (props, ref) {
             _context.t0 = [];
           case 7:
             list = _context.t0;
+            list = list.map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                customer_id: customer_id || item.customer_id
+              });
+            });
             if (isFunction(formatList)) {
               list = formatList(list);
             }
             // 转换接口数据至cardList标准数据
             setData(formatMachineCodeServer2CardList(list, value));
-            _context.next = 15;
+            _context.next = 16;
             break;
-          case 12:
-            _context.prev = 12;
+          case 13:
+            _context.prev = 13;
             _context.t1 = _context["catch"](1);
             console.error(_context.t1);
-          case 15:
-            setLoading(false);
           case 16:
+            setLoading(false);
+          case 17:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 12]]);
+      }, _callee, null, [[1, 13]]);
     }));
     return function getList(_x, _x2) {
       return _ref.apply(this, arguments);

package/es/components/pay/toC/PaymentMethods/WalletPass/index.js

@@ -164,9 +164,7 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
             return item;
           });
         });
-        return [].concat(_toConsumableArray(currentCustomerWalletPass || []), _toConsumableArray(val)).filter(function (item) {
-          return !(order !== null && order !== void 0 && order.customer_id) || item.customer_id === (order === null || order === void 0 ? void 0 : order.customer_id);
-        });
+        return [].concat(_toConsumableArray(currentCustomerWalletPass || []), _toConsumableArray(val));
       });
     }
   });
@@ -454,7 +452,8 @@ var WalletPass = /*#__PURE__*/forwardRef(function (props, ref) {
     onChange: handleCurrentChange,
     ref: listRef,
     value: selectValue,
-    onLoadingChange: setLoading
+    onLoadingChange: setLoading,
+    customer_id: order === null || order === void 0 ? void 0 : order.customer_id
   }))), /*#__PURE__*/React.createElement(PisellModal, {
     title: /*#__PURE__*/React.createElement("div", null, locales.getText('tocPay.text.searchResult')),
     mobileModalHeight: '90%',