update

src/App.vue

@@ -147,66 +147,6 @@ body {
 .pro-wrapper {
 	width: 100vw;
 	height: 100vh;
-<<<<<<< HEAD
-	// overflow-y: hidden;
-}
-
-/* 确保Element Plus容器组件占满宽度 */
-.el-container {
-	width: 100%;
-	height: 100%;
-}
-
-.navbar {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	background: #fff;
-	color: rgba(10, 18, 30, 1);
-	border-bottom: 1px solid #e5e7eb;
-	box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-	position: sticky;
-	top: 0;
-	z-index: 2000;
-	box-sizing: border-box;
-	height: 72px;
-}
-
-.main-container {
-	/* 移除宽度限制，让子页面自己控制布局 */
-	width: 100%;
-	height: 1008px;
-	position: relative;
-}
-
-.nav-brand {
-	display: flex;
-	align-items: center;
-	gap: 12px;
-	position: absolute;
-	left: 160px;
-
-	.brand-icon {
-		width: 48px;
-		height: 48px;
-		img {
-			width: 100%;
-			height: 100%;
-		}
-	}
-}
-
-.brand-icon {
-	font-size: 24px;
-	color: #1e3a8a;
-}
-
-.brand-text {
-	cursor: pointer;
-
-	.text-ch {
-		height: 37px;
-=======
 	position: relative;
 	overflow: hidden;
 	.navbar {
@@ -214,7 +154,6 @@ body {
 		justify-content: center;
 		align-items: center;
 		background: #fff;
->>>>>>> c1d8a1e364a6650ee4e3e5b1049b0a673ec53337
 		color: rgba(10, 18, 30, 1);
 		border-bottom: 1px solid #e5e7eb;
 		box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);

src/views/bill/billLayout/index.vue

@@ -257,24 +257,24 @@ onMounted(() => {
 	// margin: 0 auto;
 	.layout-main {
 		width: 100%;
-		height: calc(100% - 64px);
+		height: calc(100vh - 64px);
+		overflow-y: auto;
 		.header-main {
 			position: sticky;
-			top: 72px;
+			top: 0;
 			z-index: 1000;
 			width: 100%;
-			height: 136px;
 			background-color: #fff;
-			box-shadow: 0px 0px 20px 0px rgba(25, 69, 130, 0.1);
+			box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.05);
+			overflow: hidden;
 		}
 		.layout-main-header {
 			width: 1744px;
-			height: 136px;
-			background: rgba(255, 255, 255, 1);
+			background: #fff;
 			display: flex;
 			justify-content: space-between;
 			margin: 0 auto;
-			padding-top: 14px;
+			padding: 14px 0;
 			.layout-main-header-left-box {
 				width: 900px;
 				// margin-left: 160px;