From b5a1e7a3bb31306bb97a16f0ec42e39a205ca85f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8C=BF=E5=B0=8F=E5=A4=A9?= <1638245306@qq.com>
Date: Sun, 6 Nov 2022 00:11:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BD=AF=E5=88=A0=E9=99=A4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/dvadmin/utils/models.py  | 2 +-
 backend/dvadmin/utils/viewset.py | 6 +-----
 web/.env                         | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/backend/dvadmin/utils/models.py b/backend/dvadmin/utils/models.py
index 273aeaf..df62b0c 100644
--- a/backend/dvadmin/utils/models.py
+++ b/backend/dvadmin/utils/models.py
@@ -25,7 +25,7 @@ class SoftDeleteQuerySet(QuerySet):
        :return: Tuple eg.(3, {'lqModel.Test': 3})
        """
         if soft_delete:
-            return self.update(is_deleted=True)
+            return super(SoftDeleteQuerySet, self).update(is_deleted=True)
         else:
             return super(SoftDeleteQuerySet, self).delete()
 
diff --git a/backend/dvadmin/utils/viewset.py b/backend/dvadmin/utils/viewset.py
index 30ecc09..f029ad9 100644
--- a/backend/dvadmin/utils/viewset.py
+++ b/backend/dvadmin/utils/viewset.py
@@ -94,11 +94,7 @@ class CustomModelViewSet(ModelViewSet,ImportSerializerMixin,ExportSerializerMixi
         instance = self.get_object()
         request_data = request.data
         soft_delete = request_data.get('soft_delete',True)
-        if soft_delete:
-            instance.is_deleted = True
-            instance.save()
-        else:
-            self.perform_destroy(instance)
+        instance.delete(soft_delete=soft_delete)
         return DetailResponse(data=[], msg="删除成功")
 
 
diff --git a/web/.env b/web/.env
index 4425b6d..4abe4b9 100644
--- a/web/.env
+++ b/web/.env
@@ -1,7 +1,7 @@
 # 所有环境默认
 
 # 页面 title 前缀
-VUE_APP_TITLE=D2Admin
+VUE_APP_TITLE=DvAdmin
 
 # 网络请求公用地址
 VUE_APP_API=/api/