@pisell/private-materials 6.4.66 → 6.4.67

package/es/components/checkout/PaymentModal.js

@@ -1410,10 +1410,14 @@ var PaymentModal = function PaymentModal(_ref18) {
     _useState34 = _slicedToArray(_useState33, 2),
     showRetryModal = _useState34[0],
     setShowRetryModal = _useState34[1];
-  var _useState35 = useState(editOrderId || 0),
+  var _useState35 = useState(false),
     _useState36 = _slicedToArray(_useState35, 2),
-    currentEditOrderId = _useState36[0],
-    _setCurrentEditOrderId = _useState36[1];
+    showCreateErrorModal = _useState36[0],
+    setShowCreateErrorModal = _useState36[1];
+  var _useState37 = useState(editOrderId || 0),
+    _useState38 = _slicedToArray(_useState37, 2),
+    currentEditOrderId = _useState38[0],
+    _setCurrentEditOrderId = _useState38[1];
   var _useActiveExecute2 = useActiveExecute(),
     executeIfActive = _useActiveExecute2.executeIfActive;
   var Toast = useToast();
@@ -1548,18 +1552,18 @@ var PaymentModal = function PaymentModal(_ref18) {
   }, []);
 
   // 订单备注相关状态
-  var _useState37 = useState(false),
-    _useState38 = _slicedToArray(_useState37, 2),
-    noteModalOpen = _useState38[0],
-    setNoteModalOpen = _useState38[1];
-  var _useState39 = useState(''),
+  var _useState39 = useState(false),
     _useState40 = _slicedToArray(_useState39, 2),
-    orderNote = _useState40[0],
-    setOrderNote = _useState40[1];
-  var _useState41 = useState('payment-content'),
+    noteModalOpen = _useState40[0],
+    setNoteModalOpen = _useState40[1];
+  var _useState41 = useState(''),
     _useState42 = _slicedToArray(_useState41, 2),
-    noteModalSource = _useState42[0],
-    setNoteModalSource = _useState42[1];
+    orderNote = _useState42[0],
+    setOrderNote = _useState42[1];
+  var _useState43 = useState('payment-content'),
+    _useState44 = _slicedToArray(_useState43, 2),
+    noteModalSource = _useState44[0],
+    setNoteModalSource = _useState44[1];
 
   // 订单备注相关处理函数
   var handleNoteConfirm = /*#__PURE__*/function () {
@@ -2288,7 +2292,7 @@ var PaymentModal = function PaymentModal(_ref18) {
               setOrderInfo(_orderInfo4);
               isLocalOrderCreated.current = true;
             case 42:
-              _context23.next = 48;
+              _context23.next = 49;
               break;
             case 44:
               _context23.prev = 44;
@@ -2301,7 +2305,9 @@ var PaymentModal = function PaymentModal(_ref18) {
                   error: _context23.t0
                 }
               });
-            case 48:
+              // 如果订单创建失败，弹出提示让重新加载 app
+              setShowCreateErrorModal(true);
+            case 49:
             case "end":
               return _context23.stop();
           }
@@ -2807,7 +2813,39 @@ var PaymentModal = function PaymentModal(_ref18) {
       width: '100%',
       marginTop: '80px'
     }
-  }, locales.getText('retry') || '重试'))));
+  }, locales.getText('retry') || '重试'))), /*#__PURE__*/React.createElement(PisellContainer, {
+    renderType: "modal",
+    props: {
+      open: showCreateErrorModal,
+      title: locales.getText('pisell2.checkout.tips'),
+      footer: null,
+      keyboard: false,
+      onCancel: function onCancel() {
+        setShowCreateErrorModal(false);
+      } // 禁用关闭
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      textAlign: 'center',
+      padding: '20px'
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginBottom: '16px',
+      fontSize: '16px'
+    }
+  }, locales.getText('pisell2.checkout.order-create-failed')), /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    size: "large",
+    onClick: function onClick() {
+      setShowCreateErrorModal(false);
+      window.location.reload();
+    },
+    style: {
+      width: '100%',
+      marginTop: '80px'
+    }
+  }, locales.getText('confirm') || '确认'))));
 };
 
 // 导出类型供外部使用

package/es/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

@@ -154,6 +154,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;
@@ -322,6 +323,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;
@@ -490,6 +492,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

@@ -200,6 +200,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',
@@ -418,6 +419,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': '重试',
@@ -636,6 +638,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/lib/components/checkout/PaymentModal.js

@@ -1063,6 +1063,7 @@ var PaymentModal = ({
   const [actualShowCashPayment, setActualShowCashPayment] = (0, import_react.useState)(true);
   const [windowHeight, setWindowHeight] = (0, import_react.useState)(0);
   const [showRetryModal, setShowRetryModal] = (0, import_react.useState)(false);
+  const [showCreateErrorModal, setShowCreateErrorModal] = (0, import_react.useState)(false);
   const [currentEditOrderId, setCurrentEditOrderId] = (0, import_react.useState)(editOrderId || 0);
   const { executeIfActive } = (0, import_pisellos.useActiveExecute)();
   const Toast = (0, import_materials.useToast)();
@@ -1620,6 +1621,7 @@ var PaymentModal = ({
             error
           }
         });
+        setShowCreateErrorModal(true);
       }
     };
     if (data) {
@@ -2052,6 +2054,34 @@ var PaymentModal = ({
       },
       import_utils.locales.getText("retry") || "重试"
     ))
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_materials.PisellContainer,
+    {
+      renderType: "modal",
+      props: {
+        open: showCreateErrorModal,
+        title: import_utils.locales.getText("pisell2.checkout.tips"),
+        footer: null,
+        keyboard: false,
+        onCancel: () => {
+          setShowCreateErrorModal(false);
+        }
+        // 禁用关闭
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement("div", { style: { textAlign: "center", padding: "20px" } }, /* @__PURE__ */ import_react.default.createElement("div", { style: { marginBottom: "16px", fontSize: "16px" } }, import_utils.locales.getText("pisell2.checkout.order-create-failed")), /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Button,
+      {
+        type: "primary",
+        size: "large",
+        onClick: () => {
+          setShowCreateErrorModal(false);
+          window.location.reload();
+        },
+        style: { width: "100%", marginTop: "80px" }
+      },
+      import_utils.locales.getText("confirm") || "确认"
+    ))
   ));
 };
 var PaymentModal_default = PaymentModal;

package/lib/components/checkout/hooks/useWalletPass.d.ts

@@ -17,7 +17,7 @@ export declare const useWalletPass: (props: {
     cardData: any;
     handleSelectWallet: (value: number[]) => void;
     selectedWalletIds: any[];
-    expiredWalletIds: any;
+    expiredWalletIds: any[];
     expiredWalletData: any;
     disabledWalletData: any[];
     clearAllSelectedWallet: () => void;

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

@@ -154,6 +154,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;
@@ -322,6 +323,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;
@@ -490,6 +492,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/lib/components/checkout/locales.js

@@ -210,6 +210,7 @@ var locales_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",
@@ -415,6 +416,7 @@ var locales_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": "重试",
@@ -620,6 +622,7 @@ var locales_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/package.json

@@ -1,6 +1,12 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.4.66",
+  "version": "6.4.67",
+  "scripts": {
+    "dev": "father dev",
+    "build": "father build",
+    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
+    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
+  },
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -50,6 +56,10 @@
     "@dnd-kit/modifiers": "^6.0.1",
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
+    "@pisell/date-picker": "workspace:*",
+    "@pisell/icon": "workspace:*",
+    "@pisell/materials": "workspace:*",
+    "@pisell/utils": "workspace:*",
     "ahooks": "^3.7.6",
     "antd": "^5.6.3",
     "classnames": "^2.3.2",
@@ -60,11 +70,7 @@
     "react-resizable": "^3.0.5",
     "styled-components": "^6.0.0-rc.3",
     "@react-spring/web": "^9.6.1",
-    "@use-gesture/react": "^10.3.1",
-    "@pisell/icon": "0.0.11",
-    "@pisell/materials": "6.4.16",
-    "@pisell/utils": "3.0.2",
-    "@pisell/date-picker": "3.0.7"
+    "@use-gesture/react": "^10.3.1"
   },
   "peerDependencies": {
     "react": "^18.0.0",
@@ -72,11 +78,5 @@
   },
   "componentConfig": {
     "materialSchema": "https://unpkg.com/@pisell/materials@1.0.1/build/lowcode/assets-prod.json"
-  },
-  "scripts": {
-    "dev": "father dev",
-    "build": "father build",
-    "lowcode:dev": "build-scripts start --config ./build.lowcode.js",
-    "lowcode:build": " build-scripts build --config ./build.lowcode.js"
   }
-}
+}