Merge pull request 'xbx' (#51) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/beelink/pulls/51
This commit is contained in:
luyuan 2020-10-16 14:53:54 +08:00
commit 9db63a6a1d
3 changed files with 10 additions and 7 deletions

View File

@ -101,7 +101,7 @@ interface Teacherliked {
export async function getteacherliked(data?:any){ export async function getteacherliked(data?:any){
const res = await get<Array<Teacherliked>>('teacherliked',data); const res = await get<Array<Teacherliked>>('teacherliked',data);
// console.log(res) // console.log(res)
return res.data return res;
} }
@ -514,8 +514,8 @@ export async function getliveinfo(id: number){
export async function getdatelist(start: string, end: string) { export async function getdatelist(start: string, end: string, teacherid: number) {
return (await get("teacherCalendar")).data return (await get("teacherCalendar",{start, end, teacherid})).data
} }

View File

@ -10,7 +10,7 @@
<div class="mid"> <div class="mid">
<!-- {{teacherlikedlist}} --> <!-- {{teacherlikedlist}} -->
<div class="studentlist"> <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" /> <img :src="i.img" alt="" class="photo" />
<div> <div>
<div class="info"> <div class="info">
@ -54,7 +54,7 @@
</div> </div>
</div> </div>
<div class="pages"> <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>
</div> </div>
</template> </template>
@ -168,7 +168,9 @@ export default defineComponent({
components: {}, components: {},
setup() { setup() {
const page = ref(1); const page = ref(1);
const teacherlikedlist =ref<Array<any>>([]); const teacherlikedlist =ref<any>({
});
const title=ref('') const title=ref('')
const condition = ref<any>({ const condition = ref<any>({
title:"" title:""

View File

@ -189,6 +189,7 @@
import { defineComponent, ref } from 'vue'; import { defineComponent, ref } from 'vue';
import { getdate } from "@/utils/date" import { getdate } from "@/utils/date"
import { getdatelist } from '@/api'; import { getdatelist } from '@/api';
import store from '@/store';
export default defineComponent({ export default defineComponent({
props:{ props:{
@ -211,7 +212,7 @@ export default defineComponent({
getdates() getdates()
} }
async function 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) console.log(res)
}) })
} }