From f089aeb6396a110024eeb34beae8355767942550 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 21:34:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?---=E7=99=BB=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 2 ++ .env.release | 2 +- src/components/NavTop.vue | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.env.prod b/.env.prod index 451d13bb..66b95318 100644 --- a/.env.prod +++ b/.env.prod @@ -2,6 +2,8 @@ NODE_ENV=prod VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi +VUE_APP_LOGIN_URL=https://u.boe.com/web + VUE_APP_BOE_API_URL=https://u.boe.com VUE_APP_IFRAME_URL=https://u.boe.com/pc/iframe diff --git a/.env.release b/.env.release index b8513712..6fc7f447 100644 --- a/.env.release +++ b/.env.release @@ -1,7 +1,7 @@ NODE_ENV=release VUE_APP_BASE=/manage-release VUE_APP_BASE_API=/manageApi-release -VUE_APP_LOGIN_URL=https://u.boe.com/web +VUE_APP_LOGIN_URL=https://u.boe.com/web-release VUE_APP_BOE_API_URL=https://u.boe.com diff --git a/src/components/NavTop.vue b/src/components/NavTop.vue index a1146bdd..9b2ab928 100644 --- a/src/components/NavTop.vue +++ b/src/components/NavTop.vue @@ -62,6 +62,7 @@ import { reactive, toRefs } from "vue"; import DownLoad from "../components/drawers/DownLoad"; import * as api from "../api/index1"; import { studentUrl } from "../api/method"; +import router from "@/router"; export default { name: "NavTop", components: { @@ -137,7 +138,7 @@ export default { localStorage.removeItem("projectId"); localStorage.removeItem("projectTemplateId"); localStorage.removeItem("orgtreeList"); - window.open("https://u-pre.boe.com/web/", "_self"); + process.env.NODE_ENV === 'development' ? router.push({path: 'login'}) : (window.location.href = process.env.VUE_APP_LOGIN_URL) }; return { ...toRefs(state), From 406d2c3e1cbfc2ee7e83f416271e7e57c13f248b Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 21:36:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?---=E7=99=BB=E5=87=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.boe | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.env.boe b/.env.boe index 2afea7c4..3bafe80c 100644 --- a/.env.boe +++ b/.env.boe @@ -2,6 +2,8 @@ NODE_ENV=boe VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi +VUE_APP_LOGIN_URL=https://u-pre.boe.com/web + VUE_APP_BOE_API_URL=https://u-pre.boe.com From f1d8ef54a4853a86fa31af1f9206cec00e7b0c8e Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Wed, 28 Dec 2022 21:55:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?---=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 450971c6..95862d45 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本1.2.9------------"); + console.log("版本2.0.2------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); });