From 44a5ab5d8118160df71a345d28c39732176f5465 Mon Sep 17 00:00:00 2001
From: XiaoMo <a1300399510@qq.com>
Date: Thu, 6 Apr 2023 19:00:11 +0800
Subject: [PATCH] =?UTF-8?q?a1300399510@qq.com=20=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=8E=202023/04/06=20-19:00:02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/detail/detailIndex.vue              | 87 +++++++++++--------
 .../search/searchResult/SearchResult.vue      |  2 +-
 2 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/views/detail/detailIndex.vue b/src/views/detail/detailIndex.vue
index 160077c..53e3fd1 100755
--- a/src/views/detail/detailIndex.vue
+++ b/src/views/detail/detailIndex.vue
@@ -134,60 +134,67 @@
             <template v-if="postList.list.length != 0">
                 <div class="card-item shadow" v-for="(item, index) in postList.list" :key="index">
                     <div class="card-head flexacenter">
-                        <img class="card-head-icon"
-                            src="https://axure-file.lanhuapp.com/md516b251fb-9cfa-46fc-a9b6-2a41a7b4dc37__3ad73406ff4bc8b138dafc6dcbf1a635.svg" />
+                        <img class="card-head-icon" :src="item.avatar" />
                         <div class="card-head-content flex1 flexflex">
-                            <div class="card-head-name flexflex">闫旭Mike <div class="landlord flexcenter" v-if="index == 0">
+                            <div class="card-head-name flexflex">{{ item.author }} <div class="landlord flexcenter"
+                                    v-if="index == 0">
                                     楼主
                                 </div>
                             </div>
-                            <div class="card-head-time">2022-7-6 14:56</div>
+                            <div class="card-head-time">{{ $formattedDate(item.dateline) }}</div>
                         </div>
                         <div class="card-head-fool">{{ index == 0 ? '楼主' : `${index}楼` }}</div>
                     </div>
 
-                    <div class="card-content flex1">
-                        <!-- 回复引用 -->
-                        <div class="quotation flexflex" v-if="index == 1">
-                            <svg-icon icon-class="quotation-left" class-name="quotation-icon"></svg-icon>
-                            <div class="quotation-right flex1 flexflex">
-                                <div class="quotation-wenzi flex1 three-lines">
-                                    这个离开香港是否超过180天，应该是居籍的判断，而非物理空间变化的判断。简单来说，只要你在香港纳税，你在香港有工作，有现金流，有房子…这个离开香港是否超过180天，应该是居籍的判断，而非物理空间变化的判断。简单来说，只要你在香港纳税，你在香港有工作，有现金流，有房子…这个离开香港是否超过180天，应该是居籍的判断，而非物理空间变化的判断。简单来说，只要你在香港纳税，你在香港有工作，有现金流，有房子…
-                                </div>
+                    <div class="card-content flex1" v-html="item.message"></div>
 
-                                <div class="quotation-bottom flexacenter">zhangsd 发表于 2022-7-6 14:56
-                                    <svg-icon icon-class="quotation-right" class-name="quotation-icon"></svg-icon>
+
+                    <template v-if="false">
+                        <div class="card-content flex1">
+                            <!-- 回复引用 -->
+                            <div class="quotation flexflex" v-if="index == 1">
+                                <svg-icon icon-class="quotation-left" class-name="quotation-icon"></svg-icon>
+                                <div class="quotation-right flex1 flexflex">
+                                    <div class="quotation-wenzi flex1 three-lines">
+                                        这个离开香港是否超过180天，应该是居籍的判断，而非物理空间变化的判断。简单来说，只要你在香港纳税，你在香港有工作，有现金流，有房子…这个离开香港是否超过180天，应该是居籍的判断，而非物理空间变化的判断。简单来说，只要你在香港纳税，你在香港有工作，有现金流，有房子…这个离开香港是否超过180天，应该是居籍的判断，而非物理空间变化的判断。简单来说，只要你在香港纳税，你在香港有工作，有现金流，有房子…
+                                    </div>
+
+                                    <div class="quotation-bottom flexacenter">zhangsd 发表于 2022-7-6 14:56
+                                        <svg-icon icon-class="quotation-right" class-name="quotation-icon"></svg-icon>
+                                    </div>
                                 </div>
                             </div>
-                        </div>
-                        之前申请永久居民，参考了不少寄托的帖子和经验，现在回馈给大家，积攒RP。
-                        <!-- 未解锁区域 -->
-                        <div class="flexcenter content-unlock content-unlock-no" v-if="index == 3 || index == 4">
-                            <img class="unlock-icom" src="@/assets/img/detail/unlock.png">
-                            {{ index == 3 ? '作者设置了回复可见' : '' }}
-                            {{ index == 4 ? '作者设置了投币可见' : '' }}
-                        </div>
-                        <!-- 已经解锁区域 -->
-                        <div class="content-unlock content-already" v-if="index == 5 || index == 6">
-                            <div class="content-already-header flexflex">
-                                - 本内容投币可见 -
+                            之前申请永久居民，参考了不少寄托的帖子和经验，现在回馈给大家，积攒RP。
+                            <!-- 未解锁区域 -->
+                            <div class="flexcenter content-unlock content-unlock-no" v-if="index == 3 || index == 4">
+                                <img class="unlock-icom" src="@/assets/img/detail/unlock.png">
+                                {{ index == 3 ? '作者设置了回复可见' : '' }}
+                                {{ index == 4 ? '作者设置了投币可见' : '' }}
                             </div>
+                            <!-- 已经解锁区域 -->
+                            <div class="content-unlock content-already" v-if="index == 5 || index == 6">
+                                <div class="content-already-header flexflex">
+                                    - 本内容投币可见 -
+                                </div>
 
-                            <div class="content-unlock-wenzi">
+                                <div class="content-unlock-wenzi">
 
-                                香港身份证件和IANG Visa label；
+                                    香港身份证件和IANG Visa label；
 
-                                香港购买的保险和MPF的缴费账单；
+                                    香港购买的保险和MPF的缴费账单；
 
-                                电话账单和当时香港上台的合约文件；
+                                    电话账单和当时香港上台的合约文件；
+
+                                </div>
 
                             </div>
 
+                            之前申请永久居民，参考了不少寄托的帖子和经验，现在回馈给大家，积攒RP。
+                            之前申请永久居民，参考了不少寄托的帖子和经验，现在回馈给大家，积攒RP。
                         </div>
+                    </template>
+
 
-                        之前申请永久居民，参考了不少寄托的帖子和经验，现在回馈给大家，积攒RP。
-                        之前申请永久居民，参考了不少寄托的帖子和经验，现在回馈给大家，积攒RP。
-                    </div>
                 </div>
             </template>
 
@@ -254,8 +261,9 @@
         </div>
 
         <!-- 分页 -->
-        <div class="paging flexcenter" v-if="postList.list.length != 0">
-            <el-pagination small background layout="prev, pager, next" :total="1000">
+        <div class="paging flexcenter" v-if="postList.count.length > postList.limit">
+            <el-pagination small background layout="prev, pager, next" @current-change="currentChange"
+                :current-page.sync="postList.page" :page-size="postList.limit" :total="postList.count">
             </el-pagination>
         </div>
 
@@ -601,17 +609,18 @@ export default {
                 let data = res.data
                 console.log(data);
 
-                this.postList.list = data.list
+                this.postList.list = data.data
                 this.postList.page = data.page
                 this.postList.limit = data.limit
                 this.postList.count = data.count
+
+                console.log(this.postList);
             })
 
 
 
         },
 
-
         // 集中处理回复帖子
         postComment(message) {
             this.$http.post("/api/operation/reply", {
@@ -622,6 +631,10 @@ export default {
             })
         },
 
+        // 点击改变页数
+        currentChange() {
+            this.getPostList()
+        },
 
         // 点击点赞
         tapLike() {
diff --git a/src/views/search/searchResult/SearchResult.vue b/src/views/search/searchResult/SearchResult.vue
index 3785c88..7b9037b 100755
--- a/src/views/search/searchResult/SearchResult.vue
+++ b/src/views/search/searchResult/SearchResult.vue
@@ -53,7 +53,7 @@
 			<img class="result-empty-icon" src="@/assets/img/icon/empty.png">
 		</div>
 
-		<div v-if="list.length > limit" class="paging flexcenter">
+		<div v-if="count > limit" class="paging flexcenter">
 			<el-pagination small background layout="prev, pager, next" @current-change="currentChange"
 				:current-page.sync="page" :page-size="limit" :total="count">
 			</el-pagination>