From b083c5499560e7e505596fe07a5ac7d76c1badb1 Mon Sep 17 00:00:00 2001
From: 边少东 <2879594283@qq.com>
Date: Sat, 8 Oct 2022 15:50:24 +0800
Subject: [PATCH] feat：柯桥点赞功能

---
 src/views/Yanxue/achievementsOne.vue | 417 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/Yanxue/pageDetails.vue     |  41 ++++++++++++++++++++++++-----------------
 2 files changed, 258 insertions(+), 200 deletions(-)

diff --git a/src/views/Yanxue/achievementsOne.vue b/src/views/Yanxue/achievementsOne.vue
index 15df219..3afd294 100644
--- a/src/views/Yanxue/achievementsOne.vue
+++ b/src/views/Yanxue/achievementsOne.vue
@@ -1,219 +1,270 @@
 <template>
-  <div class="cardBox">
-    <!-- <van-tabs v-model="tabsName">
+    <div class="cardBox">
+        <!-- <van-tabs v-model="tabsName">
       <van-tab title="红色教育"></van-tab>
       <van-tab title="劳动教育"></van-tab>
       <van-tab title="课外实践"></van-tab>
       <van-tab title="研学旅行"></van-tab>
     </van-tabs> -->
 
-    <div class="contextBox" v-if="newsList.length != 0">
-      <div
-        class="art_card_pic"
-        v-for="(v, i) in newsList"
-        :key="i"
-        @click="toDetails(v)"
-      >
-        <div class="art_context">
-          <div class="art_title">{{ v.titleDesc }}</div>
-          <div class="art_bot">
-            <!-- <div class="redSticky" v-if="v.readNumber">置顶</div> -->
-            <!-- <div class="greyTime">发布于 {{ v.createTime ? Moment(v.createTime).format('YYYY-MM-DD HH:mm:ss') : ''}}</div> -->
-            <div class="greyTime">点赞量 {{ v.likeNumber }}</div>
-            <div class="greyFont">浏览量 {{ v.readNumber }}</div>
-          </div>
+        <div class="contextBox" v-if="newsList.length != 0" @load="getData">
+            <van-list
+                v-model="loading"
+                :finished="finished"
+                finished-text="没有更多了"
+                @load="getData"
+            >
+                <div
+                    class="art_card_pic"
+                    v-for="(v, i) in newsList"
+                    :key="i"
+                    @click="toDetails(v)"
+                >
+                    <div class="art_context">
+                        <div class="art_title">{{ v.titleDesc }}</div>
+                        <div class="art_bot">
+                            <!-- <div class="redSticky" v-if="v.readNumber">置顶</div> -->
+                            <!-- <div class="greyTime">发布于 {{ v.createTime ? Moment(v.createTime).format('YYYY-MM-DD HH:mm:ss') : ''}}</div> -->
+                            <div class="greyTime">
+                                点赞量 {{ v.likeNumber }}
+                            </div>
+                            <div class="greyFont">
+                                浏览量 {{ v.readNumber }}
+                            </div>
+                        </div>
+                    </div>
+                    <div class="art_pic">
+                        <img :src="v.imgUrl" />
+                    </div>
+                </div>
+            </van-list>
+            <!-- <div
+                class="art_card_pic"
+                v-for="(v, i) in newsList"
+                :key="i"
+                @click="toDetails(v)"
+            >
+                <div class="art_context">
+                    <div class="art_title">{{ v.titleDesc }}</div>
+                    <div class="art_bot">
+                        <div class="greyTime">点赞量 {{ v.likeNumber }}</div>
+                        <div class="greyFont">浏览量 {{ v.readNumber }}</div>
+                    </div>
+                </div>
+                <div class="art_pic">
+                    <img :src="v.imgUrl" />
+                </div>
+            </div> -->
         </div>
-        <div class="art_pic">
-          <img :src="v.imgUrl" />
-        </div>
-      </div>
-    </div>
 
-    <van-empty description="暂无数据" v-else/>
+        <van-empty description="暂无数据" v-else />
 
-    <div class="imgPic" @click="toChoose">
-      <img src="@/assets/changeSchool.png" />
-    </div>
+        <div class="imgPic" @click="toChoose">
+            <img src="@/assets/changeSchool.png" />
+        </div>
 
-    <tabbar4 active="fruit"></tabbar4>
-  </div>
+        <tabbar4 active="fruit"></tabbar4>
+    </div>
 </template>
 
 <script>
 import Tabbar4 from "@/component/Tabbar4";
 export default {
-  components: { Tabbar4 },
-  data() {
-    return {
-      tabsName: 1,
-      newsList: [],
-    };
-  },
-  methods: {
-    //详情新闻
-    toDetails(v) {
-      this.$router.push({ name: "pageDetails" ,query: {schoolId:v.schoolId,dataId: v.id}});
+    components: { Tabbar4 },
+    data() {
+        return {
+            tabsName: 1,
+            newsList: [],
+            pageNum: 1,
+            pageSize: 10,
+            finished: false,
+            loading: false,
+        };
     },
-    //选择
-    toChoose() {
-      this.$router.push({ name: "chooseSchoolOne" });
+    methods: {
+        //详情新闻
+        toDetails(v) {
+            this.$router.push({
+                name: "pageDetails",
+                query: { schoolId: v.schoolId, dataId: v.id },
+            });
+        },
+        //选择
+        toChoose() {
+            this.$router.push({ name: "chooseSchoolOne" });
+        },
+        getData() {
+            this.loading = true;
+            let schoolId = this.$route.query.schoolId
+                ? this.$route.query.schoolId
+                : "";
+
+            this.yxAxios
+                .get(
+                    `${this.kqUrl}/schoolConsult/consultList?pageNum=${this.pageNum}&pageSize=${this.pageSize}&schoolId=` +
+                        schoolId
+                )
+                .then((res) => {
+                    if (res.data.code == 200) {
+                        this.newsList = this.newsList.concat(
+                            res.data.data.list
+                        );
+                        this.loading = false;
+                        if (
+                            this.pageSize * this.pageNum >=
+                            res.data.data.total
+                        ) {
+                            this.finished = true;
+                        } else {
+                            this.pageNum++;
+                        }
+                    } else {
+                        this.$toast.fail(res.data.message);
+                    }
+                });
+            // this.yxAxios
+            //   .post(`${this.dataUrl}/sys/yx/consultList`, {
+            //     page: 1,
+            //     pageSize: 999,
+            //     schoolId: this.$route.query.schoolId*1
+            //   })
+            //   .then((res) => {
+            //     if (res.data.success) {
+            //       this.newsList = res.data.data.list;
+            //     } else {
+            //       this.$toast.fail(res.data.message);
+            //     }
+            //   });
+        },
     },
-    getData() {
-      let schoolId = this.$route.query.schoolId?this.$route.query.schoolId: ''
-
-      this.yxAxios
-        .get(`${this.kqUrl}/schoolConsult/consultList?pageNum=1&pageSize=999&schoolId=`+schoolId)
-        .then((res) => {
-          if (res.data.code == 200) {
-            this.newsList = res.data.data.list;
-          } else {
-            this.$toast.fail(res.data.message);
-          }
-        });
-      // this.yxAxios
-      //   .post(`${this.dataUrl}/sys/yx/consultList`, {
-      //     page: 1,
-      //     pageSize: 999,
-      //     schoolId: this.$route.query.schoolId*1
-      //   })
-      //   .then((res) => {
-      //     if (res.data.success) {
-      //       this.newsList = res.data.data.list;
-      //     } else {
-      //       this.$toast.fail(res.data.message);
-      //     }
-      //   });
+    mounted() {
+        this.getData();
     },
-  },
-  mounted() {
-    this.getData()
-  }
 };
 </script>
 
 <style lang="scss" scoped>
 .cardBox {
-  padding: 2vw 0;
-  box-sizing: border-box;
-
-  .contextBox {
-    margin-bottom: 140px;
-    .art_card {
-      padding: 28px;
-      box-sizing: border-box;
-
-      .art_title {
-        width: 100%;
-        font-size: 34px;
-        font-weight: bold;
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        -webkit-line-clamp: 1; //限制行数
-        overflow: hidden; //超出部分隐藏
-        text-overflow: ellipsis; //用一个省略号代替超出的内容
-      }
-
-      .art_bot {
-        padding-top: 22px;
-        box-sizing: border-box;
-        display: flex;
-        align-items: center;
-
-        .redSticky {
-          color: #ff4444;
-          font-size: 24px;
-          padding: 2px;
-          box-sizing: border-box;
-          border: 1px solid #ff4444;
-        }
+    padding: 2vw 0;
+    box-sizing: border-box;
 
-        .greyTime {
-          color: #999;
-          font-size: 24px;
-          margin: 0 20px;
-        }
+    .contextBox {
+        margin-bottom: 140px;
+        .art_card {
+            padding: 28px;
+            box-sizing: border-box;
 
-        .greyFont {
-          color: #999;
-          font-size: 24px;
-          
-        }
-      }
-    }
-    .art_card_pic {
-      padding: 28px;
-      box-sizing: border-box;
-      display: flex;
-      justify-content: space-between;
-
-      .art_context {
-        height: 180px;
-        display: flex;
-        align-content: space-between;
-        flex-wrap: wrap;
-
-        .art_title {
-          width: 100%;
-          font-size: 34px;
-          font-weight: bold;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2; //限制行数
-          overflow: hidden; //超出部分隐藏
-          text-overflow: ellipsis; //用一个省略号代替超出的内容
-        }
+            .art_title {
+                width: 100%;
+                font-size: 34px;
+                font-weight: bold;
+                display: -webkit-box;
+                -webkit-box-orient: vertical;
+                -webkit-line-clamp: 1; //限制行数
+                overflow: hidden; //超出部分隐藏
+                text-overflow: ellipsis; //用一个省略号代替超出的内容
+            }
 
-        .art_bot {
-          padding-top: 22px;
-          box-sizing: border-box;
-          display: flex;
-          align-items: center;
+            .art_bot {
+                padding-top: 22px;
+                box-sizing: border-box;
+                display: flex;
+                align-items: center;
 
-          .redSticky {
-            color: #ff4444;
-            font-size: 24px;
-            padding: 2px;
+                .redSticky {
+                    color: #ff4444;
+                    font-size: 24px;
+                    padding: 2px;
+                    box-sizing: border-box;
+                    border: 1px solid #ff4444;
+                }
+
+                .greyTime {
+                    color: #999;
+                    font-size: 24px;
+                    margin: 0 20px;
+                }
+
+                .greyFont {
+                    color: #999;
+                    font-size: 24px;
+                }
+            }
+        }
+        .art_card_pic {
+            padding: 28px;
             box-sizing: border-box;
-            border: 1px solid #ff4444;
-          }
-
-          .greyTime {
-            color: #999;
-            font-size: 24px;
-            margin: 0 ;
-          }
-
-          .greyFont {
-            color: #999;
-            font-size: 24px;
-            margin-left: 20px;
-          }
+            display: flex;
+            justify-content: space-between;
+
+            .art_context {
+                height: 180px;
+                display: flex;
+                align-content: space-between;
+                flex-wrap: wrap;
+
+                .art_title {
+                    width: 100%;
+                    font-size: 34px;
+                    font-weight: bold;
+                    display: -webkit-box;
+                    -webkit-box-orient: vertical;
+                    -webkit-line-clamp: 2; //限制行数
+                    overflow: hidden; //超出部分隐藏
+                    text-overflow: ellipsis; //用一个省略号代替超出的内容
+                }
+
+                .art_bot {
+                    padding-top: 22px;
+                    box-sizing: border-box;
+                    display: flex;
+                    align-items: center;
+
+                    .redSticky {
+                        color: #ff4444;
+                        font-size: 24px;
+                        padding: 2px;
+                        box-sizing: border-box;
+                        border: 1px solid #ff4444;
+                    }
+
+                    .greyTime {
+                        color: #999;
+                        font-size: 24px;
+                        margin: 0;
+                    }
+
+                    .greyFont {
+                        color: #999;
+                        font-size: 24px;
+                        margin-left: 20px;
+                    }
+                }
+            }
+            .art_pic {
+                width: 180px;
+                height: 180px;
+                flex-shrink: 0;
+                background-color: #ff4444;
+
+                img {
+                    width: 100%;
+                    height: 100%;
+                }
+            }
         }
-      }
-      .art_pic {
-        width: 180px;
-        height: 180px;
-        flex-shrink: 0;
-        background-color: #ff4444;
+    }
+    .imgPic {
+        position: fixed;
+        right: 2vw;
+        bottom: 40vw;
+        width: 26vw;
+        height: 26vw;
 
         img {
-          width: 100%;
-          height: 100%;
+            width: 100%;
+            height: 100%;
         }
-      }
-    }
-  }
-  .imgPic {
-    position: fixed;
-    right: 2vw;
-    bottom: 40vw;
-    width: 26vw;
-    height: 26vw;
-
-    img {
-      width: 100%;
-      height: 100%;
     }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/Yanxue/pageDetails.vue b/src/views/Yanxue/pageDetails.vue
index c00a97d..f81ddd4 100644
--- a/src/views/Yanxue/pageDetails.vue
+++ b/src/views/Yanxue/pageDetails.vue
@@ -34,19 +34,19 @@
                 <div v-if="v.type == 3" class="typeThree">
                     <div class="contextThree" v-html="v.context"></div>
                 </div>
+            </div>
 
-                <div class="thumbs" v-if="v.likeStatus">
-                    <img src="@/assets/dz_on.png" @click="toDZ(false)" />
-                    <span @click="toDZ(false)">{{
-                        v.likeNumber ? v.likeNumber : 0
-                    }}</span>
-                </div>
-                <div class="thumbs thumbs_grey" v-else>
-                    <img src="@/assets/dz_off.png" @click="toDZ(true)" />
-                    <span @click="toDZ(true)">{{
-                        v.likeNumber ? v.likeNumber : 0
-                    }}</span>
-                </div>
+            <div class="thumbs" v-if="resData.likeStatus">
+                <img src="@/assets/dz_on.png" @click="toDZ(false)" />
+                <span @click="toDZ(false)">{{
+                    resData.likeNumber ? resData.likeNumber : 0
+                }}</span>
+            </div>
+            <div class="thumbs thumbs_grey" v-else>
+                <img src="@/assets/dz_off.png" @click="toDZ(true)" />
+                <span @click="toDZ(true)">{{
+                    resData.likeNumber ? resData.likeNumber : 0
+                }}</span>
             </div>
         </div>
     </div>
@@ -61,7 +61,10 @@ export default {
             modelList: [],
             background: "",
             imgUrl: "",
-            // isOn: false,
+            resData: {
+                likeStatus: 0,
+                likeNumber: 0,
+            }
         };
     },
     methods: {
@@ -70,7 +73,9 @@ export default {
             this.yxAxios
                 .get(
                     `${this.kqUrl}/schoolConsult/consultDetails?consultId=` +
-                        this.$route.query.dataId
+                        this.$route.query.dataId +
+                        `&userNum=` +
+                        JSON.parse(localStorage.getItem("userInfo")).centerNo
                 )
                 .then((res) => {
                     if (res.data.code == 200) {
@@ -82,6 +87,7 @@ export default {
                         }
                         let arr = JSON.parse(res.data.data.modelList);
                         this.modelList = arr;
+                        this.resData = res.data.data;
                         // this.showFrame();
                     } else {
                         this.$toast.fail(res.data.message);
@@ -134,7 +140,7 @@ export default {
         },
         //点赞 true点赞，false取消
         toDZ(val) {
-            this.isOn = val;
+            
             this.yxAxios
                 .post(`${this.kqUrl}/visitRecord/setConsultLike`, {
                     consultId: this.$route.query.dataId,
@@ -251,7 +257,9 @@ export default {
                 }
             }
 
-            .thumbs {
+            
+        }
+        .thumbs {
                 width: 100%;
                 font-size: 33px;
                 font-weight: bold;
@@ -269,7 +277,6 @@ export default {
             .thumbs_grey {
                 color: #999;
             }
-        }
     }
 }
 </style>
\ No newline at end of file
--
libgit2 0.21.0