From 68d1733cd55bbef68818125fa2007a22e6bb957f Mon Sep 17 00:00:00 2001
From: yuping <82253452@qq.com>
Date: Thu, 12 Jan 2023 17:46:30 +0800
Subject: [PATCH] =?UTF-8?q?--=20=E6=B5=8B=E8=AF=95=E5=8F=91=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                         | 17 ++++++++++++-----
 src/api/api.js                      |  1 +
 src/components/PathDetailImage.vue  |  2 +-
 src/views/project/ProjectManage.vue |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index aa071c2..b2ffa30 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,11 +30,12 @@
 	</div>
 </template>
 <script setup>
-import { boeRequest } from "@/api/request";
+import {boeRequest, request} from "@/api/request";
 import { GET_USER_INFO } from "@/api/ThirdApi";
 import { useStore } from "vuex";
 import { onMounted } from "vue";
 import {useRoute} from "vue-router/dist/vue-router";
+import {USER_INFO} from "@/api/api";
 
 console.log("版本2.0.5------------");
 const store = useStore();
@@ -44,10 +45,16 @@ onMounted(() => {
 });
 
 function getUserInfo() {
-	boeRequest(GET_USER_INFO).then((res) => {
-		res.result.avatar = res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'
-		store.commit("SET_USER", res.result);
-	});
+  if(import.meta.env.MODE ==='development' || import.meta.env.MODE ==='test'){
+    request(USER_INFO,{}).then(res=>{
+      store.commit("SET_USER", res.data.result);
+    })
+  }else{
+    boeRequest(GET_USER_INFO).then((res) => {
+      res.result.avatar = res.result.avatar || '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'
+      store.commit("SET_USER", res.result);
+    });
+  }
 }
 </script>
 <style lang="scss">
diff --git a/src/api/api.js b/src/api/api.js
index 6f0f2b0..ed807f8 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -7,6 +7,7 @@
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
 export const LOGIN = '/admin/CheckUser/userLogin post'
+export const USER_INFO = '/admin/CheckUser/userInfo'
 // export const FILE_UPLOAD = 'http://111.231.196.214:30001/file/upload'
 export const FILE_UPLOAD = import.meta.env.VITE_BASE_API + '/file/upload'
 export const COMMON_TOKEN = 'https://upload-z2.qiniup.com'
diff --git a/src/components/PathDetailImage.vue b/src/components/PathDetailImage.vue
index 7adc428..ade60ba 100644
--- a/src/components/PathDetailImage.vue
+++ b/src/components/PathDetailImage.vue
@@ -55,7 +55,7 @@ function toDetail(i) {
   if (current.value !== i) {
     return
   }
-  import.meta.env.MODE === "development"
+  (import.meta.env.MODE === "development" || import.meta.env.MODE === "test")
       ? router.push({
         path: "/pathdetails",
         query: {routerId: props.detail.routerId, routerName: props.detail.routerName},
diff --git a/src/views/project/ProjectManage.vue b/src/views/project/ProjectManage.vue
index c705b44..966444e 100644
--- a/src/views/project/ProjectManage.vue
+++ b/src/views/project/ProjectManage.vue
@@ -192,7 +192,7 @@ const goProjectDetails = (value) => {
     dialogVisible.value=true
     return
   }
-	import.meta.env.MODE === "development"
+  (import.meta.env.MODE === "development" || import.meta.env.MODE === "test")
 		? router.push({
 			path: "/projectdetails",
 			query: { projectId: value.projectId },