From 0ee14f4e1a722687533aa8bb18d628b7add40fa0 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 03 十二月 2024 19:24:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/.env | 2 +-
/dev/null | 5 -----
admin/src/views/login.vue | 1 +
admin/.gitignore | 1 +
admin/vue.config.js | 5 ++---
admin/src/router/index.js | 2 +-
6 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/admin/.env b/admin/.env
index af248a9..18495ab 100644
--- a/admin/.env
+++ b/admin/.env
@@ -4,7 +4,7 @@
VUE_APP_ROUTER_MODE = 'hash'
# 椤圭洰涓婁笅鏂囪矾寰�
-VUE_APP_CONTEXT_PATH = '/'
+VUE_APP_CONTEXT_PATH = '/fn_admin/#/'
# 鎺ュ彛鍓嶇紑
VUE_APP_API_PREFIX = '/gateway_interface'
diff --git a/admin/.gitignore b/admin/.gitignore
index 25910be..44007c7 100644
--- a/admin/.gitignore
+++ b/admin/.gitignore
@@ -10,6 +10,7 @@
.env.*.local
unpackage
admin
+fn_admin
# Log files
npm-debug.log*
yarn-debug.log*
diff --git a/admin/babel.config.js b/admin/babel.config.js
deleted file mode 100644
index e955840..0000000
--- a/admin/babel.config.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
- presets: [
- '@vue/cli-plugin-babel/preset'
- ]
-}
diff --git a/admin/src/router/index.js b/admin/src/router/index.js
index f69ea19..6002274 100644
--- a/admin/src/router/index.js
+++ b/admin/src/router/index.js
@@ -10,7 +10,7 @@
const router = new VueRouter({
// + (process.env.VUE_APP_ROUTER_MODE === 'hash' ? '#' : '')
- // base: process.env.VUE_APP_CONTEXT_PATH,
+ base: '/',
mode: 'hash',
routes: [
// 鐧诲綍
diff --git a/admin/src/views/login.vue b/admin/src/views/login.vue
index a728dbc..c51189a 100644
--- a/admin/src/views/login.vue
+++ b/admin/src/views/login.vue
@@ -138,6 +138,7 @@
}
Cookies.set('dm_user_token', res)
window.location.href = process.env.VUE_APP_CONTEXT_PATH
+ // this.$router.push('')
})
.catch(e => {
this.refreshCaptcha()
diff --git a/admin/vue.config.js b/admin/vue.config.js
index c429385..9d855e9 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -1,13 +1,12 @@
// 璇︾粏閰嶇疆璇峰弬鑰僪ttps://cli.vuejs.org/zh/config/#vue-config-js
-// const outputDir = process.env.VUE_APP_CONTEXT_PATH.substring(1, process.env.VUE_APP_CONTEXT_PATH.length - 1)
const path = require('path')
function resolve (dir) {
return path.join(__dirname, dir)
}
module.exports = {
- publicPath: process.env.VUE_APP_CONTEXT_PATH,
- outputDir: 'admin',
+ publicPath: './',
+ outputDir: 'fn_admin',
assetsDir: 'static',
lintOnSave: false,
devServer: {
--
Gitblit v1.9.3