@pisell/private-materials 6.4.1 → 6.4.3

package/es/components/checkout/PaymentModal.js

@@ -46,6 +46,7 @@ import { WALLET_PASS_CODE_ARRAY, WALLET_PASS_CODE_MAP } from "./constants";
 import { cloneDeep } from 'lodash';
 import { getShopWalletPassId } from "./utils";
 import usePaymentLogger from "./hooks/usePaymentLogger";
+import { Button } from 'antd';
 
 // Checkout 模块的事件常量
 var CheckoutHooks = {
@@ -82,7 +83,8 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
     onShowCashPaymentChange = _ref.onShowCashPaymentChange,
     showSuccessToast = _ref.showSuccessToast,
     _ref$dynamicMaxHeight = _ref.dynamicMaxHeight,
-    dynamicMaxHeight = _ref$dynamicMaxHeight === void 0 ? '600px' : _ref$dynamicMaxHeight;
+    dynamicMaxHeight = _ref$dynamicMaxHeight === void 0 ? '600px' : _ref$dynamicMaxHeight,
+    onOrderSyncFailed = _ref.onOrderSyncFailed;
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
   var pisellos = utils.pisellos,
@@ -450,7 +452,15 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
               var _Toast$hide;
               Toast === null || Toast === void 0 || (_Toast$hide = Toast.hide) === null || _Toast$hide === void 0 || _Toast$hide.call(Toast);
             } else {
-              Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
+              var _Toast$hide2;
+              Toast === null || Toast === void 0 || (_Toast$hide2 = Toast.hide) === null || _Toast$hide2 === void 0 || _Toast$hide2.call(Toast);
+              // 调用失败回调，让父组件处理弹窗显示
+              if (onOrderSyncFailed) {
+                onOrderSyncFailed();
+              } else {
+                // 兜底显示 Toast
+                Toast === null || Toast === void 0 || Toast.fail(locales.getText('pisell2.checkout.order-sync-failed') || 'Order sync failed');
+              }
             }
           });
 
@@ -739,9 +749,7 @@ var PaymentContent = /*#__PURE__*/forwardRef(function (_ref, ref) {
             logger === null || logger === void 0 || logger.addLog({
               type: 'info',
               title: 'handleSelectWalletChange checkoutModule updateVoucherPaymentItemsAsync',
-              metadata: {
-                voucherItems: voucherItems
-              }
+              metadata: {}
             });
             _context8.next = 6;
             return checkoutModule.updateVoucherPaymentItemsAsync(voucherItems);
@@ -1153,8 +1161,50 @@ var PaymentModal = function PaymentModal(_ref16) {
     _useState28 = _slicedToArray(_useState27, 2),
     windowHeight = _useState28[0],
     setWindowHeight = _useState28[1];
+  var _useState29 = useState(false),
+    _useState30 = _slicedToArray(_useState29, 2),
+    showRetryModal = _useState30[0],
+    setShowRetryModal = _useState30[1];
   var Toast = useToast();
 
+  // 重试处理函数（逻辑由用户自己实现）
+  var handleRetry = /*#__PURE__*/function () {
+    var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var checkoutModule, res;
+      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
+          case 0:
+            // TODO: 用户在这里实现重试逻辑
+            // console.log('重试按钮被点击，请在这里添加重试逻辑');
+            // 示例：重试成功后关闭弹窗
+            // try {
+            //   await checkoutModule.manualSyncOrderAsync();
+            //   setShowRetryModal(false); // 成功后关闭弹窗
+            // } catch (error) {
+            //   // 失败保持弹窗打开，允许继续重试
+            // }
+            checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
+            _context13.next = 3;
+            return checkoutModule === null || checkoutModule === void 0 ? void 0 : checkoutModule.manualSyncOrderAsync();
+          case 3:
+            res = _context13.sent;
+            console.log(res);
+            if (res.success) {
+              setShowRetryModal(false);
+              showSuccessToast === null || showSuccessToast === void 0 || showSuccessToast(res);
+              // setShowRetryModal(false);
+            }
+          case 6:
+          case "end":
+            return _context13.stop();
+        }
+      }, _callee13);
+    }));
+    return function handleRetry() {
+      return _ref18.apply(this, arguments);
+    };
+  }();
+
   // 初始化和监听窗口高度变化
   useEffect(function () {
     var updateHeight = function updateHeight() {
@@ -1198,28 +1248,28 @@ var PaymentModal = function PaymentModal(_ref16) {
   }, []);
 
   // 订单备注相关状态
-  var _useState29 = useState(false),
-    _useState30 = _slicedToArray(_useState29, 2),
-    noteModalOpen = _useState30[0],
-    setNoteModalOpen = _useState30[1];
-  var _useState31 = useState(''),
+  var _useState31 = useState(false),
     _useState32 = _slicedToArray(_useState31, 2),
-    orderNote = _useState32[0],
-    setOrderNote = _useState32[1];
-  var _useState33 = useState('payment-content'),
+    noteModalOpen = _useState32[0],
+    setNoteModalOpen = _useState32[1];
+  var _useState33 = useState(''),
     _useState34 = _slicedToArray(_useState33, 2),
-    noteModalSource = _useState34[0],
-    setNoteModalSource = _useState34[1];
+    orderNote = _useState34[0],
+    setOrderNote = _useState34[1];
+  var _useState35 = useState('payment-content'),
+    _useState36 = _slicedToArray(_useState35, 2),
+    noteModalSource = _useState36[0],
+    setNoteModalSource = _useState36[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
-    var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13(noteValue) {
+    var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14(noteValue) {
       var checkoutModule, orderId, _checkoutModule$editO, _checkoutModule, _checkoutModule$updat;
-      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
           case 0:
             if (!(noteModalSource === 'payment-result-toast')) {
-              _context13.next = 6;
+              _context14.next = 6;
               break;
             }
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
@@ -1230,15 +1280,15 @@ var PaymentModal = function PaymentModal(_ref16) {
               Toast === null || Toast === void 0 || Toast.success(locales.getText('pisell2.checkout.order-note.updated-successfully'));
             }
             setNoteModalOpen(false);
-            return _context13.abrupt("return");
+            return _context14.abrupt("return");
           case 6:
-            _context13.prev = 6;
+            _context14.prev = 6;
             _checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
             if (!_checkoutModule) {
-              _context13.next = 13;
+              _context14.next = 13;
               break;
             }
-            _context13.next = 11;
+            _context14.next = 11;
             return (_checkoutModule$updat = _checkoutModule.updateOrderNoteAsync) === null || _checkoutModule$updat === void 0 ? void 0 : _checkoutModule$updat.call(_checkoutModule, noteValue);
           case 11:
             setOrderNote(noteValue);
@@ -1264,38 +1314,38 @@ var PaymentModal = function PaymentModal(_ref16) {
               console.log('Note added from payment content');
               // 在支付内容中打开的，执行常规处理逻辑
             }
-            _context13.next = 21;
+            _context14.next = 21;
             break;
           case 17:
-            _context13.prev = 17;
-            _context13.t0 = _context13["catch"](6);
-            console.error('Failed to update order note:', _context13.t0);
+            _context14.prev = 17;
+            _context14.t0 = _context14["catch"](6);
+            console.error('Failed to update order note:', _context14.t0);
             Toast === null || Toast === void 0 || Toast.error(locales.getText('pisell2.checkout.order-note.update-failed'));
           case 21:
             setNoteModalOpen(false);
           case 22:
           case "end":
-            return _context13.stop();
+            return _context14.stop();
         }
-      }, _callee13, null, [[6, 17]]);
+      }, _callee14, null, [[6, 17]]);
     }));
     return function handleNoteConfirm(_x13) {
-      return _ref18.apply(this, arguments);
+      return _ref19.apply(this, arguments);
     };
   }();
   var handleNoteDelete = /*#__PURE__*/function () {
-    var _ref19 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+    var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
       var checkoutModule, _checkoutModule$updat2;
-      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
           case 0:
-            _context14.prev = 0;
+            _context15.prev = 0;
             checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
             if (!checkoutModule) {
-              _context14.next = 7;
+              _context15.next = 7;
               break;
             }
-            _context14.next = 5;
+            _context15.next = 5;
             return (_checkoutModule$updat2 = checkoutModule.updateOrderNoteAsync) === null || _checkoutModule$updat2 === void 0 ? void 0 : _checkoutModule$updat2.call(checkoutModule, '');
           case 5:
             setOrderNote('');
@@ -1311,23 +1361,23 @@ var PaymentModal = function PaymentModal(_ref16) {
                 }
               });
             }
-            _context14.next = 14;
+            _context15.next = 14;
             break;
           case 10:
-            _context14.prev = 10;
-            _context14.t0 = _context14["catch"](0);
-            console.error('Failed to delete order note:', _context14.t0);
+            _context15.prev = 10;
+            _context15.t0 = _context15["catch"](0);
+            console.error('Failed to delete order note:', _context15.t0);
             Toast === null || Toast === void 0 || Toast.error(locales.getText('pisell2.checkout.order-note.delete-failed'));
           case 14:
             setNoteModalOpen(false);
           case 15:
           case "end":
-            return _context14.stop();
+            return _context15.stop();
         }
-      }, _callee14, null, [[0, 10]]);
+      }, _callee15, null, [[0, 10]]);
     }));
     return function handleNoteDelete() {
-      return _ref19.apply(this, arguments);
+      return _ref20.apply(this, arguments);
     };
   }();
   var handleNoteCancel = function handleNoteCancel() {
@@ -1429,31 +1479,31 @@ var PaymentModal = function PaymentModal(_ref16) {
       setOrderNote(data.order_info.order_note);
     }
   }, [data]);
-  var _useState35 = useState(false),
-    _useState36 = _slicedToArray(_useState35, 2),
-    isLocalOrderCreated = _useState36[0],
-    setIsLocalOrderCreated = _useState36[1];
+  var _useState37 = useState(false),
+    _useState38 = _slicedToArray(_useState37, 2),
+    isLocalOrderCreated = _useState38[0],
+    setIsLocalOrderCreated = _useState38[1];
 
   // 初始化checkout数据
   useEffect(function () {
     var initCheckoutData = /*#__PURE__*/function () {
-      var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+      var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
         var checkout, _newData$subtotal_inf, shop_wallet_pass_id, newData, _orderInfo, _data$subtotal_info, _orderInfo2;
-        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
-          while (1) switch (_context15.prev = _context15.next) {
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _context15.prev = 0;
+              _context16.prev = 0;
               // 获取 checkout 模块并处理订单数据
               checkout = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (!(checkout && data && !isLocalOrderCreated)) {
-                _context15.next = 19;
+                _context16.next = 19;
                 break;
               }
               setIsLocalOrderCreated(true);
-              _context15.next = 6;
+              _context16.next = 6;
               return getShopWalletPassId(interaction);
             case 6:
-              shop_wallet_pass_id = _context15.sent;
+              shop_wallet_pass_id = _context16.sent;
               checkout.setOtherParams({
                 is_price_include_tax: getData('is_price_include_tax'),
                 tax_rate: getData('tax_rate') || '10',
@@ -1469,7 +1519,7 @@ var PaymentModal = function PaymentModal(_ref16) {
               console.time('initCheckoutData');
               newData = cloneDeep(data); // setTotalAmount(newData.total.expectAmount);
               // 先往 checkout 解决方案推送一条 local 数据
-              _context15.next = 12;
+              _context16.next = 12;
               return checkout.createLocalOrderAsync({
                 orderData: newData.order_info,
                 cartSummary: (_newData$subtotal_inf = newData.subtotal_info) === null || _newData$subtotal_inf === void 0 ? void 0 : _newData$subtotal_inf.subTotalList,
@@ -1562,20 +1612,20 @@ var PaymentModal = function PaymentModal(_ref16) {
                 // 可以在这里执行同步完成后的业务逻辑
                 // 比如：通知其他系统、更新UI状态等
               });
-              _context15.next = 30;
+              _context16.next = 30;
               break;
             case 19:
               if (!isLocalOrderCreated) {
-                _context15.next = 30;
+                _context16.next = 30;
                 break;
               }
               // // 如果本地订单已创建，这时候还更新了 data，则需要销毁当前的订单数据，然后更新新的订单数据了
               console.log('🔄 PaymentModal: data changed, updating checkout data...');
               setIsLocalOrderCreated(false);
-              _context15.next = 24;
+              _context16.next = 24;
               return checkout.cancelCurrentOrderAsync();
             case 24:
-              _context15.next = 26;
+              _context16.next = 26;
               return checkout.createLocalOrderAsync({
                 orderData: data === null || data === void 0 ? void 0 : data.order_info,
                 cartSummary: data === null || data === void 0 || (_data$subtotal_info = data.subtotal_info) === null || _data$subtotal_info === void 0 ? void 0 : _data$subtotal_info.subTotalList,
@@ -1591,20 +1641,20 @@ var PaymentModal = function PaymentModal(_ref16) {
               setOrderInfo(_orderInfo2);
               setIsLocalOrderCreated(true);
             case 30:
-              _context15.next = 35;
+              _context16.next = 35;
               break;
             case 32:
-              _context15.prev = 32;
-              _context15.t0 = _context15["catch"](0);
-              console.error('Failed to initialize checkout data:', _context15.t0);
+              _context16.prev = 32;
+              _context16.t0 = _context16["catch"](0);
+              console.error('Failed to initialize checkout data:', _context16.t0);
             case 35:
             case "end":
-              return _context15.stop();
+              return _context16.stop();
           }
-        }, _callee15, null, [[0, 32]]);
+        }, _callee16, null, [[0, 32]]);
       }));
       return function initCheckoutData() {
-        return _ref20.apply(this, arguments);
+        return _ref21.apply(this, arguments);
       };
     }();
     if (data) {
@@ -1631,11 +1681,11 @@ var PaymentModal = function PaymentModal(_ref16) {
 
     // 通用回调函数
     var handleDetailsClick = /*#__PURE__*/function () {
-      var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+      var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
         var _context$appHelper2;
         var _context$appHelper$ut5, isTerminal, isWebPos, checkout, orderId;
-        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
-          while (1) switch (_context16.prev = _context16.next) {
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.next) {
             case 0:
               setTimeout(function () {
                 // 关闭支付结果toast
@@ -1645,15 +1695,15 @@ var PaymentModal = function PaymentModal(_ref16) {
               }, 0);
               _context$appHelper$ut5 = (_context$appHelper2 = context.appHelper) === null || _context$appHelper2 === void 0 ? void 0 : _context$appHelper2.utils, isTerminal = _context$appHelper$ut5.isTerminal, isWebPos = _context$appHelper$ut5.isWebPos;
               if (!(isTerminal !== null && isTerminal !== void 0 && isTerminal())) {
-                _context16.next = 8;
+                _context17.next = 8;
                 break;
               }
               checkout = pisellos.getModule('checkout');
-              _context16.next = 6;
+              _context17.next = 6;
               return checkout.getCurrentOrderId();
             case 6:
-              orderId = _context16.sent;
-              return _context16.abrupt("return", interaction.utils.postMessageToApp({
+              orderId = _context17.sent;
+              return _context17.abrupt("return", interaction.utils.postMessageToApp({
                 module: 'booking',
                 key: 'view_order',
                 data: {
@@ -1663,46 +1713,46 @@ var PaymentModal = function PaymentModal(_ref16) {
               }));
             case 8:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16);
+        }, _callee17);
       }));
       return function handleDetailsClick() {
-        return _ref21.apply(this, arguments);
+        return _ref22.apply(this, arguments);
       };
     }();
     var handlePrintReceiptClick = /*#__PURE__*/function () {
-      var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+      var _ref23 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
         var checkoutModule, data, isSynced, orderId, params;
-        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-          while (1) switch (_context17.prev = _context17.next) {
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
             case 0:
               checkoutModule = pisellos === null || pisellos === void 0 ? void 0 : pisellos.getModule('checkout');
               if (checkoutModule) {
-                _context17.next = 3;
+                _context18.next = 3;
                 break;
               }
-              return _context17.abrupt("return");
+              return _context18.abrupt("return");
             case 3:
-              _context17.next = 5;
+              _context18.next = 5;
               return checkoutModule.isCurrentOrderSynced();
             case 5:
-              isSynced = _context17.sent;
+              isSynced = _context18.sent;
               if (isSynced) {
-                _context17.next = 12;
+                _context18.next = 12;
                 break;
               }
-              _context17.next = 9;
+              _context18.next = 9;
               return checkoutModule.manualSyncOrderAsync();
             case 9:
-              data = _context17.sent;
-              _context17.next = 16;
+              data = _context18.sent;
+              _context18.next = 16;
               break;
             case 12:
-              _context17.next = 14;
+              _context18.next = 14;
               return checkoutModule.getCurrentOrderId();
             case 14:
-              orderId = _context17.sent;
+              orderId = _context18.sent;
               data = {
                 orderId: orderId
               };
@@ -1728,12 +1778,12 @@ var PaymentModal = function PaymentModal(_ref16) {
               }
             case 17:
             case "end":
-              return _context17.stop();
+              return _context18.stop();
           }
-        }, _callee17);
+        }, _callee18);
       }));
       return function handlePrintReceiptClick() {
-        return _ref22.apply(this, arguments);
+        return _ref23.apply(this, arguments);
       };
     }();
     var handleRetryClick = function handleRetryClick() {
@@ -1998,7 +2048,10 @@ var PaymentModal = function PaymentModal(_ref16) {
     moduleConfig: moduleConfig,
     onShowCashPaymentChange: handleShowCashPaymentChange,
     showSuccessToast: showSuccessToast,
-    dynamicMaxHeight: dynamicMaxHeight
+    dynamicMaxHeight: dynamicMaxHeight,
+    onOrderSyncFailed: function onOrderSyncFailed() {
+      return setShowRetryModal(true);
+    }
   })), noteModalOpen && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(NoteModal, {
     open: noteModalOpen,
     title: locales.getText('pisell2.text.add-order-notes'),
@@ -2007,7 +2060,36 @@ var PaymentModal = function PaymentModal(_ref16) {
     onDelete: handleNoteDelete,
     onCancel: handleNoteCancel
     // {...({ zIndex: 2000 } as any)}
-  })), document.body));
+  })), document.body), /*#__PURE__*/React.createElement(PisellContainer, {
+    renderType: "modal",
+    props: {
+      open: showRetryModal,
+      title: locales.getText('pisell2.checkout.tips'),
+      footer: null,
+      closable: false,
+      maskClosable: false,
+      keyboard: false,
+      onCancel: function onCancel() {} // 禁用关闭
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      textAlign: 'center',
+      padding: '20px'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: '16px',
+      fontSize: '16px'
+    }
+  }, locales.getText('pisell2.checkout.sync-retry-hint') || '请点击重试按钮重新同步订单'), /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    size: "large",
+    onClick: handleRetry,
+    style: {
+      width: '100%',
+      marginTop: '80px'
+    }
+  }, locales.getText('retry') || '重试'))));
 };
 
 // 导出类型供外部使用

package/es/components/checkout/components/AdditionalModule/index.less

@@ -1,4 +1,6 @@
 .additional-module {
+  padding-bottom: 16px; // 底部间距
+
   // 标题样式
   &-title {
     font-size: 24px;

package/es/components/checkout/hooks/useWalletPass.js

@@ -417,10 +417,7 @@ export var useWalletPass = function useWalletPass(props) {
       logger === null || logger === void 0 || logger.addLog({
         type: 'info',
         title: 'useWalletPass_onOrderCreated onSelectChange 开始调用',
-        metadata: {
-          recommendList: recommendList,
-          select: _select
-        }
+        metadata: {}
       });
       // 设置默认选中钱包
       onSelectChange === null || onSelectChange === void 0 || onSelectChange(_select);
@@ -571,10 +568,7 @@ export var useWalletPass = function useWalletPass(props) {
     logger === null || logger === void 0 || logger.addLog({
       type: 'info',
       title: 'useWalletPass_handleFetchUserIdentificationCodes onSelectChange 开始调用',
-      metadata: {
-        prepare_payments: prepare_payments,
-        select: select
-      }
+      metadata: {}
     });
     onSelectChange === null || onSelectChange === void 0 || onSelectChange(select);
     fetchUserIdentificationCodes({
@@ -740,13 +734,18 @@ export var useWalletPass = function useWalletPass(props) {
     }
   });
   var handleSelectDiscount = useMemoizedFn(function (value, option) {
-    var _pisellos$effects2;
+    var _detail$discountList, _pisellos$effects2;
     setLoading(true);
     var isSelected = value.includes(option.id);
     var detail = shopDiscount.setDiscountSelected({
       discountId: option.id,
       isSelected: isSelected
     });
+    if (!(detail !== null && detail !== void 0 && (_detail$discountList = detail.discountList) !== null && _detail$discountList !== void 0 && (_detail$discountList = _detail$discountList.find(function (item) {
+      return item.id === option.id;
+    })) !== null && _detail$discountList !== void 0 && _detail$discountList.isSelected)) {
+      setLoading(false);
+    }
 
     // 保持初始顺序设置折扣列表
     var sortedDiscountList = sortDiscountListWithInitialOrder(detail.discountList);

package/es/components/checkout/index.less

@@ -91,7 +91,6 @@
     .additional-module-container {
       flex-shrink: 0; // 不允许缩小
       min-height: 60px; // 确保额外模块有足够的显示空间
-      padding-bottom: 16px; // 底部间距
       position: absolute;
       bottom: 0;
       width: calc(100% - 80px);

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

@@ -147,6 +147,9 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.sync-retry-hint': string;
+        'pisell2.checkout.tips': string;
+        retry: string;
     };
     'zh-CN': {
         'order.total': string;
@@ -296,6 +299,9 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.sync-retry-hint': string;
+        'pisell2.checkout.tips': string;
+        retry: string;
     };
     'zh-HK': {
         'order.total': string;
@@ -445,6 +451,9 @@ declare const _default: {
         'wallet-pass-module-customer-name-walk-in': string;
         'pisell2.amount-summary.amount-cannot-be-zero': string;
         'pisell2.checkout.order-sync-failed': string;
+        'pisell2.checkout.sync-retry-hint': string;
+        'pisell2.checkout.tips': string;
+        retry: string;
     };
 };
 export default _default;

package/es/components/checkout/locales.js

@@ -192,7 +192,10 @@ export default {
     // Amount validation errors
     'pisell2.amount-summary.amount-cannot-be-zero': 'The amount cannot be 0',
     // Order sync errors
-    'pisell2.checkout.order-sync-failed': 'Order sync failed, please check your network'
+    'pisell2.checkout.order-sync-failed': 'Order sync failed, please check your network',
+    'pisell2.checkout.sync-retry-hint': 'Network error, please click the retry button to resync the order',
+    'pisell2.checkout.tips': 'Tips',
+    'retry': 'Retry'
   },
   'zh-CN': {
     // Order and Payment
@@ -390,7 +393,10 @@ export default {
     // Amount validation errors
     'pisell2.amount-summary.amount-cannot-be-zero': '金额不能为0',
     // Order sync errors
-    'pisell2.checkout.order-sync-failed': '订单同步失败，请检查网络'
+    'pisell2.checkout.order-sync-failed': '订单同步失败，请检查网络',
+    'pisell2.checkout.sync-retry-hint': '网络异常，请点击重试按钮重新同步订单',
+    'pisell2.checkout.tips': '提示',
+    'retry': '重试'
   },
   'zh-HK': {
     // Order and Payment
@@ -588,6 +594,9 @@ export default {
     // Amount validation errors
     'pisell2.amount-summary.amount-cannot-be-zero': '金額不能為0',
     // Order sync errors
-    'pisell2.checkout.order-sync-failed': '訂單同步失敗，請檢查網絡'
+    'pisell2.checkout.order-sync-failed': '訂單同步失敗，請檢查網絡',
+    'pisell2.checkout.sync-retry-hint': '網絡異常，請點擊重試按鈕重新同步訂單',
+    'pisell2.checkout.tips': '提示',
+    'retry': '重試'
   }
 };

package/es/plus/productSelect/index.js

@@ -88,7 +88,7 @@ var index = function index(_ref) {
     return createGridComponents(layout);
   }, [layout]);
   var context = useEngineContext();
-  useEffect(function () {
+  useLayoutEffect(function () {
     var _context$appHelper$ut;
     locales.init(localeTexts, ((_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 || (_context$appHelper$ut = _context$appHelper$ut.storage) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.get('umi_locale')) || 'en');
   }, []);