对接接口

2025-12-10 11:26:43 +08:00 · 2023-09-02 14:48:59 +08:00
parent b49b83a7cf
commit 5346f360bc
7 changed files with 219 additions and 291 deletions
--- a/src/api/modules/grateful.js
+++ b/src/api/modules/grateful.js
@@ -3,13 +3,26 @@ import ajax from '../ajax';
 const baseURL = '/activityApi';

 //notice新增
-const saveOpinion=function (data){
-  return ajax.postJson(baseURL,'/xboe/m/boe/opinion/save',data);
-}
+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 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);
+




 export {
-  saveOpinion
+  saveOpinion,
+  toolList,
+  noticeList,
+  noticeDataById,
+  courselList,
+  teachersList
 }
--- a/src/views/grateful/GratefulHomePage.vue
+++ b/src/views/grateful/GratefulHomePage.vue
@@ -18,15 +18,17 @@
                    <router-link to="/grateful/gratefulNotice" style="font-size: 14px;">查看更多</router-link>
                  </div>
                  <ul>
-                    <li v-for="(item, index) in 6" :key="index" style="cursor: pointer;line-height: 22px;" class="liList">
-                      <router-link :to="'/case/detail?id=' + item.id" style="display: flex;align-items: center;">
+                    <li v-for="(item, index) in courseList.noticeList" :key="index"
+                      style="cursor: pointer;line-height: 22px;" class="liList">
+                      <router-link :to="'/grateful/noticeDetail?id=' + item.id"
+                        style="display: flex;align-items: center;">
                        <span class="portal-right-text blue-one">
                          <img :src="getPic(index)" alt="">
                        </span>
                        <div class="portal-title-desc"
                          style="flex: 1;font-size: 14px;display: flex;justify-content: space-between;">
-                          <span class="title-line-ellipsis " style="width: 130px;">哈哈哈哈哈哈哈哈哈哈哈哈哈</span>
-                          <span>2023-09-09</span>
+                          <span class="title-line-ellipsis " style="width: 130px;">{{ item.content }}</span>
+                          <span>{{ item.createTime.split(' ')[0] }}</span>
                        </div>
                      </router-link>
                    </li>
@@ -89,11 +91,6 @@
            <!--内容列表内容-->
            <div v-for="(course, ccidx) in courseList.list" :key="'cc' + ccidx" class="xindex-course"
              style="position: relative;margin-right: 0;">
-              <div style="position: absolute; right: 25px; bottom: 72px">
-                <interactBar nodeWidth="20px" :courseExclusive="true" :type="1" :data="course" :comments="false"
-                  :praises="false" :shares="false" :views="false">
-                </interactBar>
-              </div>
              <a @click="toCourseDetail(course)">
                <div class="xindex-course-image">
                  <course-image :course="course"></course-image>
@@ -104,13 +101,12 @@
                </div>
                <div class="course-author">
                  <div class="course-author-left">
-                    {{ course.authorInfo.name }}
-
-                    <span class="study-num">{{ formatNum(course.studys) }}人学习</span>
+                    {{ course.createName }}
+                    <span class="study-num">{{ formatNum(course.studies) }}人学习</span>
                  </div>
                  <div style="display: flex">
-                    <div v-if="course.score">
-                      <span class="course-score-value" style="margin-left: 10px">{{ toScore(course.score) }}分</span>
+                    <div v-if="course.score != '0'">
+                      <span class="course-score-value" style="margin-left: 10px">{{ toScore(Number(course.score)) }}分</span>
                    </div>
                    <div v-else class="course-score-no">未评分</div>
                  </div>
@@ -157,18 +153,13 @@
 </template>

 <script>
-import { mapGetters } from "vuex";
 import apiCourseStudy from "@/api/modules/courseStudy.js";
-import apiCourse from "@/api/modules/coursePortal.js";
-import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
 import { toScore, formatUserNumber } from "@/utils/tools.js";
-import apiIndex from "@/api/phase2/index.js";
-import { saveOpinion } from '@/api/modules/grateful.js'
+import { saveOpinion, noticeList, courselList } from '@/api/modules/grateful.js'
 export default {
  name: "Grateful",
  components: {
-    interactBar,
    courseImage,
  },
  data() {
@@ -178,24 +169,20 @@ export default {
      },
      gratefulVisible: false,
      formatNum: formatUserNumber,
-      isNext: true,
      toScore,
      // 列表
      courseList: {
        num: 12,
        orderType: 2,
        list: [],
-      }
+        noticeList: []
+      },
    };
  },
  mounted() {
    this.getCourseData(1);
-  },
-  computed: {
-    ...mapGetters(["userInfo", "studyTaskCount"]),
-    swiper() {
-      return this.$refs.mySwiper.swiper;
-    },
+    this.getNoticeData()
+    this.getToolData()
  },
  methods: {
    submitNotice() {
@@ -213,85 +200,44 @@ export default {
      this.gratefulVisible = false
    },
    toCourseDetail(item) {
-      //二期调整，直接改成一个地址
-      //return this.webBaseUrl + '/course/detail?id=' + item.id;
-      let $this = this;
      if (item.type == 10) {
-        //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
        //console.log("直接进入学习页面");
        this.$router.push("/course/studyindex?id=" + item.id);
      } else if (item.type == 20) {
        apiCourseStudy.hasSignup(item.id).then((rs) => {
          if (rs.status == 200) {
-            //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
            this.$router.push("/course/studyindex?id=" + item.id);
          } else {
-            //return $this.webBaseUrl + "/course/detail?id=" + item.id;
            this.$router.push("/course/detail?id=" + item.id);
          }
        });
-        //return $this.webBaseUrl + "/course/detail?id=" + item.id;
      }
    },
    getCourseData(pageIndex) {
-      this.isNext = false;
-      let { orderType, num } = this.courseList;
-      let course = {
-        pageSize: 8,
-        device: 1,
-        orderField: orderType == 1 ? "" : "studys",
-        orderAsc: false,
-        topOrder: true,
-        pageIndex: pageIndex,
-      };
-
-      apiIndex.courselist(course).then((res) => {
-        if (res.status == 200 && res.result.length > 0) {
-          let courseIds = [];
-          res.result.forEach((item) => {
-            item.authorInfo = {
-              aid: "",
-              name: "",
-              orgInfo: "",
-              avatar: "",
-              code: "",
-              sex: null,
-            };
-            courseIds.push(item.id);
-          });
-          this.loadCouserTeacher(res.result, courseIds);
-          this.courseList.list = res.result;
+      courselList({
+        pageNo: pageIndex,
+        pageSize: 8
+      }).then((res) => {
+        if (res.code == 200 && res.data.records.length > 0) {
+          console.log(res.result, '之前的');
+          this.courseList.list = res.data.records;
        } else {
          console.log("加载课程信息失败:" + res.error);
        }
      });
    },
-    loadCouserTeacher(list, ids) {
-      // 先查课程关联教师iD
-      apiCourse.getTeacherByCourseIDs(ids).then((cres) => {
-        if (cres.status == 200) {
-          let userIds = [];
-          list.forEach((item, index) => {
-            cres.result.some((courseTeahcer) => {
-              if (courseTeahcer.courseId == item.id) {
-                if (courseTeahcer.teacherIds) {
-                  userIds.push(courseTeahcer.teacherIds[0]);
-                  item.authorInfo.aid = courseTeahcer.teacherIds[0];
-                  item.authorInfo.name = courseTeahcer.names[0];
-                  if (item.authorInfo.name == "BOE教师") {
-                    item.authorInfo.name = "";
-                  }
-                }
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-          //that.loadCourseAuthorInfo(list, userIds);
-        }
-      });
-    }
+    getNoticeData() {
+      noticeList({
+        pageNo: 1,
+        pageSize: 6,
+        isTop: '0'
+      }).then((res) => {
+        this.courseList.noticeList = res.data.records || []
+      })
+    },
+    getToolData() {
+
+    },
  },
 };
 </script>
--- a/src/views/grateful/GratefulNotice.vue
+++ b/src/views/grateful/GratefulNotice.vue
@@ -6,7 +6,7 @@
      <div class="modules xcontent2">
        <div class="xcontent2-main">
          <div class="navTop">
-            <router-link to="/">首页</router-link>&nbsp;>&nbsp;<span style="cursor: pointer;">通知</span>
+            <router-link to="/grateful">首页</router-link>&nbsp;>&nbsp;<span style="cursor: pointer;">通知</span>
          </div>
        </div>
      </div>
@@ -18,70 +18,66 @@
          <div class="modules-list" style="margin-top: 0;">
            <div style="padding:20px 70px;" class="bgc">
              <!--内容列表内容-->
-              <div v-for="(item, ccidx) in 10" :key="'cc' + ccidx" class="toolEvery" @click="noticeDetail(item)">
-                <div class="contnet">教师节活动通知</div>
+              <div v-for="(item, ccidx) in list" :key="'cc' + ccidx" class="toolEvery" @click="noticeDetail(item)">
+                <div class="contnet">{{ item.name }}</div>
                <div class="case-info-date portal-time">
                  <i class="el-icon-time" style="margin-right: 5px;"></i>
-                  <time-show time="2023-08-04"></time-show>
+                  <time-show :time="item.createTime.split(' ')[0]"></time-show>
                </div>
              </div>
-              <pagination :size="courseList.pageSize" :total="courseList.count" :page="courseList.pageIndex"
-                @change-size="changePageSize" @change-page="loadData">
-              </pagination>
+              <div v-if="total > 0">
+                <pagination style="background-color: rgba(0, 0, 0, 0);" :size="params.pageSize" :total="total"
+                  :page="params.pageNo" @change-size="changePageSize" @change-page="changPage" :autoScroll="false">
+                </pagination>
+              </div>
            </div>
-
          </div>
        </div>
-        <!-- <div class="xcontent2-minor" style="margin-left: 25px;">
-          <div class="portal-ranking ranking-bg">
-            <p class="ranking-title">教师赋能排行榜</p>
-            <ul class="xindex-ranking-course">
-              <li class="xindex-ranking-li" v-for="(item, cindex) in 10" :key="'cc' + cindex">
-                <a style="display: inherit">
-                  <span class="portal-right-text blue-one">
-                    <img :src="getPic(cindex)" alt="" />
-                  </span>
-                  <span class="portal-title-desc index-one-line-ellipsis title-line-ellipsis"
-                    style="font-size: 14px; color: #04243c">哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈</span>
-                </a>
-              </li>
-            </ul>
-          </div>
-        </div> -->
      </div>
    </div>
  </div>
 </template>
 <script>
 import timeShow from "@/components/Portal/datetimeShow.vue";
+import { noticeList } from '@/api/modules/grateful.js'
 export default {
  data: () => {
    return {
-      courseList: {
-        list: [],
-        count: 0,
-        pageIndex: 1,
+      list: [],
+      total: 0,
+      params: {
+        pageNo: 1,
        pageSize: 10,
      },
    };
  },
  components: { timeShow },
+  mounted() {
+    this.getNoticeList()
+  },
  methods: {
-    noticeDetail(detailInfo) {
-      console.log(detailInfo);
-      this.$router.push({
-        path: '/grateful/noticeDetail',
+    getNoticeList() {
+      noticeList(this.params).then((result) => {
+        console.log(result);
+        const { total, records } = result.data
+        this.total = total
+        this.list = records
      })
-
+    },
+    noticeDetail(item) {
+      console.log(item);
+      this.$router.push('/grateful/noticeDetail?id=' + item.id)
    },
    getPic(index) {
      return this.webBaseUrl + "/images/listblue0" + (index + 1) + ".png";
    },
    changePageSize(pageSize) {
-      this.courseList.pageSize = pageSize;
+      this.params.pageSize = pageSize;
+      this.getNoticeList()
    },
-    loadData(pindex) {
-      console.log(pindex);
+    changPage(pageNo) {
+      this.params.pageNo = pageNo
+      this.getNoticeList()
    },
  },
 };
@@ -116,12 +112,13 @@ export default {
    height: 240px;
  }
 }
-.navTop{
+
+.navTop {
  color: #666;
 }

 .modules-list {
-  min-height: 555px;
+  // min-height: 555px;
  background: #ffffff;
  border-radius: 8px;

--- a/src/views/grateful/NoticeDetail.vue
+++ b/src/views/grateful/NoticeDetail.vue
@@ -6,7 +6,7 @@
        <div class="xcontent2-main">
          <div class="navTop">
            <div>
-              <router-link to="/">首页</router-link>&nbsp;>&nbsp;
+              <router-link to="/grateful">首页</router-link>&nbsp;>&nbsp;
              <span style="cursor: pointer;">通知详情</span>
            </div>
          </div>
@@ -22,14 +22,14 @@
              <div class="title">教师节活动通知</div>
              <!--内容列表内容-->
              <div class="timeAndAuthor">
-                <div class="author">发布人：李玉冰</div>
+                <div class="author">发布人：{{ createName }}</div>
                <div class="case-info-date portal-time">
                  <i class="el-icon-time" style="margin-right: 5px;"></i>
-                  <time-show time="2023-08-04"></time-show>
+                  <time-show :time="createTime.split(' ')[0]"></time-show>
                </div>
              </div>
              <div class="topTitle">通知内容</div>
-              <div class="noticeContent">--内容列表内容--</div>
+              <div class="noticeContent">{{ content }}</div>
            </div>
          </div>
        </div>
@@ -39,18 +39,25 @@
 </template>
 <script>
 import timeShow from "@/components/Portal/datetimeShow.vue";
+import { noticeDataById } from '@/api/modules/grateful';
 export default {
  data: () => {
    return {
-      courseList: {
-        list: [],
-        count: 0,
-        pageIndex: 1,
-        pageSize: 10,
-      },
+      content: '',
+      createName: '',
+      createTime: ''
    };
  },
  components: { timeShow },
+  mounted() {
+    noticeDataById(this.$route.query.id).then((result) => {
+      console.log(result);
+      const { content, createName, createTime } = result.data
+      this.content = content
+      this.createTime = createTime
+      this.createName = createName
+    })
+  },
  methods: {
    noticeDetail(item) {
    },
--- a/src/views/grateful/TeacherEmpowerment.vue
+++ b/src/views/grateful/TeacherEmpowerment.vue
@@ -7,12 +7,12 @@
        <div class="xcontent2-main">
          <div class="navTop">
            <div>
-              <router-link to="/">首页</router-link>&nbsp;>&nbsp;
+              <router-link to="/grateful">首页</router-link>&nbsp;>&nbsp;
              <span style="cursor: pointer;">教师赋能</span>
            </div>
            <div style="position: relative;">
              <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "
-                @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword">
+                @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="param.name">
              </el-input>
              <el-button class="sear-but" @click="searchJump()" type="primary" size="mini">搜索</el-button>
            </div>
@@ -26,13 +26,7 @@
        <div class="xcontent2-main">
          <div class="modules-list list" style="margin-top: 0">
            <!--内容列表内容-->
-            <div v-for="(course, ccidx) in courseList.list" :key="'cc' + ccidx" class="xindex-course"
-              style="position: relative">
-              <div style="position: absolute; right: 25px; bottom: 72px">
-                <interactBar nodeWidth="20px" :courseExclusive="true" :type="1" :data="course" :comments="false"
-                  :praises="false" :shares="false" :views="false">
-                </interactBar>
-              </div>
+            <div v-for="(course, ccidx) in list" :key="'cc' + ccidx" class="xindex-course" style="position: relative">
              <a @click="toCourseDetail(course)">
                <div class="xindex-course-image">
                  <course-image :course="course"></course-image>
@@ -43,13 +37,13 @@
                </div>
                <div class="course-author">
                  <div class="course-author-left">
-                    {{ course.authorInfo.name }}
-
-                    <span class="study-num">{{ formatNum(course.studys) }}人学习</span>
+                    {{ course.createName }}
+                    <span class="study-num">{{ formatNum(course.studies) }}人学习</span>
                  </div>
                  <div style="display: flex">
-                    <div v-if="course.score">
-                      <span class="course-score-value" style="margin-left: 10px">{{ toScore(course.score) }}分</span>
+                    <div v-if="course.score != '0'">
+                      <span class="course-score-value" style="margin-left: 10px">{{ toScore(Number(course.score))
+                      }}分</span>
                    </div>
                    <div v-else class="course-score-no">未评分</div>
                  </div>
@@ -60,72 +54,56 @@
        </div>
      </div>
    </div>
-    <!-- <div v-if="courseList.count > courseList.pageSize"> -->
    <div>
-      <pagination :size="courseList.pageSize" :total="courseList.count" :page="courseList.pageIndex"
-        @change-size="changePageSize" @change-page="loadData" style="background-color: rgba(0, 0, 0, 0);"></pagination>
+      <pagination :size="param.pageSize" :total="total" :page="param.pageNo" @change-size="changePageSize"
+        @change-page="loadData" style="background-color: rgba(0, 0, 0, 0);" :autoScroll="false"
+        :pageSizes="[12, 24, 36, 48]"></pagination>
    </div>
  </div>
 </template>

 <script>
-import { mapGetters } from "vuex";
 import apiCourseStudy from "@/api/modules/courseStudy.js";
-import apiCourse from "@/api/modules/coursePortal.js";
-import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
 import { toScore, formatUserNumber } from "@/utils/tools.js";
-import apiIndex from "@/api/phase2/index.js";
+import { courselList } from '@/api/modules/grateful.js'
 export default {
  name: "TeacherEmpowerment",
  components: {
-    interactBar,
    courseImage,
  },
  data() {
    return {
-      keyword: '',
-      form: {
-        textarea: "",
-      },
-      gratefulVisible: false,
      formatNum: formatUserNumber,
-      isNext: true,
      toScore,
-      // 列表
-      courseList: {
-        pageSize: 10,
-        count: 0,
-        pageIndex: 1,
-        list: [],
+      list: [],
+      total: 0,
+      param: {
+        name: '',
+        pageNo: 1,
+        pageSize: 12
      }
    };
  },
  mounted() {
-    this.getCourseData(1);
-  },
-  computed: {
-    ...mapGetters(["userInfo", "studyTaskCount"]),
-    swiper() {
-      return this.$refs.mySwiper.swiper;
-    },
+    this.getCourseData();
  },
  methods: {
    searchJump() {
-
+      this.param.pageNo = 1
+      this.getCourseData();
    },
    changePageSize(pageSize) {
-      this.courseList.pageSize = pageSize;
+      this.param.pageSize = pageSize;
+      this.getCourseData()
    },
-    loadData(pindex) {
-      console.log(pindex);
-
-    }, getPic(index) {
+    loadData(pageNo) {
+      this.param.pageNo = pageNo
+      this.getCourseData()
+    },
+    getPic(index) {
      return this.webBaseUrl + "/images/listblue0" + (index + 1) + ".png";
    },
-    closeDlg() {
-      this.gratefulVisible = false
-    },
    toCourseDetail(item) {
      //二期调整，直接改成一个地址
      //return this.webBaseUrl + '/course/detail?id=' + item.id;
@@ -147,63 +125,16 @@ export default {
        //return $this.webBaseUrl + "/course/detail?id=" + item.id;
      }
    },
-    getCourseData(pageIndex) {
-      this.isNext = false;
-      let { orderType, num } = this.courseList;
-      let course = {
-        pageSize: 12,
-        device: 1,
-        orderField: orderType == 1 ? "" : "studys",
-        orderAsc: false,
-        topOrder: true,
-        pageIndex: pageIndex,
-      };
-
-      apiIndex.courselist(course).then((res) => {
-        if (res.status == 200 && res.result.length > 0) {
-          let courseIds = [];
-          res.result.forEach((item) => {
-            item.authorInfo = {
-              aid: "",
-              name: "",
-              orgInfo: "",
-              avatar: "",
-              code: "",
-              sex: null,
-            };
-            courseIds.push(item.id);
-          });
-          this.loadCouserTeacher(res.result, courseIds);
-          this.courseList.list = res.result;
+    getCourseData() {
+      courselList(this.param).then((res) => {
+        if (res.code == 200 && res.data.records.length > 0) {
+          console.log(res.data, '之前的');
+          this.list = res.data.records;
+          this.total = res.data.total
        } else {
          console.log("加载课程信息失败:" + res.error);
        }
      });
-    },
-    loadCouserTeacher(list, ids) {
-      // 先查课程关联教师iD
-      apiCourse.getTeacherByCourseIDs(ids).then((cres) => {
-        if (cres.status == 200) {
-          let userIds = [];
-          list.forEach((item, index) => {
-            cres.result.some((courseTeahcer) => {
-              if (courseTeahcer.courseId == item.id) {
-                if (courseTeahcer.teacherIds) {
-                  userIds.push(courseTeahcer.teacherIds[0]);
-                  item.authorInfo.aid = courseTeahcer.teacherIds[0];
-                  item.authorInfo.name = courseTeahcer.names[0];
-                  if (item.authorInfo.name == "BOE教师") {
-                    item.authorInfo.name = "";
-                  }
-                }
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-        }
-      });
    }
  },
 };
--- a/src/views/grateful/TeacherOpinion.vue
+++ b/src/views/grateful/TeacherOpinion.vue
@@ -7,12 +7,12 @@
        <div class="xcontent2-main">
          <div class="navTop">
            <div>
-              <router-link to="/">首页</router-link>&nbsp;>&nbsp;
+              <router-link to="/grateful">首页</router-link>&nbsp;>&nbsp;
              <span style="cursor: pointer;">名师好课</span>
            </div>
            <div style="position: relative;">
              <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "
-                @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="keyword">
+                @keyup.enter.native="searchJump()" clearable maxlength="50" v-model="params.keyword">
              </el-input>
              <el-button class="sear-but" @click="searchJump()" type="primary" size="mini">搜索</el-button>
            </div>
@@ -26,19 +26,17 @@
        <div class="xcontent2-main">
          <div class="modules-list" style="margin-top: 0;">
            <div class="content">
-              <el-table :data="pageData" stripe border>
-                <el-table-column label="课程名称" prop="courseUser" align="center"></el-table-column>
-                <el-table-column label="课程价值" prop="auditTime" align="center" show-overflow-tooltip></el-table-column>
-                <el-table-column label="教师名称" prop="auditRemark" align="center" width="200px"
-                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="教师工号" prop="auditRemark" align="center" width="200px"
-                  show-overflow-tooltip></el-table-column>
+              <el-table :data="list" stripe border>
+                <el-table-column label="课程名称" prop="courseName" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column label="课程价值" prop="meaning" align="center" show-overflow-tooltip></el-table-column>
+                <el-table-column label="教师名称" prop="teacherName" align="center" width="150px"></el-table-column>
+                <el-table-column label="教师工号" prop="teacherNo" align="center" width="150px"></el-table-column>
              </el-table>
              <div v-if="pageData.length > 0" style="text-align: center;margin-top: 50px;">
-                <pagination :size="courseList.pageSize" :total="courseList.count" :page="courseList.pageIndex"
-                  @change-size="changePageSize" @change-page="loadData" :autoScroll="false"></pagination>
+                <pagination style="background-color: rgba(0, 0, 0, 0);" :size="params.pageSize" :total="total"
+                  :page="params.pageNo" @change-size="changePageSize" @change-page="loadData" :autoScroll="false">
+                </pagination>
              </div>
-
            </div>
          </div>
        </div>
@@ -48,10 +46,10 @@
 </template>
 <script>
 import timeShow from "@/components/Portal/datetimeShow.vue";
+import { teachersList } from "../../api/modules/grateful";
 export default {
  data: () => {
    return {
-      keyword: '',
      pageData: [
        {
          courseUser: '2016-05-02',
@@ -109,34 +107,42 @@ export default {
          auditRemark: '上海市普陀区金沙江路 1518 弄'
        },
      ],
-      courseList: {
-        list: [],
-        count: 0,
-        pageIndex: 1,
+      total: 0,
+      list: [],
+      params: {
+        pageNo: 1,
        pageSize: 10,
-      },
+        keyword: '',
+      }
    };
  },
  components: { timeShow },
+  mounted() {
+    this.getTeachersList()
+  },
  methods: {
+    getTeachersList() {
+      teachersList(this.params).then((result) => {
+        console.log(result);
+        const { total, records } = result.data
+        this.total = total;
+        this.list = records;
+      })
+    },
    searchJump() {
-
+      this.params.pageNo = 1
+      this.getTeachersList()
    },
-    changePageSize(pageSize) {
-      this.courseList.pageSize = pageSize
+    loadData(pageNo) {
+      this.params.pageNo = pageNo
+      this.getTeachersList()
    },
-    loadData(pageIndex) {
-      this.pageIndex = pageIndex
-    },
-    noticeDetail(item) { },
    getPic(index) {
      return this.webBaseUrl + "/images/listblue0" + (index + 1) + ".png";
    },
    changePageSize(pageSize) {
-      this.courseList.pageSize = pageSize;
-    },
-    loadData(pindex) {
-      console.log(pindex);
+      this.params.pageSize = pageSize;
+      this.getTeachersList()
    },
  },
 };
@@ -185,7 +191,7 @@ export default {
 }

 .modules-list {
-  min-height: 555px;
+  // min-height: 555px;
  background: #ffffff;
  border-radius: 8px;

--- a/src/views/grateful/ToolDown.vue
+++ b/src/views/grateful/ToolDown.vue
@@ -8,7 +8,7 @@
        <div class="xcontent2-main">
          <div class="navTop">
            <div>
-              <router-link to="/">首页</router-link>&nbsp;>&nbsp;
+              <router-link to="/grateful">首页</router-link>&nbsp;>&nbsp;
              <span style="cursor: pointer;">下载工具</span>
            </div>
          </div>
@@ -20,21 +20,29 @@
      <div class="modules xcontent2">
        <div class="xcontent2-main">
          <div class="modules-list" style="margin-top: 0;">
-            <div style="padding: 20px 70px;border-radius: 8px 8px 0 0;" class="bgc">
+            <div v-if="toolList.total > toolList.pageSize" style="padding: 20px 70px;border-radius: 8px 8px 0 0;"
+              class="bgc">
              <!--内容列表内容-->
-              <div v-for="(course, ccidx) in 10" :key="'cc' + ccidx" class="toolEvery">
+              <div v-for="(tool, index) in toolList.list" :key="'cc' + index" class="toolEvery">
                <div class="contnet">
-                  MNT销量突破促经营哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈哈
+                  {{ tool.courseName }}
                </div>
                <div class="btn">
                  <button>立即下载</button>
                </div>
              </div>
            </div>
-
-            <pagination :size="courseList.pageSize" :total="courseList.count" :page="courseList.pageIndex"
-              @change-size="changePageSize" @change-page="loadData">
-            </pagination>
+            <div v-if="toolList.total > toolList.pageSize">
+              <pagination :size="toolList.pageSize" :total="toolList.total" :page="toolList.pageIndex"
+                @change-size="changePageSize" @change-page="loadData">
+              </pagination>
+            </div>
+            <div class="pagination-div">
+              <span class="notcoures" v-if="toolList.list.length == 0">
+                <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
+                <h5>暂无工具～</h5>
+              </span>
+            </div>
          </div>
        </div>
      </div>
@@ -42,23 +50,36 @@
  </div>
 </template>
 <script>
+import { toolList } from '../../api/modules/grateful';
 export default {
  data: () => {
    return {
-      courseList: {
+      toolList: {
        list: [],
-        count: 0,
+        total: 0,
        pageIndex: 1,
        pageSize: 10,
      },
    };
  },
+  mounted() {
+    this.getToolList()
+  },
  methods: {
+    async getToolList() {
+      const result = await toolList()
+      if (result.code === 200) {
+
+        const { total, records } = result.data
+        this.toolList.list = records
+        this.toolList.total = total
+      }
+    },
    getPic(index) {
      return this.webBaseUrl + "/images/listblue0" + (index + 1) + ".png";
    },
    changePageSize(pageSize) {
-      this.courseList.pageSize = pageSize;
+      this.toolList.pageSize = pageSize;
    },
    loadData(pindex) {
      console.log(pindex);
@@ -104,19 +125,26 @@ export default {
  color: #666;
 }

+.bgc {
+  background: linear-gradient(180deg,
+      rgba(56, 125, 247, 0.2) 0%,
+      rgba(166, 168, 255, 0) 100%) no-repeat;
+  background-size: 100% 166px;
+  border-radius: 8px;
+}
+
 .modules-list {
-  min-height: 555px;
+  // min-height: 555px;
  background: #ffffff;
  border-radius: 8px;

-  .bgc {
-    background: linear-gradient(180deg,
-        rgba(56, 125, 247, 0.2) 0%,
-        rgba(166, 168, 255, 0) 100%) no-repeat;
-    background-size: 100% 166px;
-    border-radius: 8px;
+  .pagination-div {
+    text-align: center;
+    padding: 70px 0;
  }

+
+
  .toolEvery {
    height: 80px;
    line-height: 80px;