@pisell/private-materials 6.7.8 → 6.8.1

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

@@ -17,6 +17,7 @@
   margin: 0 !important;
   pointer-events: none !important; // 让Toast Modal Wrap点击穿透
 
+  // 非 mask 模式下的样式
   .ant-modal {
     position: static !important;
     top: auto !important;
@@ -32,11 +33,47 @@
   }
 }
 
+// mask 模式下的全局样式（Modal 渲染到 body）
+.toast-modal-wrap-with-mask {
+  position: fixed !important;
+  top: 0 !important;
+  left: 0 !important;
+  right: 0 !important;
+  bottom: 0 !important;
+  width: 100vw !important;
+  height: 100vh !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  pointer-events: auto !important; // mask 模式下需要响应点击
+
+  .ant-modal-mask {
+    position: fixed !important;
+    top: 0 !important;
+    left: 0 !important;
+    right: 0 !important;
+    bottom: 0 !important;
+    width: 100vw !important;
+    height: 100vh !important;
+  }
+
+  .ant-modal {
+    position: relative !important;
+    top: auto !important;
+    left: auto !important;
+    transform: none !important;
+    margin: 0 !important;
+    padding: 0 !important;
+    width: auto !important;
+    max-width: none !important;
+    pointer-events: auto !important; // Modal 内容可以响应点击
+  }
+}
+
 // Toast容器样式 - 用于多实例定位
 [data-toast-id] {
   z-index: 1000;
   position: fixed !important;
-  left: 96px !important;
   /* 注意：不设置bottom的!important，让JavaScript可以动态更新 */
   /* 移除强制的z-index设置，让Toast使用默认层级 */
   pointer-events: none !important; // 让Toast容器本身点击穿透
@@ -45,6 +82,23 @@
   width: auto !important;
   height: auto !important;
 
+  // 非 mask 模式下使用左下角定位
+  &:not([data-mask="true"]) {
+    left: 96px !important;
+  }
+
+  // mask 模式下，Modal 会渲染到 body，容器只作为占位符
+  // 不需要设置定位，因为 Modal 已经独立渲染
+  &[data-mask="true"] {
+    // 容器在 mask 模式下不需要定位，Modal 会独立渲染到 body
+    position: static !important;
+    left: auto !important;
+    top: auto !important;
+    bottom: auto !important;
+    right: auto !important;
+    transform: none !important;
+  }
+
   /* 新Toast进入动画 */
   &.toast-entering {
     opacity: 0;
@@ -81,42 +135,49 @@
   }
 
   // 强制覆盖Ant Design Modal的默认定位
-  .ant-modal-wrap {
-    position: static !important;
-    pointer-events: none !important; // 让Modal wrap点击穿透
-  }
+  // 非 mask 模式下使用 static 定位
+  &:not([data-mask="true"]) {
+    .ant-modal-wrap {
+      position: static !important;
+      pointer-events: none !important; // 让Modal wrap点击穿透
+    }
 
-  .ant-modal {
-    position: static !important;
-    top: auto !important;
-    left: auto !important;
-    transform: none !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    pointer-events: none !important; // 让Modal本身点击穿透
+    .ant-modal {
+      position: static !important;
+      top: auto !important;
+      left: auto !important;
+      transform: none !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      pointer-events: none !important; // 让Modal本身点击穿透
+    }
   }
 
+  // mask 模式下，Modal 会渲染到 body，容器内的样式不再需要
+  // 样式已通过全局 .toast-modal-wrap-with-mask 类名设置
 
-  // 覆盖所有可能的Ant Design Modal定位
-  .ant-modal-wrap {
-    position: static !important;
-    display: block !important;
-    overflow: visible !important;
-    pointer-events: none !important; // 让Modal wrap点击穿透
-  }
+  // 覆盖所有可能的Ant Design Modal定位（非 mask 模式）
+  &:not([data-mask="true"]) {
+    .ant-modal-wrap {
+      position: static !important;
+      display: block !important;
+      overflow: visible !important;
+      pointer-events: none !important; // 让Modal wrap点击穿透
+    }
 
-  .ant-modal {
-    position: static !important;
-    top: auto !important;
-    left: auto !important;
-    right: auto !important;
-    bottom: auto !important;
-    transform: none !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    width: 100% !important;
-    max-width: none !important;
-    pointer-events: none !important; // 让Modal点击穿透
+    .ant-modal {
+      position: static !important;
+      top: auto !important;
+      left: auto !important;
+      right: auto !important;
+      bottom: auto !important;
+      transform: none !important;
+      margin: 0 !important;
+      padding: 0 !important;
+      width: 100% !important;
+      max-width: none !important;
+      pointer-events: none !important; // 让Modal点击穿透
+    }
   }
 
   // Toast进入动画
@@ -401,7 +462,7 @@
   // 副标题样式
   &-subtitle {
     &-text {
-      font-size: 30px; // 与图片一致
+      font-size: 48px; // 与图片一致
       font-weight: 600; // 与图片一致
       text-shadow: none; // 移除阴影
 

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

@@ -40,12 +40,12 @@ var SearchAndClientModule = function SearchAndClientModule(props) {
   var bookingTicket = useBookingTicket();
   var handleSearch = useDebounceFn( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(keyword) {
-      var res, _Toast$info, _clientCardRef$curren, _clientCardRef$curren2, _res$data, customer, rest, _Toast$info2, _customer;
+      var res, _Toast$info, _clientCardRef$curren, _clientCardRef$curren2, _Toast$info2, _res$data, customer, rest, _Toast$info3, _customer;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!keyword) {
-              _context.next = 24;
+              _context.next = 27;
               break;
             }
             setLoading(true);
@@ -62,47 +62,46 @@ var SearchAndClientModule = function SearchAndClientModule(props) {
             return _context.abrupt("return");
           case 9:
             if (!('type' in res && res.type == 'walletCode')) {
-              _context.next = 16;
+              _context.next = 19;
               break;
             }
-            // if (disabledSwitch) {
-            //   Toast?.info?.(
-            //     locales.getText(
-            //       'pisell2.checkout.client-card.tip.partially-paid'
-            //     )
-            //   );
-            //   return;
-            // }
+            if (!disabledSwitch) {
+              _context.next = 13;
+              break;
+            }
+            Toast === null || Toast === void 0 || (_Toast$info2 = Toast.info) === null || _Toast$info2 === void 0 || _Toast$info2.call(Toast, locales.getText('pisell2.checkout.client-card.tip.partially-paid'));
+            return _context.abrupt("return");
+          case 13:
             _res$data = res.data, customer = _res$data.customer, rest = _objectWithoutProperties(_res$data, _excluded); // todo 无绑定client
             if (customer) {
-              _context.next = 14;
+              _context.next = 17;
               break;
             }
-            Toast === null || Toast === void 0 || (_Toast$info2 = Toast.info) === null || _Toast$info2 === void 0 || _Toast$info2.call(Toast, locales.getText('pisell2.checkout.wallet-pass-module.no-result'));
+            Toast === null || Toast === void 0 || (_Toast$info3 = Toast.info) === null || _Toast$info3 === void 0 || _Toast$info3.call(Toast, locales.getText('pisell2.checkout.wallet-pass-module.no-result'));
             return _context.abrupt("return");
-          case 14:
+          case 17:
             _customer = _objectSpread(_objectSpread({}, customer), {}, {
               latest_wallet_detail: rest
             }); // @ts-ignore
             (_clientCardRef$curren = clientCardRef.current) === null || _clientCardRef$curren === void 0 || (_clientCardRef$curren2 = _clientCardRef$curren.handleSetClient) === null || _clientCardRef$curren2 === void 0 || _clientCardRef$curren2.call(_clientCardRef$curren, _customer, {
               sameClientTip: locales.getText('pisell2.checkout.client-card.tip.same-client')
             });
-          case 16:
+          case 19:
             setValue('');
-            _context.next = 21;
+            _context.next = 24;
             break;
-          case 19:
-            _context.prev = 19;
+          case 22:
+            _context.prev = 22;
             _context.t0 = _context["catch"](2);
-          case 21:
-            _context.prev = 21;
-            setLoading(false);
-            return _context.finish(21);
           case 24:
+            _context.prev = 24;
+            setLoading(false);
+            return _context.finish(24);
+          case 27:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 19, 21, 24]]);
+      }, _callee, null, [[2, 22, 24, 27]]);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);
@@ -151,23 +150,23 @@ var SearchAndClientModule = function SearchAndClientModule(props) {
         size: 'default'
       }
     };
-    // if (disabledSwitch === true) {
-    //   _props = {
-    //     open: false,
-    //     buttonProps: {
-    //       icon,
-    //       size: 'default',
-    //       onClick: () => {
-    //         // todo 根据当前订单付款情况判断是否可以切换
-    //         Toast?.info?.(
-    //           locales.getText('pisell2.checkout.client-card.tip.partially-paid')
-    //         );
-    //       },
-    //       style: { cursor: 'not-allowed' },
-    //     },
-    //   };
-    // }
-
+    if (disabledSwitch === true) {
+      _props = {
+        open: false,
+        buttonProps: {
+          icon: icon,
+          size: 'default',
+          onClick: function onClick() {
+            var _Toast$info4;
+            // todo 根据当前订单付款情况判断是否可以切换
+            Toast === null || Toast === void 0 || (_Toast$info4 = Toast.info) === null || _Toast$info4 === void 0 || _Toast$info4.call(Toast, locales.getText('pisell2.checkout.client-card.tip.partially-paid'));
+          },
+          style: {
+            cursor: 'not-allowed'
+          }
+        }
+      };
+    }
     return _props;
   }, [Toast, disabledSwitch]);
   return /*#__PURE__*/React.createElement("div", {

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

@@ -407,7 +407,7 @@ export var useWalletPass = function useWalletPass(props) {
       handleFetchUserIdentificationCodes(newValues.map(function (item) {
         return item.id;
       }));
-    });
+    }, 200);
   });
   var onOrderCreated = useMemoizedFn(function () {
     var orderInfo = checkoutModule.getOrderOriginalData();

package/es/components/checkout/index.less

@@ -71,7 +71,7 @@
     grid-template-rows: auto auto;
     gap: 8px 16px;
     background-color: #f6f2ff;
-    padding: 16px 16px 0 16px;
+    padding: 16px 16px 8px 16px;
     border-radius: 0 0 12px 12px;
     width: 100%; // 确保容器占满宽度
 

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

@@ -141,6 +141,7 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
+        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -154,6 +155,7 @@ 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.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -301,6 +303,7 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
+        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -322,6 +325,7 @@ 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.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;
@@ -477,6 +481,7 @@ declare const _default: {
         'pisell2.checkout.modal.close-price-adjustment': string;
         'pisell2.checkout.modal.reset-price-adjustment': string;
         'pisell2.checkout.modal.done-price-adjustment': string;
+        'pisell2.checkout.modal.price-adjustment-tips': string;
         'pisell2.checkout.send-payment-link.modal-title': string;
         'pisell2.checkout.send-payment-link.email-address': string;
         'pisell2.checkout.send-payment-link.email-placeholder': string;
@@ -490,6 +495,7 @@ 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.order-create-failed': string;
         'pisell2.checkout.sync-retry-hint': string;
         'pisell2.checkout.tips': string;
         retry: string;

package/es/components/checkout/locales.js

@@ -180,6 +180,7 @@ export default {
     'pisell2.checkout.modal.close-price-adjustment': 'Close price adjustment modal',
     'pisell2.checkout.modal.reset-price-adjustment': 'Reset',
     'pisell2.checkout.modal.done-price-adjustment': 'Done',
+    'pisell2.checkout.modal.price-adjustment-tips': 'Changing amount will update order total',
     // Send Payment Link Modal
     'pisell2.checkout.send-payment-link.modal-title': 'Send Payment Link',
     'pisell2.checkout.send-payment-link.email-address': 'Email Address',
@@ -200,6 +201,7 @@ export default {
     '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-create-failed': 'Order create failed, please refresh app',
     'pisell2.checkout.sync-retry-hint': 'Network error, please click the retry button to resync the order',
     'pisell2.checkout.tips': 'Tips',
     'retry': 'Retry',
@@ -379,6 +381,7 @@ export default {
     'pisell2.checkout.modal.close-price-adjustment': '关闭价格调整弹窗',
     'pisell2.checkout.modal.reset-price-adjustment': '重置',
     'pisell2.checkout.modal.done-price-adjustment': '完成',
+    'pisell2.checkout.modal.price-adjustment-tips': '修改金额将更新订单总额',
     // Send Payment Link Modal
     'pisell2.checkout.send-payment-link.modal-title': '发送支付链接',
     'pisell2.checkout.send-payment-link.email-address': '邮箱地址',
@@ -418,6 +421,7 @@ export default {
     'pisell2.amount-summary.amount-cannot-be-zero': '金额不能为0',
     // Order sync errors
     'pisell2.checkout.order-sync-failed': '订单同步失败，请检查网络',
+    'pisell2.checkout.order-create-failed': '订单创建失败，请重启APP',
     'pisell2.checkout.sync-retry-hint': '网络异常，请点击重试按钮重新同步订单',
     'pisell2.checkout.tips': '提示',
     'retry': '重试',
@@ -616,6 +620,7 @@ export default {
     'pisell2.checkout.modal.close-price-adjustment': '關閉價格調整彈窗',
     'pisell2.checkout.modal.reset-price-adjustment': '重置',
     'pisell2.checkout.modal.done-price-adjustment': '完成',
+    'pisell2.checkout.modal.price-adjustment-tips': '修改金額將更新訂單總額',
     // Send Payment Link Modal
     'pisell2.checkout.send-payment-link.modal-title': '發送支付鏈接',
     'pisell2.checkout.send-payment-link.email-address': '郵箱地址',
@@ -636,6 +641,7 @@ export default {
     'pisell2.amount-summary.amount-cannot-be-zero': '金額不能為0',
     // Order sync errors
     'pisell2.checkout.order-sync-failed': '訂單同步失敗，請檢查網絡',
+    'pisell2.checkout.order-create-failed': '订单创建失败，请重启APP',
     'pisell2.checkout.sync-retry-hint': '網絡異常，請點擊重試按鈕重新同步訂單',
     'pisell2.checkout.tips': '提示',
     'retry': '重試',

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

@@ -0,0 +1,2 @@
+declare const PaymentModalPlugin: any;
+export default PaymentModalPlugin;