@pisell/private-materials 6.8.89 → 6.8.90

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

@@ -695,40 +695,38 @@ var Footer = function Footer(props) {
                 console.log('Payment result:', paymentResult);
                 setIsPaymentModalOpen(false);
                 if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'success' || (paymentResult === null || paymentResult === void 0 || (_paymentResult$respon = paymentResult.response) === null || _paymentResult$respon === void 0 || (_paymentResult$respon = _paymentResult$respon.data) === null || _paymentResult$respon === void 0 ? void 0 : _paymentResult$respon.payment_status) === 'paid') {
-                  var _window3;
                   console.log('Payment completed successfully');
-                  logger.addLog({
-                    title: 'Footer: setPaymentCallback success 调用清空购物车',
-                    metadata: {
-                      paymentResult: paymentResult
-                    }
-                  });
-                  (_window3 = window) === null || _window3 === void 0 || (_window3 = _window3.shopApi) === null || _window3 === void 0 || (_window3 = _window3.bookingTicket) === null || _window3 === void 0 || _window3.clearAllCart();
+                  // logger.addLog({
+                  //   title: 'Footer: setPaymentCallback success 调用清空购物车',
+                  //   metadata: {
+                  //     paymentResult
+                  //   },
+                  // });
+                  // (window as any)?.shopApi?.bookingTicket?.clearAllCart();
                   // 支付成功后关闭弹窗
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else if ((paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status) === 'cancelled') {
                   console.log('Payment cancelled');
                   if (res !== null && res !== void 0 && res.order_id) {
-                    var _window4;
-                    (_window4 = window) === null || _window4 === void 0 || (_window4 = _window4.shopApi) === null || _window4 === void 0 || (_window4 = _window4.booking) === null || _window4 === void 0 || _window4.voidBooking(res.order_id);
+                    var _window3;
+                    (_window3 = window) === null || _window3 === void 0 || (_window3 = _window3.shopApi) === null || _window3 === void 0 || (_window3 = _window3.booking) === null || _window3 === void 0 || _window3.voidBooking(res.order_id);
                   }
                   // 支付取消后关闭弹窗
                   setPaymentModalData(null);
                   setPaymentCallback(null);
                 } else {
-                  var _window5;
                   console.log('Payment status:', paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status);
                   // 其他状态也关闭弹窗
                   setPaymentModalData(null);
                   setPaymentCallback(null);
-                  logger.addLog({
-                    title: "Footer: setPaymentCallback ".concat(paymentResult === null || paymentResult === void 0 ? void 0 : paymentResult.status, " \u8C03\u7528\u6E05\u7A7A\u8D2D\u7269\u8F66"),
-                    metadata: {
-                      paymentResult: paymentResult
-                    }
-                  });
-                  (_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.shopApi) === null || _window5 === void 0 || (_window5 = _window5.bookingTicket) === null || _window5 === void 0 || _window5.clearAllCart();
+                  // logger.addLog({
+                  //   title: `Footer: setPaymentCallback ${paymentResult?.status} 调用清空购物车`,
+                  //   metadata: {
+                  //     paymentResult
+                  //   },
+                  // });
+                  // (window as any)?.shopApi?.bookingTicket?.clearAllCart();
                 }
               };
             });
@@ -881,7 +879,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, _window6, 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, _window4, callbackData, values, checkout, subtotal_info, res, isNeedDeposit, api;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
           case 0:
@@ -1016,7 +1014,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((_window6 = window) === null || _window6 === void 0 ? void 0 : _window6.shopApi, function (key, value) {
+                value: JSON.stringify((_window4 = window) === null || _window4 === void 0 ? void 0 : _window4.shopApi, function (key, value) {
                   if (typeof value === 'function') {
                     return 'function';
                   }
@@ -1815,7 +1813,7 @@ var Footer = function Footer(props) {
     clearAllScanListenersTaskQueue = _useScanManager2.clearAllScanListenersTaskQueue;
   // 清空所有内容并重置购物车
   var handleClearAllAndReset = function handleClearAllAndReset() {
-    var _window7;
+    var _window5;
     logger.addLog({
       title: 'Footer: PaymentOnClose reset 清空所有内容并重置购物车',
       metadata: {}
@@ -1885,7 +1883,7 @@ var Footer = function Footer(props) {
     //   }, 100);
     // }
     clearAllScanListenersTaskQueue();
-    (_window7 = window) === null || _window7 === void 0 || (_window7 = _window7.shopApi) === null || _window7 === void 0 || (_window7 = _window7.bookingTicket) === null || _window7 === void 0 || _window7.clearAllCart();
+    (_window5 = window) === null || _window5 === void 0 || (_window5 = _window5.shopApi) === null || _window5 === void 0 || (_window5 = _window5.bookingTicket) === null || _window5 === void 0 || _window5.clearAllCart();
   };
 
   // 购物车进入编辑状态

package/es/components/checkout/PaymentModal.js

@@ -1531,7 +1531,7 @@ var PaymentModal = function PaymentModal(_ref19) {
   // 重试处理函数（逻辑由用户自己实现）
   var handleRetry = /*#__PURE__*/function () {
     var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
-      var checkoutModule, res;
+      var checkoutModule, res, _res$response;
       return _regeneratorRuntime().wrap(function _callee15$(_context15) {
         while (1) switch (_context15.prev = _context15.next) {
           case 0:
@@ -1551,13 +1551,20 @@ var PaymentModal = function PaymentModal(_ref19) {
             res = _context15.sent;
             console.log(res);
             if (!res.success) {
-              _context15.next = 9;
+              _context15.next = 10;
               break;
             }
             setShowRetryModal(false);
             _context15.next = 9;
             return showSuccessToast === null || showSuccessToast === void 0 ? void 0 : showSuccessToast(res);
           case 9:
+            // 如果是整单支付，则调用 onClose 让外面清空购物车
+            if ((res === null || res === void 0 || (_res$response = res.response) === null || _res$response === void 0 || (_res$response = _res$response.data) === null || _res$response === void 0 ? void 0 : _res$response.payment_status) === 'paid') {
+              onClose === null || onClose === void 0 || onClose(true);
+            }
+            // if (res.data.payment_status)
+            // setShowRetryModal(false);
+          case 10:
           case "end":
             return _context15.stop();
         }

package/es/components/checkout/components/PaymentResultToast/index.js

@@ -158,9 +158,11 @@ var PaymentResultToast = /*#__PURE__*/memo(function (props) {
       }
     };
     document.addEventListener('mousedown', handleClickOutside);
+    document.addEventListener('pointerup', handleClickOutside);
     // 清理函数
     return function () {
       document.removeEventListener('mousedown', handleClickOutside);
+      document.removeEventListener('pointerup', handleClickOutside);
     };
   }, [clickOutsideToClose, visible, clearCountdown]);
 

package/es/plus/productSelect/ProductCard/SkuCard/components/CardWrapper/index.js

@@ -46,8 +46,14 @@ var CardWrapper = function CardWrapper(props) {
   }, [style, paddingX, paddingY, borderWidth, borderColor, isBorderVisible, radius, background, marginX, marginY]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(PREFIX, "__card-wrapper"), (skuStatusOverlayConfig === null || skuStatusOverlayConfig === void 0 ? void 0 : skuStatusOverlayConfig.isOpen) && "".concat(PREFIX, "__card-wrapper-overlay"), className),
-    onClick: function onClick() {
-      onCardClick === null || onCardClick === void 0 || onCardClick(dataSource);
+    onPointerUp: function onPointerUp() {
+      // 使用onClick 会有点击300ms延迟问题
+      // 使用onPointerUp的话 会触发到点击位置弹窗内 onClick 所以增加两次 requestAnimationFrame解决该问题
+      requestAnimationFrame(function () {
+        return requestAnimationFrame(function () {
+          return onCardClick === null || onCardClick === void 0 ? void 0 : onCardClick(dataSource);
+        });
+      });
     }
   }, /*#__PURE__*/React.createElement(CardPro, {
     isMedia: false,

package/es/plus/productSelect/ProductCard/index.js

@@ -120,7 +120,13 @@ export var ProductCard = /*#__PURE__*/memo(function (_ref) {
       selected: isSelected
     }),
     onPointerUp: function onPointerUp() {
-      onSelect === null || onSelect === void 0 || onSelect(item);
+      // 使用onClick 会有点击300ms延迟问题
+      // 使用onPointerUp的话 会触发到点击位置弹窗内 onClick 所以增加两次 requestAnimationFrame解决该问题
+      requestAnimationFrame(function () {
+        return requestAnimationFrame(function () {
+          return onSelect === null || onSelect === void 0 ? void 0 : onSelect(item);
+        });
+      });
     },
     "data-index": index,
     "data-item-index": index
@@ -131,7 +137,13 @@ export var ProductCard = /*#__PURE__*/memo(function (_ref) {
       height: imgHeight || 'auto'
     },
     onPointerUp: function onPointerUp() {
-      onSelectCover === null || onSelectCover === void 0 || onSelectCover(item);
+      // 使用onClick 会有点击300ms延迟问题
+      // 使用onPointerUp的话 会触发到点击位置弹窗内 onClick 所以增加两次 requestAnimationFrame解决该问题
+      requestAnimationFrame(function () {
+        return requestAnimationFrame(function () {
+          return onSelectCover === null || onSelectCover === void 0 ? void 0 : onSelectCover(item);
+        });
+      });
     }
   }, item.cover ? /*#__PURE__*/React.createElement("img", {
     loading: "lazy",
@@ -148,7 +160,13 @@ export var ProductCard = /*#__PURE__*/memo(function (_ref) {
   }, getTextCover(item.title))) : null, /*#__PURE__*/React.createElement("div", {
     className: "card-right",
     onPointerUp: function onPointerUp() {
-      onSelectInfo === null || onSelectInfo === void 0 || onSelectInfo(item);
+      // 使用onClick 会有点击300ms延迟问题
+      // 使用onPointerUp的话 会触发到点击位置弹窗内 onClick 所以增加两次 requestAnimationFrame解决该问题
+      requestAnimationFrame(function () {
+        return requestAnimationFrame(function () {
+          return onSelectInfo === null || onSelectInfo === void 0 ? void 0 : onSelectInfo(item);
+        });
+      });
     }
   }, !!isTitle ? /*#__PURE__*/React.createElement("div", {
     className: "title"

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

@@ -501,24 +501,17 @@ var Footer = (props) => {
         setIsPaymentModalOpen(true);
         setCheckoutLoading(false);
         setPaymentCallback(() => (paymentResult) => {
-          var _a3, _b3, _c3, _d2, _e2, _f2, _g2, _h2;
+          var _a3, _b3, _c3, _d2;
           console.log("Payment result:", paymentResult);
           setIsPaymentModalOpen(false);
           if ((paymentResult == null ? void 0 : paymentResult.status) === "success" || ((_b3 = (_a3 = paymentResult == null ? void 0 : paymentResult.response) == null ? void 0 : _a3.data) == null ? void 0 : _b3.payment_status) === "paid") {
             console.log("Payment completed successfully");
-            logger.addLog({
-              title: "Footer: setPaymentCallback success 调用清空购物车",
-              metadata: {
-                paymentResult
-              }
-            });
-            (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.bookingTicket) == null ? void 0 : _d2.clearAllCart();
             setPaymentModalData(null);
             setPaymentCallback(null);
           } else if ((paymentResult == null ? void 0 : paymentResult.status) === "cancelled") {
             console.log("Payment cancelled");
             if (res == null ? void 0 : res.order_id) {
-              (_f2 = (_e2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _e2.booking) == null ? void 0 : _f2.voidBooking(res.order_id);
+              (_d2 = (_c3 = window == null ? void 0 : window.shopApi) == null ? void 0 : _c3.booking) == null ? void 0 : _d2.voidBooking(res.order_id);
             }
             setPaymentModalData(null);
             setPaymentCallback(null);
@@ -526,13 +519,6 @@ var Footer = (props) => {
             console.log("Payment status:", paymentResult == null ? void 0 : paymentResult.status);
             setPaymentModalData(null);
             setPaymentCallback(null);
-            logger.addLog({
-              title: `Footer: setPaymentCallback ${paymentResult == null ? void 0 : paymentResult.status} 调用清空购物车`,
-              metadata: {
-                paymentResult
-              }
-            });
-            (_h2 = (_g2 = window == null ? void 0 : window.shopApi) == null ? void 0 : _g2.bookingTicket) == null ? void 0 : _h2.clearAllCart();
           }
         });
       } else {

package/lib/components/checkout/PaymentModal.js

@@ -1156,12 +1156,16 @@ var PaymentModal = ({
   const Toast = (0, import_materials.useToast)();
   const { nativePrint } = (0, import_printer.default)();
   const handleRetry = async () => {
+    var _a2, _b2;
     const checkoutModule = pisellos == null ? void 0 : pisellos.getModule("checkout");
     const res = await (checkoutModule == null ? void 0 : checkoutModule.manualSyncOrderAsync());
     console.log(res);
     if (res.success) {
       setShowRetryModal(false);
       await (showSuccessToast == null ? void 0 : showSuccessToast(res));
+      if (((_b2 = (_a2 = res == null ? void 0 : res.response) == null ? void 0 : _a2.data) == null ? void 0 : _b2.payment_status) === "paid") {
+        onClose == null ? void 0 : onClose(true);
+      }
     }
   };
   (0, import_react.useEffect)(() => {

package/lib/components/checkout/components/PaymentResultToast/index.js

@@ -153,8 +153,10 @@ var PaymentResultToast = (0, import_react.memo)((props) => {
       }
     };
     document.addEventListener("mousedown", handleClickOutside);
+    document.addEventListener("pointerup", handleClickOutside);
     return () => {
       document.removeEventListener("mousedown", handleClickOutside);
+      document.removeEventListener("pointerup", handleClickOutside);
     };
   }, [clickOutsideToClose, visible, clearCountdown]);
   const handleClose = (0, import_react.useCallback)(() => {

package/lib/plus/productSelect/ProductCard/SkuCard/components/CardWrapper/index.js

@@ -94,8 +94,8 @@ var CardWrapper = (props) => {
         (skuStatusOverlayConfig == null ? void 0 : skuStatusOverlayConfig.isOpen) && `${import_status.PREFIX}__card-wrapper-overlay`,
         className
       ),
-      onClick: () => {
-        onCardClick == null ? void 0 : onCardClick(dataSource);
+      onPointerUp: () => {
+        requestAnimationFrame(() => requestAnimationFrame(() => onCardClick == null ? void 0 : onCardClick(dataSource)));
       }
     },
     /* @__PURE__ */ import_react.default.createElement(

package/lib/plus/productSelect/ProductCard/index.js

@@ -132,7 +132,7 @@ var ProductCard = (0, import_react.memo)(
           selected: isSelected
         }),
         onPointerUp: () => {
-          onSelect == null ? void 0 : onSelect(item);
+          requestAnimationFrame(() => requestAnimationFrame(() => onSelect == null ? void 0 : onSelect(item)));
         },
         "data-index": index,
         "data-item-index": index
@@ -146,7 +146,7 @@ var ProductCard = (0, import_react.memo)(
             height: imgHeight || "auto"
           },
           onPointerUp: () => {
-            onSelectCover == null ? void 0 : onSelectCover(item);
+            requestAnimationFrame(() => requestAnimationFrame(() => onSelectCover == null ? void 0 : onSelectCover(item)));
           }
         },
         item.cover ? /* @__PURE__ */ import_react.default.createElement(
@@ -164,7 +164,7 @@ var ProductCard = (0, import_react.memo)(
         {
           className: "card-right",
           onPointerUp: () => {
-            onSelectInfo == null ? void 0 : onSelectInfo(item);
+            requestAnimationFrame(() => requestAnimationFrame(() => onSelectInfo == null ? void 0 : onSelectInfo(item)));
           }
         },
         !!isTitle ? /* @__PURE__ */ import_react.default.createElement("div", { className: "title" }, item.title) : null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.8.89",
+  "version": "6.8.90",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",

package/es/pro/skuDetailModal/index.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import { SkuDetailModalProps, SkuDetailModalRef } from './types';
-import './index.less';
-declare const _default: React.ForwardRefExoticComponent<SkuDetailModalProps & React.RefAttributes<SkuDetailModalRef>>;
-export default _default;

package/lib/pro/skuDetailModal/index.d.ts

@@ -1,5 +0,0 @@
-import React from 'react';
-import { SkuDetailModalProps, SkuDetailModalRef } from './types';
-import './index.less';
-declare const _default: React.ForwardRefExoticComponent<SkuDetailModalProps & React.RefAttributes<SkuDetailModalRef>>;
-export default _default;