@pisell/private-materials 3.3.55 → 3.3.57

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

@@ -15,6 +15,8 @@ import ThreedsLoading from "../MWCreditCard/TDSPay/ThreedsLoading";
 import { getAliPayUrl } from "./serve";
 import { getPayGroupParamsFromStorage, setPayNumber } from "../../payGroup";
 import "./index.less";
+import useEngineContext from "../../../../../hooks/useEngineContext";
+import { clientPayment } from "../../utils";
 /**
  * @title: 支付宝支付
  * @description:
@@ -23,11 +25,15 @@ import "./index.less";
  * @Date: 2024-08-16 11:18
  */
 var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
+  var _context$appHelper;
   var onChange = props.onChange;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    interaction = _context$appHelper$ut.interaction;
 
   /**
    * @title: 初始化
@@ -39,26 +45,37 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var _interaction$utils, _interaction$utils$is;
       var payGroup, values, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref.payGroup;
-            setOpen(true);
-
             // 交易组
             values = getPayGroupParamsFromStorage(payGroup.order_id);
+            if (!(interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils))) {
+              _context.next = 4;
+              break;
+            }
+            return _context.abrupt("return", clientPayment({
+              order_id: payGroup.order_id,
+              type: 'aliPay',
+              values: values,
+              interaction: interaction
+            }));
+          case 4:
+            setOpen(true);
             if (values) {
-              _context.next = 6;
+              _context.next = 8;
               break;
             }
             setOpen(false);
             return _context.abrupt("return");
-          case 6:
-            _context.prev = 6;
-            _context.next = 9;
+          case 8:
+            _context.prev = 8;
+            _context.next = 11;
             return getAliPayUrl(payGroup.order_id, values);
-          case 9:
+          case 11:
             data = _context.sent;
             if (data !== null && data !== void 0 && data.pay_url) {
               // 设置交易号
@@ -69,17 +86,17 @@ var SuperPayAliPayH5 = function SuperPayAliPayH5(props, ref) {
             } else {
               setOpen(false);
             }
-            _context.next = 16;
+            _context.next = 18;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](6);
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](8);
             setOpen(false);
-          case 16:
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 13]]);
+      }, _callee, null, [[8, 15]]);
     }));
     return function init(_x) {
       return _ref2.apply(this, arguments);

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

@@ -15,6 +15,8 @@ import { getWxPayUrl } from "./serve";
 import { getPayGroupParamsFromStorage, setPayNumber } from "../../payGroup";
 import "./index.less";
 import { locales } from '@pisell/utils';
+import { clientPayment } from "../../utils";
+import useEngineContext from "../../../../../hooks/useEngineContext";
 /**
  * @title: 微信支付
  * @description:
@@ -25,10 +27,14 @@ import { locales } from '@pisell/utils';
  * @Date: 2024-08-16 11:18
  */
 var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
+  var _context$appHelper;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
     setOpen = _useState2[1];
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    interaction = _context$appHelper$ut.interaction;
 
   /**
    * @title: 初始化
@@ -40,26 +46,37 @@ var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
    */
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+      var _interaction$utils, _interaction$utils$is;
       var payGroup, values, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             payGroup = _ref.payGroup;
-            setOpen(true);
-
             // 获取交易组
             values = getPayGroupParamsFromStorage(payGroup.order_id);
+            if (!(interaction !== null && interaction !== void 0 && (_interaction$utils = interaction.utils) !== null && _interaction$utils !== void 0 && (_interaction$utils$is = _interaction$utils.isAppEnv) !== null && _interaction$utils$is !== void 0 && _interaction$utils$is.call(_interaction$utils))) {
+              _context.next = 4;
+              break;
+            }
+            return _context.abrupt("return", clientPayment({
+              order_id: payGroup.order_id,
+              type: 'wxPay',
+              values: values,
+              interaction: interaction
+            }));
+          case 4:
+            setOpen(true);
             if (values) {
-              _context.next = 6;
+              _context.next = 8;
               break;
             }
             setOpen(false);
             return _context.abrupt("return");
-          case 6:
-            _context.prev = 6;
-            _context.next = 9;
+          case 8:
+            _context.prev = 8;
+            _context.next = 11;
             return getWxPayUrl(payGroup.order_id, values);
-          case 9:
+          case 11:
             data = _context.sent;
             if (data !== null && data !== void 0 && data.pay_url) {
               // 设置交易号
@@ -70,17 +87,17 @@ var SuperPayWxPayH5 = function SuperPayWxPayH5(props, ref) {
             } else {
               setOpen(false);
             }
-            _context.next = 16;
+            _context.next = 18;
             break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](6);
+          case 15:
+            _context.prev = 15;
+            _context.t0 = _context["catch"](8);
             setOpen(false);
-          case 16:
+          case 18:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 13]]);
+      }, _callee, null, [[8, 15]]);
     }));
     return function init(_x) {
       return _ref2.apply(this, arguments);

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

@@ -7,7 +7,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }); }; }
-import React, { useImperativeHandle, forwardRef, useRef } from 'react';
+import React, { useImperativeHandle, forwardRef, useRef, useEffect } from 'react';
 import MWCreditCard from "./MWCreditCard";
 import SuperPayAliPayH5 from "./SuperPayAliPayH5";
 import StripePay from "./StripePay";
@@ -18,7 +18,7 @@ import CustomPayment from "./CustomPayment";
 import { isCustomPayment } from "../PaymentList/status";
 import CashManual from "./CashManual";
 import GooglePay from "./GooglePay";
-import { removePayGroupFromStorage, syncPayGroupToStorage } from "../payGroup";
+import { removePayGroupFromStorage, setPayNumber, syncPayGroupToStorage } from "../payGroup";
 import ApplePay from "./ApplePay";
 import GlobePayAliPayH5 from "./GlobePayAliPayH5";
 import GlobePayPaypalH5 from "./GlobePayPaypalH5";
@@ -26,6 +26,9 @@ import GlobePayWxH5 from "./GlobePayWxH5";
 import GlobePayQrcode from "./GlobePayQrcode";
 import { walletPassPay } from "./WalletPass/serve";
 import { formatWalletPassParams } from "../utils";
+import useEngineContext from "../../../../hooks/useEngineContext";
+import { isJson } from "@pisell/utils";
+import { getReturnUrl } from "./GlobePayQrcode/serve";
 var isOfflinePayment = function isOfflinePayment(type) {
   if (isCustomPayment(type)) {
     return true;
@@ -33,6 +36,7 @@ var isOfflinePayment = function isOfflinePayment(type) {
   return ['pisell.bank_deposit', 'pisell.offline_payment', 'pisell.other.cashmanual', 'pisell.custom_bank_transfer'].includes(type);
 };
 var PaymentMethods = function PaymentMethods(props, ref) {
+  var _context$appHelper;
   var MWCreditCardRef = useRef(null);
   var SuperPayAliPayH5Ref = useRef(null);
   var StripePayRef = useRef(null);
@@ -47,6 +51,9 @@ var PaymentMethods = function PaymentMethods(props, ref) {
   var GlobePayPaypalH5Ref = useRef(null);
   var GlobePayWxH5Ref = useRef(null);
   var GlobePayQrcodeRef = useRef(null);
+  var context = useEngineContext();
+  var _context$appHelper$ut = (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils,
+    interaction = _context$appHelper$ut.interaction;
   var init = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
       var _payGroup$walletPass;
@@ -112,6 +119,26 @@ var PaymentMethods = function PaymentMethods(props, ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  useEffect(function () {
+    var _interaction$utils, _interaction$utils$is, _interaction$utils2, _interaction$utils2$i;
+    console.log('paymentResult isAppEnv', interaction === null || interaction === void 0 || (_interaction$utils = interaction.utils) === null || _interaction$utils === void 0 || (_interaction$utils$is = _interaction$utils.isAppEnv) === null || _interaction$utils$is === void 0 ? void 0 : _interaction$utils$is.call(_interaction$utils));
+    if (interaction !== null && interaction !== void 0 && (_interaction$utils2 = interaction.utils) !== null && _interaction$utils2 !== void 0 && (_interaction$utils2$i = _interaction$utils2.isAppEnv) !== null && _interaction$utils2$i !== void 0 && _interaction$utils2$i.call(_interaction$utils2)) {
+      interaction.utils.mountFunction('global', 'paymentResult', function (strResult) {
+        console.log('paymentResult', strResult);
+        if (!isJson(strResult)) return;
+        var result = JSON.parse(strResult);
+        var type = result.type,
+          pay_number = result.pay_number,
+          order_id = result.order_id;
+        if (type && order_id && pay_number) {
+          setPayNumber(order_id, pay_number);
+        }
+        var url = "".concat(getReturnUrl(), "?order_id=").concat(order_id, "&status=success");
+        console.log(url, 'paymentResult');
+        window.location.href = url;
+      });
+    }
+  }, []);
   var onPayByType = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
       var type, payGroup, _ApplePayRef$current, _GooglePayRef$current, _MWCreditCardRef$curr, _SuperPayAliPayH5Ref$, _SuperPayWxPayH5Ref$c, _StripePayRef$current, _OfflinePaymentRef$cu, _BankDepositRef$curre, _CashManualRef$curren, _GlobePayAliPayH5Ref$, _GlobePayPaypalH5Ref$, _GlobePayWxH5Ref$curr, _GlobePayQrcodeRef$cu, _CustomPaymentRef$cur;

package/es/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

package/es/components/pay/toC/WalletPassBlock/index.less

@@ -10,6 +10,10 @@
       display: flex;
       align-items: center;
       justify-content: center;
+      & > span:first-child {
+        text-overflow: ellipsis;
+        overflow: hidden;
+      }
     }
   }
 

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

@@ -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, _dvaStore$core2, _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,
@@ -107,33 +107,33 @@ 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$order4, _utils$translation, _wallet_setting$popup;
+      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$order4 = initProps.order) === null || _initProps$order4 === void 0 ? void 0 : _initProps$order4.sale_channel) || 'online-store';
+            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")
@@ -241,15 +241,21 @@ var ToCPay = function ToCPay(props, ref) {
             _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
-              })
+              }
             });
 
             // 初始化支付列表
@@ -596,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);
 
@@ -609,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,
@@ -634,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", {
@@ -647,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
       }));
     }
 
@@ -669,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
       }
     });
@@ -753,8 +761,8 @@ 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,
@@ -766,7 +774,7 @@ var ToCPay = function ToCPay(props, ref) {
       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,

package/es/components/pay/toC/utils.d.ts

@@ -49,3 +49,9 @@ export declare const isFranchiseeShop: (path?: any, history?: any) => any;
 export declare const getFranchiseeShopId: (path?: any, history?: any) => number;
 export declare const formatFranchiseeRoute: (url: string, history?: any) => string;
 export declare const getAvailableMaxAmount: (data: WalletPassDataType) => string;
+export declare const clientPayment: (params: {
+    order_id: number;
+    type: "aliPay" | "wxPay";
+    values: any;
+    interaction?: any;
+}) => void;

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

@@ -1,3 +1,9 @@
+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 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); }
 import { Decimal } from 'decimal.js';
 import { isTripartitePayment } from "./status";
 /**
@@ -90,4 +96,19 @@ export var formatFranchiseeRoute = function formatFranchiseeRoute(url, history)
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
   return data.tag !== 'point_card' ? data.available_max_amount : data === null || data === void 0 ? void 0 : data.recommended_usage_amount;
+};
+export var clientPayment = function clientPayment(params) {
+  var _interaction$utils, _interaction$utils$po;
+  var interaction = params.interaction,
+    type = params.type,
+    order_id = params.order_id,
+    values = params.values;
+  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: 'global',
+    key: 'paymentClient',
+    data: _objectSpread({
+      type: type,
+      order_id: order_id
+    }, values)
+  });
 };

package/es/components/productExtension/fields/SelectProducts/ProductItem/index.d.ts

@@ -1,3 +1,3 @@
-import "./index.less";
+import './index.less';
 declare const ProductItem: ({ item, onClick, amountSymbol, style, className, }: any) => JSX.Element;
 export default ProductItem;

package/es/components/productExtension/fields/SelectProducts/ProductItem/index.js

@@ -1,18 +1,27 @@
-import React from "react";
-import { formatAmount, image } from "@pisell/utils";
-import classNames from "classnames";
+import React from 'react';
+import { image } from '@pisell/utils';
+import classNames from 'classnames';
+import Decimal from 'decimal.js';
+import PisellPriceText from "../../../../productSelect/components/pisellPriceText";
 import "./index.less";
 var ProductItem = function ProductItem(_ref) {
   var _ref$item = _ref.item,
     item = _ref$item === void 0 ? {} : _ref$item,
     _onClick = _ref.onClick,
     _ref$amountSymbol = _ref.amountSymbol,
-    amountSymbol = _ref$amountSymbol === void 0 ? "$" : _ref$amountSymbol,
+    amountSymbol = _ref$amountSymbol === void 0 ? '$' : _ref$amountSymbol,
     style = _ref.style,
     className = _ref.className;
+  var price = item.price,
+    is_bundle = item.is_bundle,
+    minimum_markup_price = item.minimum_markup_price;
+  var _price = price;
+  if (is_bundle) {
+    _price = new Decimal(price).plus(new Decimal(minimum_markup_price)).toFixed(2);
+  }
   return /*#__PURE__*/React.createElement("div", {
     style: style,
-    className: classNames("product-item-card", className),
+    className: classNames('product-item-card', className),
     onClick: function onClick() {
       _onClick(item);
     }
@@ -25,6 +34,9 @@ var ProductItem = function ProductItem(_ref) {
     className: "product-item-card-title"
   }, item.title), /*#__PURE__*/React.createElement("div", {
     className: "product-item-card-price"
-  }, formatAmount(item.price, 2, amountSymbol))));
+  }, /*#__PURE__*/React.createElement(PisellPriceText, {
+    value: _price,
+    isMini: is_bundle
+  }))));
 };
 export default ProductItem;

package/es/components/productSelect/components/TabProduct/index.js

@@ -12,9 +12,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Skeleton } from 'antd';
 import { PisellEmpty } from '@pisell/materials';
-import { useMemoizedFn } from 'ahooks';
+import { useMemoizedFn, useDebounceFn } from 'ahooks';
 import { locales } from '@pisell/utils';
-import Tabs from "../../../booking/components/TabProduct/tabs";
+import Tabs from "./tabs";
 import ProductGroup, { ProductGroupSkeleton } from "../productGroup";
 var io = null;
 var TabProduct = function TabProduct(props) {
@@ -43,19 +43,37 @@ var TabProduct = function TabProduct(props) {
       });
     }
   }, [list]);
+
+  // 添加防抖的scroll函数
+  var debouncedScroll = useDebounceFn(function (id) {
+    var _tabsRef$current;
+    tabsRef === null || tabsRef === void 0 || (_tabsRef$current = tabsRef.current) === null || _tabsRef$current === void 0 || _tabsRef$current.scroll(id);
+  }, {
+    wait: 100
+  } // 100ms防抖
+  );
   var handleObserver = useMemoizedFn(function () {
     var _marginTop = 270;
     var _marginBottom = window.innerHeight - 70 - 200 - 70;
     var _rootMargin = "".concat(_marginTop * -1, "px 0px ").concat(_marginBottom * -1, "px 0px");
     io = new IntersectionObserver(function (entries) {
-      if (entries[0].isIntersecting) {
-        var _entries$, _tabsRef$current;
-        var _entries$0$target$id$ = (_entries$ = entries[0]) === null || _entries$ === void 0 || (_entries$ = _entries$.target) === null || _entries$ === void 0 || (_entries$ = _entries$.id) === null || _entries$ === void 0 ? void 0 : _entries$.split('-'),
-          _entries$0$target$id$2 = _slicedToArray(_entries$0$target$id$, 2),
-          name = _entries$0$target$id$2[0],
-          id = _entries$0$target$id$2[1];
-        setCurrentGroupId(Number(id));
-        tabsRef === null || tabsRef === void 0 || (_tabsRef$current = tabsRef.current) === null || _tabsRef$current === void 0 || _tabsRef$current.scroll(id);
+      var enteringEntries = entries.filter(function (entry) {
+        return entry.isIntersecting;
+      });
+      if (enteringEntries.length > 0) {
+        var _topMostEntry$target;
+        // 选择最靠近顶部的元素
+        var topMostEntry = enteringEntries.reduce(function (top, current) {
+          return current.boundingClientRect.top < top.boundingClientRect.top ? current : top;
+        });
+        var _topMostEntry$target$ = topMostEntry === null || topMostEntry === void 0 || (_topMostEntry$target = topMostEntry.target) === null || _topMostEntry$target === void 0 || (_topMostEntry$target = _topMostEntry$target.id) === null || _topMostEntry$target === void 0 ? void 0 : _topMostEntry$target.split('-'),
+          _topMostEntry$target$2 = _slicedToArray(_topMostEntry$target$, 2),
+          name = _topMostEntry$target$2[0],
+          id = _topMostEntry$target$2[1];
+        var newGroupId = Number(id);
+        setCurrentGroupId(newGroupId);
+        debouncedScroll.run(id);
+        // tabsRef?.current?.scroll(id);
       }
     }, {
       root: null,

package/es/components/productSelect/components/TabProduct/tabs/index.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import './index.less';
+export interface Com<T> extends React.FC<T> {
+}
+export declare type RowKey = string | number;
+export interface Option {
+    id: number | string;
+    name: React.ReactNode;
+}
+export interface TabsProps extends Omit<React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>, 'onChange'> {
+    renderTab: (item: any) => React.ReactNode;
+    rowKey: RowKey;
+    name: RowKey;
+    onChange: (key: RowKey, _item: any) => void;
+    tab: RowKey;
+    className: string;
+    tabsRef: any;
+    options: Option[];
+}
+declare const _default: React.ForwardRefExoticComponent<Omit<Partial<TabsProps>, "ref"> & React.RefAttributes<unknown>>;
+export default _default;