renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test

Browse Source 
# Conflicts:
#	src/components/_base/navbar/index.vue
This commit is contained in:
rd
2025-08-13 10:48:35 +08:00
parent 4b7d0c0f8e a0a96f512a
commit 6bab0c1092
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/_base/navbar/index.vue
View File

@ -8,7 +8,7 @@
<div class="flex-1"> <div class="flex-1">
<NavbarMenu v-if="!isAgentRoute"/> <NavbarMenu v-if="!isAgentRoute"/>
</div> </div>
<RightSide :isAgentRoute="isAgentRoute" /> <RightSide :isAgentRoute="isAgentRoute" v-if="userStore.isLogin"/>
</div> </div>
</template> </template>
@ -16,10 +16,12 @@
import NavbarMenu from './components/navbar-menu'; import NavbarMenu from './components/navbar-menu';
import RightSide from './components/right-side'; import RightSide from './components/right-side';
import { useUserStore } from '@/stores';
import { handleUserHome } from '@/utils/user.ts'; import { handleUserHome } from '@/utils/user.ts';
import router from '@/router'; import router from '@/router';
const route = useRoute(); const route = useRoute();
const userStore = useUserStore();
const isAgentRoute = computed(() => { const isAgentRoute = computed(() => {
return route.meta?.isAgentRoute; return route.meta?.isAgentRoute;