From 005309aa82a678943bea5a63d9481c5e2149559c Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Tue, 7 Feb 2023 11:06:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/discuss/DiscussPage.vue | 105 +++++++-----------------------
 1 file changed, 22 insertions(+), 83 deletions(-)

diff --git a/src/views/discuss/DiscussPage.vue b/src/views/discuss/DiscussPage.vue
index 262ace7..7cda5d4 100644
--- a/src/views/discuss/DiscussPage.vue
+++ b/src/views/discuss/DiscussPage.vue
@@ -224,85 +224,23 @@ const handleCreated = (editor) => {
   editorRef.value = editor; // 记录 editor 实例，重要！
 };
 
-useRequest(DISCUSS_LIST, param.value, (e)=>{
-  console.log('我是获取的讨论详情数据', e)
+request(DISCUSS_LIST, {
+  type:type==1?2:1,
+  id,
+}).then(e=>{
+  console.log('112233---->',e)
   state.info = e.data;
   // 获取该讨论下面的帖子
   console.log('我是查询讨论下帖子的参数',{
-      "discussId": e.data.discussDtoList[0].discussId,
-      "pageNo": state.pageNo,
-      "pageSize": state.pageSize,
-      "searchType": state.searchType
-    })
-  useRequest(
-    QueryDiscussSubmitDetailByDiscussId, 
-    {
-      "discussId": e.data.discussDtoList[0].discussId,
-      "pageNo": state.pageNo,
-      "pageSize": state.pageSize,
-      "searchType": state.searchType
-    }, 
-    (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;
-    })
-});
+    "discussId": e.data.discussDtoList[0].discussId,
+    "pageNo": state.pageNo,
+    "pageSize": state.pageSize,
+    "searchType": state.searchType
+  })
+  getPostList(e.data.discussDtoList[0].discussId);
+}).catch(err=>{
+  console.log(err)
+})
 
 // 获取帖子
 function getPostList(discussId) {
@@ -313,15 +251,14 @@ function getPostList(discussId) {
       "searchType": state.searchType
     })
 
-  useRequest(
+  request(
     QueryDiscussSubmitDetailByDiscussId, 
     {
       "discussId": discussId,
       "pageNo": state.pageNo,
       "pageSize": state.pageSize,
       "searchType": state.searchType
-    }, 
-    (e)=>{
+    }).then(e=>{
       console.log('我是当前讨论下的帖子',e)
       state.postList = e.data.rows;
       state.total = e.data.total;
@@ -380,22 +317,24 @@ function getPostList(discussId) {
         }
       ]
       state.total = 100;
+    }).catch(err=>{
+      console.log(err)
     })
 }
 
 // 最新
-function nowPost(id) {
+function nowPost(discussId) {
   state.searchType = 1;
   state.pageNo = 1;
   state.currentPage = 1;
-  getPostList(id);
+  getPostList(discussId);
 } 
 // 最热
-function hotPost() {
+function hotPost(discussId) {
   state.searchType = 2;
   state.pageNo = 1;
   state.currentPage = 1;
-  getPostList(id);
+  getPostList(discussId);
 } 
 
 // 分页