From 090f37a59d8c2f62eb93313afa7b838255a34509 Mon Sep 17 00:00:00 2001
From: nisen <laonisen@icloud.com>
Date: Sat, 2 Sep 2023 18:03:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/grateful.js             |  5 ++--
 src/views/grateful/GratefulHomePage.vue | 32 ++++++++++++--------
 src/views/grateful/ToolDown.vue         | 40 ++++++++++++-------------
 3 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/src/api/modules/grateful.js b/src/api/modules/grateful.js
index 94908038..8c45e3be 100644
--- a/src/api/modules/grateful.js
+++ b/src/api/modules/grateful.js
@@ -5,14 +5,15 @@ const baseURL = '/activityApi';
 //notice新增
 const saveOpinion = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/opinion/save', data);
 //工具列表
-const toolList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/files/list', data);
+const toolList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/tools/list', data);
 //通知列表
 const noticeList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/notice/list', data);
 //通知列表
 const courselList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/course/list', data);
 //通知根据id查询
 const noticeDataById = (id) => ajax.get(baseURL, `/xboe/m/boe/notice/getDataById?id=${id}`);
-const teachersList =(data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/teachers/list', data);
+//教师列表
+const teachersList = (data = {}) => ajax.postJson(baseURL, '/xboe/m/boe/teachers/list', data);
 
 
 
diff --git a/src/views/grateful/GratefulHomePage.vue b/src/views/grateful/GratefulHomePage.vue
index e7aa1838..389b2671 100644
--- a/src/views/grateful/GratefulHomePage.vue
+++ b/src/views/grateful/GratefulHomePage.vue
@@ -11,8 +11,8 @@
               </router-link>
             </div>
             <div class="navNotice">
-              <div id="fixd-box">
-                <div class="portal-ranking ranking-bg">
+              <div id="fixd-box" style="height: 100%;">
+                <div class="portal-ranking ranking-bg" style="height: 100%;">
                   <div style="display: flex;justify-content: space-between;">
                     <p class="ranking-title">通知</p>
                     <router-link to="/grateful/gratefulNotice" style="font-size: 14px;">查看更多</router-link>
@@ -37,16 +37,16 @@
               </div>
             </div>
             <div class="navTool">
-              <div id="fixd-box">
-                <div class="portal-ranking ranking-bg1">
+              <div id="fixd-box" style="height: 100%;">
+                <div class="portal-ranking ranking-bg1" style="height: 100%;">
                   <div style="display: flex;justify-content: space-between;">
                     <p class="ranking-title">工具下载</p>
                     <router-link to="/grateful/toolDown" style="font-size: 14px;">查看更多</router-link>
                   </div>
                   <ul>
-                    <li v-for="(item, index) in 6" :key="index" style="cursor: pointer;line-height: 22px;"
-                      class="title-line-ellipsis liList">
-                      <router-link :to="'/case/detail?id=' + item.id">
+                    <li v-for="(item, index) in courseList.toolList" :key="index"
+                      style="cursor: pointer;line-height: 22px;" class="title-line-ellipsis liList">
+                      <router-link to='/grateful/toolDown'>
                         <span class="portal-right-text orange-one" v-if="index == 0">
                           <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
                         </span>
@@ -65,7 +65,7 @@
                         <span class="portal-right-text" v-if="index == 5">
                           <img :src="`${webBaseUrl}/images/listblue06.png`" alt="">
                         </span>
-                        <span class="portal-title-desc" style="font-size: 14px;">哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈</span>
+                        <span class="portal-title-desc" style="font-size: 14px;">{{ item.name.split('.')[0] }}</span>
                       </router-link>
                     </li>
                   </ul>
@@ -106,7 +106,8 @@
                   </div>
                   <div style="display: flex">
                     <div v-if="course.score != '0'">
-                      <span class="course-score-value" style="margin-left: 10px">{{ toScore(Number(course.score)) }}分</span>
+                      <span class="course-score-value" style="margin-left: 10px">{{ toScore(Number(course.score))
+                      }}分</span>
                     </div>
                     <div v-else class="course-score-no">未评分</div>
                   </div>
@@ -156,7 +157,7 @@
 import apiCourseStudy from "@/api/modules/courseStudy.js";
 import courseImage from "@/components/Course/courseImage.vue";
 import { toScore, formatUserNumber } from "@/utils/tools.js";
-import { saveOpinion, noticeList, courselList } from '@/api/modules/grateful.js'
+import { saveOpinion, noticeList, courselList, toolList } from '@/api/modules/grateful.js'
 export default {
   name: "Grateful",
   components: {
@@ -175,7 +176,8 @@ export default {
         num: 12,
         orderType: 2,
         list: [],
-        noticeList: []
+        noticeList: [],
+        toolList: []
       },
     };
   },
@@ -236,7 +238,13 @@ export default {
       })
     },
     getToolData() {
-
+      toolList({
+        pageNo: 1,
+        pageSize: 6
+      }).then((result) => {
+        console.log(result.data.records, '哈哈哈哈');
+        this.courseList.toolList = result.data.records || []
+      })
     },
   },
 };
diff --git a/src/views/grateful/ToolDown.vue b/src/views/grateful/ToolDown.vue
index 3461140f..899ab258 100644
--- a/src/views/grateful/ToolDown.vue
+++ b/src/views/grateful/ToolDown.vue
@@ -20,25 +20,24 @@
       <div class="modules xcontent2">
         <div class="xcontent2-main">
           <div class="modules-list" style="margin-top: 0;">
-            <div v-if="toolList.total > toolList.pageSize" style="padding: 20px 70px;border-radius: 8px 8px 0 0;"
-              class="bgc">
+            <div v-if="total > 0" style="padding: 20px 70px;border-radius: 8px 8px 0 0;" class="bgc">
               <!--内容列表内容-->
-              <div v-for="(tool, index) in toolList.list" :key="'cc' + index" class="toolEvery">
+              <div v-for="(tool, index) in list" :key="'cc' + index" class="toolEvery">
                 <div class="contnet">
-                  {{ tool.courseName }}
+                  {{ tool.name.split('.')[0] }}
                 </div>
                 <div class="btn">
                   <button>立即下载</button>
                 </div>
               </div>
             </div>
-            <div v-if="toolList.total > toolList.pageSize">
-              <pagination :size="toolList.pageSize" :total="toolList.total" :page="toolList.pageIndex"
-                @change-size="changePageSize" @change-page="loadData">
+            <div>
+              <pagination :size="params.pageSize" :total="total" :page="params.pageIndex" @change-size="changePageSize"
+                @change-page="loadData" :autoScroll="false">
               </pagination>
             </div>
             <div class="pagination-div">
-              <span class="notcoures" v-if="toolList.list.length == 0">
+              <span class="notcoures" v-if="list.length == 0">
                 <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
                 <h5>暂无工具～</h5>
               </span>
@@ -54,12 +53,12 @@ import { toolList } from '../../api/modules/grateful';
 export default {
   data: () => {
     return {
-      toolList: {
-        list: [],
-        total: 0,
-        pageIndex: 1,
+      list: [],
+      total: 0,
+      params: {
+        pageNo: 1,
         pageSize: 10,
-      },
+      }
     };
   },
   mounted() {
@@ -67,22 +66,23 @@ export default {
   },
   methods: {
     async getToolList() {
-      const result = await toolList()
+      const result = await toolList(this.params)
       if (result.code === 200) {
-
         const { total, records } = result.data
-        this.toolList.list = records
-        this.toolList.total = total
+        this.list = records
+        this.total = total
       }
     },
     getPic(index) {
       return this.webBaseUrl + "/images/listblue0" + (index + 1) + ".png";
     },
     changePageSize(pageSize) {
-      this.toolList.pageSize = pageSize;
+      this.params.pageSize = pageSize;
+      this.getToolList()
     },
-    loadData(pindex) {
-      console.log(pindex);
+    loadData(pageNo) {
+      this.params.pageNo = pageNo;
+      this.getToolList()
     },
   },
 };