From 41fc3d69e920ca286591352f7f6d03ccaad1e794 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 26 九月 2025 15:42:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/main.js | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/admin/src/main.js b/admin/src/main.js
index 0ad3f03..83b2a5e 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -37,7 +37,7 @@
router,
store,
computed: {
- ...mapState(['userInfo', 'homePage'])
+ ...mapState(['userInfo', 'homePage','topMenuCurrent','menuData'])
},
watch: {
async userInfo () {
@@ -48,7 +48,7 @@
}
},
methods: {
- ...mapMutations(['switchCollapseMenu', 'setHomePage']),
+ ...mapMutations(['switchCollapseMenu', 'setHomePage', 'setTopMenuCurrent', 'setTopMenuCurrent']),
// 鍒濆鍖栨湰鍦伴厤缃�
initLocalConfig () {
// 鑿滃崟鐘舵�侀厤缃�
@@ -74,15 +74,27 @@
await fetchMenuTree()
.then(allmenus => {
// 娣诲姞鑿滃崟
- var menus = allmenus.filter(item => {
- return item.type !== 1
- })
var topList = allmenus.filter(item => {
return item.type === 1
})
- console.log(topList)
- storeMenus.push.apply(storeMenus, menus)
storeTopMenus.push.apply(storeTopMenus, topList)
+ var topCurrent = null
+ topList.forEach(item => {
+ if (item.linkType === 0 && topCurrent == null) {
+ topCurrent = item
+ }
+ })
+ this.setTopMenuCurrent(topCurrent)
+ // console.log(topList)
+ // var menus = []
+ // topList.forEach(item => {
+ // console.log(topCurrent.id, item.id)
+ // if (item.id == this.topMenuCurrent.id) {
+ // menus = item.children
+ // }
+ // })
+ console.log('menus', this.menuData.list)
+ storeMenus.push.apply(storeMenus, this.menuData.list)
// 娣诲姞璺敱
this.__addRouters(storeMenus)
// 404
--
Gitblit v1.9.3