合并分支 '3.x' 到 'main'

3.x

查看合并请求 !59

package.json

@@ -66,56 +66,56 @@
         }
     },
     "dependencies": {
-        "@dcloudio/uni-app": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-app-plus": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-components": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-h5": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-mp-alipay": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-mp-baidu": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-mp-jd": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-mp-kuaishou": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-mp-lark": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-mp-qq": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-mp-toutiao": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-mp-weixin": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-quickapp-webview": "3.0.0-alpha-3090120230927001",
+        "@dcloudio/uni-app": "3.0.0-3090420231025001",
+        "@dcloudio/uni-app-plus": "3.0.0-3090420231025001",
+        "@dcloudio/uni-components": "3.0.0-3090420231025001",
+        "@dcloudio/uni-h5": "3.0.0-3090420231025001",
+        "@dcloudio/uni-mp-alipay": "3.0.0-3090420231025001",
+        "@dcloudio/uni-mp-baidu": "3.0.0-3090420231025001",
+        "@dcloudio/uni-mp-jd": "3.0.0-3090420231025001",
+        "@dcloudio/uni-mp-kuaishou": "3.0.0-3090420231025001",
+        "@dcloudio/uni-mp-lark": "3.0.0-3090420231025001",
+        "@dcloudio/uni-mp-qq": "3.0.0-3090420231025001",
+        "@dcloudio/uni-mp-toutiao": "3.0.0-3090420231025001",
+        "@dcloudio/uni-mp-weixin": "3.0.0-3090420231025001",
+        "@dcloudio/uni-quickapp-webview": "3.0.0-3090420231025001",
         "@dcloudio/uni-ui": "^1.4.28",
-        "@faker-js/faker": "^8.1.0",
+        "@faker-js/faker": "^8.2.0",
         "@vue/runtime-core": "~3.2.47",
         "@vueuse/core": "^10.5.0",
-        "axios": "^1.5.1",
-        "crypto-js": "^4.1.1",
+        "axios": "^1.6.0",
+        "crypto-js": "^4.2.0",
         "dayjs": "^1.11.10",
         "lodash-es": "^4.17.21",
-        "nanoid": "^5.0.1",
+        "nanoid": "^5.0.2",
         "pinia": "~2.0.36",
         "qs": "~6.9.7",
         "stompjs": "^2.3.3",
         "urijs": "^1.19.11",
         "vue": "~3.2.47",
-        "vue-i18n": "^9.5.0",
-        "vue-request": "^2.0.3",
+        "vue-i18n": "^9.6.0",
+        "vue-request": "^2.0.4",
         "vue-types": "^5.1.1"
     },
     "devDependencies": {
         "@antfu/eslint-config": "^0.43.1",
-        "@commitlint/cli": "^17.7.2",
-        "@commitlint/config-conventional": "^17.7.0",
-        "@dcloudio/types": "^3.4.0",
-        "@dcloudio/uni-automator": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/uni-cli-shared": "3.0.0-alpha-3090120230927001",
+        "@commitlint/cli": "^18.2.0",
+        "@commitlint/config-conventional": "^18.1.0",
+        "@dcloudio/types": "^3.4.1",
+        "@dcloudio/uni-automator": "3.0.0-3090420231025001",
+        "@dcloudio/uni-cli-shared": "3.0.0-3090420231025001",
         "@dcloudio/uni-helper-json": "^1.0.13",
-        "@dcloudio/uni-stacktracey": "3.0.0-alpha-3090120230927001",
-        "@dcloudio/vite-plugin-uni": "3.0.0-alpha-3090120230927001",
-        "@iconify/json": "^2.2.125",
-        "@types/crypto-js": "^4.1.2",
-        "@types/lodash-es": "^4.17.9",
-        "@types/node": "^20.8.3",
-        "@types/qs": "^6.9.8",
-        "@types/stompjs": "^2.3.6",
-        "@types/urijs": "^1.19.20",
-        "@typescript-eslint/eslint-plugin": "^6.7.4",
-        "@typescript-eslint/parser": "^6.7.4",
+        "@dcloudio/uni-stacktracey": "3.0.0-3090420231025001",
+        "@dcloudio/vite-plugin-uni": "3.0.0-3090420231025001",
+        "@iconify/json": "^2.2.133",
+        "@types/crypto-js": "^4.1.3",
+        "@types/lodash-es": "^4.17.10",
+        "@types/node": "^20.8.9",
+        "@types/qs": "^6.9.9",
+        "@types/stompjs": "^2.3.7",
+        "@types/urijs": "^1.19.22",
+        "@typescript-eslint/eslint-plugin": "^6.9.0",
+        "@typescript-eslint/parser": "^6.9.0",
         "commitizen": "^4.3.0",
         "conventional-changelog-cli": "^4.1.0",
         "cz-conventional-changelog": "^3.3.0",
@@ -123,10 +123,10 @@
         "cz-git": "^1.7.1",
         "czg": "^1.7.1",
         "dotenv": "^16.3.1",
-        "eslint": "^8.51.0",
+        "eslint": "^8.52.0",
         "eslint-config-prettier": "^9.0.0",
-        "eslint-plugin-prettier": "^5.0.0",
-        "eslint-plugin-vue": "^9.17.0",
+        "eslint-plugin-prettier": "^5.0.1",
+        "eslint-plugin-vue": "^9.18.0",
         "husky": "^8.0.3",
         "jest": "27.0.4",
         "jest-environment-node": "27.5.1",
@@ -140,20 +140,20 @@
         "postcss-less": "^6.0.0",
         "prettier": "^3.0.3",
         "rimraf": "^5.0.5",
-        "sass": "^1.69.0",
+        "sass": "^1.69.5",
         "sort-package-json": "^2.6.0",
-        "stylelint": "^15.10.3",
+        "stylelint": "^15.11.0",
         "stylelint-config-html": "^1.1.0",
         "stylelint-config-recommended": "^13.0.0",
         "stylelint-config-standard": "^34.0.0",
         "stylelint-order": "^6.0.3",
         "typescript": "~5.1.6",
         "unocss": "^0.56.5",
-        "unocss-preset-weapp": "^0.56.0",
-        "unplugin-auto-import": "^0.16.6",
+        "unocss-preset-weapp": "^0.56.1",
+        "unplugin-auto-import": "^0.16.7",
         "unplugin-vue-components": "^0.25.2",
-        "vite": "^4.4.11",
-        "vue-eslint-parser": "^9.3.1"
+        "vite": "^4.5.0",
+        "vue-eslint-parser": "^9.3.2"
     },
     "engines": {
         "node": ">=16",

src/utils/http/axios/Axios.ts

@@ -19,7 +19,7 @@ axios.defaults.adapter = function (config: InternalAxiosRequestConfig): AxiosPro
             method: config.method.toUpperCase() as RequestEnum,
             url: config.url,
             data: config.data || config.params,
-            header: config.headers,
+            header: { ...config.headers },
             responseType: config.responseType,
             timeout: config.timeout,
             dataType: 'json',