|
@@ -32,13 +32,12 @@ const barRoutes = ref({key: '', path: '', title: ''});
|
|
|
|
|
|
//渲染完成
|
|
//渲染完成
|
|
onMounted(() => {
|
|
onMounted(() => {
|
|
- const {name, path, meta} = useRoutes
|
|
|
|
- const {title, noMenuBar} = meta
|
|
|
|
|
|
+ const {name, path, meta, query} = useRoutes
|
|
barRoutes.value = {
|
|
barRoutes.value = {
|
|
path,
|
|
path,
|
|
key: name,
|
|
key: name,
|
|
- title,
|
|
|
|
- noMenuBar
|
|
|
|
|
|
+ title: meta.title,
|
|
|
|
+ query
|
|
}
|
|
}
|
|
setBarMenuData()
|
|
setBarMenuData()
|
|
})
|
|
})
|
|
@@ -47,24 +46,25 @@ onMounted(() => {
|
|
watch(() => [
|
|
watch(() => [
|
|
useRoutes?.name,
|
|
useRoutes?.name,
|
|
useRoutes?.path,
|
|
useRoutes?.path,
|
|
- useRoutes?.meta?.title,
|
|
|
|
- useRoutes?.meta?.noMenuBar,
|
|
|
|
-], ([key, path, title, noMenuBar]) => {
|
|
|
|
- barRoutes.value = {path, key, title, noMenuBar}
|
|
|
|
|
|
+ useRoutes?.query,
|
|
|
|
+ useRoutes?.meta?.title
|
|
|
|
+], ([key, path, query, title]) => {
|
|
|
|
+ barRoutes.value = {path, key, title, query}
|
|
setBarMenuData()
|
|
setBarMenuData()
|
|
})
|
|
})
|
|
|
|
|
|
|
|
|
|
//设置菜单数据
|
|
//设置菜单数据
|
|
const setBarMenuData = () => {
|
|
const setBarMenuData = () => {
|
|
- const {key, path, title, noMenuBar} = barRoutes.value
|
|
|
|
- if (key !== 'home' && !noMenuBar) {
|
|
|
|
|
|
+ const {key, path, title, query} = barRoutes.value
|
|
|
|
+ if (key !== 'home') {
|
|
const index = barMenuData.value.findIndex(item => item.key === key)
|
|
const index = barMenuData.value.findIndex(item => item.key === key)
|
|
if (index === -1) {
|
|
if (index === -1) {
|
|
barMenuData.value.push({
|
|
barMenuData.value.push({
|
|
path,
|
|
path,
|
|
key: key,
|
|
key: key,
|
|
- title: title
|
|
|
|
|
|
+ title: title,
|
|
|
|
+ query
|
|
})
|
|
})
|
|
}
|
|
}
|
|
setStoreValue('bar-menu-datas', barMenuData.value)
|
|
setStoreValue('bar-menu-datas', barMenuData.value)
|
|
@@ -75,7 +75,7 @@ const setBarMenuData = () => {
|
|
const barMenuClick = (item) => {
|
|
const barMenuClick = (item) => {
|
|
const {key} = barRoutes.value
|
|
const {key} = barRoutes.value
|
|
if (key !== item.key) {
|
|
if (key !== item.key) {
|
|
- router.push({name: item.key});
|
|
|
|
|
|
+ router.push({name: item.key, query: item.query});
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -129,7 +129,7 @@ const barMenuCloseClick = (item, index) => {
|
|
} else {
|
|
} else {
|
|
barRoutes.value = items
|
|
barRoutes.value = items
|
|
setStoreValue('bar-menu-datas', barMenuData.value)
|
|
setStoreValue('bar-menu-datas', barMenuData.value)
|
|
- router.push({name: items.key});
|
|
|
|
|
|
+ router.push({name: items.key, query: items.query});
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
setStoreValue('bar-menu-datas', barMenuData.value)
|
|
setStoreValue('bar-menu-datas', barMenuData.value)
|