Merge remote-tracking branch 'origin/master'

src/assets/css/main.css

@@ -30,7 +30,6 @@ li {
 
 
 .content-box {
-    padding-bottom: 30px;
     -webkit-transition: left .3s ease-in-out;
     transition: left .3s ease-in-out;
     background: #f0f0f0;

src/views/data/Framework.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>
+    <div class="wrap">
         <el-container>
             <el-aside width="300px">
                 <div class="plus">
@@ -18,7 +18,7 @@
             </el-aside>
 
             <el-main style="padding-top: 0">
-                <el-card shadow="hover">
+                <el-card class="main-wrap" shadow="hover">
                     <el-form label-width="80px" class="flex-between mgb20">
                         <div class="flex-center">
                             <el-form-item label="更新时间" style="margin: 0 20px 0 0">
@@ -624,7 +624,16 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+    .wrap, .el-container{
+        min-height: calc(100vh - 290px);
+    }
+    .el-aside, .main-wrap{
+        height: calc(100vh - 290px);
+        overflow: auto;
+    }
     /deep/.el-container{
+        height: 100%;
+        padding-bottom: 0;
         .el-aside{
             padding: 15px;
             background-color: #fff;
@@ -646,5 +655,8 @@ export default {
                 }
             }
         }
+        .el-main{
+            height: 100%;
+        }
     }
 </style>

src/views/data/Introduce.vue

@@ -154,16 +154,16 @@ export default {
             const keyword = this.newKeyword
             if (keyword) {
                 if (this.keywordList.find(e => e.keyword === keyword)) return this.$message.error('请不要输入重复关键字！')
+                this.confirmEdit()
                 this.$post(this.api.addKeyword,{
                     categoryId: this.categoryId,
                     keyword
                 }).then(res => {
                     this.newKeyword = ''
                     this.getKeyword()
-                    this.confirmEdit()
                 }).catch(res => {})
             } else {
-                this.$message.error('请输入关键字！')
+                this.confirmEdit()
             }
         }
     }