Merge branch 'master' of https://gitee.com/virus010101/linfeng-community

src/main/resources/static/linfeng-community-vue/src/views/modules/admin/category-add-or-update.vue

@@ -39,7 +39,7 @@ export default {
         ],
         coverImage: [
           { required: true, message: "图片不能为空", trigger: "blur" },
-        ],
+        ]
       },
     };
   },

src/main/resources/static/linfeng-community-vue/src/views/modules/admin/comment-add-or-update.vue

@@ -32,26 +32,8 @@
           createTime: ''
         },
         dataRule: {
-          pid: [
-            { required: true, message: '父级id不能为空', trigger: 'blur' }
-          ],
-          uid: [
-            { required: true, message: '评论作者ID不能为空', trigger: 'blur' }
-          ],
-          toUid: [
-            { required: true, message: '被回复用户ID不能为空', trigger: 'blur' }
-          ],
-          postId: [
-            { required: true, message: '评论帖子ID不能为空', trigger: 'blur' }
-          ],
-          content: [
-            { required: true, message: '评论内容不能为空', trigger: 'blur' }
-          ],
           status: [
-            { required: true, message: '评论状态不能为空', trigger: 'blur' }
+            { required: true, message: '评论状态未选择', trigger: 'blur' }
-          ],
-          createTime: [
-            { required: true, message: '创建时间不能为空', trigger: 'blur' }
           ]
         }
       }

src/main/resources/static/linfeng-community-vue/src/views/modules/admin/comment.vue

@@ -36,13 +36,6 @@
         label="id"
       >
       </el-table-column>
-      <el-table-column
-        prop="pid"
-        header-align="center"
-        align="center"
-        label="父级id"
-      >
-      </el-table-column>
       <el-table-column
         prop="uid"
         header-align="center"
@@ -50,13 +43,6 @@
         label="评论作者ID"
       >
       </el-table-column>
-      <el-table-column
-        prop="toUid"
-        header-align="center"
-        align="center"
-        label="被回复用户ID"
-      >
-      </el-table-column>
       <el-table-column
         prop="postId"
         header-align="center"

src/main/resources/static/linfeng-community-vue/src/views/modules/admin/link-add-or-update.vue

@@ -50,14 +50,8 @@ export default {
       },
       dataRule: {
         title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
-        url: [{ required: true, message: "路径不能为空", trigger: "blur" }],
+        url: [{ required: true, message: "跳转路径不能为空", trigger: "blur" }],
-        img: [{ required: true, message: "图片不能为空", trigger: "blur" }],
+        img: [{ required: true, message: "图片不能为空", trigger: "blur" }] 
-        type: [
-          { required: true, message: "3圈子页轮播图不能为空", trigger: "blur" },
-        ],
-        createTime: [
-          { required: true, message: "创建时间不能为空", trigger: "blur" },
-        ],
       },
     };
   },

src/main/resources/static/linfeng-community-vue/src/views/modules/admin/post.vue

@@ -76,13 +76,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column
+      
-        prop="topicName"
-        header-align="center"
-        align="center"
-        label="归属"
-      >
-      </el-table-column>
       <el-table-column
         prop="title"
         header-align="center"
@@ -153,13 +147,6 @@
         label="点赞数"
       >
       </el-table-column>
-      <el-table-column
-        prop="discussTitle"
-        header-align="center"
-        align="center"
-        label="话题"
-      >
-      </el-table-column>
       <el-table-column
         prop="postTop"
         header-align="center"