gitee/course-tencent-cloud
1
0
Fork 0
mirror of https://gitee.com/koogua/course-tencent-cloud.git synced 2025-06-28 21:31:37 +08:00
Code Issues Releases Wiki Activity

Merge branch 'fix-uc-review' into demo

Browse Source
This commit is contained in:
koogua 2021-06-23 12:52:16 +08:00
commit 6a2ab9fa82
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Home/Views/im/group/manage_users.volt
View File

@ -37,7 +37,7 @@
<td>{{ gender_info(item.user.gender) }}</td> <td>{{ gender_info(item.user.gender) }}</td>
<td>{{ date('Y-m-d H:i:s',item.create_time) }}</td> <td>{{ date('Y-m-d H:i:s',item.create_time) }}</td>
<td class="center"> <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> <button class="layui-btn layui-btn-sm layui-bg-red kg-delete" data-url="{{ delete_url }}">删除</button>
{% else %} {% else %}
<button class="layui-btn layui-btn-sm layui-btn-disabled">删除</button> <button class="layui-btn layui-btn-sm layui-btn-disabled">删除</button>

6
app/Http/Home/Views/user/console/courses.volt
View File

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

4
app/Repos/CourseFavorite.php
View File

@ -30,6 +30,10 @@ class CourseFavorite extends Repository
$builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]); $builder->andWhere('user_id = :user_id:', ['user_id' => $where['user_id']]);
} }
if (isset($where['deleted'])) {
$builder->andWhere('deleted = :deleted:', ['deleted' => $where['deleted']]);
}
switch ($sort) { switch ($sort) {
default: default:
$orderBy = 'id DESC'; $orderBy = 'id DESC';

2
app/Services/Logic/User/Console/FavoriteList.php
View File

@ -31,6 +31,8 @@ class FavoriteList extends LogicService
$params['user_id'] = $user->id; $params['user_id'] = $user->id;
$params['deleted'] = 0;
$sort = $pagerQuery->getSort(); $sort = $pagerQuery->getSort();
$page = $pagerQuery->getPage(); $page = $pagerQuery->getPage();
$limit = $pagerQuery->getLimit(); $limit = $pagerQuery->getLimit();