Merge branch 'main' of git.zdool.com:xs/ggfwjsc

This commit is contained in:
duanxiaohai 2024-04-17 16:53:41 +08:00
commit 86685d312c
1 changed files with 10 additions and 9 deletions

View File

@ -83,14 +83,11 @@
<div class="yd_title service"></div>
<eP7></eP7>
</div>
<div class="flex1" style="height:100vh;">
<div class="flex1" >
<div class="yd_title last"></div>
<div class="table">
<div class="item" >3月2日健康日在龙中公园进行健康活动宣</div>
<div class="item" >3月2日健康日在龙中公园进行健康活动宣</div>
<div class="item" >3月2日健康日在龙中公园进行健康活动宣</div>
<div class="item" >3月2日健康日在龙中公园进行健康活动宣</div>
<div class="item" >3月2日健康日在龙中公园进行健康活动宣</div>
<div class="item" v-for="i in 15">3月2日健康日在龙中公园进行健康活动宣</div>
</div>
</div>
</div>
@ -654,13 +651,16 @@ const change = (name, index) => {
}
}
.table {
box-sizing: border-box;
margin-top: 10px;
width: 95%;
min-height: 200px;
height: calc(100% - 115px);
height: 220px;
// height: calc(100% - 115px);
// background: red;
overflow-y: scroll;
overflow-y: auto;
.item {
box-sizing: border-box;
margin-top: 10px;
padding: 16px 20px;
background-image: url(@/assets/images/hygiene/table_bg.png);
@ -668,6 +668,7 @@ const change = (name, index) => {
background-size: 100% 100%;
color: #ffffff;
}
}
/* 滚动条整体部分 */
.table::-webkit-scrollbar {