@pisell/private-materials 6.8.21 → 6.8.23

package/es/components/booking/components/footer/index.js

@@ -699,10 +699,12 @@ var Footer = function Footer(props) {
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else {
+                  var _window7;
                   console.log('Payment status:', paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status);
                   // 其他状态也关闭弹窗
                   setPaymentModalData(null);
                   setPaymentCallback(null);
+                  (_window7 = window) === null || _window7 === void 0 || (_window7 = _window7.shopApi) === null || _window7 === void 0 || (_window7 = _window7.bookingTicket) === null || _window7 === void 0 || _window7.clearAllCart();
                 }
               };
             });
@@ -855,7 +857,7 @@ var Footer = function Footer(props) {
   var handleSave = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(_ref6) {
       var _state$bookingConfig6, _state$service$value2, _state$client3;
-      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isToastMode, isHasDayProducts, hasUnspecifiedHolderProduct, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window7, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
+      var type, _ref6$messageShow, messageShow, _ref6$noSubmit, noSubmit, isToastMode, isHasDayProducts, hasUnspecifiedHolderProduct, _setLoading, _getApis, createBooking, editBooking, editApi, createApi, saveOtherValue, _state$onSave, _store$getState, _window8, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -984,7 +986,7 @@ var Footer = function Footer(props) {
                 value: store === null || store === void 0 || (_store$getState = store.getState) === null || _store$getState === void 0 || (_store$getState = _store$getState.call(store)) === null || _store$getState === void 0 || (_store$getState = _store$getState.global) === null || _store$getState === void 0 || (_store$getState = _store$getState.globalConfig) === null || _store$getState === void 0 ? void 0 : _store$getState.id
               }, {
                 key: 'shopApi',
-                value: JSON.stringify((_window7 = window) === null || _window7 === void 0 ? void 0 : _window7.shopApi, function (key, value) {
+                value: JSON.stringify((_window8 = window) === null || _window8 === void 0 ? void 0 : _window8.shopApi, function (key, value) {
                   if (typeof value === 'function') {
                     return 'function';
                   }
@@ -1783,15 +1785,8 @@ var Footer = function Footer(props) {
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _shopDiscount$clear;
+    var _shopDiscount$clear, _window9;
     clearAllScanListenersTaskQueue();
-    // 清空服务项目
-    dispatch({
-      type: 'setService',
-      payload: {
-        value: []
-      }
-    });
 
     // 清空附加服务
     dispatch({
@@ -1842,10 +1837,14 @@ var Footer = function Footer(props) {
     // 清空商品券
     shopDiscount === null || shopDiscount === void 0 || (_shopDiscount$clear = shopDiscount.clear) === null || _shopDiscount$clear === void 0 || _shopDiscount$clear.call(shopDiscount);
     setEditOrderId(0);
-    setTimeout(function () {
-      var _window8;
-      (_window8 = window) === null || _window8 === void 0 || (_window8 = _window8.shopApi) === null || _window8 === void 0 || (_window8 = _window8.bookingTicket) === null || _window8 === void 0 || _window8.clearAllCart();
-    }, 0);
+    (_window9 = window) === null || _window9 === void 0 || (_window9 = _window9.shopApi) === null || _window9 === void 0 || (_window9 = _window9.bookingTicket) === null || _window9 === void 0 || _window9.clearAllCart();
+    // 清空服务项目
+    dispatch({
+      type: 'setService',
+      payload: {
+        value: []
+      }
+    });
   };
 
   // 购物车进入编辑状态
@@ -1989,7 +1988,7 @@ var Footer = function Footer(props) {
     onChangeOrderNote: handleNoteConfirm,
     onDeleteOrderNote: handleNoteDelete,
     onClose: function onClose(reset) {
-      // console.log('🔄 Footer: Closing PaymentModal');
+      console.log('🔄 Footer: Closing PaymentModal', reset);
       setIsPaymentModalOpen(false);
       setPaymentModalData(null);
       setPaymentCallback(null);
@@ -2005,9 +2004,7 @@ var Footer = function Footer(props) {
       //   handleClearAllAndReset();
       // }
       if (reset) {
-        setTimeout(function () {
-          handleClearAllAndReset();
-        }, 0);
+        handleClearAllAndReset();
       }
       // setPaymentModalData(null);
       // setPaymentCallback(null);

package/lib/components/booking/components/footer/index.js

@@ -500,7 +500,7 @@ var Footer = (props) => {
         setIsPaymentModalOpen(true);
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
-          var _a3, _b3, _c3, _d2;
+          var _a3, _b3, _c3, _d2, _e2, _f2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
           if ((paymentResult == null ? void 0 : paymentResult.status) === "success") {
@@ -519,6 +519,7 @@ var Footer = (props) => {
             console.log("Payment status:", paymentResult == null ? void 0 : paymentResult.status);
             setPaymentModalData(null);
             setPaymentCallback(null);
+            (_f2 = (_e2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _e2.bookingTicket) == null ? void 0 : _f2.clearAllCart();
           }
         });
       } else {
@@ -1286,14 +1287,8 @@ var Footer = (props) => {
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const { clearAllScanListenersTaskQueue } = (0, import_useScanManager.default)();
   const handleClearAllAndReset = () => {
-    var _a2;
+    var _a2, _b2, _c2;
     clearAllScanListenersTaskQueue();
-    dispatch({
-      type: "setService",
-      payload: {
-        value: []
-      }
-    });
     dispatch({
       type: "setAddons",
       payload: {
@@ -1326,10 +1321,13 @@ var Footer = (props) => {
     });
     (_a2 = shopDiscount == null ? void 0 : shopDiscount.clear) == null ? void 0 : _a2.call(shopDiscount);
     setEditOrderId(0);
-    setTimeout(() => {
-      var _a3, _b2;
-      (_b2 = (_a3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _a3.bookingTicket) == null ? void 0 : _b2.clearAllCart();
-    }, 0);
+    (_c2 = (_b2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _b2.bookingTicket) == null ? void 0 : _c2.clearAllCart();
+    dispatch({
+      type: "setService",
+      payload: {
+        value: []
+      }
+    });
   };
   const setEditCartMode = (order_id2, payData, closeModal = false) => {
     setEditOrderId(order_id2);
@@ -1460,6 +1458,7 @@ var Footer = (props) => {
       onChangeOrderNote: handleNoteConfirm,
       onDeleteOrderNote: handleNoteDelete,
       onClose: (reset) => {
+        console.log("🔄 Footer: Closing PaymentModal", reset);
         setIsPaymentModalOpen(false);
         setPaymentModalData(null);
         setPaymentCallback(null);
@@ -1471,9 +1470,7 @@ var Footer = (props) => {
           }
         });
         if (reset) {
-          setTimeout(() => {
-            handleClearAllAndReset();
-          }, 0);
+          handleClearAllAndReset();
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.8.21",
+  "version": "6.8.23",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,10 +76,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
-    "@pisell/date-picker": "3.0.7",
-    "@pisell/materials": "6.8.6",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.2"
+    "@pisell/utils": "3.0.2",
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/materials": "6.8.6"
   },
   "peerDependencies": {
     "react": "^18.0.0",