From 5c9e44f3d51807de0c0a712b0003b9718c8e628a Mon Sep 17 00:00:00 2001
From: koogua <xiaochong0302@gmail.com>
Date: Wed, 23 Jun 2021 12:51:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Duc=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=BE=A4=E5=91=98=E7=AE=A1=E7=90=86=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=97=AE=E9=A2=98=203.=E4=BF=AE=E5=A4=8D=E8=AF=84?=
 =?UTF-8?q?=E4=BB=B7=E6=8C=89=E9=92=AE=E5=8D=95=E5=87=BB=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Home/Views/im/group/manage_users.volt   | 2 +-
 app/Http/Home/Views/user/console/courses.volt    | 6 ++++++
 app/Repos/CourseFavorite.php                     | 4 ++++
 app/Services/Logic/User/Console/FavoriteList.php | 2 ++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/Http/Home/Views/im/group/manage_users.volt b/app/Http/Home/Views/im/group/manage_users.volt
index 8da3b8a2..bdd1ddc6 100644
--- a/app/Http/Home/Views/im/group/manage_users.volt
+++ b/app/Http/Home/Views/im/group/manage_users.volt
@@ -37,7 +37,7 @@
                 <td>{{ gender_info(item.user.gender) }}</td>
                 <td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
                 <td class="center">
-                    {% if item.user.id == group.owner.id %}
+                    {% if item.user.id != group.owner.id %}
                         <button class="layui-btn layui-btn-sm layui-bg-red kg-delete" data-url="{{ delete_url }}">删除</button>
                     {% else %}
                         <button class="layui-btn layui-btn-sm layui-btn-disabled">删除</button>
diff --git a/app/Http/Home/Views/user/console/courses.volt b/app/Http/Home/Views/user/console/courses.volt
index 8066eac5..04a2bbfb 100644
--- a/app/Http/Home/Views/user/console/courses.volt
+++ b/app/Http/Home/Views/user/console/courses.volt
@@ -63,4 +63,10 @@
         </div>
     </div>
 
+{% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('home/js/user.console.js') }}
+
 {% endblock %}
\ No newline at end of file
diff --git a/app/Repos/CourseFavorite.php b/app/Repos/CourseFavorite.php
index fadab1a6..cfa69092 100644
--- a/app/Repos/CourseFavorite.php
+++ b/app/Repos/CourseFavorite.php
@@ -30,6 +30,10 @@ class CourseFavorite extends Repository
             $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
         }
 
+        if (isset($where['deleted'])) {
+            $builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
+        }
+
         switch ($sort) {
             default:
                 $orderBy = 'id DESC';
diff --git a/app/Services/Logic/User/Console/FavoriteList.php b/app/Services/Logic/User/Console/FavoriteList.php
index 99dc16b0..3ba07d8e 100644
--- a/app/Services/Logic/User/Console/FavoriteList.php
+++ b/app/Services/Logic/User/Console/FavoriteList.php
@@ -31,6 +31,8 @@ class FavoriteList extends LogicService
 
         $params['user_id'] = $user->id;
 
+        $params['deleted'] = 0;
+
         $sort = $pagerQuery->getSort();
         $page = $pagerQuery->getPage();
         $limit = $pagerQuery->getLimit();