Merge branch 'fix-uc-review' into demo

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>

app/Http/Home/Views/user/console/courses.volt

@@ -64,3 +64,9 @@
     </div>
 
 {% endblock %}
+
+{% block include_js %}
+
+    {{ js_include('home/js/user.console.js') }}
+
+{% endblock %}

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';

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();