Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

pages/index/index.vue

@@ -1769,7 +1769,7 @@ export default {
 	display: flex;
 	flex-direction: column;
 	height: calc(100vh - 50px);
-	margin-bottom: 60px;
+	// margin-bottom: 60px;
 }
 
 .work-school {
@@ -2664,8 +2664,8 @@ page {
 
 .qyList {
 	width: 100%;
-	height: auto;
-
+	overflow: auto;
+	flex: 1;
 	/* 技能标签区域 */
 	.resume-skills {
 		margin: 20rpx 0; // 与上下模块的间距