diff --git a/.gitignore b/.gitignore index e7cc5a9d..50c33370 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ .idea/ /web/node_modules /web/dist - +/web/vue.config.js .DS_Store # local env files diff --git a/web/src/style/side.scss b/web/src/style/side.scss index 4619d789..ea80d79a 100644 --- a/web/src/style/side.scss +++ b/web/src/style/side.scss @@ -20,21 +20,17 @@ .tilte { min-height: $height-aside-tilte; line-height: $height-aside-tilte; - background: $bg-aside; text-align: center; - .logoimg { width: $width-aside-img; height: $height-aside-img; vertical-align: middle; - background: #fff; border-radius: 50%; padding: 3px; } .tit-text { display: inline-block; - color: $aside-color; font-weight: 600; font-size: 20px; vertical-align: middle; diff --git a/web/src/view/layout/index.vue b/web/src/view/layout/index.vue index 71d079fd..2ea404d9 100644 --- a/web/src/view/layout/index.vue +++ b/web/src/view/layout/index.vue @@ -3,7 +3,7 @@ -
+

{{ $GIN_VUE_ADMIN.appName }}

@@ -195,150 +195,12 @@ export default { diff --git a/web/vue.config.js b/web/vue.config.js index 283e698f..efa87735 100644 --- a/web/vue.config.js +++ b/web/vue.config.js @@ -25,7 +25,8 @@ module.exports = { // 把key的路径代理到target位置 // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // 需要代理的路径 例如 '/api' - target: `${process.env.VUE_APP_BASE_PATH}:${process.env.VUE_APP_SERVER_PORT}/`, // 代理到 目标路径 + // target: `${process.env.VUE_APP_BASE_PATH}:${process.env.VUE_APP_SERVER_PORT}/`, // 代理到 目标路 + target: `http://demo.gin-vue-admin.com/api/`, // 代理到 目标路径 changeOrigin: true, pathRewrite: { // 修改路径数据 ['^' + process.env.VUE_APP_BASE_API]: '' // 举例 '^/api:""' 把路径中的/api字符串删除