Merge branch 'master' into feat-fake-pop-order-mession

package-lock.json

@@ -26,6 +26,7 @@
         "date-fns": "^2.16.1",
         "dva": "^2.4.1",
         "file-saver": "^2.0.5",
+        "json-bigint": "^1.0.0",
         "lodash": "^4.17.11",
         "moment": "^2.24.0",
         "omit.js": "^1.0.2",
@@ -12525,6 +12526,15 @@
         "node": "*"
       }
     },
+    "node_modules/bignumber.js": {
+      "version": "9.1.2",
+      "resolved": "http://npm.tjzimu.com/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
+      "license": "MIT",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.1.0",
       "resolved": "http://npmprivate.quantgroups.com/binary-extensions/-/binary-extensions-2.1.0.tgz",
@@ -25810,6 +25820,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/json-bigint": {
+      "version": "1.0.0",
+      "resolved": "http://npm.tjzimu.com/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "license": "MIT",
+      "dependencies": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
     "node_modules/json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "http://npmprivate.quantgroups.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
@@ -49895,6 +49914,11 @@
       "resolved": "http://npmprivate.quantgroups.com/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
+    "bignumber.js": {
+      "version": "9.1.2",
+      "resolved": "http://npm.tjzimu.com/bignumber.js/-/bignumber.js-9.1.2.tgz",
+      "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug=="
+    },
     "binary-extensions": {
       "version": "2.1.0",
       "resolved": "http://npmprivate.quantgroups.com/binary-extensions/-/binary-extensions-2.1.0.tgz",
@@ -59589,6 +59613,14 @@
       "resolved": "http://npmprivate.quantgroups.com/jsesc/-/jsesc-2.5.2.tgz",
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
     },
+    "json-bigint": {
+      "version": "1.0.0",
+      "resolved": "http://npm.tjzimu.com/json-bigint/-/json-bigint-1.0.0.tgz",
+      "integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+      "requires": {
+        "bignumber.js": "^9.0.0"
+      }
+    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "http://npmprivate.quantgroups.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",

package.json

@@ -67,6 +67,7 @@
 		"date-fns": "^2.16.1",
 		"dva": "^2.4.1",
 		"file-saver": "^2.0.5",
+		"json-bigint": "^1.0.0",
 		"lodash": "^4.17.11",
 		"moment": "^2.24.0",
 		"omit.js": "^1.0.2",

src/pages/orderManage/pendingDeliveryOrder/components/MultiLogisticsModal/index.jsx

@@ -221,7 +221,7 @@ const UpdateStatusModal = (props, ref) => {
         skuInfoList: skuInfoList
           .filter(skuInfo => skuInfo.skuNo?.length)
           .map(skuInfo => ({
-            skuNo: Number(skuInfo.skuNo[0]),
+            skuNo: skuInfo.skuNo[0],
             quantity: Number(skuInfo.quantity),
           })),
       };
@@ -316,7 +316,6 @@ const UpdateStatusModal = (props, ref) => {
     companys,
     minPackageCount: oldPackageList?.length || 1,
   };
-
   return renderModal ? (
     <Modal {...modalProps}>{record ? <FormWarpper ref={formRef} {...formProps} /> : ''}</Modal>
   ) : (

src/utils/request.js

@@ -6,6 +6,7 @@
 /* eslint-disable no-underscore-dangle */
 import { extend } from 'umi-request';
 import { notification } from 'antd';
+import JSONbig from 'json-bigint';
 import { getUrlSearchParams, getToken } from './utils';
 import localStorage from './localStorage';
 import config from '../../config/env.config';
@@ -109,7 +110,13 @@ request.interceptors.response.use(async (response, options) => {
   if (options.responseType === 'arrayBuffer') {
     return response;
   }
-  const data = await response.clone().json();
+  let data = await response.clone().json();
+  if (response.ok) {
+    const dataText = await response.clone().text(); // 获取原始的JSON字符串
+    data = JSONbig.parse(dataText); // 使用json-bigint来解析大整数
+    // data = { ...response, data: parsedData };
+  }
+  // const data = await response.clone().json();
   if (data.code === 4033) {
     // TODO 该接口是否需要提示权限信息
     if (options.role) {
@@ -142,7 +149,7 @@ request.interceptors.response.use(async (response, options) => {
       duration: typeof options.duration === 'undefined' ? 4.5 : options.duration,
     });
   }
-  return response;
+  return data;
 });
 
 export default request;