Merge remote-tracking branch 'origin/master'

@@ -106,7 +106,7 @@ export default {
 	},
 	},
 	mounted() {
 	mounted() {
 		this.$nextTick(() => {
 		this.$nextTick(() => {
-			this.tableHeight = this.$refs.notice.offsetHeight - 53;
+			this.tableHeight = this.$refs.notice.offsetHeight - 54;
 		});
 		});
 	},
 	},
 	methods: {
 	methods: {
@@ -228,13 +228,13 @@ export default {
 				}
 				}
 			}
 			}
 		}
 		}
-		.el-card__body {
-			padding: 40px;
+		/deep/ .el-card__body {
+			padding: 50px 20px;
 		}
 		}
 	}
 	}
 	.notice {
 	.notice {
 		padding: 0;
 		padding: 0;
-		height: calc(100% - 225px);
+		height: calc(100% - 285px);
 		@flex();
 		@flex();
 		.news {
 		.news {
 			float: left;
 			float: left;