Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/App.vue
This commit is contained in:
yuping
2022-12-30 20:44:44 +08:00

View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本2.0.2------------"); console.log("版本2.0.3------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });