From 068e0df43c5f629607a2314951e90a81d5297995 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Tue, 30 Nov 2021 11:13:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue          | 27 +++++++++++++++++++++------
 src/utils/request.js |  2 +-
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 056901d7a..0c579e30a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <router-view />
+    <router-view v-if="$store.state.user.baseUrl" />
     <deomon-topic ref="deomonTopic" />
     <img v-show="loading" :src="loadingImg" class="AppAll">
   </div>
@@ -15,6 +15,7 @@ import WindowResizeHandler from '@/mixin/WindowResizeHandler';
 import LoadingImg from '@/assets/loading.gif';
 import { openIndexedDB } from '@/utils/indexedDb';
 import { getBaseUrlByProject } from '@/api/projectServer';
+import { localPackageProject } from '@/scripts/ProjectConfig';
 
 export default {
     name: 'App',
@@ -63,11 +64,25 @@ export default {
             this.loading = false;
         }
     },
-    created() {
-        const project = getSessionStorage('project');
-        getBaseUrlByProject(ProjectCode[project]).then(resp => {
-            this.$store.dispatch('setBaseUrl', resp.data.domainName);
-        });
+    async created() {
+        let project = '';
+        if (this.$route.query.project && this.$route.path.includes('login')) {
+            project = this.$route.query.project;
+            const split = this.$route.path.split('/')[1];
+            if (process.env.VUE_APP_PRO) {
+                project = localPackageProject[process.env.VUE_APP_PRO + split];
+            } else if (split == 'design') {
+                project = project ? split + project : split;
+            } else if (split == 'login') {
+                project = project || 'login';
+            } else {
+                project = split;
+            }
+        } else {
+            project = getSessionStorage('project');
+        }
+        const resp = await getBaseUrlByProject(ProjectCode[project]);
+        resp && resp.data && this.$store.dispatch('setBaseUrl', resp.data.domainName);
         if (project) {
             document.querySelector("link[rel*='icon']").href = loginInfo[project].linkIcon || ProjectIcon[project];
         }
diff --git a/src/utils/request.js b/src/utils/request.js
index 0e004c128..2a5ad9f77 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
     timeout: 600000 // 请求超时时间
 });
 
-// request拦截器
+// request拦截器108
 service.interceptors.request.use(config => {
     if (getToken()) {
         config.headers['X-Token'] = getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改