diff --git a/.env.development b/.env.development index bfc2703..066aadd 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,11 @@ +### + # @Descripttion: + # @version: + # @Author: JC9527 + # @Date: 2024-03-25 09:07:08 + # @LastEditors: JC9527 + # @LastEditTime: 2024-04-01 09:39:22 +### # 页面标题 VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 @@ -5,7 +13,7 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统 ENV = 'development' # 金鸡湖现代服务业品牌管理系统/开发环境 -# VUE_APP_BASE_API = 'http://192.168.0.114:9040' +# VUE_APP_BASE_API = 'http://192.168.0.111:9040' VUE_APP_BASE_API = 'http://39.101.188.84:9040' # 路由懒加载 diff --git a/src/assets/styles/public.scss b/src/assets/styles/public.scss index 03869d3..b6ce5ce 100644 --- a/src/assets/styles/public.scss +++ b/src/assets/styles/public.scss @@ -562,6 +562,7 @@ .btnsFlex { display: flex; align-items: center; + margin-top: 40px; .el-upload { // .el-upload-dragger { display: flex; diff --git a/src/layout/components/FixedHeader/index.vue b/src/layout/components/FixedHeader/index.vue index a64a225..e548ee3 100644 --- a/src/layout/components/FixedHeader/index.vue +++ b/src/layout/components/FixedHeader/index.vue @@ -69,7 +69,8 @@ export default { }) .then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "/index"; + // location.href = "/index"; + this.$router.replace("/login"); }); }) .catch(() => {}); diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b01c4fc..125b4b2 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -110,7 +110,8 @@ export default { }) .then(() => { this.$store.dispatch("LogOut").then(() => { - location.href = "/demo/JinJiHu"; + // location.href = "/login"; + this.$router.replace("/login"); }); }) .catch(() => {}); diff --git a/src/utils/request.js b/src/utils/request.js index ffb0d21..d273357 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -6,6 +6,7 @@ import errorCode from '@/utils/errorCode' import { tansParams, blobValidate } from "@/utils/ruoyi"; import cache from '@/plugins/cache' import { saveAs } from 'file-saver' +import router from '@/router' let downloadLoadingInstance; // 是否显示重新登录 @@ -87,7 +88,8 @@ service.interceptors.response.use(res => { MessageBox.confirm('登录状态已过期,您可以继续留在该页面,或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => { isRelogin.show = false; store.dispatch('LogOut').then(() => { - location.href = '/index'; + // location.href = '/index'; + router.replace("/login"); }) }).catch(() => { isRelogin.show = false; diff --git a/src/views/project/index.vue b/src/views/project/index.vue index b69a491..b20d256 100644 --- a/src/views/project/index.vue +++ b/src/views/project/index.vue @@ -4,7 +4,7 @@ * @Author: JC9527 * @Date: 2024-03-25 09:07:08 * @LastEditors: JC9527 - * @LastEditTime: 2024-03-29 16:51:22 + * @LastEditTime: 2024-04-01 10:29:01 -->