11

11

src/api/teacher.js

@@ -377,7 +377,7 @@ const queryStudentsWithTeacher = (data) => {
 // 获取回访记录列表
 const geteduVisitList = (data) => {
   return axios({
-    url: '/api-teacher/eduVisit/queryPage',
+    url: '/api-teacher/visit/queryPage',
     method: 'get',
     params: data
   })

src/common/axios.js

@@ -2,7 +2,7 @@
 /* eslint-disable */
 import axios from "axios"
 // import router from '../router/index'
-import { browser }  from '@/common/common'
+import { browser } from '@/common/common'
 
 // Full config:  https://github.com/axios/axios#request-config
 // axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
@@ -10,43 +10,43 @@ import { browser }  from '@/common/common'
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
 
 let config = {
-    // baseURL: process.env.baseURL || process.env.apiUrl || ""
-    // timeout: 60 * 1000, // Timeout
-    // withCredentials: true, // Check cross-site Access-Control
-    // transformRequest: [function(data) {
-    //     console.log(data)
-    //     if(!data.qStringify) {
-    //       data = qs.stringify({
-    //           ...data
-    //       })
-    //     }
-    //     return data
-    // }]
+  // baseURL: process.env.baseURL || process.env.apiUrl || ""
+  // timeout: 60 * 1000, // Timeout
+  // withCredentials: true, // Check cross-site Access-Control
+  // transformRequest: [function(data) {
+  //     console.log(data)
+  //     if(!data.qStringify) {
+  //       data = qs.stringify({
+  //           ...data
+  //       })
+  //     }
+  //     return data
+  // }]
 
 };
 
 const _axios = axios.create(config);
 
 _axios.interceptors.request.use(
-  function(config) {
+  function (config) {
     // Do something before request is sent
     // 判断用户是否登录
-    if(browser().android || browser().iPhone) { // app里面
+    if (browser().android || browser().iPhone) { // app里面
       let userInfo = decodeURI(localStorage.getItem('Authorization'))
-   
-      if(userInfo) {
+
+      if (userInfo) {
         config.headers['Authorization'] = userInfo
       }
     } else { // 网页里面
       let auth = decodeURI(localStorage.getItem('userInfo'))
-      if(auth) {
+      if (auth) {
         config.headers['Authorization'] = auth
       }
     }
-    // config.headers['Authorization'] ='bearer a8ecd31d-ed2d-4caa-9038-e85b8135af53'
+    config.headers['Authorization'] = 'bearer 5848d682-f5a3-4ce1-b86d-5b5f466ae665'
     return config;
   },
-  function(error) {
+  function (error) {
     // Do something with request error
     return Promise.reject(error);
   }
@@ -54,21 +54,21 @@ _axios.interceptors.request.use(
 
 // Add a response interceptor
 _axios.interceptors.response.use(
-  function(response) {
+  function (response) {
     // Do something with response data
-    if(response.data.code == 403) {
+    if (response.data.code == 403) {
       window.localStorage.removeItem('userInfo') // 删除用户信息
       window.localStorage.removeItem('Authorization') // 删除用户信息
       // android ios 注册方法
-      if(browser().android) {
-          DAYA.postMessage(JSON.stringify({api: 'login'}))
-      } else if(browser().iPhone) {
-          window.webkit.messageHandlers.DAYA.postMessage(JSON.stringify({api: 'login'}))
-      } 
+      if (browser().android) {
+        DAYA.postMessage(JSON.stringify({ api: 'login' }))
+      } else if (browser().iPhone) {
+        window.webkit.messageHandlers.DAYA.postMessage(JSON.stringify({ api: 'login' }))
+      }
     }
     return response;
   },
-  function(error) {
+  function (error) {
     // Do something with response error
     return Promise.reject(error);
   }

src/views/teacher/visitManager/visitList.vue

@@ -54,6 +54,7 @@
     <van-pull-refresh v-model="refreshing"
                       @refresh="onRefresh">
       <van-list v-model="loading"
+                v-if='dataShow'
                 :finished="finished"
                 finished-text="没有更多了"
                 @load="getList">
@@ -74,7 +75,7 @@
 <script>
 import MHeader from '@/components/MHeader'
 import dayjs from 'dayjs'
-import { bv } from '@/api/teacher'
+import { geteduVisitList } from '@/api/teacher'
 export default {
   components: { MHeader },
   data () {
@@ -100,8 +101,16 @@ export default {
       loading: false,
       finished: false,
       refreshing: false,
+      params: {
+        page: 1,
+        rows: 20
+      },
+      dataShow: true
     }
   },
+  mounted () {
+    // this.getList()
+  },
   methods: {
     cancelBtn () {
       this.startDate = null
@@ -118,31 +127,38 @@ export default {
       this.showEnd = false
     },
     getList () {
-      if (this.refreshing) {
-        this.list = [];
-        // this.refreshing = false;
-        // this.refreshing = true;
-
-        setTimeout(() => {
-          this.refreshing = false;
-          this.loading = false;
-          this.finished = false;
-        }, 1000);
-
-      }
-      this.refreshing = false;
-      this.loading = false;
-      this.finished = false;
+      let params = this.params;
+      geteduVisitList(params).then(res => {
+        let result = res.data
+        this.loading = false
+        this.refreshing = false
+        if (result.code == 200) {
+          params.page = result.data.pageNo
+          this.list = this.list.concat(result.data.rows)
+          if (params.page >= result.data.totalPage) {
+            this.finished = true;
+          }
+          this.params.page++;
+        } else {
+          this.finished = true;
+        }
+        console.log(this.loading)
+        // 判断是否有数据
+        // if (this.dataList.length <= 0) {
+        //   this.dataShow = false;
+        // }
+      })
 
     },
     onRefresh () {
       // 清空列表数据
       this.finished = false;
-
+      this.list = []
       // 重新加载数据
       // 将 loading 设置为 true，表示处于加载状态
       this.loading = true;
-      this.onLoad();
+      this.params.page = 1;
+      this.getList();
     },
     formatter (type, val) {
       if (type === "year") {