From 1467d91c4dbface566a81cd7d7a51ffada173465 Mon Sep 17 00:00:00 2001
From: zhangyong <517047165@qq.com>
Date: 星期一, 27 五月 2024 09:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/HangZhouMes

---
 UI-Project/src/layout/MainErpView.vue |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/UI-Project/src/layout/MainErpView.vue b/UI-Project/src/layout/MainErpView.vue
index d2e3ed7..91453ae 100644
--- a/UI-Project/src/layout/MainErpView.vue
+++ b/UI-Project/src/layout/MainErpView.vue
@@ -18,14 +18,27 @@
   userStore.$patch({
     user: null,
   })
-  router.push('/login')
+  // router.push('/login')
+  let token = window.localStorage.getItem('userInfo')
+console.log(token);
+  request.get("/loadGlass/sys/user/login").then((res) => {
+    if (res.code === 200) {
+    ElMessage.success(res.msg);
+     console.log(res.data);
+    } else {
+    ElMessage.warning(res.msg);
+    // router.push("/login");
+    }
+   });
 }
 
 //鎻愬彇鑿滃崟妯″潡鍒楄〃
 let menuList = $ref([])
-request.get('/loadGlass/menu/sysMenu/list').then((res) => {
+// request.get('/loadGlass/menu/sysMenu/list').then((res) => {
+request.get('/loadGlass/sys/menu/getMenuTree').then((res) => {
   if (res.code == 200) {
     menuList = deepClone(res.data)
+    console.log(response.data.token);
   } else {
     ElMessage.warning(res.msg)
     router.push('/login')

--
Gitblit v1.8.0