From f9deb7e916deb97f299c471212cd95cdf20526c3 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 8 Jul 2021 15:18:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=92=AD=E6=94=BE=E6=80=BB=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/views/system/user.vue | 1 -
 server/apps/vod/views.py         | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/client/src/views/system/user.vue b/client/src/views/system/user.vue
index 0162e29..b0cbab5 100644
--- a/client/src/views/system/user.vue
+++ b/client/src/views/system/user.vue
@@ -45,7 +45,6 @@
              <el-select
               v-model="listQuery.roles"
               placeholder="角色"
-              clearable
               style="width: 90px"
               class="filter-item"
               @change="handleFilter"
diff --git a/server/apps/vod/views.py b/server/apps/vod/views.py
index 285aabd..9275d46 100644
--- a/server/apps/vod/views.py
+++ b/server/apps/vod/views.py
@@ -94,11 +94,16 @@ class MyViewRecordAPIView(APIView):
             video = Video.objects.get(pk=id)
         except:
             return Response('视频不存在', status=HTTP_400_BAD_REQUEST)
-        record, _ = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user})
+        record, fcreated = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user})
+        if fcreated:
+            video.viewsp = video.viewsp + 1
+            video.save()
         if request.data.get('current', None):
             record.current = request.data.get('current')
         if timezone.now() > record.update_time + timedelta(hours=6) or record.create_time == record.update_time:
             record.views = record.views + 1
+            video.views = video.views + 1
+            video.save()
         record.save()
         return Response()
 

From 6e4c2c39f228c250733d3979844397a4d2652e90 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 8 Jul 2021 15:39:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E6=80=BB=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/apps/vod/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/apps/vod/views.py b/server/apps/vod/views.py
index 9275d46..c10252b 100644
--- a/server/apps/vod/views.py
+++ b/server/apps/vod/views.py
@@ -97,10 +97,11 @@ class MyViewRecordAPIView(APIView):
         record, fcreated = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user})
         if fcreated:
             video.viewsp = video.viewsp + 1
+            record.views = 1
             video.save()
         if request.data.get('current', None):
             record.current = request.data.get('current')
-        if timezone.now() > record.update_time + timedelta(hours=6) or record.create_time == record.update_time:
+        if timezone.now() > record.update_time + timedelta(hours=6):
             record.views = record.views + 1
             video.views = video.views + 1
             video.save()

From c5d44ffcf619a6c3ad1e86dbbd5edd8c62d7dcf5 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 8 Jul 2021 15:42:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=80=BB=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/apps/vod/views.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/apps/vod/views.py b/server/apps/vod/views.py
index c10252b..3607b9a 100644
--- a/server/apps/vod/views.py
+++ b/server/apps/vod/views.py
@@ -97,6 +97,7 @@ class MyViewRecordAPIView(APIView):
         record, fcreated = ViewRecord.objects.get_or_create(video=video, user=request.user, defaults={'video':video, 'user':request.user})
         if fcreated:
             video.viewsp = video.viewsp + 1
+            video.views = video.views + 1
             record.views = 1
             video.save()
         if request.data.get('current', None):