Merge branches 'gva_workflow' and 'master' of https://github.com/flipped-aurora/gin-vue-admin into gva_workflow

Conflicts: web/package.json
2020-10-11 12:24:11 +08:00
parent 213d1a700f f5c6f95b27
commit 9865d53ea7
14 changed files with 262 additions and 59 deletions
@@ -3,13 +3,13 @@
    "version": "0.1.0",
    "private": true,
    "scripts": {
-        "serve": "vue-cli-service serve",
+        "serve": "start https://www.gin-vue-admin.com && vue-cli-service serve",
        "build": "vue-cli-service build",
        "lint": "vue-cli-service lint"
    },
    "dependencies": {
        "@moefe/vue-aplayer": "^2.0.0-beta.5",
-        "axios": "^0.19.0",
+        "axios": "^0.19.2",
        "core-js": "^3.6.5",
        "echarts": "^4.7.0",
        "element-ui": "^2.12.0",
@@ -65,4 +65,4 @@
        "> 1%",
        "last 2 versions"
    ]
-}
+}