@pisell/private-materials 6.9.2 → 6.9.3

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

@@ -23,13 +23,14 @@ import PayAmount from "./PayAmount";
 import WalletPassBlock from "./WalletPassBlock";
 import PaymentList from "./PaymentList";
 import PaymentMethods from "./PaymentMethods";
-import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus } from "./serve";
+import { getPaymentsAndWalletPass, getPaymentInit, getWalletNameAndPopupStatus, getOrderBasicDetail } from "./serve";
 import { Provider, Context } from "./model";
 import useEngineContext from "../../../hooks/useEngineContext";
 import usePaymentLogger from "../../../hooks/usePaymentLogger";
 import { request } from "../../../utils";
 import { removePayGroupFromStorage } from "./payGroup";
 import localeTexts from "./locales";
+import { getMachineCodeList } from "./PaymentMethods/WalletPass/serve";
 import { getIsWalletPassAndTripartitePayment } from "./utils";
 import { saleChannelMap } from "./status";
 import "./index.less";
@@ -263,7 +264,7 @@ var ToCPay = function ToCPay(props, ref) {
    */
   var _getPaymentsAndWalletPass = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(order) {
-      var _state$payGroup2, _paymentListRef$curre, data, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, withCustomerIdList;
+      var _order$_order, _state$payGroup2, _paymentListRef$curre, _yield$Promise$all, _yield$Promise$all2, data, allList, orderBasicDetail, _ref4, _ref4$remain_amount, remain_amount, wallet_pass_recommend_list, wallet_pass_amount, payment_list, walletPass, products, _res, recommended, transformList, noApplicableVoucher, recommendedAmount, withCustomerIdList, _waitAmount2;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -276,14 +277,42 @@ var ToCPay = function ToCPay(props, ref) {
             });
             _context3.prev = 1;
             _context3.next = 4;
-            return getPaymentsAndWalletPass({
+            return Promise.all([getPaymentsAndWalletPass({
               order_id: order.order_id,
               total_amount: order.amount,
               sale_channel: order.sale_channel || 'online-store'
-            });
+            }), getMachineCodeList({
+              order_id: order.order_id,
+              available: 2,
+              prepare_payments: [],
+              filter_prepare_wallet_pass: 1,
+              sale_channel: ((_order$_order = order._order) === null || _order$_order === void 0 ? void 0 : _order$_order.sale_channel) || 'online-store',
+              other_exact_codes: []
+            }), getOrderBasicDetail(order.order_id)]);
           case 4:
-            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; // 记录获取到的数据
+            _yield$Promise$all = _context3.sent;
+            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);
+            data = _yield$Promise$all2[0];
+            allList = _yield$Promise$all2[1];
+            orderBasicDetail = _yield$Promise$all2[2];
+            _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;
+            products = (orderBasicDetail.detail || []).map(function (item) {
+              var _ref5;
+              return _objectSpread(_objectSpread({}, item), {}, {
+                is_price_include_tax: orderBasicDetail.is_price_include_tax,
+                product_bundle: (_ref5 = item.product_bundle || []) === null || _ref5 === void 0 ? void 0 : _ref5.map(function (bundle) {
+                  return _objectSpread(_objectSpread({}, bundle), {}, {
+                    is_price_include_tax: orderBasicDetail.is_price_include_tax
+                  });
+                })
+              });
+            });
+            _res = utils.walletPassEvaluator.getRecommendedVouchers({
+              orderTotalAmount: Math.min(orderBasicDetail.product_unpaid_total_pay_amount, order.amount),
+              products: products,
+              vouchers: allList || []
+            });
+            recommended = _res.recommended, transformList = _res.transformList, noApplicableVoucher = _res.noApplicableVoucher, recommendedAmount = _res.recommendedAmount; // 记录获取到的数据
             paymentLogger.addLog({
               key: '支付数据获取',
               value: ''
@@ -292,30 +321,40 @@ var ToCPay = function ToCPay(props, ref) {
               return _objectSpread(_objectSpread({}, item), {}, {
                 customer_id: customer_id || item.customer_id
               });
-            }); // 设置交易组
+            });
+            _waitAmount2 = new Decimal((order === null || order === void 0 ? void 0 : order.amount) || 0).minus(new Decimal(recommendedAmount)).toNumber(); // 设置交易组
             dispatch({
               type: 'setPayGroup',
               payload: {
                 // ...state.payGroup,
                 order_id: order === null || order === void 0 ? void 0 : order.order_id,
                 // total_amount: order?.amount,
+                orderDetail: orderBasicDetail,
                 // 原订单信息
                 _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$payGroup2 = state.payGroup) === null || _state$payGroup2 === void 0 ? void 0 : _state$payGroup2.walletPass), walletPass), {}, {
-                  amount: wallet_pass_amount,
-                  cards: withCustomerIdList
+                  // 推荐钱包
+                  cards: recommended,
+                  // 推荐金额
+                  amount: recommendedAmount,
+                  // 不可用钱包
+                  noApplicableVoucher: noApplicableVoucher,
+                  // 转换列表
+                  transformList: transformList
+                  // amount: wallet_pass_amount,
+                  // cards: wallet_pass_recommend_list,
                 }) : null,
                 total_amount: order === null || order === void 0 ? void 0 : order.amount,
-                wait_amount: remain_amount
+                wait_amount: Math.max(0, _waitAmount2)
               }
             });
 
             // 初始化支付列表
-            _context3.next = 11;
-            return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list);
-          case 11:
+            _context3.next = 19;
+            return (_paymentListRef$curre = paymentListRef.current) === null || _paymentListRef$curre === void 0 ? void 0 : _paymentListRef$curre.init(payment_list, remain_amount || 0);
+          case 19:
             // 解除loading
             setTimeout(function () {
               setLoading(false);
@@ -326,10 +365,10 @@ var ToCPay = function ToCPay(props, ref) {
               key: '获取支付列表成功',
               value: ''
             });
-            _context3.next = 21;
+            _context3.next = 29;
             break;
-          case 15:
-            _context3.prev = 15;
+          case 23:
+            _context3.prev = 23;
             _context3.t0 = _context3["catch"](1);
             console.log('err', _context3.t0);
 
@@ -352,11 +391,11 @@ var ToCPay = function ToCPay(props, ref) {
                 fn: '_getPaymentsAndWalletPass'
               }
             });
-          case 21:
+          case 29:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[1, 15]]);
+      }, _callee3, null, [[1, 23]]);
     }));
     return function _getPaymentsAndWalletPass(_x3) {
       return _ref3.apply(this, arguments);
@@ -373,7 +412,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-16 10:46
    */
   var handlePaymentByType = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(type, payGroup) {
       var _state$payGroup3;
       var paymentType, currentPayGroup, _paymentMethodsRef$cu;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -433,7 +472,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee4, null, [[3, 12]]);
     }));
     return function handlePaymentByType(_x4, _x5) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
 
@@ -445,7 +484,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:41
    */
   var paymentInit = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(newOrderId) {
       var _state$payGroup4;
       var orderId, _state$payGroup5, data;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -519,7 +558,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee5, null, [[3, 12]]);
     }));
     return function paymentInit(_x6) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -578,7 +617,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-30 10:23:48
    */
   var getIsShowDetectIncognitoConfirm = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payGroup) {
       var _yield$detectIncognit, isPrivate;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -596,7 +635,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee6);
     }));
     return function getIsShowDetectIncognitoConfirm(_x7) {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -608,7 +647,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-15 13:25
    */
   var onSubmit = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(newOrderId) {
       var _state$payGroup10, _state$payGroup11, _state$payGroup12;
       var newPayGroup, _state$payGroup13, _newPayGroup, _newPayGroup2, _state$payGroup14, result, _state$payGroup15;
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
@@ -686,7 +725,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee7, null, [[2, 20]]);
     }));
     return function onSubmit(_x8) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
 
@@ -743,7 +782,7 @@ var ToCPay = function ToCPay(props, ref) {
    * @Date: 2024-08-09 14:25
    */
   var payCallback = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(res) {
       var _res$data, _state$payGroup20, _props$callback;
       var orderId, _res$data2;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -783,7 +822,7 @@ var ToCPay = function ToCPay(props, ref) {
       }, _callee8);
     }));
     return function payCallback(_x9) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
 
@@ -894,6 +933,7 @@ var ToCPay = function ToCPay(props, ref) {
       open: open,
       cancelVisible: false,
       okText: okText,
+      wrapClassName: 'toc-pay-modal-content',
       bodyStyle: {
         padding: 24
       },

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

@@ -98,6 +98,8 @@ declare const _default: {
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
+        'tocPay.text.domestic': string;
+        'tocPay.text.rest-of-world': string;
     };
     'zh-CN': {
         'tocPay.text.checkout': string;
@@ -197,6 +199,8 @@ declare const _default: {
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
+        'tocPay.text.domestic': string;
+        'tocPay.text.rest-of-world': string;
     };
     'zh-HK': {
         'tocPay.text.checkout': string;
@@ -296,6 +300,8 @@ declare const _default: {
         'tocPay.text.paymentCompletedAndViewOrder': string;
         'tocPay.text.paymentFailed': string;
         'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': string;
+        'tocPay.text.domestic': string;
+        'tocPay.text.rest-of-world': string;
     };
 };
 export default _default;

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

@@ -117,7 +117,9 @@ export default {
     'tocPay.text.returnAndSelectOtherPaymentMethod': 'Go Back / Choose Another Payment',
     'tocPay.text.paymentCompletedAndViewOrder': 'Payment Completed / View Order',
     'tocPay.text.paymentFailed': 'Not paid yet, please check if the payment is successful',
-    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': 'We are verifying your payment. Please check your order status later.'
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': 'We are verifying your payment. Please check your order status later.',
+    'tocPay.text.domestic': 'Domestic',
+    'tocPay.text.rest-of-world': 'Rest of world'
   },
   'zh-CN': {
     'tocPay.text.checkout': '结账',
@@ -236,7 +238,9 @@ export default {
     'tocPay.text.returnAndSelectOtherPaymentMethod': '返回 / 选择其他支付方式',
     'tocPay.text.paymentCompletedAndViewOrder': '支付完成 / 查看订单',
     'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功",
-    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我们正在确认您的支付状态，请稍后查看订单状态。'
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我们正在确认您的支付状态，请稍后查看订单状态。',
+    'tocPay.text.domestic': '本国',
+    'tocPay.text.rest-of-world': '国外'
   },
   'zh-HK': {
     'tocPay.text.checkout': '結帳',
@@ -355,6 +359,8 @@ export default {
     'tocPay.text.returnAndSelectOtherPaymentMethod': '返回 / 選擇其他支付方式',
     'tocPay.text.paymentCompletedAndViewOrder': '支付完成 / 查看訂單',
     'tocPay.text.paymentFailed': "未支付完成，请检查是否支付成功",
-    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我們正在確認您的支付狀態，請稍後查看訂單狀態。'
+    'tocPay.text.weAreVerifyingYourPaymentPleaseCheckYourOrderStatusLater': '我們正在確認您的支付狀態，請稍後查看訂單狀態。',
+    'tocPay.text.domestic': '本國',
+    'tocPay.text.rest-of-world': '國外'
   }
 };

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

@@ -28,5 +28,6 @@ export interface PayGroup {
     pay_number?: string;
     _order: any;
     front_order_uuid?: string;
+    orderDetail: any;
 }
 export declare const Provider: any, Context: any;

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

@@ -60,3 +60,21 @@ export declare const getWalletNameAndPopupStatus: (values: {
  * @description: 获取支付结果
  */
 export declare const getPaymentResult: (values: any) => Promise<any>;
+declare type OrderBasicDetail = {
+    id: number;
+    status: string;
+    payment_status: string;
+    order_time: string;
+    detail: any[];
+    product_unpaid_total_pay_amount: number;
+    product_paid_total_pay_amount: number;
+    is_price_include_tax: 1 | 0;
+};
+/**
+ * @title: 查询订单基础信息和订单商品信息
+ * @description: 查询订单基础信息和订单商品信息
+ * @param {string} order_id
+ * @return {*}
+ */
+export declare const getOrderBasicDetail: (order_id: string) => Promise<OrderBasicDetail>;
+export {};

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

@@ -185,4 +185,32 @@ export var getWalletNameAndPopupStatus = /*#__PURE__*/function () {
  */
 export var getPaymentResult = function getPaymentResult(values) {
   return request.getRequest().get("/h5/pay/order/payment/result", values);
-};
+};
+/**
+ * @title: 查询订单基础信息和订单商品信息
+ * @description: 查询订单基础信息和订单商品信息
+ * @param {string} order_id
+ * @return {*}
+ */
+export var getOrderBasicDetail = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_id) {
+    var _yield$request$getReq5, data;
+    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
+          return request.getRequest().get("/h5/order/order/".concat(order_id, "/basic-detail"), {});
+        case 2:
+          _yield$request$getReq5 = _context5.sent;
+          data = _yield$request$getReq5.data;
+          return _context5.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return function getOrderBasicDetail(_x5) {
+    return _ref5.apply(this, arguments);
+  };
+}();

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

@@ -22,7 +22,7 @@ export declare const formatWalletPassParams: (payGroup: PayGroup) => {
     order_id: string;
     payment_group_id: number;
     payments: {
-        amount: string;
+        amount: string | number;
         wallet_pass_use_value: any;
         voucher_id: any;
         tag: any;
@@ -48,7 +48,7 @@ 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 getAvailableMaxAmount: (data: WalletPassDataType) => string | number;
 export declare const clientPayment: (params: {
     order_id: number;
     type: "aliPay" | "wxPay" | 'google_pay';

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

@@ -6,6 +6,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); }
 import { Decimal } from 'decimal.js';
 import { isTripartitePayment } from "./status";
+import { isNumber } from "@pisell/utils";
 /**
  * 计算walletPass列表数据的总金额
  * @param list
@@ -95,6 +96,9 @@ export var formatFranchiseeRoute = function formatFranchiseeRoute(url, history)
 
 // 获取walletPass可用最大金额
 export var getAvailableMaxAmount = function getAvailableMaxAmount(data) {
+  if (isNumber(data._available_max_amount)) {
+    return data._available_max_amount;
+  }
   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) {

package/es/components/pisellSelectCustomerModal/RightPanel/Add/PhoneField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/es/components/pisellSelectCustomerModal/RightPanel/Add/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface AddClientProps {
     onChange: (value: any) => void;

package/es/components/pisellSelectCustomerModal/RightPanel/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface RightPanelProps {
     value: any;

package/es/components/productExtension/fields/Actor/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Actor: ({ name }: {
     name: string;
 }) => JSX.Element;

package/es/components/productExtension/fields/Forms/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface InfoProps {
     relation_id: any;
     action: any;

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

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

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 interface valueType {
 }

package/es/components/productExtension/fields/SelectResourcesTable/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const SelectResourcesTable: ({ value, onChange }: any) => JSX.Element;
 export default SelectResourcesTable;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface ProductExtensionProps {
     onDataChange: any;

package/es/components/productSelect/components/productGroup/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare type BoolConfigVal = 0 | 1;
 export interface ProductCardConfig {

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

@@ -97,7 +97,7 @@ var ProductGroup = function ProductGroup(_ref) {
       className: classNames('product-card', {
         selected: currentProductId && item.id === currentProductId
       }),
-      onPointerUp: function onPointerUp() {
+      onClick: function onClick() {
         console.log('进入 renderItem onClick');
         onSelectProduct === null || onSelectProduct === void 0 || onSelectProduct(item);
       }

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 interface RuleSettingProps {
     value: any;

package/es/components/shoppingCart/components/Cart/Product.js

@@ -122,7 +122,7 @@ var Product = function Product(props) {
       Comp = ProductCard.V2;
     }
     return /*#__PURE__*/React.createElement(Comp, _extends({
-      type: isRetail ? 'a2' : 'a5',
+      type: isRetail ? 'a9' : 'a5',
       rightActions: [{
         key: 'update_number',
         text: /*#__PURE__*/React.createElement(PisellNumberSelector, {

package/es/components/shoppingCart/components/Empty/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Empty: (props: any) => JSX.Element;
 export default Empty;

package/es/components/shoppingCart/components/Render/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Content: () => JSX.Element;
 export default Content;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { shoppingCartProps } from './type';
 declare const shoppingCart: ({ onCard, onAction, onChange, onAddProduct, onActiveKey, ...props }: shoppingCartProps) => JSX.Element;
 export default shoppingCart;

package/es/components/systemSettings/registry/components/SectionList.js

@@ -3,6 +3,8 @@ import { Card, Empty, Spin } from 'antd';
 import { ShoppingCartOutlined, CreditCardOutlined, SafetyCertificateOutlined, SettingOutlined } from '@ant-design/icons';
 import { ShoppingCart01 } from '@pisell/icon';
 import { locales } from '@pisell/utils';
+import useEngineContext from "../../../../hooks/useEngineContext";
+
 // 获取多语言文本的工具函数
 var getLocalizedText = function getLocalizedText(text) {
   var locale = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'zh-CN';
@@ -38,6 +40,7 @@ var renderSectionIcon = function renderSectionIcon(iconName, code) {
   return sectionIcons.default;
 };
 var SectionList = function SectionList(_ref) {
+  var _context$engine;
   var sections = _ref.sections,
     selectedSectionId = _ref.selectedSectionId,
     onSectionSelect = _ref.onSectionSelect,
@@ -48,9 +51,10 @@ var SectionList = function SectionList(_ref) {
     onLoadMore = _ref.onLoadMore;
   var scrollContainerRef = useRef(null);
   var loadingRef = useRef(null);
+  var context = useEngineContext();
 
   // 获取当前语言
-  var currentLocale = localStorage.getItem('umi_locale') || 'zh-CN';
+  var currentLocale = (context === null || context === void 0 || (_context$engine = context.engine) === null || _context$engine === void 0 || (_context$engine = _context$engine.props) === null || _context$engine === void 0 ? void 0 : _context$engine.locale) || localStorage.getItem('umi_locale') || 'en';
 
   // 滚动加载更多的处理函数
   var handleScroll = useCallback(function () {

package/es/components/ticketBooking/components/ProductDisplayAdapter/ProductDisplayAdapter.js

@@ -11,8 +11,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React, { useMemo, useRef, useState } from 'react';
-import { useSize } from 'ahooks';
+import React, { useMemo, useState } from 'react';
 import ProductSelect from "../../../../plus/productSelect";
 import List from "../../../list/List";
 import SkuCard from "../../../../plus/productSelect/ProductCard/SkuCard";
@@ -37,12 +36,10 @@ var ProductDisplayAdapter = function ProductDisplayAdapter(props) {
     className = props.className;
   var _config$displayMode = config.displayMode,
     displayMode = _config$displayMode === void 0 ? 'product-select' : _config$displayMode;
-  var listRef = useRef(null);
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     keyword = _useState2[0],
     setKeyword = _useState2[1];
-  var size = useSize(listRef);
 
   // 渲染 ProductSelect 模式
   var renderProductSelect = useMemo(function () {
@@ -66,6 +63,7 @@ var ProductDisplayAdapter = function ProductDisplayAdapter(props) {
         isStock: 0
       } : _ref$productListSetti;
     return /*#__PURE__*/React.createElement(ProductSelect, {
+      tabSwitchMode: "switch",
       dataSource: dataSource,
       layout: layout,
       onChange: onSelectProduct,
@@ -136,12 +134,11 @@ var ProductDisplayAdapter = function ProductDisplayAdapter(props) {
     console.log(tabData, 'tabData123');
     return /*#__PURE__*/React.createElement("div", {
       className: "sku-list-container ".concat(className || ''),
-      style: style,
-      ref: listRef
+      style: style
     }, /*#__PURE__*/React.createElement(List, {
       className: "sku-list",
       style: {
-        maxHeight: size === null || size === void 0 ? void 0 : size.height,
+        maxHeight: '100%',
         overflow: 'auto'
       },
       data: filteredData,
@@ -177,7 +174,7 @@ var ProductDisplayAdapter = function ProductDisplayAdapter(props) {
         }));
       }
     }));
-  }, [config.skuListConfig, dataSource, loading, currentProductId, onSelectProduct, emptyDescription, style, className, size === null || size === void 0 ? void 0 : size.height, _filteredList, tabData]);
+  }, [config.skuListConfig, dataSource, loading, currentProductId, onSelectProduct, emptyDescription, style, className, _filteredList, tabData]);
 
   // 根据配置渲染对应模式
   if (displayMode === 'sku-list') {