feat:增加讨论任务-评论列表-发表帖子、帖子详情-帖子展示-图片展示-图片上传-回复评论

src/views/discuss/DiscussPage.vue

@@ -69,14 +69,12 @@
           v-for="(d, j) in state?.postList"
           :key="j"
         >
-          <div class="itemtitle" @click="comment(d)">{{ d.discussSubmitTitle }}</div>
-          <div class="itemdiscuss" @click="comment(d)">
-            {{ d.discussSubmitContent }}
-          </div>
+          <div class="itemtitle" @click="comment(d)">{{ d.title }}</div>
+          <div class="itemdiscuss" @click="comment(d)" :v-html="d.content"></div>
           <div class="allstar clearfix">
             <div @click="comment(d)" style="display: flex; cursor: pointer">
               <span class="iconfont icon-pinglun" style="color: #b3bdc4"></span>
-              <div class="count">{{ d.discussReviewCount || 0 }}</div>
+              <div class="count">{{ d.commentNum || 0 }}</div>
             </div>
             <div @click="like(d)" style="display: flex; cursor: pointer">
               <span
@@ -86,7 +84,7 @@
                   marginLeft: '19px',
                 }"
               ></span>
-              <div class="count">{{ d.discussLikeCount || 0 }}</div>
+              <div class="count">{{ d.praiseNum || 0 }}</div>
             </div>
             <div @click="collection(d)" style="display: flex; cursor: pointer">
               <span
@@ -96,13 +94,12 @@
                   marginLeft: '19px',
                 }"
               ></span>
-              <div class="count">{{ d.discussCollectionCount || 0 }}</div>
+              <div class="count">{{ d.collectionNum || 0 }}</div>
             </div>
           </div>
           <div class="thinline"></div>
         </div>
-        <div
-           style="display:flex;justify-content:center;align-items:center;margin-top:36px;">
+        <div style="display:flex;justify-content:center;align-items:center;margin-top:36px;margin-bottom:36px;">
           <!-- 分页 -->
           <el-pagination
             v-model:current-page="state.currentPage"
@@ -252,14 +249,7 @@ function getPostList(discussId) {
   console.log('获取帖子参数', {
       "discussId": discussId,
       "pageNo": state.pageNo,
-      "pageSize": state.pageSize,
-      "id": "",
-      "title": "",
-      "content": "",
-      "userId": userInfo.value.id,
-      "userJobName": userInfo.value.jobName,
-      "userName": userInfo.value.realName,
-      "userOrgName": userInfo.value.orgName
+      "pageSize": state.pageSize
     })
 
   request(
@@ -267,73 +257,11 @@ function getPostList(discussId) {
     {
       "discussId": discussId,
       "pageNo": state.pageNo,
-      "pageSize": state.pageSize,
-      "id": "",
-      "title": "",
-      "content": "",
-      "userId": userInfo.value.id,
-      "userJobName": userInfo.value.jobName,
-      "userName": userInfo.value.realName,
-      "userOrgName": userInfo.value.orgName
+      "pageSize": state.pageSize
     }).then(e=>{
       console.log('我是当前讨论下的帖子',e)
-      state.postList = e.data.rows;
-      state.total = e.data.total;
-
-      // 添加一条假的数据 供测试使用
-      state.postList =[
-        {
-          "createTime": "",
-          "createUser": 0,
-          "discussCollectionCount": "234",
-          "discussId": "",
-          "discussLikeCount": "3576",
-          "discussReviewCount": "12353",
-          "discussSubmitContent": "帖子的内容----帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容帖子的内容",
-          "discussSubmitId": "",
-          "discussSubmitPictureAddress": "",
-          "discussSubmitTitle": "我是一个用来测试的帖子标题",
-          "stuId": "",
-          "stuName": "",
-          "updateTime": "",
-				  "updateUser": 0,
-
-          "submitReviewVoList": [
-            {
-              "createTime": "",
-              "createUser": 0,
-              "discussLikeCount": "",
-              "discussReviewContent": "",
-              "discussReviewFlag": "",
-              "discussReviewId": "",
-              "discussReviewPictureAddress": "",
-              "discussSubmitId": "",
-              "stuId": "",
-              "stuName": "",
-              "submitReplyVoList": [
-                {
-                  "createTime": "",
-                  "createUser": 0,
-                  "discussReplyId": 0,
-                  "discussReviewId": "",
-                  "replyContent": "",
-                  "replyFlag": "",
-                  "replyPictureAddress": "",
-                  "reviewStuId": "",
-                  "reviewStuName": "",
-                  "stuId": "",
-                  "stuName": "",
-                  "updateTime": "",
-                  "updateUser": 0
-                }
-              ],
-              "updateTime": "",
-              "updateUser": 0
-            }
-          ]
-        }
-      ]
-      state.total = 100;
+      state.postList = e.data.records;
+      state.total = Number(e.data.total);
     }).catch(err=>{
       console.log(err)
     })
@@ -363,20 +291,30 @@ function handleCurrentChange(e, k) {
 }
 
 
-function comment({ discussId: id }) {
-  router.push({ path: "discussdetail", query: { id, type, pName, sName} });
+function comment({ discussId: id, id: postID }) {
+  router.push({ path: "discussdetail", query: { id, type, pName, sName, postID, postName:state.info.discussDtoList[0].discussName } });
 }
 
 function like(d) {
-  d.praised ? (d.praiseNum -= 1) : (d.praiseNum += 1);
+  d.praised ? ((d.praiseNum) -= 1) : (d.praiseNum += 1);
   d.praised = !d.praised;
-  request(COMMENT_PRAISE, { targetId: d.discussId, type: 3 });
+  console.log('我是点赞传递的参数', { targetId: d.discussId, type: 2 })
+  request(PostPraise, { targetId: d.discussId, type: 2 }).then(res=>{
+    console.log('我是点赞的操作',res)
+  }).catch(err=>{
+    console.log(err)
+  });
 }
 
 function collection(d) {
   d.collected ? (d.collectionNum -= 1) : (d.collectionNum += 1);
   d.collected = !d.collected;
-  request(COMMENT_COLLECTION, { targetId: d.discussId, type: 4 });
+  console.log('我是收藏传递的参数', { targetId: d.discussId, type: 2 })
+  request(PostCollection, { targetId: d.discussId, type: 2 }).then(res=>{
+    console.log('我是收藏的操作',res)
+  }).catch(err=>{
+    console.log(err)
+  });
 }
 
 
@@ -420,7 +358,9 @@ const postAdd = () => {
     if(res.code==200){
       dialogVisible.value = false;
       ElMessage.success("发帖成功");
-      getPostList();
+      getPostList(state.info.discussDtoList[0].discussId);
+      titleName.value = "";
+      valueHtml.value = "";
     }
   }).catch(err=>{
     console.log(err)