From 2dc82c80007e3ea9da2715c7df686261d5a7709a Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Fri, 16 Oct 2020 16:22:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=88=E6=97=A5=E5=8E=86=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/date.ts         | 12 ++++++++--
 src/views/regime/date.vue | 46 +++++++++++++++++++++++++++++----------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/utils/date.ts b/src/utils/date.ts
index 2478765..1dbf9a8 100644
--- a/src/utils/date.ts
+++ b/src/utils/date.ts
@@ -2,7 +2,7 @@ import dayjs from 'dayjs'
 
 interface Date{
     day?: number;
-    list?: Array<unknown>;
+    list?: Array<any>;
 }
 
 interface GetDate{
@@ -46,7 +46,8 @@ export function getdate(yue?: number): GetDate{
         i++;
         const zhou =  Math.floor((i + w - 1) / 7)
         const d = {
-            day: i
+            day: i,
+            list: []
         }
         if(date[zhou] == undefined){
             date[zhou] = []
@@ -91,4 +92,11 @@ export function getweek(zhou?: number){
     }
     console.log(date)
     return {date, year, yue, day, zhou}
+}
+
+
+export function getDay(date: string){
+    const now = dayjs(date)
+    console.log(now.date())
+    return now.date();
 }
\ No newline at end of file
diff --git a/src/views/regime/date.vue b/src/views/regime/date.vue
index 81ae416..eaa4720 100644
--- a/src/views/regime/date.vue
+++ b/src/views/regime/date.vue
@@ -28,11 +28,11 @@
                 <div class="row" v-for="(item,index) in month.date" :key="index">
                     <div v-for="(i,j) in item" :key="j">
                         <div class="day">
-                            <div :class="{ing: yue == 0 && month.day == i.day}">
+                            <div :class="{ing: yue == 0 && month.day == i.day,old: (yue < 0 || (yue == 0 && month.day > i.day)) && i.list.length != 0 ,next: (yue > 0 || (yue == 0 && month.day < i.day)) && i.list.length != 0 }">
                                     {{i.day}}
-                                    <!-- <div class="item">
-                                        <div></div><p>asdsadas</p>
-                                    </div> -->
+                                    <div class="item" v-for="(i,j) in i.list" :key="j">
+                                        <div></div><p>{{i}}</p>
+                                    </div>
                                 <!-- <span class="ing"></span> -->
                                 <!-- <span class="next"></span> -->
                             </div>
@@ -186,8 +186,8 @@
 }
 </style>
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
-import { getdate } from "@/utils/date"
+import { computed, defineComponent, ref, watch } from 'vue';
+import { getdate, getDay } from "@/utils/date"
 import { getdatelist } from '@/api';
 import store from '@/store';
 
@@ -199,24 +199,46 @@ export default defineComponent({
         console.log(1)
         const date = getdate();
         console.log(date)
-        const month = ref(date);
+        const month: any = ref(date);
         const yue = ref(0);
         function xia(){
             yue.value  = yue.value + 1;
             month.value = getdate(yue.value)
-            getdates()
+            getdates(userid.value)
         }
+        const userid = computed(() => {
+            return store.state.userinfo.memberid;
+        
+        })
+        watch(userid, ()=> {
+            getdates(userid.value);
+        })
         function shang(){
             yue.value  = yue.value  - 1;
             month.value = getdate(yue.value)
-            getdates()
+            getdates(userid.value)
         }
-        async function getdates(){
-            getdatelist(month.value.start, month.value.end, store.state.userinfo.memberid).then((res)=>{
+        async function getdates(userid: number){
+            getdatelist(month.value.start, month.value.end, userid).then((res: any)=>{
                 console.log(res)
+                for(let i in res){
+                    const day = getDay(res[i].dateline)
+                    for(let j in month.value.date){
+                        for(let k in month.value.date[j]){
+                            if(month.value.date[j][k].day == day){
+                                if(month.value.date[j][k].list == undefined){
+                                    month.value.date[j][k].list = [];
+                                }
+                                month.value.date[j][k].list.push(res[i].title);
+                                console.log(day)
+                            }
+                        }
+                    }
+                }
+                console.log(month.value.date)
             })
         }
-        getdates()
+        getdates(userid.value);
         return {
             month,
             xia,

From c3e33c70b58818fb626d69bd18ff212823f34ce1 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 19 Oct 2020 08:59:04 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/regime/Video.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/regime/Video.vue b/src/views/regime/Video.vue
index af5c7ed..fadaacc 100644
--- a/src/views/regime/Video.vue
+++ b/src/views/regime/Video.vue
@@ -83,7 +83,7 @@
       ></VideoItem>
     </div>
     <div class="pages">
-      <a-pagination v-model:current="page" :total="50" :showLessItems="true" @change="pagechange" />
+      <a-pagination v-model:current="page" :total="videolist.total" :showLessItems="true" @change="pagechange" />
     </div>
   </div>
 </template>
@@ -232,6 +232,7 @@ export default defineComponent({
     }
     async function sel(){
         console.log(input.value);
+        page.value = 1;
           videolist.value = await getvideolist({title: input.value,page:page.value});
     }
     async function  pagechange() {