From 1a9dd0ba5082647976e7911a68b740479dc33cfd Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 16 Oct 2020 14:47:35 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A5=E5=8E=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts          | 4 ++--
 src/views/regime/date.vue | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index cdfd7b6..3c220cf 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -514,8 +514,8 @@ export async function getliveinfo(id: number){
 
 
 
-export async function getdatelist(start: string, end: string) {
-    return (await get("teacherCalendar")).data
+export async function getdatelist(start: string, end: string, teacherid: number) {
+    return (await get("teacherCalendar",{start, end, teacherid})).data
 }
 
 
diff --git a/src/views/regime/date.vue b/src/views/regime/date.vue
index 846c744..81ae416 100644
--- a/src/views/regime/date.vue
+++ b/src/views/regime/date.vue
@@ -189,6 +189,7 @@
 import { defineComponent, ref } from 'vue';
 import { getdate } from "@/utils/date"
 import { getdatelist } from '@/api';
+import store from '@/store';
 
 export default defineComponent({
     props:{
@@ -211,7 +212,7 @@ export default defineComponent({
             getdates()
         }
         async function getdates(){
-            getdatelist(month.value.start, month.value.end).then((res)=>{
+            getdatelist(month.value.start, month.value.end, store.state.userinfo.memberid).then((res)=>{
                 console.log(res)
             })
         }

From b9f4d755a04d5323e2ba91fb07bed99832bdf89a Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 16 Oct 2020 14:52:21 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/index.ts                | 2 +-
 src/views/regime/Subscriber.vue | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/api/index.ts b/src/api/index.ts
index 3c220cf..52aeb32 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -101,7 +101,7 @@ interface Teacherliked {
 export async function getteacherliked(data?:any){
     const res = await get<Array<Teacherliked>>('teacherliked',data);
     // console.log(res)
-    return res.data
+    return res;
 }
 
 
diff --git a/src/views/regime/Subscriber.vue b/src/views/regime/Subscriber.vue
index f45439c..67cad05 100644
--- a/src/views/regime/Subscriber.vue
+++ b/src/views/regime/Subscriber.vue
@@ -10,7 +10,7 @@
     <div class="mid">
       <!-- {{teacherlikedlist}} -->
       <div class="studentlist">
-        <div class="stuitem" v-for="(i,j) in teacherlikedlist" :key="j">
+        <div class="stuitem" v-for="(i,j) in teacherlikedlist.data" :key="j">
           <img :src="i.img" alt="" class="photo" />
           <div>
             <div class="info">
@@ -54,7 +54,7 @@
       </div>
     </div>
     <div class="pages">
-      <a-pagination v-model:current="page" :total="500" :showLessItems="true" />
+      <a-pagination v-model:current="page" :total="teacherlikedlist.total" :showLessItems="true" />
     </div>
   </div>
 </template>
@@ -168,7 +168,9 @@ export default defineComponent({
   components: {},
   setup() {
     const page = ref(1);
-    const teacherlikedlist =ref<Array<any>>([]);
+    const teacherlikedlist =ref<any>({
+
+    });
     const title=ref('')
     const condition = ref<any>({
       title:""