Merge remote-tracking branch 'origin/huangzhenbao-admin' into comclib-analytics
This commit is contained in:
@@ -63,7 +63,8 @@
|
||||
<!-- 内容展示区 (内部路由渲染) -->
|
||||
<view class="content-scroll">
|
||||
<view class="content-inner" :class="{ 'is-mobile': isMobile }">
|
||||
<component :is="currentComponent" v-if="!isPageLoading" />
|
||||
<slot></slot>
|
||||
<component :is="currentComponent" v-if="!isPageLoading && currentComponent != null" />
|
||||
<AdminPageLoading v-if="isPageLoading" />
|
||||
</view>
|
||||
<AdminFooter />
|
||||
@@ -118,6 +119,13 @@ import type { TabItem } from '@/layouts/admin/store/adminNavStore.uts'
|
||||
|
||||
import { getComponent } from '@/layouts/admin/router/adminComponentMap.uts'
|
||||
|
||||
const props = defineProps({
|
||||
currentPage: {
|
||||
type: String,
|
||||
default: ''
|
||||
}
|
||||
})
|
||||
|
||||
// 侧边栏宽度配置 (CRMEB 1:1)
|
||||
const ASIDE_W = 70
|
||||
const SUB_W = 200
|
||||
@@ -388,6 +396,9 @@ onMounted(async () => {
|
||||
}
|
||||
|
||||
initNavState()
|
||||
if (props.currentPage != '') {
|
||||
openRoute(props.currentPage as string)
|
||||
}
|
||||
|
||||
// 初始化窗口宽度
|
||||
windowWidth.value = uni.getWindowInfo().windowWidth
|
||||
|
||||
Reference in New Issue
Block a user