Merge remote-tracking branch 'origin/manage-release'

# Conflicts:
#	src/App.vue

.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
 
 

.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

.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
 

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("版本2.0.1------------");
+		console.log("版本2.0.2------------");
 		const routes = computed(() => {
 			return router.getRoutes().filter((e) => e.meta?.isLink);
 		});

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),