@pisell/private-materials 6.0.25 → 6.1.1

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

@@ -23,7 +23,7 @@ import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
 import PaymentList from "./PaymentList";
 import PaymentMethods from "./PaymentMethods";
-import { getPaymentsAndWalletPass, getPaymentInit } from "./serve";
+import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus } from "./serve";
 import { Provider, Context } from "./model";
 import useEngineContext from "../../../hooks/useEngineContext";
 import { request } from "../../../utils";
@@ -41,7 +41,7 @@ import "./index.less";
  * @Date: 2024-08-16 10:43
  */
 var ToCPay = function ToCPay(props, ref) {
-  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _dvaStore$core, _state$payGroup6, _state$payGroup16, _state$order, _state$order2, _state$payGroup21, _state$payGroup22, _state$payGroup23;
+  var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _dvaStore$core, _dvaStore$core2, _state$payGroup6, _state$payGroup17, _state$order, _state$order2, _state$payGroup22, _state$payGroup23, _state$payGroup24;
   //@ts-ignore
   var _useContext = useContext(Context),
     state = _useContext.state,
@@ -70,6 +70,7 @@ var ToCPay = function ToCPay(props, ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     renderType = _useState8[0],
     setRenderType = _useState8[1];
+  var walletPassBlockRef = useRef(null);
   var context = useEngineContext();
 
   // 退出提醒
@@ -89,8 +90,11 @@ var ToCPay = function ToCPay(props, ref) {
   // 客户id
   var customer_id = (_context$appHelper$ut3 = context.appHelper.utils) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut3 = _context$appHelper$ut3.getStore()) === null || _context$appHelper$ut3 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut3.getState) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.call(_context$appHelper$ut3)) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.global) === null || _context$appHelper$ut4 === void 0 || (_context$appHelper$ut4 = _context$appHelper$ut4.userInfo) === null || _context$appHelper$ut4 === void 0 ? void 0 : _context$appHelper$ut4.id;
 
+  // 店铺名称
+  var shopName = (_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 || (_dvaStore$core = _dvaStore$core.core) === null || _dvaStore$core === void 0 || (_dvaStore$core = _dvaStore$core.shop) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.name;
+
   // 注册多语言
-  locales.init(localeTexts, ((_dvaStore$core = dvaStore.core) === null || _dvaStore$core === void 0 ? void 0 : _dvaStore$core.translateLocale) || 'en');
+  locales.init(localeTexts, ((_dvaStore$core2 = dvaStore.core) === null || _dvaStore$core2 === void 0 ? void 0 : _dvaStore$core2.translateLocale) || 'en');
 
   // 注册请求
   request.setRequest(utils === null || utils === void 0 ? void 0 : utils.request);
@@ -103,25 +107,65 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 14:02
    */
   var _initStore = function _initStore(initProps) {
-    var _context$appHelper$ut5, _initProps$order, _initProps$order2, _initProps$order3;
+    var _context$appHelper$ut5;
     dispatch({
       type: 'init',
       payload: _objectSpread(_objectSpread({}, initProps), {}, {
         status: 'init',
         // 将支付回调储存在store, 方便其他模块调用
         payCallback: props.callback,
-        history: (_context$appHelper$ut5 = context.appHelper.utils) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.history,
+        history: (_context$appHelper$ut5 = context.appHelper.utils) === null || _context$appHelper$ut5 === void 0 ? void 0 : _context$appHelper$ut5.history
         // 支付组
-        payGroup: {
-          order_id: initProps === null || initProps === void 0 || (_initProps$order = initProps.order) === null || _initProps$order === void 0 ? void 0 : _initProps$order.order_id,
-          total_amount: initProps === null || initProps === void 0 || (_initProps$order2 = initProps.order) === null || _initProps$order2 === void 0 ? void 0 : _initProps$order2.amount,
-          // 原订单信息
-          _order: initProps === null || initProps === void 0 ? void 0 : initProps.order,
-          payment_group_id: initProps === null || initProps === void 0 || (_initProps$order3 = initProps.order) === null || _initProps$order3 === void 0 ? void 0 : _initProps$order3.payment_group_id
-        }
+        // payGroup: {
+        //   order_id: initProps?.order?.order_id,
+        //   total_amount: initProps?.order?.amount,
+        //   // 原订单信息
+        //   _order: initProps?.order,
+        //   payment_group_id: initProps?.order?.payment_group_id,
+        // },
       })
     });
   };
+  var getWalletSetting = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(initProps) {
+      var _initProps$order, _utils$translation, _wallet_setting$popup;
+      var sale_channel, _yield$getWalletNameA, wallet, wallet_setting, setting;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            sale_channel = (initProps === null || initProps === void 0 || (_initProps$order = initProps.order) === null || _initProps$order === void 0 ? void 0 : _initProps$order.sale_channel) || 'online-store';
+            _context.next = 3;
+            return getWalletNameAndPopupStatus({
+              setting_type: "".concat(sale_channel, "-wallet-setting")
+            });
+          case 3:
+            _yield$getWalletNameA = _context.sent;
+            wallet = _yield$getWalletNameA.wallet;
+            wallet_setting = _yield$getWalletNameA.wallet_setting;
+            setting = {
+              name: (utils === null || utils === void 0 || (_utils$translation = utils.translation) === null || _utils$translation === void 0 ? void 0 : _utils$translation.call(utils, wallet === null || wallet === void 0 ? void 0 : wallet.name)) || locales.getText('tocPay.text.walletName')(shopName),
+              popup_status: (_wallet_setting$popup = wallet_setting === null || wallet_setting === void 0 ? void 0 : wallet_setting.popup_status) !== null && _wallet_setting$popup !== void 0 ? _wallet_setting$popup : 1
+            };
+            if (setting.popup_status === 1) {
+              setTimeout(function () {
+                var _walletPassBlockRef$c;
+                (_walletPassBlockRef$c = walletPassBlockRef.current) === null || _walletPassBlockRef$c === void 0 || _walletPassBlockRef$c.open();
+              });
+            }
+            dispatch({
+              type: 'setWalletSetting',
+              payload: setting
+            });
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getWalletSetting(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   /**
    * @title: 全局唯一初始化方法
@@ -132,10 +176,10 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 14:02
    */
   var init = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(initProps) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(initProps) {
       var renderType;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             renderType = initProps.renderType;
             setRenderType(renderType !== null && renderType !== void 0 ? renderType : 'modal');
@@ -155,16 +199,19 @@ var ToCPay = function ToCPay(props, ref) {
             removePayGroupFromStorage(initProps.order.order_id);
 
             // 获取支付列表和钱包
-            _context.next = 9;
+            _context2.next = 9;
             return _getPaymentsAndWalletPass(initProps.order);
           case 9:
+            _context2.next = 11;
+            return getWalletSetting(initProps);
+          case 11:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
-    return function init(_x) {
-      return _ref.apply(this, arguments);
+    return function init(_x2) {
+      return _ref2.apply(this, arguments);
     };
   }();
 
@@ -177,64 +224,70 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:51
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(order) {
-      var _state$payGroup, _paymentListRef$curre, data, _ref3, _ref3$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
+      var _state$payGroup, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass;
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
+            _context3.prev = 0;
+            _context3.next = 3;
             return getPaymentsAndWalletPass({
               order_id: order.order_id,
               total_amount: order.amount,
               sale_channel: order.sale_channel || 'online-store'
             });
           case 3:
-            data = _context2.sent;
-            _ref3 = data || {}, _ref3$remain_amount = _ref3.remain_amount, remain_amount = _ref3$remain_amount === void 0 ? 0 : _ref3$remain_amount, wallet_pass_recommend_list = _ref3.wallet_pass_recommend_list, wallet_pass_amount = _ref3.wallet_pass_amount, payment_list = _ref3.payment_list, walletPass = _ref3.walletPass; // 设置交易组
+            data = _context3.sent;
+            _ref4 = data || {}, _ref4$remain_amount = _ref4.remain_amount, remain_amount = _ref4$remain_amount === void 0 ? 0 : _ref4$remain_amount, wallet_pass_recommend_list = _ref4.wallet_pass_recommend_list, wallet_pass_amount = _ref4.wallet_pass_amount, payment_list = _ref4.payment_list, walletPass = _ref4.walletPass; // 设置交易组
             dispatch({
               type: 'setPayGroup',
-              payload: _objectSpread(_objectSpread({}, state.payGroup), {}, {
+              payload: {
+                // ...state.payGroup,
+                order_id: order === null || order === void 0 ? void 0 : order.order_id,
+                // total_amount: order?.amount,
+                // 原订单信息
+                _order: order,
+                payment_group_id: order === null || order === void 0 ? void 0 : order.payment_group_id,
                 // 支付方式没有walletPass时walletPass设置null
                 walletPass: walletPass ? _objectSpread(_objectSpread(_objectSpread({}, (_state$payGroup = state.payGroup) === null || _state$payGroup === void 0 ? void 0 : _state$payGroup.walletPass), walletPass), {}, {
                   amount: wallet_pass_amount,
                   cards: wallet_pass_recommend_list
                 }) : null,
-                total_amount: order.amount,
+                total_amount: order === null || order === void 0 ? void 0 : order.amount,
                 wait_amount: remain_amount
-              })
+              }
             });
 
             // 初始化支付列表
-            _context2.next = 8;
+            _context3.next = 8;
             return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list);
           case 8:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
             }, 100);
-            _context2.next = 15;
+            _context3.next = 15;
             break;
           case 11:
-            _context2.prev = 11;
-            _context2.t0 = _context2["catch"](0);
-            console.log('err', _context2.t0);
+            _context3.prev = 11;
+            _context3.t0 = _context3["catch"](0);
+            console.log('err', _context3.t0);
             payCallback({
               key: 'fail',
               data: {
-                err: _context2.t0,
+                err: _context3.t0,
                 order: order,
                 fn: '_getPaymentsAndWalletPass'
               }
             });
           case 15:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2, null, [[0, 11]]);
+      }, _callee3, null, [[0, 11]]);
     }));
-    return function _getPaymentsAndWalletPass(_x2) {
-      return _ref2.apply(this, arguments);
+    return function _getPaymentsAndWalletPass(_x3) {
+      return _ref3.apply(this, arguments);
     };
   }();
 
@@ -248,16 +301,16 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:46
    */
   var handlePaymentByType = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(type, payGroup) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
       var _paymentMethodsRef$cu, _state$payGroup2;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             // 打开loading
             setSubmitLoading(true);
 
             // 根据不同的支付方式, 调用不同的支付方法
-            _context3.next = 3;
+            _context4.next = 3;
             return (_paymentMethodsRef$cu = paymentMethodsRef.current) === null || _paymentMethodsRef$cu === void 0 ? void 0 : _paymentMethodsRef$cu.onPay({
               type: type || ((_state$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 || (_state$payGroup2 = _state$payGroup2.otherPayment) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.service),
               payGroup: payGroup || state.payGroup
@@ -267,12 +320,12 @@ var ToCPay = function ToCPay(props, ref) {
             setSubmitLoading(false);
           case 4:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
-    return function handlePaymentByType(_x3, _x4) {
-      return _ref4.apply(this, arguments);
+    return function handlePaymentByType(_x4, _x5) {
+      return _ref5.apply(this, arguments);
     };
   }();
 
@@ -284,23 +337,23 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:41
    */
   var paymentInit = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(newOrderId) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
       var _state$payGroup3;
       var orderId, _state$payGroup4, data;
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             // 默认使用store内的order_id, 如果传入了新的order_id, 则使用新的order_id
             orderId = newOrderId || ((_state$payGroup3 = state.payGroup) === null || _state$payGroup3 === void 0 ? void 0 : _state$payGroup3.order_id);
             setSubmitLoading(true);
-            _context4.prev = 2;
-            _context4.next = 5;
+            _context5.prev = 2;
+            _context5.next = 5;
             return getPaymentInit({
               order_id: orderId,
               amount: (_state$payGroup4 = state.payGroup) === null || _state$payGroup4 === void 0 ? void 0 : _state$payGroup4.total_amount
             });
           case 5:
-            data = _context4.sent;
+            data = _context5.sent;
             // 设置交易组
             dispatch({
               type: 'setPayGroup',
@@ -311,32 +364,32 @@ var ToCPay = function ToCPay(props, ref) {
                 payment_priority: data.payment_priority
               }
             });
-            return _context4.abrupt("return", _objectSpread(_objectSpread({}, state.payGroup), {}, {
+            return _context5.abrupt("return", _objectSpread(_objectSpread({}, state.payGroup), {}, {
               order_id: orderId,
               total_amount: data.amount,
               payment_group_id: data.payment_group_id,
               payment_priority: data.payment_priority
             }));
           case 10:
-            _context4.prev = 10;
-            _context4.t0 = _context4["catch"](2);
+            _context5.prev = 10;
+            _context5.t0 = _context5["catch"](2);
             setSubmitLoading(false);
             payCallback({
               key: 'fail',
               data: {
-                err: _context4.t0,
+                err: _context5.t0,
                 orderId: orderId,
                 fn: 'paymentInit'
               }
             });
           case 14:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4, null, [[2, 10]]);
+      }, _callee5, null, [[2, 10]]);
     }));
-    return function paymentInit(_x5) {
-      return _ref5.apply(this, arguments);
+    return function paymentInit(_x6) {
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -395,25 +448,25 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-30 10:23:48
    */
   var getIsShowDetectIncognitoConfirm = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(payGroup) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
       var _yield$detectIncognit, isPrivate;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.next = 2;
+            _context6.next = 2;
             return detectIncognito();
           case 2:
-            _yield$detectIncognit = _context5.sent;
+            _yield$detectIncognit = _context6.sent;
             isPrivate = _yield$detectIncognit.isPrivate;
-            return _context5.abrupt("return", ((payGroup === null || payGroup === void 0 ? void 0 : payGroup.wait_amount) || 0) > 0 && getIsWalletPassAndTripartitePayment(payGroup) && isPrivate);
+            return _context6.abrupt("return", ((payGroup === null || payGroup === void 0 ? void 0 : payGroup.wait_amount) || 0) > 0 && getIsWalletPassAndTripartitePayment(payGroup) && isPrivate);
           case 5:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
-    return function getIsShowDetectIncognitoConfirm(_x6) {
-      return _ref6.apply(this, arguments);
+    return function getIsShowDetectIncognitoConfirm(_x7) {
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -425,43 +478,43 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:25
    */
   var onSubmit = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(newOrderId) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
       var _state$payGroup9;
       var newPayGroup, result;
-      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             newPayGroup = state.payGroup; // 是否要展示无痕模式提示
-            _context6.next = 3;
+            _context7.next = 3;
             return getIsShowDetectIncognitoConfirm(newPayGroup);
           case 3:
-            result = _context6.sent;
+            result = _context7.sent;
             if (!result) {
-              _context6.next = 7;
+              _context7.next = 7;
               break;
             }
             setShowDetectIncognitoConfirm(true);
-            return _context6.abrupt("return");
+            return _context7.abrupt("return");
           case 7:
             if ((_state$payGroup9 = state.payGroup) !== null && _state$payGroup9 !== void 0 && _state$payGroup9.payment_group_id) {
-              _context6.next = 11;
+              _context7.next = 11;
               break;
             }
-            _context6.next = 10;
+            _context7.next = 10;
             return paymentInit(newOrderId);
           case 10:
-            newPayGroup = _context6.sent;
+            newPayGroup = _context7.sent;
           case 11:
             // 调用支付
             handlePaymentByType(undefined, newPayGroup);
           case 12:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
-    return function onSubmit(_x7) {
-      return _ref7.apply(this, arguments);
+    return function onSubmit(_x8) {
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -518,10 +571,10 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-09 14:25
    */
   var payCallback = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(res) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
       var _props$callback;
-      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             // 取消支付,关闭弹窗
             if (res.key === 'cancel') {
@@ -532,12 +585,12 @@ var ToCPay = function ToCPay(props, ref) {
             (_props$callback = props.callback) === null || _props$callback === void 0 || _props$callback.call(props, res);
           case 2:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7);
+      }, _callee8);
     }));
-    return function payCallback(_x8) {
-      return _ref8.apply(this, arguments);
+    return function payCallback(_x9) {
+      return _ref9.apply(this, arguments);
     };
   }();
 
@@ -549,7 +602,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-08 16:34
    */
   var onCancel = function onCancel() {
-    var _state$payGroup14;
+    var _state$payGroup14, _state$payGroup15;
     // 删除交易组
     removePayGroupFromStorage((_state$payGroup14 = state.payGroup) === null || _state$payGroup14 === void 0 ? void 0 : _state$payGroup14.order_id);
 
@@ -562,15 +615,17 @@ var ToCPay = function ToCPay(props, ref) {
     // 回调外部
     payCallback({
       key: 'cancel',
-      data: {}
+      data: {
+        order_id: (_state$payGroup15 = state.payGroup) === null || _state$payGroup15 === void 0 ? void 0 : _state$payGroup15.order_id
+      }
     });
   };
 
   // 待支付金额变化时, 重新计算附加费
   useUpdateEffect(function () {
-    var _paymentListRef$curre2, _state$payGroup15;
-    (_paymentListRef$curre2 = paymentListRef.current) === null || _paymentListRef$curre2 === void 0 || _paymentListRef$curre2.calculateSurcharge(((_state$payGroup15 = state.payGroup) === null || _state$payGroup15 === void 0 ? void 0 : _state$payGroup15.wait_amount) || 0);
-  }, [(_state$payGroup16 = state.payGroup) === null || _state$payGroup16 === void 0 ? void 0 : _state$payGroup16.wait_amount]);
+    var _paymentListRef$curre2, _state$payGroup16;
+    (_paymentListRef$curre2 = paymentListRef.current) === null || _paymentListRef$curre2 === void 0 || _paymentListRef$curre2.calculateSurcharge(((_state$payGroup16 = state.payGroup) === null || _state$payGroup16 === void 0 ? void 0 : _state$payGroup16.wait_amount) || 0);
+  }, [(_state$payGroup17 = state.payGroup) === null || _state$payGroup17 === void 0 ? void 0 : _state$payGroup17.wait_amount]);
   useImperativeHandle(ref, function () {
     return {
       init: init,
@@ -587,7 +642,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:49
    */
   var renderPaymentListTitle = function renderPaymentListTitle() {
-    var _state$payGroup17;
+    var _state$payGroup18;
     // 待支付金额为0 展示无需选择支付方式
     if (waitAmount == 0) {
       return /*#__PURE__*/React.createElement("div", {
@@ -600,13 +655,13 @@ var ToCPay = function ToCPay(props, ref) {
     }
 
     // 有剩余金额, 展示继续支付
-    if (((_state$payGroup17 = state.payGroup) === null || _state$payGroup17 === void 0 ? void 0 : _state$payGroup17.total_amount) !== waitAmount) {
-      var _state$payGroup18;
+    if (((_state$payGroup18 = state.payGroup) === null || _state$payGroup18 === void 0 ? void 0 : _state$payGroup18.total_amount) !== waitAmount) {
+      var _state$payGroup19;
       return /*#__PURE__*/React.createElement("div", {
         className: "custom-payment-list-title"
       }, locales.getText('tocPay.text.continuePayment'), ' ', /*#__PURE__*/React.createElement(PisellText.Amount, {
         className: "custom-payment-list-title-price",
-        value: ((_state$payGroup18 = state.payGroup) === null || _state$payGroup18 === void 0 ? void 0 : _state$payGroup18.wait_amount) || 0.0
+        value: ((_state$payGroup19 = state.payGroup) === null || _state$payGroup19 === void 0 ? void 0 : _state$payGroup19.wait_amount) || 0.0
       }));
     }
 
@@ -622,12 +677,12 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:50
    */
   var onWalletPassChange = useMemoizedFn(function (walletPass) {
-    var _state$payGroup19, _state$payGroup20;
-    var _waitAmount = new Decimal(String(((_state$payGroup19 = state.payGroup) === null || _state$payGroup19 === void 0 ? void 0 : _state$payGroup19.total_amount) || 0)).minus(new Decimal(String(walletPass.amount || 0))).toNumber();
+    var _state$payGroup20, _state$payGroup21;
+    var _waitAmount = new Decimal(String(((_state$payGroup20 = state.payGroup) === null || _state$payGroup20 === void 0 ? void 0 : _state$payGroup20.total_amount) || 0)).minus(new Decimal(String(walletPass.amount || 0))).toNumber();
     dispatch({
       type: 'setPayGroup',
       payload: {
-        walletPass: _objectSpread(_objectSpread({}, (_state$payGroup20 = state.payGroup) === null || _state$payGroup20 === void 0 ? void 0 : _state$payGroup20.walletPass), walletPass),
+        walletPass: _objectSpread(_objectSpread({}, (_state$payGroup21 = state.payGroup) === null || _state$payGroup21 === void 0 ? void 0 : _state$payGroup21.walletPass), walletPass),
         wait_amount: _waitAmount
       }
     });
@@ -683,11 +738,11 @@ var ToCPay = function ToCPay(props, ref) {
     onCancel: function onCancel() {
       setShowDetectIncognitoConfirm(false);
     },
-    onOk: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+    onOk: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            _context8.next = 2;
+            _context9.next = 2;
             return copyToClipboard(window.location.href);
           case 2:
             PisellToast({
@@ -695,9 +750,9 @@ var ToCPay = function ToCPay(props, ref) {
             });
           case 3:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     }))
   }), /*#__PURE__*/React.createElement(PisellLoading, {
     loading: loading,
@@ -706,18 +761,20 @@ var ToCPay = function ToCPay(props, ref) {
   }, ((_state$order = state.order) === null || _state$order === void 0 ? void 0 : _state$order.countdown) && /*#__PURE__*/React.createElement(PayCountdown, {
     time: (_state$order2 = state.order) === null || _state$order2 === void 0 ? void 0 : _state$order2.countdown
   }), /*#__PURE__*/React.createElement(PayAmount, {
-    amount: ((_state$payGroup21 = state.payGroup) === null || _state$payGroup21 === void 0 ? void 0 : _state$payGroup21.total_amount) || 0
-  }), ((_state$payGroup22 = state.payGroup) === null || _state$payGroup22 === void 0 ? void 0 : _state$payGroup22.walletPass) && /*#__PURE__*/React.createElement(WalletPassBlock, {
+    amount: ((_state$payGroup22 = state.payGroup) === null || _state$payGroup22 === void 0 ? void 0 : _state$payGroup22.total_amount) || 0
+  }), ((_state$payGroup23 = state.payGroup) === null || _state$payGroup23 === void 0 ? void 0 : _state$payGroup23.walletPass) && /*#__PURE__*/React.createElement(WalletPassBlock, {
     customer_id: customer_id,
     payGroup: state.payGroup,
-    onWalletPassChange: onWalletPassChange
+    onWalletPassChange: onWalletPassChange,
+    ref: walletPassBlockRef,
+    walletSetting: state.walletSetting
   }), /*#__PURE__*/React.createElement(PaymentList, {
     ref: paymentListRef,
     handlePayment: function handlePayment(detail) {
       handlePaymentByType(detail === null || detail === void 0 ? void 0 : detail.service);
     },
     paymentTypeChange: paymentTypeChange,
-    hide: ((_state$payGroup23 = state.payGroup) === null || _state$payGroup23 === void 0 ? void 0 : _state$payGroup23.wait_amount) == 0,
+    hide: ((_state$payGroup24 = state.payGroup) === null || _state$payGroup24 === void 0 ? void 0 : _state$payGroup24.wait_amount) == 0,
     renderTitle: renderPaymentListTitle
   })), /*#__PURE__*/React.createElement(PaymentMethods, {
     ref: paymentMethodsRef,