shish 8 месяцев назад
Родитель
Сommit
88b1a16ae2
2 измененных файлов с 30 добавлено и 6 удалено
  1. 15 3
      ghsApp/src/admin/item/list2.vue
  2. 15 3
      hdApp/src/admin/item/list2.vue

+ 15 - 3
ghsApp/src/admin/item/list2.vue

@@ -647,12 +647,25 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.app-content {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	overflow: hidden;
+}
+
+.modern-tabs-container {
+	flex-shrink: 0;
+}
+
 .billing_box_bg {
-	height: 100%;
+	flex: 1;
 	display: flex;
 	background:white;
 	flex-direction: column;
+	overflow: hidden;
 	.input-wrap {
+		flex-shrink: 0;
 		display: flex;
 		padding: 10upx 20upx 22upx 13upx;
 		.search-bar {
@@ -668,7 +681,6 @@ export default {
 		overflow: hidden;
 	}
 	.tab-view {
-		height: calc(100vh - 140upx);
 		width: 170upx;
 		flex-shrink: 0;
 		background-color: #f0f2f6;
@@ -705,7 +717,6 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
 		flex: 1;
 		box-sizing: border-box;
 	}
@@ -740,6 +751,7 @@ export default {
   padding: 0;
   background-color: #f8f9fa;
   width: 100%;
+  flex-shrink: 0;
 }
 
 .modern-tabs {

+ 15 - 3
hdApp/src/admin/item/list2.vue

@@ -633,12 +633,25 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.app-content {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+	overflow: hidden;
+}
+
+.modern-tabs-container {
+	flex-shrink: 0;
+}
+
 .billing_box_bg {
-	height: 100%;
+	flex: 1;
 	display: flex;
 	background:white;
 	flex-direction: column;
+	overflow: hidden;
 	.input-wrap {
+		flex-shrink: 0;
 		display: flex;
 		padding: 10upx 20upx 22upx 13upx;
 		.search-bar {
@@ -653,7 +666,6 @@ export default {
 		overflow: hidden;
 	}
 	.tab-view {
-		height: calc(100vh - 140upx);
 		width: 170upx;
 		flex-shrink: 0;
 		background-color: #f0f2f6;
@@ -689,7 +701,6 @@ export default {
 		}
 	}
 	.right-box {
-		height: calc(100vh - 140upx);
 		flex: 1;
 		box-sizing: border-box;
 	}
@@ -723,6 +734,7 @@ export default {
   padding: 0;
   background-color: #f8f9fa;
   width: 100%;
+  flex-shrink: 0;
 }
 
 .modern-tabs {