冲突解决

13f46f5f · zhuzhequan · 931ebadf · 13f46f5f · 13f46f5f · 13f46f5f
Commit 13f46f5f authored Aug 13, 2024 by zhuzhequan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

package-lock.json
+0 -0

package.json
+4 -5

vue.config.js
+1 -1

No files found.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -11,18 +11,18 @@
    "@wangeditor/editor": "^5.1.23",
    "@wangeditor/editor-for-vue": "^1.0.2",
    "axios": "^1.1.3",
+    "babel-plugin-component": "^1.1.1",
+    "babel-plugin-import": "^1.13.8",
    "core-js": "^3.8.3",
    "element-ui": "^2.15.13",
    "js-md5": "^0.7.3",
-    "lodash": "^4.17.21",
+    "lodash": "~4.17.20",
-    "uuid": "^10.0.0",
    "vue": "^2.6.14",
    "vue-router": "^3.5.1",
    "vuedraggable": "^2.24.3",
    "vuex": "^3.6.2",
    "vxe-table": "^3.5.9",
-    "vxe-table-plugin-element": "^4.0.4",
+    "xe-utils": "^3.5.4"
-    "xe-utils": "^3.5.7"
  },
  "devDependencies": {
    "@babel/core": "^7.12.16",
@@ -33,7 +33,6 @@
    "@vue/cli-plugin-vuex": "~5.0.0",
    "@vue/cli-service": "~5.0.0",
    "@vue/eslint-config-standard": "^6.1.0",
-    "babel-plugin-import": "^1.13.8",
    "eslint": "^7.32.0",
    "eslint-plugin-import": "^2.25.3",
    "eslint-plugin-node": "^11.1.0",

--- a/vue.config.js
+++ b/vue.config.js
@@ -6,7 +6,7 @@ module.exports = defineConfig({
    host: '',
    proxy: {
      '/api': {
-        target: 'http://192.168.31.232:8070',
+        target: 'http://10.168.31.142:8070',
        changeOrigin: true
        // 路径重写规则，这里将 /api 开头的请求路径替换为空字符串，即去掉 /api 前缀