From 118e03d7df7fc427f529439dfbfcf8a6274d206a Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期四, 14 十一月 2024 13:24:36 +0800
Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.V1.0 into test
---
src/layout/component/main.vue | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue
index dd5c594..ae57df5 100644
--- a/src/layout/component/main.vue
+++ b/src/layout/component/main.vue
@@ -9,9 +9,18 @@
wrap-class="layout-main-scroll flex"
view-class="layout-main-scroll bg-[#1c1e1d] flex h100 w-full"
>
- <SideBar />
- <div class="flex-auto flex-col flex right-container">
- <Header class="flex-0" />
+ <SideBar v-if="!isSharePage && sidebarIsShow" :isShow="sidebarIsShow" @toggleSidebar="toggleSidebar"/>
+ <div
+ class="flex-auto flex-col flex right-container"
+ :class="{
+ // 'm-[6px]': !isSharePage,
+ // 'rounded-[10px]': !isSharePage,
+ 'bg-[#1c1e1d]': !isSharePage,
+ 'bg-[#f7f8fa]': isSharePage,
+ }"
+ >
+ <Header v-if="!isSharePage" class="flex-0" @toggleSidebar="toggleSidebar" :sidebarIsShow="sidebarIsShow"/>
+ <ShareHeader v-else class="flex-0"></ShareHeader>
<LayoutParentView class="flex-auto" />
</div>
</el-scrollbar>
@@ -24,15 +33,18 @@
import { computed, defineAsyncComponent, onMounted, ref } from 'vue';
import { useRoute } from 'vue-router';
import Header from './header/Header.vue';
+import ShareHeader from './header/ShareHeader.vue';
+
import SideBar from './sidebar/Sidebar.vue';
import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
import { useThemeConfig } from '/@/stores/themeConfig';
import { NextLoading } from '/@/utils/loading';
+import { isSharePage } from '/@/stores/chatRoom';
+import { Local } from '/@/utils/storage';
// 寮曞叆缁勪欢
const LayoutParentView = defineAsyncComponent(() => import('/@/layout/routerView/parent.vue'));
const LayoutFooter = defineAsyncComponent(() => import('/@/layout/footer/index.vue'));
-
// 瀹氫箟鍙橀噺鍐呭
const layoutMainScrollbarRef = ref();
const route = useRoute();
@@ -70,6 +82,14 @@
defineExpose({
layoutMainScrollbarRef,
});
+
+//#region ====================== 渚ц竟鏍忔樉绀洪殣钘� ======================
+const sidebarIsShow = ref(!!Local.get('sidebarIsShow'));
+const toggleSidebar = (val) => {
+ sidebarIsShow.value = val;
+ Local.set('sidebarIsShow',val)
+};
+//#endregion
</script>
<style scoped lang="scss">
@@ -80,9 +100,9 @@
overflow: hidden;
-webkit-box-sizing: border-box;
box-sizing: border-box;
- background-color: #1c1e1d;
+ // background-color: #1c1e1d;
font-family: 'Segoe UI', Roboto, 'Helvetica Neue', Arial, sans-serif;
- margin: 6px;
- border-radius: 10px;
+ // margin: 6px;
+ // border-radius: 10px;
}
</style>
--
Gitblit v1.9.3